progress on ROWLABELS=LAYER

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 2a970ed19a47b203a78e7cedec7e610f943419aa..e5a1ca5b19dda4c5964d53e4f0e346c55a1ac10e 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4698,6 +4698,17 @@ ctables_prepare_table (struct ctables_table *t)
                         break;
                       }
                   }
+                else if (at == CTAT_LAYER && t->label_axis[a] == 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;
+                      }
+                    continue;
+                  }
 
                 if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   {
@@ -4709,6 +4720,24 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->n_areas[at]--;
                     continue;
                   }
+                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                  {
+                    if (a == PIVOT_AXIS_ROW)
+                      {
+                        size_t n = nest->n_areas[at];
+                        if (n > 1)
+                          {
+                            nest->areas[at][n - 2] = nest->areas[at][n - 1];
+                            nest->n_areas[at]--;
+                          }
+                      }
+                    else if (a == PIVOT_AXIS_COLUMN)
+                      {
+                        if (nest->n_areas[at] > 0)
+                          nest->n_areas[at]--;
+                      }
+                    continue;
+                  }
                 else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
                   {
                     size_t n_drop = (a == PIVOT_AXIS_LAYER ? 0