COLLABELS=LAYER works too

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 812e6b3a8af3d91d2805093e38b5214784c114ad..4e872fc59fbd55e45c5a3c679eb2f14d5cdb08d6 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4698,6 +4698,16 @@ ctables_prepare_table (struct ctables_table *t)
                         break;
                       }
                   }
+                else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == 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--)
@@ -4748,6 +4758,24 @@ ctables_prepare_table (struct ctables_table *t)
                       }
                     continue;
                   }
+                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+                  {
+                    if (a == 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]--;
+                          }
+                      }
+                    else if (a == PIVOT_AXIS_ROW)
+                      {
+                        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
@@ -4792,6 +4820,16 @@ ctables_prepare_table (struct ctables_table *t)
                       }
                     continue;
                   }
+                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == 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