- 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 = 0;
+ bool drop_inner = false;
+ switch (at)
+ {
+ case CTAT_SUBTABLE:
+ if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
+ n_drop = a != PIVOT_AXIS_LAYER;
+ else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
+ n_drop = a == t->clabels_from_axis ? 2 : 0;
+ else
+ {
+ n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
+ drop_inner = a == t->clabels_from_axis;
+ }
+ break;
+
+ case CTAT_LAYERROW:
+ case CTAT_LAYERCOL:
+ n_drop = a == ata && t->label_axis[ata] == atb;
+ break;
+
+ case CTAT_ROW:
+ case CTAT_COL:
+ if (a == atb && t->label_axis[ata] == atb)
+ n_drop = 0;
+ else if (a == atb && t->label_axis[atb] == ata)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else if (a == atb && t->label_axis[atb] == PIVOT_AXIS_LAYER)
+ {
+ drop_inner = true;
+ n_drop = 0;
+ }
+ else
+ {
+ n_drop = a == atb;
+ if (a == ata && t->label_axis[ata] == atb)
+ n_drop++;
+ }
+ break;
+
+ case CTAT_LAYER:
+ case CTAT_TABLE:
+ n_drop = 0;
+ break;
+ }
+
+ 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]--;