ROWLABELS=LAYER works

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index e5a1ca5b19dda4c5964d53e4f0e346c55a1ac10e..812e6b3a8af3d91d2805093e38b5214784c114ad 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4688,6 +4688,16 @@ ctables_prepare_table (struct ctables_table *t)
                         break;
                       }
                   }
+                else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                  {
+                    for (size_t k = nest->n - 1; k < nest->n; k--)
+                      {
+                        if (k == nest->scale_idx)
+                          continue;
+                        nest->areas[at][nest->n_areas[at]++] = k;
+                        break;
+                      }
+                  }
                 else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
                   {
                     for (size_t k = nest->n - 1; k < nest->n; k--)
@@ -4772,6 +4782,16 @@ ctables_prepare_table (struct ctables_table *t)
                       }
                     continue;
                   }
+                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                  {
+                    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