ROWLABELS=OPPOSITE is correct

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 341e68e0d9039c3b4a7cc5b85aaed688e40614f5..f81dc818273ef2bfe3b3467e163e205350dac15b 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4678,7 +4678,7 @@ ctables_prepare_table (struct ctables_table *t)
                         continue;
                       nest->areas[at][nest->n_areas[at]++] = k;
                     }
-                else if ((at == CTAT_COL || at == CTAT_LAYERCOL) && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   {
                     for (size_t k = nest->n - 1; k < nest->n; k--)
                       {
@@ -4699,6 +4699,18 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->n_areas[at]--;
                     continue;
                   }
+                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                  continue;
+                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                  {
+                    size_t n = nest->n_areas[at];
+                    if (n > 1)
+                      {
+                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
+                        nest->n_areas[at]--;
+                      }
+                    continue;
+                  }
 
                 bool drop_last = (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
                                   : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
@@ -4708,7 +4720,8 @@ ctables_prepare_table (struct ctables_table *t)
                   nest->n_areas[at]--;
 
                 bool drop_additional
-                  = (((at == CTAT_ROW || at == CTAT_LAYERROW || at == CTAT_COL) && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN));
+                  = (t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN
+                     && (((at == CTAT_ROW || at == CTAT_LAYERROW) && a == PIVOT_AXIS_ROW)));
                 if (drop_additional && nest->n_areas[at] > 0)
                   nest->n_areas[at]--;
               }