- bool drop_last = (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
- : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
- : at == CTAT_COL ? a == PIVOT_AXIS_ROW
- : false);
- if (drop_last && nest->n_areas[at] > 0)
- 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));
- if (drop_additional && nest->n_areas[at] > 0)
- nest->n_areas[at]--;
+ size_t n_drop;
+ bool drop_inner = false;
+ if (at == CTAT_SUBTABLE
+ && t->clabels_from_axis != PIVOT_AXIS_LAYER
+ && t->clabels_to_axis != PIVOT_AXIS_LAYER)
+ n_drop = a == t->clabels_from_axis ? 2 : 0;
+ else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+ {
+ if (a == PIVOT_AXIS_COLUMN)
+ n_drop = 1;
+ else
+ {
+ if (a == PIVOT_AXIS_ROW)
+ drop_inner = true;
+ n_drop = 0;
+ }
+ }
+ else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+ {
+ if (a == PIVOT_AXIS_ROW)
+ n_drop = 1;
+ else
+ {
+ if (a == PIVOT_AXIS_COLUMN)
+ drop_inner = true;
+ n_drop = 0;
+ }
+ }
+ else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+ n_drop = 0;
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ n_drop = 0;
+ else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else
+ {
+ n_drop = 0;
+ if (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
+ : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
+ : at == CTAT_COL ? a == PIVOT_AXIS_ROW
+ : false)
+ n_drop++;
+ if ((t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && (at == CTAT_ROW || at == CTAT_LAYERROW) && a == PIVOT_AXIS_ROW)
+ || (t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && (at == CTAT_COL || at == CTAT_LAYERCOL) && a == PIVOT_AXIS_COLUMN))
+ n_drop++;
+ }
+
+ if (drop_inner)
+ {
+ size_t n = nest->n_areas[at];
+ if (n > 1)
+ {
+ nest->areas[at][n - 2] = nest->areas[at][n - 1];
+ nest->n_areas[at]--;
+ }
+ }
+ for (size_t i = 0; i < n_drop; i++)
+ if (nest->n_areas[at] > 0)
+ nest->n_areas[at]--;