ooxml-core 1.14.0 → 1.16.0

package/dist/automation/index.cjs

@@ -81,7 +81,7 @@ var DEFAULT_XML_LIMITS = {
   maxNodes: 5e6
 };
 var MARKUP_RE = /<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?\]\]>|<\?[\s\S]*?\?>|<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/g;
-function checkXmlLimits(xml, label5, limits = {}) {
+function checkXmlLimits(xml, label2, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
@@ -94,16 +94,16 @@ function checkXmlLimits(xml, label5, limits = {}) {
       continue;
     }
     nodes++;
-    if (nodes > maxNodes) throw new Error(`${label5} XML exceeds the limit of ${maxNodes} elements`);
+    if (nodes > maxNodes) throw new Error(`${label2} XML exceeds the limit of ${maxNodes} elements`);
     if (!selfClosing && ++depth > maxDepth)
-      throw new Error(`${label5} XML exceeds the nesting depth limit of ${maxDepth}`);
+      throw new Error(`${label2} XML exceeds the nesting depth limit of ${maxDepth}`);
   }
 }
 function parseXml(xml, options = {}) {
-  const label5 = options.label ?? "OOXML";
+  const label2 = options.label ?? "OOXML";
   if (/<!DOCTYPE|<!ENTITY/i.test(xml))
-    throw new Error(`${label5} XML with DTD or entity declarations is not supported`);
-  checkXmlLimits(xml, label5, options.limits);
+    throw new Error(`${label2} XML with DTD or entity declarations is not supported`);
+  checkXmlLimits(xml, label2, options.limits);
   let parseError = "";
   let parsed;
   try {
@@ -114,12 +114,12 @@ function parseXml(xml, options = {}) {
     }).parseFromString(xml, "application/xml");
   } catch (error) {
     throw new Error(
-      `Invalid ${label5} XML: ${error instanceof Error ? error.message : String(error)}`,
+      `Invalid ${label2} XML: ${error instanceof Error ? error.message : String(error)}`,
       { cause: error }
     );
   }
   if (parseError || !parsed.documentElement)
-    throw new Error(`Invalid ${label5} XML: ${parseError || "missing root element"}`);
+    throw new Error(`Invalid ${label2} XML: ${parseError || "missing root element"}`);
   return parsed;
 }
 var buildXml = (node3) => new xmldom.XMLSerializer().serializeToString(node3);
@@ -406,10 +406,10 @@ function withParseWarnings(warnings, fn) {
 function reportParseWarning(message) {
   if (sink && !sink.includes(message)) sink.push(message);
 }
-function enumValue(guard2, raw2, label5) {
+function enumValue(guard2, raw2, label2) {
   if (raw2 === null || raw2 === void 0 || raw2 === "") return void 0;
   if (guard2(raw2)) return raw2;
-  reportParseWarning(`Ignored invalid ${label5} value \u201C${raw2}\u201D; it is not allowed by the schema.`);
+  reportParseWarning(`Ignored invalid ${label2} value \u201C${raw2}\u201D; it is not allowed by the schema.`);
   return void 0;
 }
 
@@ -2298,7 +2298,7 @@ function flatChildren(parent, names, level = "block", enclosing, controls3 = /*
   return found;
 }
 var flatBlocks = (container) => flatChildren(container, ["p", "tbl"]);
-var flatRows = (table3) => flatChildren(table3, ["tr"], "row");
+var flatRows = (table4) => flatChildren(table4, ["tr"], "row");
 var flatCells = (row3) => flatChildren(row3, ["tc"], "cell");
 var flatCellParagraphs = (cell) => flatChildren(cell, ["p"]);
 
@@ -3011,42 +3011,42 @@ function buildMargins(doc, margins, tag) {
   }
   return element2.childNodes.length ? element2 : void 0;
 }
-function tableJustification(table3) {
-  const { alignment, justification } = table3;
+function tableJustification(table4) {
+  const { alignment, justification } = table4;
   const implied = justification === "start" ? "left" : justification === "end" ? "right" : justification;
   return justification && implied === alignment ? justification : alignment;
 }
-function tableColumnCount(table3) {
+function tableColumnCount(table4) {
   return Math.max(
     1,
-    ...table3.rows.map((row3) => row3.reduce((sum3, cell) => sum3 + (cell.gridSpan ?? 1), 0))
+    ...table4.rows.map((row3) => row3.reduce((sum3, cell) => sum3 + (cell.gridSpan ?? 1), 0))
   );
 }
-function buildNewTableProperties(doc, table3, contentWidthTwips) {
+function buildNewTableProperties(doc, table4, contentWidthTwips) {
   const tblPr = makeW(doc, "tblPr");
-  if (table3.style) {
+  if (table4.style) {
     const style3 = makeW(doc, "tblStyle");
-    setW2(style3, "val", table3.style);
+    setW2(style3, "val", table4.style);
     tblPr.appendChild(style3);
   }
   const width = makeW(doc, "tblW");
-  setW2(width, "w", String(table3.widthTwips ?? 0));
-  setW2(width, "type", table3.widthTwips ? "dxa" : "auto");
+  setW2(width, "w", String(table4.widthTwips ?? 0));
+  setW2(width, "type", table4.widthTwips ? "dxa" : "auto");
   tblPr.appendChild(width);
-  const jcValue = tableJustification(table3);
+  const jcValue = tableJustification(table4);
   if (jcValue) {
     const jc = makeW(doc, "jc");
     setW2(jc, "val", jcValue);
     tblPr.appendChild(jc);
   }
-  if (table3.indentTwips !== void 0) {
+  if (table4.indentTwips !== void 0) {
     const indent = makeW(doc, "tblInd");
-    setW2(indent, "w", String(table3.indentTwips));
+    setW2(indent, "w", String(table4.indentTwips));
     setW2(indent, "type", "dxa");
     tblPr.appendChild(indent);
   }
-  if (table3.borders) tblPr.appendChild(buildBorders(doc, table3.borders, "tblBorders"));
-  const margins = table3.cellMargins && buildMargins(doc, table3.cellMargins, "tblCellMar");
+  if (table4.borders) tblPr.appendChild(buildBorders(doc, table4.borders, "tblBorders"));
+  const margins = table4.cellMargins && buildMargins(doc, table4.cellMargins, "tblCellMar");
   if (margins) tblPr.appendChild(margins);
   const look = makeW(doc, "tblLook");
   const lookAttributes = [
@@ -3061,8 +3061,8 @@ function buildNewTableProperties(doc, table3, contentWidthTwips) {
   for (const [name3, value2] of lookAttributes) setW2(look, name3, value2);
   tblPr.appendChild(look);
   const tblGrid = makeW(doc, "tblGrid");
-  const columns = tableColumnCount(table3);
-  const widths = table3.grid?.length === columns ? table3.grid : Array.from({ length: columns }, () => Math.max(1, Math.floor(contentWidthTwips / columns)));
+  const columns = tableColumnCount(table4);
+  const widths = table4.grid?.length === columns ? table4.grid : Array.from({ length: columns }, () => Math.max(1, Math.floor(contentWidthTwips / columns)));
   for (const value2 of widths) {
     const column2 = makeW(doc, "gridCol");
     setW2(column2, "w", String(value2));
@@ -3310,14 +3310,14 @@ function patchRowProperties(doc, tr, next, base2) {
   }
   orderChildren(props, ROW_ORDER);
 }
-function patchTableMargins(doc, table3, node3, base2) {
+function patchTableMargins(doc, table4, node3, base2) {
   patchMarginProperties(
     doc,
     node3,
     "tblPr",
     "tblCellMar",
     TABLE_ORDER,
-    table3.cellMargins,
+    table4.cellMargins,
     base2?.cellMargins
   );
 }
@@ -3412,12 +3412,12 @@ function patchCellShading(doc, tc, next, base2) {
 }
 
 // docx/write-table.ts
-function canEditTableStructure(table3) {
+function canEditTableStructure(table4) {
   const only = (parent, allowed) => Array.from(parent.childNodes).filter(isElement).every((node3) => allowed.some((name3) => named2(node3, name3)));
-  if (!only(table3, ["tblPr", "tblGrid", "tr"])) return false;
-  const grid = first2(table3, "tblGrid");
+  if (!only(table4, ["tblPr", "tblGrid", "tr"])) return false;
+  const grid = first2(table4, "tblGrid");
   if (grid && !only(grid, ["gridCol"])) return false;
-  const rows = children2(table3, "tr");
+  const rows = children2(table4, "tr");
   if (!rows.length) return false;
   const [firstRow] = rows;
   if (!firstRow) return false;
@@ -3443,7 +3443,7 @@ function canEditTableStructure(table3) {
   }
   return true;
 }
-var layout = (table3) => table3.rows.map((row3) => row3.map((cell) => cell.paragraphs.map((p) => p.id)));
+var layout = (table4) => table4.rows.map((row3) => row3.map((cell) => cell.paragraphs.map((p) => p.id)));
 var TABLE_DESCRIPTOR_KEYS = [
   "grid",
   "widthTwips",
@@ -3460,9 +3460,9 @@ function pick(source2, keys) {
   for (const key2 of keys) if (record2[key2] !== void 0) result2[key2] = record2[key2];
   return result2;
 }
-function assertNoDescriptorEdits(table3, base2) {
+function assertNoDescriptorEdits(table4, base2) {
   if (!base2) return;
-  if (JSON.stringify(pick(table3, TABLE_DESCRIPTOR_KEYS)) !== JSON.stringify(pick(base2, TABLE_DESCRIPTOR_KEYS)))
+  if (JSON.stringify(pick(table4, TABLE_DESCRIPTOR_KEYS)) !== JSON.stringify(pick(base2, TABLE_DESCRIPTOR_KEYS)))
     throw new Error(
       "Cannot edit table grid widths, width, alignment, indent, borders, or style; only cell text and row/column structure changes are supported. The original DOCX package remains unchanged."
     );
@@ -3472,7 +3472,7 @@ function assertNoDescriptorEdits(table3, base2) {
       const id3 = cell.paragraphs[0]?.id;
       if (id3) baseCellById.set(id3, cell);
     }
-  for (const row3 of table3.rows)
+  for (const row3 of table4.rows)
     for (const cell of row3) {
       const id3 = cell.paragraphs[0]?.id;
       const source2 = id3 ? baseCellById.get(id3) : void 0;
@@ -3488,23 +3488,23 @@ function writeNestedTables(doc, tc, cell, base2, writeParagraph, replaceSlots2)
   const next = tables(cell.sourceBlocks);
   const before = tables(base2?.sourceBlocks);
   const nodes = children2(tc, "tbl");
-  next.forEach((table3, index3) => {
+  next.forEach((table4, index3) => {
     const node3 = nodes[index3];
     if (node3 && before[index3])
-      writeTable(doc, table3, node3, before[index3], writeParagraph, replaceSlots2);
+      writeTable(doc, table4, node3, before[index3], writeParagraph, replaceSlots2);
   });
 }
-function writeTable(doc, table3, node3, base2, writeParagraph, replaceSlots2) {
-  if (base2 && JSON.stringify(table3) === JSON.stringify(base2)) return node3;
-  assertNoDescriptorEdits(table3, base2);
-  patchTableMargins(doc, table3, node3, base2);
-  const structural = base2 && JSON.stringify(layout(table3)) !== JSON.stringify(layout(base2));
+function writeTable(doc, table4, node3, base2, writeParagraph, replaceSlots2) {
+  if (base2 && JSON.stringify(table4) === JSON.stringify(base2)) return node3;
+  assertNoDescriptorEdits(table4, base2);
+  patchTableMargins(doc, table4, node3, base2);
+  const structural = base2 && JSON.stringify(layout(table4)) !== JSON.stringify(layout(base2));
   if (structural && !canEditTableStructure(node3))
     throw new Error(
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
-  const width = table3.rows[0]?.length ?? 0;
-  if (!width || table3.rows.some((row3) => row3.length !== width || row3.some((cell) => !cell.paragraphs.length)))
+  const width = table4.rows[0]?.length ?? 0;
+  if (!width || table4.rows.some((row3) => row3.length !== width || row3.some((cell) => !cell.paragraphs.length)))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node3).map((entry3) => entry3.element);
   const sourceById = /* @__PURE__ */ new Map();
@@ -3525,7 +3525,7 @@ function writeTable(doc, table3, node3, base2, writeParagraph, replaceSlots2) {
   const usedCells = /* @__PURE__ */ new Set();
   const usedRows = /* @__PURE__ */ new Set();
   const columns = /* @__PURE__ */ new Map();
-  const nextRows = table3.rows.map((row3, rowIndex2) => {
+  const nextRows = table4.rows.map((row3, rowIndex2) => {
     const sources = row3.map(
       (cell) => cell.paragraphs.map((p) => sourceById.get(p.id)).find(Boolean)
     );
@@ -3540,7 +3540,7 @@ function writeTable(doc, table3, node3, base2, writeParagraph, replaceSlots2) {
     patchRowProperties(
       doc,
       tr,
-      table3.rowProperties?.[rowIndex2],
+      table4.rowProperties?.[rowIndex2],
       sourceRow === void 0 ? void 0 : base2?.rowProperties?.[sourceRow]
     );
     const nextCells = row3.map((cell, ci) => {
@@ -11566,8 +11566,8 @@ function gd14(name3, formula) {
   const parts = formula.trim().split(/\s+/);
   return { name: name3, formula, args: parts.slice(1) };
 }
-function parseGdTable(table3) {
-  return table3.trim().split(/[\n;]/).filter((entry3) => entry3.length > 0).map((entry3) => {
+function parseGdTable(table4) {
+  return table4.trim().split(/[\n;]/).filter((entry3) => entry3.length > 0).map((entry3) => {
     const sep = entry3.indexOf("|");
     return gd14(entry3.slice(0, sep), entry3.slice(sep + 1));
   });
@@ -13460,8 +13460,8 @@ function parseDiagramDataModel(source2, part) {
           "CONNECTION_ENDPOINT_MISSING",
           `dgm:cxn ${attribute4} references missing point: ${id3}.`
         );
-    const label5 = connectionLabel(connection, transitionText);
-    connections2.push(label5 ? { ...connection, label: label5 } : connection);
+    const label2 = connectionLabel(connection, transitionText);
+    connections2.push(label2 ? { ...connection, label: label2 } : connection);
     if ((!connection.type || connection.type === "parOf") && !parentById.has(connection.destId))
       parentById.set(connection.destId, connection.sourceId);
   }
@@ -13500,14 +13500,14 @@ function colorList(container) {
 }
 function parseDiagramColors(source2) {
   const root = rootOf2(source2);
-  const labels = children(root, "styleLbl", NS.dgm).map((label5) => ({
-    name: stringAttribute(label5, "name") ?? "",
-    fill: colorList(first(label5, "fillClrLst", NS.dgm)),
-    line: colorList(first(label5, "linClrLst", NS.dgm)),
-    effect: colorList(first(label5, "effectClrLst", NS.dgm)),
-    textLine: colorList(first(label5, "txLinClrLst", NS.dgm)),
-    textFill: colorList(first(label5, "txFillClrLst", NS.dgm)),
-    textEffect: colorList(first(label5, "txEffectClrLst", NS.dgm))
+  const labels = children(root, "styleLbl", NS.dgm).map((label2) => ({
+    name: stringAttribute(label2, "name") ?? "",
+    fill: colorList(first(label2, "fillClrLst", NS.dgm)),
+    line: colorList(first(label2, "linClrLst", NS.dgm)),
+    effect: colorList(first(label2, "effectClrLst", NS.dgm)),
+    textLine: colorList(first(label2, "txLinClrLst", NS.dgm)),
+    textFill: colorList(first(label2, "txFillClrLst", NS.dgm)),
+    textEffect: colorList(first(label2, "txEffectClrLst", NS.dgm))
   }));
   return { ...parseDefinitionHeader(root), labels };
 }
@@ -13540,16 +13540,16 @@ function parseStyleReferences(style3) {
 var hasContent = (element2) => Boolean(element2 && (element2.attributes.length > 0 || elements(element2).length > 0));
 function parseDiagramQuickStyle(source2) {
   const root = rootOf2(source2);
-  const labels = children(root, "styleLbl", NS.dgm).map((label5) => ({
-    name: stringAttribute(label5, "name") ?? "",
-    ...parseStyleReferences(first(label5, "style", NS.dgm)),
-    hasScene3d: Boolean(first(label5, "scene3d", NS.dgm)),
-    hasShape3d: hasContent(first(label5, "sp3d", NS.dgm))
+  const labels = children(root, "styleLbl", NS.dgm).map((label2) => ({
+    name: stringAttribute(label2, "name") ?? "",
+    ...parseStyleReferences(first(label2, "style", NS.dgm)),
+    hasScene3d: Boolean(first(label2, "scene3d", NS.dgm)),
+    hasShape3d: hasContent(first(label2, "sp3d", NS.dgm))
   }));
   return {
     ...parseDefinitionHeader(root),
     labels,
-    has3d: labels.some((label5) => label5.hasShape3d)
+    has3d: labels.some((label2) => label2.hasShape3d)
   };
 }
 function parseDiagramLayoutSummary(source2) {
@@ -14719,10 +14719,10 @@ function parseDisplayUnits(context, element2) {
   if (!element2) return void 0;
   reportUnmodelled(context, element2, DISPLAY_UNITS);
   const labelElement = cChild(element2, "dispUnitsLbl");
-  let label5;
+  let label2;
   if (labelElement) {
     reportUnmodelled(context, labelElement, DISPLAY_UNITS_LABEL);
-    label5 = assignDefined(
+    label2 = assignDefined(
       {},
       {
         layout: manualLayout(labelElement),
@@ -14737,7 +14737,7 @@ function parseDisplayUnits(context, element2) {
     {
       builtInUnit: cVal(element2, "builtInUnit"),
       customUnit: cNumber(context, element2, "custUnit"),
-      label: label5,
+      label: label2,
       extLst: extensionList2(element2)
     }
   );
@@ -15591,10 +15591,10 @@ function titleXml(context, title) {
 function labelOptionsXml(context, options) {
   return numberFormatXml(options.numberFormat) + shapePropertiesXml(context, options.spPr) + textBodyXml(context, options.txPr) + valXml("dLblPos", options.position) + valXml("showLegendKey", options.showLegendKey) + valXml("showVal", options.showValue) + valXml("showCatName", options.showCategoryName) + valXml("showSerName", options.showSeriesName) + valXml("showPercent", options.showPercent) + valXml("showBubbleSize", options.showBubbleSize) + (options.separator === void 0 ? "" : textElement("separator", options.separator));
 }
-function labelXml(context, label5) {
+function labelXml(context, label2) {
   return elementXml(
     "dLbl",
-    valXml("idx", label5.index) + valXml("delete", label5.deleted) + layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + labelOptionsXml(context, label5) + raw(context, label5.extLst)
+    valXml("idx", label2.index) + valXml("delete", label2.deleted) + layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + labelOptionsXml(context, label2) + raw(context, label2.extLst)
   );
 }
 function dataLabelsXml(context, labels) {
@@ -15602,7 +15602,7 @@ function dataLabelsXml(context, labels) {
   const leaderLines = labels.leaderLines ? elementXml("leaderLines", shapePropertiesXml(context, labels.leaderLines.spPr)) : "";
   return elementXml(
     "dLbls",
-    labels.labels.map((label5) => labelXml(context, label5)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
+    labels.labels.map((label2) => labelXml(context, label2)).join("") + valXml("delete", labels.deleted) + labelOptionsXml(context, labels) + valXml("showLeaderLines", labels.showLeaderLines) + leaderLines + raw(context, labels.extLst)
   );
 }
 
@@ -15614,21 +15614,21 @@ function surfaceXml(context, local, surface) {
     valXml("thickness", surface.thickness) + shapePropertiesXml(context, surface.spPr) + raw(context, surface.pictureOptionsXml) + raw(context, surface.extLst)
   );
 }
-function dataTableXml(context, table3) {
-  if (!table3) return "";
+function dataTableXml(context, table4) {
+  if (!table4) return "";
   return elementXml(
     "dTable",
-    valXml("showHorzBorder", table3.showHorizontalBorder) + valXml("showVertBorder", table3.showVerticalBorder) + valXml("showOutline", table3.showOutline) + valXml("showKeys", table3.showKeys) + shapePropertiesXml(context, table3.spPr) + textBodyXml(context, table3.txPr) + raw(context, table3.extLst)
+    valXml("showHorzBorder", table4.showHorizontalBorder) + valXml("showVertBorder", table4.showVerticalBorder) + valXml("showOutline", table4.showOutline) + valXml("showKeys", table4.showKeys) + shapePropertiesXml(context, table4.spPr) + textBodyXml(context, table4.txPr) + raw(context, table4.extLst)
   );
 }
 function displayUnitsXml(context, units2) {
   if (!units2) return "";
-  const label5 = units2.label;
+  const label2 = units2.label;
   return elementXml(
     "dispUnits",
-    valXml("custUnit", units2.customUnit) + (units2.customUnit === void 0 ? valXml("builtInUnit", units2.builtInUnit) : "") + (label5 ? elementXml(
+    valXml("custUnit", units2.customUnit) + (units2.customUnit === void 0 ? valXml("builtInUnit", units2.builtInUnit) : "") + (label2 ? elementXml(
       "dispUnitsLbl",
-      layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr)
+      layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr)
     ) : "") + raw(context, units2.extLst)
   );
 }
@@ -15653,11 +15653,11 @@ function axisXml(context, axis) {
 }
 
 // chart/write-analysis.ts
-function trendlineLabelXml(context, label5) {
-  if (!label5) return "";
+function trendlineLabelXml(context, label2) {
+  if (!label2) return "";
   return elementXml(
     "trendlineLbl",
-    layoutXml(context, label5.layout) + chartTextXml(context, label5.tx, false) + numberFormatXml(label5.numberFormat) + shapePropertiesXml(context, label5.spPr) + textBodyXml(context, label5.txPr) + raw(context, label5.extLst)
+    layoutXml(context, label2.layout) + chartTextXml(context, label2.tx, false) + numberFormatXml(label2.numberFormat) + shapePropertiesXml(context, label2.spPr) + textBodyXml(context, label2.txPr) + raw(context, label2.extLst)
   );
 }
 function trendlineXml(context, trendline) {
@@ -17908,16 +17908,16 @@ var RelationshipAllocator = class {
 
 // docx/write.ts
 var twips2 = (pixels) => String(Math.round(pixels * 15));
-function createTable(doc, table3, allocator, contentWidthTwips, spans2) {
+function createTable(doc, table4, allocator, contentWidthTwips, spans2) {
   const node3 = makeW(doc, "tbl");
-  const { tblPr, tblGrid } = buildNewTableProperties(doc, table3, contentWidthTwips);
+  const { tblPr, tblGrid } = buildNewTableProperties(doc, table4, contentWidthTwips);
   node3.appendChild(tblPr);
   node3.appendChild(tblGrid);
-  const columns = tableColumnCount(table3);
-  table3.rows.forEach((row3, rowIndex2) => {
+  const columns = tableColumnCount(table4);
+  table4.rows.forEach((row3, rowIndex2) => {
     const tr = makeW(doc, "tr");
     const spanned = row3.reduce((sum3, cell) => sum3 + (cell.gridSpan ?? 1), 0);
-    const trPr = buildRowProperties(doc, table3.rowProperties?.[rowIndex2], columns - spanned);
+    const trPr = buildRowProperties(doc, table4.rowProperties?.[rowIndex2], columns - spanned);
     if (trPr) tr.appendChild(trPr);
     for (const cell of row3) {
       const tc = makeW(doc, "tc");
@@ -18320,28 +18320,28 @@ function validateCell(c2, cell) {
     for (const side2 of ["top", "bottom", "left", "right"])
       c2.at(".margins").signed(side2, cell.margins[side2], "ST_SignedTwipsMeasure");
 }
-function validateTable(c2, table3) {
-  c2.unsigned("widthTwips", table3.widthTwips, "ST_TwipsMeasure");
-  c2.signed("indentTwips", table3.indentTwips, "ST_SignedTwipsMeasure");
+function validateTable(c2, table4) {
+  c2.unsigned("widthTwips", table4.widthTwips, "ST_TwipsMeasure");
+  c2.signed("indentTwips", table4.indentTwips, "ST_SignedTwipsMeasure");
   c2.check(
     "alignment",
-    table3.alignment,
+    table4.alignment,
     (v) => v === "left" || v === "center" || v === "right",
     'must be "left", "center" or "right"'
   );
-  c2.enum("justification", table3.justification, isStJcTable, "ST_JcTable");
-  table3.grid?.forEach(
+  c2.enum("justification", table4.justification, isStJcTable, "ST_JcTable");
+  table4.grid?.forEach(
     (width, index3) => c2.at(`.grid[${index3}]`).unsigned("width", width, "ST_TwipsMeasure")
   );
-  validateBorders(c2.at(".borders"), table3.borders);
-  if (table3.cellMargins)
+  validateBorders(c2.at(".borders"), table4.borders);
+  if (table4.cellMargins)
     for (const side2 of ["top", "bottom", "left", "right"])
-      c2.at(".cellMargins").signed(side2, table3.cellMargins[side2], "ST_SignedTwipsMeasure");
-  table3.rowProperties?.forEach((row3, index3) => {
+      c2.at(".cellMargins").signed(side2, table4.cellMargins[side2], "ST_SignedTwipsMeasure");
+  table4.rowProperties?.forEach((row3, index3) => {
     if (row3)
       c2.at(`.rowProperties[${index3}]`).unsigned("heightTwips", row3.heightTwips, "ST_TwipsMeasure");
   });
-  table3.rows.forEach(
+  table4.rows.forEach(
     (row3, r) => row3.forEach((cell, k) => validateCell(c2.at(`.rows[${r}][${k}]`), cell))
   );
 }
@@ -19773,40 +19773,40 @@ function parseTable(node3, id3, parseParagraph3) {
       (cell, ci) => parseCell(cell.element, parseParagraph3, `${id3}-r${ri}c${ci}`, cell.control)
     )
   );
-  const table3 = { type: "table", id: id3, rows, structureEditable: canEditTableStructure(node3) };
+  const table4 = { type: "table", id: id3, rows, structureEditable: canEditTableStructure(node3) };
   const gridElement = first2(node3, "tblGrid");
   const grid = gridElement ? children2(gridElement, "gridCol").flatMap((column2) => {
     const width2 = dxa(getW(column2, "w"));
     return width2 === void 0 ? [] : [width2];
   }) : [];
-  if (grid.length) table3.grid = grid;
+  if (grid.length) table4.grid = grid;
   const tblPr = first2(node3, "tblPr");
   const tableWidth = first2(tblPr, "tblW");
   const width = (getW(tableWidth, "type") ?? "dxa") === "dxa" ? dxa(getW(tableWidth, "w")) : void 0;
-  if (width !== void 0) table3.widthTwips = width;
+  if (width !== void 0) table4.widthTwips = width;
   const justification = enumValue(isStJcTable, getW(first2(tblPr, "jc"), "val"), "w:tblPr/w:jc");
   if (justification) {
-    table3.justification = justification;
+    table4.justification = justification;
     const rtl = onOffElement(first2(tblPr, "bidiVisual")) === true;
-    table3.alignment = justification === "start" ? rtl ? "right" : "left" : justification === "end" ? rtl ? "left" : "right" : justification;
+    table4.alignment = justification === "start" ? rtl ? "right" : "left" : justification === "end" ? rtl ? "left" : "right" : justification;
   }
   const indent = parseSignedTwips(getW(first2(tblPr, "tblInd"), "w"));
-  if (indent !== void 0) table3.indentTwips = indent;
+  if (indent !== void 0) table4.indentTwips = indent;
   const borders = parseTableBorders(first2(tblPr, "tblBorders"));
-  if (borders) table3.borders = borders;
+  if (borders) table4.borders = borders;
   const styleId = getW(first2(tblPr, "tblStyle"), "val");
-  if (styleId) table3.style = styleId;
+  if (styleId) table4.style = styleId;
   const look = parseLook(first2(tblPr, "tblLook"));
-  if (look) table3.look = look;
+  if (look) table4.look = look;
   const cellMargins = parseMargins(first2(tblPr, "tblCellMar"));
-  if (cellMargins) table3.cellMargins = cellMargins;
+  if (cellMargins) table4.cellMargins = cellMargins;
   const rowProperties = rowEntries.map(({ element: element2, control }) => {
     const properties = parseRowProperties(element2);
     if (control) properties.contentControl = control;
     return properties;
   });
-  if (rowProperties.some((row3) => Object.keys(row3).length)) table3.rowProperties = rowProperties;
-  return table3;
+  if (rowProperties.some((row3) => Object.keys(row3).length)) table4.rowProperties = rowProperties;
+  return table4;
 }
 
 // docx/hyperlink.ts
@@ -20860,19 +20860,19 @@ var nextSheetId = (workbook) => workbook.sheets.reduce((max, sheet) => Math.max(
 var MAX_ROW = 1048575;
 var MAX_COL = 16383;
 function columnLabel(col) {
-  let label5 = "";
+  let label2 = "";
   let n = col + 1;
   while (n > 0) {
     const rem = (n - 1) % 26;
-    label5 = String.fromCharCode(65 + rem) + label5;
+    label2 = String.fromCharCode(65 + rem) + label2;
     n = Math.floor((n - 1) / 26);
   }
-  return label5;
+  return label2;
 }
-function columnIndex(label5) {
-  if (!/^[A-Za-z]{1,3}$/.test(label5)) return -1;
+function columnIndex(label2) {
+  if (!/^[A-Za-z]{1,3}$/.test(label2)) return -1;
   let n = 0;
-  for (const ch of label5.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
+  for (const ch of label2.toUpperCase()) n = n * 26 + (ch.charCodeAt(0) - 64);
   return n - 1;
 }
 var formatAddress = (address2) => `${columnLabel(address2.col)}${address2.row + 1}`;
@@ -23231,11 +23231,235 @@ var pivotRowFields = (pivot) => [
   ...pivot.secondRowField ? [pivot.secondRowField] : [],
   ...pivot.secondRowField ? pivot.moreRowFields ?? [] : []
 ];
+function pivotValuesIndex(pivot) {
+  if (pivot.valuesAxis !== "rows") return -1;
+  const count2 = pivotRowFields(pivot).length;
+  const at2 = pivot.valuesPosition;
+  if (typeof at2 === "number") return Math.min(Math.max(Math.trunc(at2), 0), count2);
+  return at2 === "first" ? 0 : at2 === "between" ? Math.min(1, count2) : count2;
+}
 var pivotColumnFields = (pivot) => [
   ...pivot.columnField ? [pivot.columnField] : [],
   ...pivot.columnField ? pivot.moreColumnFields ?? [] : []
 ];
 
+// i18n/locale.ts
+var SUPPORTED_OFFICE_LOCALES = ["en", "fr", "de", "es", "zh-CN"];
+var DEFAULT_REJECTED_SUBTAGS = ["hant", "tw", "hk", "mo"];
+function normalizeLocale(input, supported2, fallback, options = {}) {
+  const parts = (input ?? "").trim().toLowerCase().split(/[-_]/).filter(Boolean);
+  const language = parts[0];
+  if (!language) return fallback;
+  const find3 = (tag) => supported2.find((item) => item.toLowerCase() === tag);
+  const exact = find3(parts.join("-"));
+  if (exact) return exact;
+  const base2 = find3(language);
+  if (base2) return base2;
+  const rejected = options.rejectedSubtags ?? DEFAULT_REJECTED_SUBTAGS;
+  if (parts.slice(1).some((part) => rejected.includes(part))) return fallback;
+  return supported2.find((item) => item.toLowerCase().split("-")[0] === language && item.includes("-")) ?? fallback;
+}
+function normalizeOfficeLocale(input) {
+  return normalizeLocale(input, SUPPORTED_OFFICE_LOCALES, "en");
+}
+
+// xlsx/pivot/captions-locales.ts
+var table = (words2, prefix3, rest, functions) => ({
+  ...rest,
+  functions,
+  aggregates: Object.fromEntries(
+    Object.keys(words2).map((fn) => [fn, prefix3(words2[fn])])
+  )
+});
+var GERMAN = {
+  sum: "Summe",
+  count: "Anzahl",
+  average: "Mittelwert",
+  max: "Max",
+  min: "Min",
+  product: "Produkt",
+  countNums: "Anzahl (Zahlen)",
+  stdDev: "Standardabweichung",
+  stdDevp: "Standardabweichung (Grundgesamtheit)",
+  var: "Varianz",
+  varp: "Varianz (Grundgesamtheit)"
+};
+var SPANISH = {
+  sum: "Suma",
+  count: "Cuenta",
+  average: "Promedio",
+  max: "M\xE1x",
+  min: "M\xEDn",
+  product: "Producto",
+  countNums: "Cuenta de n\xFAmeros",
+  stdDev: "Desvest",
+  stdDevp: "Desvestp",
+  var: "Var",
+  varp: "Varp"
+};
+var FRENCH = {
+  sum: "Somme",
+  count: "Nombre",
+  average: "Moyenne",
+  max: "Max",
+  min: "Min",
+  product: "Produit",
+  countNums: "Nombre (nombres)",
+  stdDev: "\xC9cartype",
+  stdDevp: "\xC9cartypep",
+  var: "Var",
+  varp: "Varp"
+};
+var CHINESE = {
+  sum: "\u6C42\u548C",
+  count: "\u8BA1\u6570",
+  average: "\u5E73\u5747\u503C",
+  max: "\u6700\u5927\u503C",
+  min: "\u6700\u5C0F\u503C",
+  product: "\u4E58\u79EF",
+  countNums: "\u6570\u503C\u8BA1\u6570",
+  stdDev: "\u6807\u51C6\u504F\u5DEE",
+  stdDevp: "\u603B\u4F53\u6807\u51C6\u504F\u5DEE",
+  var: "\u65B9\u5DEE",
+  varp: "\u603B\u4F53\u65B9\u5DEE"
+};
+var LOCALIZED_PIVOT_CAPTIONS = {
+  de: table(
+    GERMAN,
+    (word) => `${word} von {0}`,
+    {
+      rowLabels: "Zeilenbeschriftungen",
+      columnLabels: "Spaltenbeschriftungen",
+      grandTotal: "Gesamtergebnis",
+      values: "Werte",
+      all: "(Alle)",
+      blank: "(leer)",
+      subtotal: "{0} Ergebnis",
+      measureTotal: "Gesamt {0}"
+    },
+    GERMAN
+  ),
+  es: table(
+    SPANISH,
+    (word) => `${word} de {0}`,
+    {
+      rowLabels: "Etiquetas de fila",
+      columnLabels: "Etiquetas de columna",
+      grandTotal: "Total general",
+      values: "Valores",
+      all: "(Todas)",
+      blank: "(en blanco)",
+      subtotal: "{0} Total",
+      measureTotal: "Total {0}"
+    },
+    SPANISH
+  ),
+  fr: table(
+    FRENCH,
+    (word) => `${word} de {0}`,
+    {
+      rowLabels: "\xC9tiquettes de lignes",
+      columnLabels: "\xC9tiquettes de colonnes",
+      grandTotal: "Total g\xE9n\xE9ral",
+      values: "Valeurs",
+      all: "(Tous)",
+      blank: "(vide)",
+      subtotal: "{0} Total",
+      measureTotal: "Total {0}"
+    },
+    FRENCH
+  ),
+  "zh-CN": table(
+    CHINESE,
+    (word) => `${word}\u9879:{0}`,
+    {
+      rowLabels: "\u884C\u6807\u7B7E",
+      columnLabels: "\u5217\u6807\u7B7E",
+      grandTotal: "\u603B\u8BA1",
+      values: "\u6570\u503C",
+      all: "(\u5168\u90E8)",
+      blank: "(\u7A7A\u767D)",
+      subtotal: "{0} \u6C47\u603B",
+      measureTotal: "\u603B\u8BA1 {0}"
+    },
+    CHINESE
+  )
+};
+
+// xlsx/pivot/captions.ts
+var FUNCTIONS = {
+  sum: "Sum",
+  count: "Count",
+  average: "Average",
+  max: "Max",
+  min: "Min",
+  product: "Product",
+  countNums: "Count",
+  stdDev: "StdDev",
+  stdDevp: "StdDevp",
+  var: "Var",
+  varp: "Varp"
+};
+var aggregateNames = () => Object.fromEntries(
+  Object.keys(FUNCTIONS).map((fn) => [
+    fn,
+    `${fn[0].toUpperCase()}${fn.slice(1)} of {0}`
+  ])
+);
+var ENGLISH_PIVOT_CAPTIONS = {
+  rowLabels: "Row Labels",
+  columnLabels: "Column Labels",
+  grandTotal: "Grand Total",
+  values: "Values",
+  all: "(All)",
+  blank: "(blank)",
+  subtotal: "{0} Total",
+  measureTotal: "Total {0}",
+  functions: FUNCTIONS,
+  aggregates: aggregateNames()
+};
+var fillCaption = (template, ...args) => template.replace(/\{(\d)\}/g, (_match, at2) => args[Number(at2)] ?? "");
+function pivotCaptions(pivot) {
+  const own2 = pivot.captions;
+  if (!own2) return ENGLISH_PIVOT_CAPTIONS;
+  return {
+    ...ENGLISH_PIVOT_CAPTIONS,
+    ...Object.fromEntries(Object.entries(own2).filter(([, value2]) => typeof value2 === "string")),
+    functions: { ...ENGLISH_PIVOT_CAPTIONS.functions, ...own2.functions },
+    aggregates: { ...ENGLISH_PIVOT_CAPTIONS.aggregates, ...own2.aggregates }
+  };
+}
+var pivotMeasureName = (aggregate2, field2, pivot = {}) => fillCaption(pivotCaptions(pivot).aggregates[aggregate2], field2);
+function localizedPivotCaptions(locale) {
+  const caps = LOCALIZED_PIVOT_CAPTIONS[normalizeOfficeLocale(locale)];
+  return caps ? structuredClone(caps) : void 0;
+}
+function trimmedCaptions(caps) {
+  const out = {};
+  for (const key2 of [
+    "rowLabels",
+    "columnLabels",
+    "grandTotal",
+    "values",
+    "all",
+    "blank",
+    "subtotal",
+    "measureTotal"
+  ])
+    if (caps[key2] !== ENGLISH_PIVOT_CAPTIONS[key2]) out[key2] = caps[key2];
+  for (const key2 of ["functions", "aggregates"]) {
+    const changed = Object.keys(caps[key2]).filter(
+      (fn) => caps[key2][fn] !== ENGLISH_PIVOT_CAPTIONS[key2][fn]
+    );
+    if (changed.length) out[key2] = Object.fromEntries(changed.map((fn) => [fn, caps[key2][fn]]));
+  }
+  return Object.keys(out).length ? out : void 0;
+}
+function authoredCaptions(options) {
+  const own2 = options.captions ?? localizedPivotCaptions(options.locale);
+  return own2 && Object.keys(own2).length ? structuredClone(own2) : void 0;
+}
+
 // xlsx/formula/date-serial.ts
 var DAY_MS = 864e5;
 var EPOCH_19002 = Date.UTC(1899, 11, 30);
@@ -23332,7 +23556,7 @@ var LEAP_MONTHS = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 var MAX_ITEMS = 1e4;
 var pad3 = (value2, width = 2) => String(value2).padStart(width, "0");
 var dateGroupUnits = (group) => PIVOT_DATE_UNITS.filter((unit3) => group.by.includes(unit3));
-var dateGroupFieldName = (unit3, field2) => `${UNIT_TITLES[unit3]} (${field2})`;
+var dateGroupFieldName = (unit3, field2, group) => group?.localized?.[unit3]?.name ?? `${UNIT_TITLES[unit3]} (${field2})`;
 var dateGroupDays = (group) => group.by.length === 1 && group.by[0] === "days" ? group.days ?? 1 : 1;
 function dateGroupRange(group, serials) {
   let min = Infinity;
@@ -23355,7 +23579,7 @@ var secondsOfDay = (serial) => Math.round((serial - Math.floor(serial)) * 86400)
 function dayBuckets(range2, days) {
   return Math.max(1, Math.ceil((Math.floor(range2.end) - Math.floor(range2.start) + 1) / days));
 }
-function dateUnitLabels(unit3, range2, days, date1904) {
+function englishDateUnitLabels(unit3, range2, days, date1904) {
   const labels = [`<${isoDay(range2.start, date1904)}`];
   if (unit3 === "seconds" || unit3 === "minutes")
     for (let i2 = 0; i2 < 60; i2++) labels.push(`:${pad3(i2)}`);
@@ -23384,6 +23608,11 @@ function dateUnitLabels(unit3, range2, days, date1904) {
   labels.push(`>${isoDay(range2.end, date1904)}`);
   return labels;
 }
+function dateUnitLabels(unit3, range2, days, date1904, group) {
+  const english = englishDateUnitLabels(unit3, range2, days, date1904);
+  const localized = group?.localized?.[unit3]?.labels;
+  return localized?.length === english.length ? localized : english;
+}
 function dateUnitIndex(unit3, range2, days, date1904, serial, count2) {
   if (serial < range2.start) return 0;
   if (serial > range2.end) return count2 - 1;
@@ -23407,7 +23636,7 @@ function derivedDateFields(pivot) {
   for (const group of pivot.dateGroups ?? [])
     for (const unit3 of dateGroupUnits(group))
       derived.push({
-        name: dateGroupFieldName(unit3, group.field),
+        name: dateGroupFieldName(unit3, group.field, group),
         unit: unit3,
         group,
         index: databaseFields + derived.length
@@ -23418,7 +23647,7 @@ function countDerived(pivot) {
   let count2 = 0;
   for (const group of pivot.dateGroups ?? [])
     for (const unit3 of dateGroupUnits(group))
-      if (pivot.fields.includes(dateGroupFieldName(unit3, group.field))) count2++;
+      if (pivot.fields.includes(dateGroupFieldName(unit3, group.field, group))) count2++;
   return count2;
 }
 var pivotAxisFieldNames = (pivot) => [
@@ -23438,7 +23667,7 @@ function derivedDateLabels(pivot, name3) {
   if (!entry3) return void 0;
   const [group] = resolveDateGroups({ ...pivot, dateGroups: [entry3.group] });
   const range2 = { start: group.start, end: group.end };
-  return dateUnitLabels(entry3.unit, range2, dateGroupDays(group), pivot.date1904 ?? false);
+  return dateUnitLabels(entry3.unit, range2, dateGroupDays(group), pivot.date1904 ?? false, group);
 }
 function validateDateGroups(pivot) {
   const groups = pivot.dateGroups;
@@ -23454,18 +23683,16 @@ function validateDateGroups(pivot) {
     seen.add(group.field);
     if (!(pivot.dateFields ?? []).includes(group.field))
       throw new Error("Only fields that contain dates can be grouped by date.");
-    if (pivot.pageFilter || pivot.dateFilter)
-      throw new Error("Date groups cannot be combined with report filters or timelines.");
     const serials = pivot.records.map((record2) => record2[index3]);
     if (!serials.length || serials.some((v) => typeof v !== "number" || !Number.isFinite(v)))
       throw new Error("Only fields that contain dates can be grouped by date.");
     const range2 = dateGroupRange(group, serials);
     if (range2.start >= range2.end) throw new Error("The date group must end after it starts.");
     for (const unit3 of dateGroupUnits(group)) {
-      const name3 = dateGroupFieldName(unit3, group.field);
+      const name3 = dateGroupFieldName(unit3, group.field, group);
       if (pivot.fields.includes(name3))
         throw new Error("A source field already has the name of a date group field.");
-      if (dateUnitLabels(unit3, range2, dateGroupDays(group), pivot.date1904 ?? false).length > MAX_ITEMS)
+      if (dateUnitLabels(unit3, range2, dateGroupDays(group), pivot.date1904 ?? false, group).length > MAX_ITEMS)
         throw new Error("The date group has too many items.");
     }
   }
@@ -23479,7 +23706,7 @@ function expandDateGroups(pivot) {
   const tables = derived.map((entry3) => {
     const range2 = { start: entry3.group.start, end: entry3.group.end };
     const days = dateGroupDays(entry3.group);
-    const labels = dateUnitLabels(entry3.unit, range2, days, date1904);
+    const labels = dateUnitLabels(entry3.unit, range2, days, date1904, entry3.group);
     return {
       base: pivot.fields.indexOf(entry3.group.field),
       labels,
@@ -23491,9 +23718,9 @@ function expandDateGroups(pivot) {
     fields: [...pivot.fields, ...derived.map((entry3) => entry3.name)],
     records: pivot.records.map((record2) => [
       ...record2,
-      ...tables.map((table3) => {
-        const value2 = record2[table3.base];
-        return typeof value2 === "number" ? table3.labels[table3.index(value2)] : null;
+      ...tables.map((table4) => {
+        const value2 = record2[table4.base];
+        return typeof value2 === "number" ? table4.labels[table4.index(value2)] : null;
       })
     ])
   };
@@ -23612,15 +23839,13 @@ function normalizedFieldSubtotals(entries) {
     };
   });
 }
-function validateFieldSubtotals(pivot, rowFields) {
+function validateFieldSubtotals(pivot, axisFields) {
   const entries = pivot.fieldSubtotals;
   if (entries === void 0) return;
   if (!Array.isArray(entries)) throw new Error("Choose valid field subtotals.");
-  if (entries.length && pivot.valuesAxis === "rows")
-    throw new Error("Field subtotals require Values on columns.");
   const seen = /* @__PURE__ */ new Set();
   for (const entry3 of entries) {
-    if (!entry3 || typeof entry3 !== "object" || !rowFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
+    if (!entry3 || typeof entry3 !== "object" || !axisFields.includes(entry3.field) || seen.has(entry3.field) || !Array.isArray(entry3.functions) || entry3.functions.some((fn) => !PIVOT_AGGREGATES.includes(fn)) || new Set(entry3.functions).size !== entry3.functions.length)
       throw new Error("Choose valid field subtotals.");
     seen.add(entry3.field);
   }
@@ -23699,6 +23924,17 @@ function pruneItemFilters(pivot) {
   return next.length ? next : void 0;
 }
 
+// xlsx/pivot/item-labels.ts
+var keyOf = (field2, item) => `${field2}\0${pivotValueKey(item)}`;
+function pivotItemLabeler(pivot) {
+  const blank = pivotCaptions(pivot).blank;
+  const names = pivot.itemNames?.length ? new Map(pivot.itemNames.map((entry3) => [keyOf(entry3.field, entry3.item), entry3.name])) : void 0;
+  return (field2, value2) => names?.get(keyOf(field2, value2)) ?? (value2 === null || value2 === "" ? blank : pivotItemLabel(value2));
+}
+var pivotItemName = (pivot, field2, item) => pivot.itemNames?.find(
+  (entry3) => entry3.field === field2 && pivotValueKey(entry3.item) === pivotValueKey(item)
+)?.name;
+
 // xlsx/pivot/page-filter.ts
 function validatePivotPageFilter(pivot) {
   const filter2 = pivot.pageFilter;
@@ -23710,23 +23946,24 @@ function validatePivotPageFilter(pivot) {
     pivot.columnField,
     pivot.valueField,
     ...extras.map((v) => v?.field)
-  ].includes(filter2.field) || pivot.valuesAxis === "rows")
-    throw new Error("Report filters require Values on columns and a separate source field.");
+  ].includes(filter2.field))
+    throw new Error("Report filters require a separate source field.");
   if (filter2.item !== void 0 && !(filter2.item === null || typeof filter2.item === "string" || typeof filter2.item === "boolean" || typeof filter2.item === "number" && Number.isFinite(filter2.item) || isCellError(filter2.item) && isErrorCode(filter2.item.error) && Object.keys(filter2.item).length === 1))
     throw new Error("Choose a cached literal report filter item.");
 }
 function pivotPageProjection(pivot) {
-  return applyPivotGroups(applyPivotItemFilters(pagedProjection(pivot)));
+  const groups = pivot.dateGroups?.length ? { ...pivot, dateGroups: resolveDateGroups(pivot) } : pivot;
+  return applyPivotGroups(applyPivotItemFilters(pagedProjection(groups)));
 }
 function pagedProjection(pivot) {
   const filter2 = pivot.pageFilter;
   if (!filter2) return pivot;
   const labels = /* @__PURE__ */ new Map();
   for (const item of pivotItems(pivot, filter2.field)) {
-    const label5 = String(pivotItemLabel(item)).toLowerCase(), key3 = pivotValueKey(item);
-    if (label5 === "(all)" || labels.has(label5) && labels.get(label5) !== key3)
+    const label2 = String(pivotItemLabel(item)).toLowerCase(), key3 = pivotValueKey(item);
+    if (label2 === "(all)" || labels.has(label2) && labels.get(label2) !== key3)
       throw new Error("Ambiguous report filter item captions are preserved.");
-    labels.set(label5, key3);
+    labels.set(label2, key3);
   }
   if (filter2.item === void 0) return pivot;
   const index3 = pivot.fields.indexOf(filter2.field), key2 = pivotValueKey(filter2.item);
@@ -23744,7 +23981,7 @@ function prependPivotPage(grid, pivot) {
     values: [
       [
         pivot.pageFilter.field,
-        pivot.pageFilter.item === void 0 ? "(All)" : pivotItemLabel(pivot.pageFilter.item),
+        pivot.pageFilter.item === void 0 ? pivotCaptions(pivot).all : pivotItemLabeler(pivot)(pivot.pageFilter.field, pivot.pageFilter.item),
         ...Array(width - 2).fill(null)
       ],
       Array(width).fill(null),
@@ -23865,13 +24102,9 @@ function validatePivotFields(pivot) {
   const columns = pivotColumnFields(pivot);
   if (pivot.moreColumnFields !== void 0 && (!Array.isArray(pivot.moreColumnFields) || pivot.moreColumnFields.length > 0 && !pivot.columnField || pivot.moreColumnFields.length > 62 || pivot.moreColumnFields.some((name3) => typeof name3 !== "string")))
     throw new Error("Choose valid PivotTable column fields.");
-  if (pivot.valuesAxis === "rows" && rows.length > 2)
-    throw new Error("Values on rows support at most two row fields.");
-  if (pivot.valuesAxis === "rows" && columns.length > 1)
-    throw new Error("Values on rows support one column field.");
   if (pivot.pageFilter && columns.length > 1)
     throw new Error("Report filters support one column field.");
-  validateFieldSubtotals(pivot, rows);
+  validateFieldSubtotals(pivot, [...rows, ...columns]);
   const axisNames = pivotAxisFieldNames(pivot);
   if ((pivot.dateGroups ?? []).some(
     (group) => [...rows, ...columns].some((name3) => name3 === group.field)
@@ -23880,13 +24113,14 @@ function validatePivotFields(pivot) {
   const extras = pivot.additionalValues ?? [];
   if (pivot.valuesAxis !== void 0 && !["columns", "rows"].includes(pivot.valuesAxis))
     throw new Error("Choose a valid Values axis.");
-  if (pivot.valuesPosition !== void 0 && !["last", "between", "first"].includes(pivot.valuesPosition))
+  const position2 = pivot.valuesPosition;
+  if (position2 !== void 0 && !["last", "between", "first"].includes(position2) && !(typeof position2 === "number" && Number.isInteger(position2) && position2 >= 0))
     throw new Error("Choose a valid Values position.");
-  if ((pivot.valuesPosition === "between" || pivot.valuesPosition === "first") && (pivot.valuesAxis !== "rows" || !pivot.secondRowField))
+  if (position2 !== void 0 && position2 !== "last" && (pivot.valuesAxis !== "rows" || position2 === "between" && !pivot.secondRowField || typeof position2 === "number" && position2 > rows.length))
     throw new Error("Values before or between fields require two row fields and Values on rows.");
   if (pivot.valuesAxis === "rows" && (!Array.isArray(extras) || !extras.length))
     throw new Error("Values on rows require multiple measures.");
-  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== "Values")
+  if (extras.length > 0 && pivot.sourceXml && parseXml(pivot.sourceXml).documentElement.getAttribute("dataCaption") !== pivotCaptions(pivot).values)
     throw new Error("This PivotTable uses unsupported Values header captions.");
   if (!Array.isArray(extras) || extras.length > 15 || extras.some(
     (measure2) => !measure2 || !pivot.fields.includes(measure2.field) || !PIVOT_AGGREGATES.includes(measure2.aggregate) || typeof measure2.caption !== "string" || !measure2.caption.trim() || measure2.caption.length > 255 || pivot.fields.some((field2) => field2.toLowerCase() === measure2.caption.toLowerCase())
@@ -23899,8 +24133,47 @@ function validatePivotFields(pivot) {
   if (pivot.layout !== void 0 && !["tabular", "compact", "outline"].includes(pivot.layout) || pivot.subtotalPosition !== void 0 && !["top", "bottom"].includes(pivot.subtotalPosition) || !PIVOT_AGGREGATES.includes(pivot.aggregate) || !pivot.fields.includes(pivot.valueField) || [...rows, ...columns].some((field2) => !axisNames.includes(field2)) || (/* @__PURE__ */ new Set([...rows, ...columns])).size !== rows.length + columns.length || pivot.subtotals !== void 0 && typeof pivot.subtotals !== "boolean" || pivot.repeatLabels !== void 0 && typeof pivot.repeatLabels !== "boolean")
     throw new Error("Choose valid PivotTable fields; row and column fields must differ.");
 }
-function pivotCaption(aggregate2, field2) {
-  return `${aggregate2[0].toUpperCase()}${aggregate2.slice(1)} of ${field2}`;
+function pivotCaption(aggregate2, field2, pivot) {
+  return pivotMeasureName(aggregate2, field2, pivot);
+}
+
+// xlsx/write/xml-out.ts
+var XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
+var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
+var NEEDS_ESCAPE = new RegExp(`[${CONTROL2}\r]|_x[0-9A-Fa-f]{4}_`);
+var ESCAPABLE = new RegExp(`[${CONTROL2}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
+function encodeEscapes(text8) {
+  if (!NEEDS_ESCAPE.test(text8)) return text8;
+  return text8.replace(
+    ESCAPABLE,
+    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
+  );
+}
+var INVALID_XML2 = new RegExp(`[${CONTROL2}]`, "g");
+var escapeText3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var escapeAttr3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
+function attrs2(values2) {
+  let out = "";
+  for (const [name3, value2] of Object.entries(values2)) {
+    if (value2 === void 0) continue;
+    const text8 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
+    out += ` ${name3}="${escapeAttr3(text8)}"`;
+  }
+  return out;
+}
+var el4 = (name3, values2 = {}, content2 = "") => content2 ? `<${name3}${attrs2(values2)}>${content2}</${name3}>` : `<${name3}${attrs2(values2)}/>`;
+var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
+function tElement(text8, name3 = "t") {
+  const encoded = escapeText3(encodeEscapes(text8));
+  const preserve = /^\s|\s$|\n|\t/.test(text8) ? ' xml:space="preserve"' : "";
+  return `<${name3}${preserve}>${encoded}</${name3}>`;
+}
+var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
+function inlineFragment(xml) {
+  const end = xml.indexOf(">");
+  if (end < 0) return xml;
+  const head = xml.slice(0, end);
+  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
 }
 
 // xlsx/pivot/measures.ts
@@ -23908,7 +24181,7 @@ var pivotMeasures = (pivot) => [
   { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
   ...pivot.additionalValues ?? []
 ];
-function normalizedPivotMeasures(values2) {
+function normalizedPivotMeasures(values2, pivot) {
   if (!Array.isArray(values2) || values2.length > 15)
     throw new Error("Choose between one and sixteen PivotTable value fields.");
   return values2.map((value2) => {
@@ -23920,7 +24193,7 @@ function normalizedPivotMeasures(values2) {
     return {
       field: value2.field,
       aggregate: aggregate2,
-      caption: value2.caption ?? `${aggregate2[0].toUpperCase()}${aggregate2.slice(1)} of ${value2.field}`
+      caption: value2.caption ?? pivotMeasureName(aggregate2, value2.field, pivot)
     };
   });
 }
@@ -23952,329 +24225,16 @@ function aggregateValues(records, field2, type) {
   return type === "average" ? sum3 / numbers3.length : sum3;
 }
 var pivotMeasureNumber = (pivot, records, measure2) => aggregateValues(records, pivot.fields.indexOf(measure2.field), measure2.aggregate);
-var pivotNumbers = (pivot, records) => pivotMeasures(pivot).map((measure2) => pivotMeasureNumber(pivot, records, measure2));
-function pivotHeaderDimensions(pivot, columnItems, rowLabels) {
-  return {
-    rows: (pivot.columnField ? 2 : 1) + (pivot.pageFilter ? 2 : 0),
-    width: rowLabels + (pivot.columnField ? columnItems + 1 : 1)
-  };
-}
-function pivotHeaders(pivot, columns, labels, label5) {
-  const rowLabels = pivot.layout === "compact" ? ["Row Labels"] : pivot.valuesPosition === "first" ? ["Values", ...labels] : pivot.valuesPosition === "between" ? [labels[0], "Values", labels[1]] : [...labels, "Values"];
-  return pivot.columnField ? [
-    [
-      ...rowLabels.map(() => null),
-      pivot.layout === "compact" ? "Column Labels" : pivot.columnField,
-      ...columns.map(() => null)
-    ],
-    [...rowLabels, ...columns.map(label5), "Grand Total"]
-  ] : [[...rowLabels, null]];
-}
-
-// xlsx/pivot/hierarchy-first.ts
-function appendFirstPivotValues(pivot, context) {
-  const {
-    rowItems,
-    secondRowItems,
-    columnItems,
-    children: children4,
-    innerIndices,
-    groups,
-    details,
-    buckets,
-    width,
-    rowLabels,
-    top,
-    bottom,
-    append
-  } = context;
-  const compact3 = pivot.layout === "compact";
-  const tabular = !pivot.layout || pivot.layout === "tabular";
-  const blank = () => Array(width - rowLabels).fill(null);
-  pivotMeasures(pivot).forEach((measure2, m) => {
-    const numbers3 = (keys, records) => [
-      ...columnItems.map(
-        (column2) => pivotMeasureNumber(
-          pivot,
-          buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-          measure2
-        )
-      ),
-      pivotMeasureNumber(pivot, records, measure2)
-    ];
-    if (!tabular)
-      append([measure2.caption, ...Array(rowLabels - 1).fill(null)], blank(), {
-        indices: [m],
-        measure: m
-      });
-    let first3 = true;
-    rowItems.forEach((outer, outerIndex) => {
-      const key2 = pivotValueKey(outer);
-      const group = groups.get(key2) ?? [];
-      if (!tabular)
-        append(
-          compact3 ? [pivotItemLabel(outer)] : [null, pivotItemLabel(outer), null],
-          top ? numbers3([key2], group) : blank(),
-          { indices: [m, outerIndex], measure: m },
-          compact3 ? 1 : 0
-        );
-      const innerKeys = [...children4.get(key2)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      innerKeys.forEach((innerKey, child7) => {
-        const innerIndex = innerIndices.get(innerKey);
-        append(
-          compact3 ? [pivotItemLabel(secondRowItems[innerIndex])] : [
-            tabular && first3 ? measure2.caption : null,
-            pivot.repeatLabels || tabular && child7 === 0 ? pivotItemLabel(outer) : null,
-            pivotItemLabel(secondRowItems[innerIndex])
-          ],
-          numbers3([key2, innerKey], details.get(JSON.stringify([key2, innerKey]))),
-          { indices: [m, outerIndex, innerIndex], measure: m },
-          compact3 ? 2 : 0
-        );
-        first3 = false;
-      });
-      if (bottom)
-        append(
-          compact3 ? [`${String(pivotItemLabel(outer))} Total`] : [null, `${String(pivotItemLabel(outer))} Total`, null],
-          numbers3([key2], group),
-          { indices: [m, outerIndex], measure: m, type: "default" },
-          compact3 ? 1 : 0
-        );
-    });
-  });
-}
-
-// xlsx/pivot/hierarchy.ts
-var label = pivotItemLabel;
-function hierarchicalPivotGrid(pivot) {
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const secondRowItems = pivotItems(pivot, pivot.secondRowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const outerField = pivot.fields.indexOf(pivot.rowField);
-  const innerField = pivot.fields.indexOf(pivot.secondRowField);
-  const columnField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const layout3 = pivot.layout ?? "tabular";
-  const compact3 = layout3 === "compact";
-  const firstValues = pivot.valuesPosition === "first";
-  const between = pivot.valuesPosition === "between";
-  const measures2 = pivotMeasures(pivot);
-  const top = firstValues && layout3 !== "tabular" && pivot.subtotals !== false && (pivot.subtotalPosition ?? "top") === "top";
-  const bottom = pivot.subtotals !== false && !top;
-  const rowLabelColumns = compact3 ? 1 : 3;
-  const groups = /* @__PURE__ */ new Map();
-  const details = /* @__PURE__ */ new Map();
-  const children4 = /* @__PURE__ */ new Map();
-  const innerIndices = new Map(secondRowItems.map((item, index3) => [pivotValueKey(item), index3]));
-  const buckets = /* @__PURE__ */ new Map();
-  const collect = (map, key2, record2) => {
-    const list2 = map.get(key2);
-    if (list2) list2.push(record2);
-    else map.set(key2, [record2]);
-  };
-  for (const record2 of pivot.records) {
-    const outer = pivotValueKey(record2[outerField] ?? null);
-    const inner2 = pivotValueKey(record2[innerField] ?? null);
-    collect(groups, outer, record2);
-    collect(details, JSON.stringify([outer, inner2]), record2);
-    if (!children4.has(outer)) children4.set(outer, /* @__PURE__ */ new Set());
-    children4.get(outer).add(inner2);
-    if (pivot.columnField) {
-      const column2 = pivotValueKey(record2[columnField] ?? null);
-      for (const key2 of [[], [outer], [outer, inner2]])
-        collect(buckets, JSON.stringify([...key2, column2]), record2);
-    }
-  }
-  const dimensions3 = pivotHeaderDimensions(pivot, columnItems.length, rowLabelColumns);
-  const rows = (details.size + rowItems.length * Number(bottom) + 1) * measures2.length + rowItems.length * Number(layout3 !== "tabular") * (firstValues ? measures2.length : 1) + (firstValues ? measures2.length : between ? rowItems.length * measures2.length : details.size) * Number(layout3 !== "tabular") + dimensions3.rows;
-  if (rows * dimensions3.width > 1e6) throw new Error("The PivotTable result is too large.");
-  const labels = compact3 ? ["Row Labels"] : [pivot.rowField, pivot.secondRowField];
-  const values2 = pivotHeaders(pivot, columnItems, labels, label);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
-  const rowEntries = [];
-  const append = (labels2, numbers4, entry3, indent = 0) => {
-    values2.push([...labels2, ...numbers4]);
-    rowEntries.push(entry3);
-    indents.push(indent);
-  };
-  const bands = (keys, records) => [
-    ...columnItems.map(
-      (column2) => pivotNumbers(pivot, buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [])
-    ),
-    pivotNumbers(pivot, records)
-  ];
-  const numbers3 = (keys, records) => bands(keys, records).flat();
-  const appendMeasures = (labels2, keys, records, indices, type) => {
-    const values3 = bands(keys, records);
-    measures2.forEach(
-      (measure2, m) => append(
-        type ? [
-          `${type === "grand" ? "Total" : String(labels2[0])} ${measure2.caption}`,
-          ...Array(rowLabelColumns - 1).fill(null)
-        ] : compact3 ? [measure2.caption] : [
-          ...labels2.map(
-            (label5) => layout3 === "tabular" && m === 0 || pivot.repeatLabels ? label5 : null
-          ),
-          measure2.caption
-        ],
-        values3.map((band2) => band2[m] ?? null),
-        { indices: type ? indices : [...indices, m], measure: m, ...type ? { type } : {} },
-        compact3 && !type ? 2 : 0
-      )
-    );
-  };
-  if (firstValues)
-    appendFirstPivotValues(pivot, {
-      rowItems,
-      secondRowItems,
-      columnItems,
-      children: children4,
-      innerIndices,
-      groups,
-      details,
-      buckets,
-      width: dimensions3.width,
-      rowLabels: rowLabelColumns,
-      top,
-      bottom,
-      append
-    });
-  else
-    rowItems.forEach((outer, outerIndex) => {
-      const key2 = pivotValueKey(outer);
-      if (layout3 !== "tabular")
-        append(
-          [label(outer), ...Array(rowLabelColumns - 1).fill(null)],
-          top ? numbers3([key2], groups.get(key2) ?? []) : Array(dimensions3.width - rowLabelColumns).fill(null),
-          { indices: [outerIndex] }
-        );
-      let first3 = true;
-      const innerKeys = [...children4.get(key2)].sort(
-        (a2, b) => innerIndices.get(a2) - innerIndices.get(b)
-      );
-      if (between)
-        measures2.forEach((measure2, m) => {
-          if (layout3 !== "tabular")
-            append(
-              compact3 ? [measure2.caption] : [pivot.repeatLabels ? label(outer) : null, measure2.caption, null],
-              Array(dimensions3.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, m], measure: m },
-              compact3 ? 1 : 0
-            );
-          innerKeys.forEach((innerKey, child7) => {
-            const innerIndex = innerIndices.get(innerKey);
-            const keys = [key2, innerKey];
-            const records = details.get(JSON.stringify(keys));
-            append(
-              compact3 ? [label(secondRowItems[innerIndex])] : [
-                pivot.repeatLabels || layout3 === "tabular" && m === 0 && child7 === 0 ? label(outer) : null,
-                layout3 === "tabular" && child7 === 0 ? measure2.caption : null,
-                label(secondRowItems[innerIndex])
-              ],
-              [
-                ...columnItems.map(
-                  (column2) => pivotMeasureNumber(
-                    pivot,
-                    buckets.get(JSON.stringify([...keys, pivotValueKey(column2)])) ?? [],
-                    measure2
-                  )
-                ),
-                pivotMeasureNumber(pivot, records, measure2)
-              ],
-              { indices: [outerIndex, m, innerIndex], measure: m },
-              compact3 ? 2 : 0
-            );
-          });
-        });
-      else
-        innerKeys.forEach((innerKey) => {
-          const innerIndex = innerIndices.get(innerKey);
-          const inner2 = secondRowItems[innerIndex];
-          const keys = [key2, innerKey];
-          const records = details.get(JSON.stringify(keys));
-          if (!records) return;
-          if (layout3 !== "tabular")
-            append(
-              compact3 ? [label(inner2)] : [pivot.repeatLabels ? label(outer) : null, label(inner2), null],
-              Array(dimensions3.width - rowLabelColumns).fill(null),
-              { indices: [outerIndex, innerIndex] },
-              compact3 ? 1 : 0
-            );
-          appendMeasures(
-            [pivot.repeatLabels || first3 ? label(outer) : null, label(inner2)],
-            keys,
-            records,
-            [outerIndex, innerIndex]
-          );
-          first3 = false;
-        });
-      if (bottom)
-        appendMeasures([label(outer)], [key2], groups.get(key2) ?? [], [outerIndex], "default");
-    });
-  appendMeasures([], [], pivot.records, [0], "grand");
-  return {
-    values: values2,
-    rowItems,
-    secondRowItems,
-    columnItems,
-    rowEntries,
-    firstDataRow,
-    rowLabelColumns,
-    indents,
-    firstHeaderRow: 1
-  };
-}
-
-// xlsx/write/xml-out.ts
-var XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n';
-var CONTROL2 = "\0-\b\v\f-" + String.fromCharCode(65534, 65535);
-var NEEDS_ESCAPE = new RegExp(`[${CONTROL2}\r]|_x[0-9A-Fa-f]{4}_`);
-var ESCAPABLE = new RegExp(`[${CONTROL2}\r]|_(?=x[0-9A-Fa-f]{4}_)`, "g");
-function encodeEscapes(text8) {
-  if (!NEEDS_ESCAPE.test(text8)) return text8;
-  return text8.replace(
-    ESCAPABLE,
-    (ch) => `_x${ch.charCodeAt(0).toString(16).toUpperCase().padStart(4, "0")}_`
-  );
-}
-var INVALID_XML2 = new RegExp(`[${CONTROL2}]`, "g");
-var escapeText3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-var escapeAttr3 = (text8) => text8.replace(INVALID_XML2, "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\r/g, "&#13;").replace(/\n/g, "&#10;").replace(/\t/g, "&#9;");
-function attrs2(values2) {
-  let out = "";
-  for (const [name3, value2] of Object.entries(values2)) {
-    if (value2 === void 0) continue;
-    const text8 = typeof value2 === "boolean" ? value2 ? "1" : "0" : typeof value2 === "number" ? num(value2) : value2;
-    out += ` ${name3}="${escapeAttr3(text8)}"`;
-  }
-  return out;
-}
-var el4 = (name3, values2 = {}, content2 = "") => content2 ? `<${name3}${attrs2(values2)}>${content2}</${name3}>` : `<${name3}${attrs2(values2)}/>`;
-var num = (value2) => Object.is(value2, -0) ? "0" : String(value2);
-function tElement(text8, name3 = "t") {
-  const encoded = escapeText3(encodeEscapes(text8));
-  const preserve = /^\s|\s$|\n|\t/.test(text8) ? ' xml:space="preserve"' : "";
-  return `<${name3}${preserve}>${encoded}</${name3}>`;
-}
-var MAIN_NS = ' xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"';
-function inlineFragment(xml) {
-  const end = xml.indexOf(">");
-  if (end < 0) return xml;
-  const head = xml.slice(0, end);
-  return head.includes(MAIN_NS) ? head.replace(MAIN_NS, "") + xml.slice(end) : xml;
-}
 
 // xlsx/pivot/columns.ts
 var SEPARATOR = "
";
-var label2 = pivotItemLabel;
 var columnKey = (keys, depth) => keys.slice(0, depth).join(SEPARATOR);
 var recordColumnKeys = (record2, indices) => indices.map((index3) => pivotValueKey(record2[index3] ?? null));
 function pivotColumnEntries(pivot) {
   const names = pivotColumnFields(pivot);
   const items = names.map((name3) => pivotItems(pivot, name3));
   const entries = [];
+  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
   if (names.length) {
     const order = items.map(
       (list2) => new Map(list2.map((item, index3) => [pivotValueKey(item), index3]))
@@ -24309,7 +24269,9 @@ function pivotColumnEntries(pivot) {
         if (level === names.length - 1) entries.push({ kind: "leaf", ...entry3 });
         else {
           visit2(child7[1], level + 1, here.path, here.values, here.keys);
-          entries.push({ kind: "subtotal", ...entry3 });
+          const own2 = functions[level];
+          if (own2 === "auto") entries.push({ kind: "subtotal", ...entry3 });
+          else for (const fn of own2) entries.push({ kind: "subtotal", ...entry3, fn });
         }
       }
     };
@@ -24318,26 +24280,31 @@ function pivotColumnEntries(pivot) {
   entries.push({ kind: "grand", path: [], key: "", values: [] });
   return { names, items, entries };
 }
-function pivotColumnDimensions(pivot, columns, labelColumns) {
-  const measures2 = 1 + (pivot.additionalValues?.length ?? 0);
+function pivotColumnDimensions(pivot, columns, labelColumns, valuesOnRows = false) {
+  const measures2 = valuesOnRows ? 1 : 1 + (pivot.additionalValues?.length ?? 0);
   const levels = columns.names.length;
   return {
     rows: (levels ? levels + 1 + Number(measures2 > 1) : 1) + (pivot.pageFilter ? 2 : 0),
     width: labelColumns + (levels ? columns.entries.length : 1) * measures2
   };
 }
-function pivotColumnHeaders(pivot, columns, rowLabels) {
-  const measures2 = pivotMeasures(pivot);
+function pivotColumnHeaders(pivot, columns, rowLabels, valuesOnRows = false) {
+  const measures2 = valuesOnRows ? pivotMeasures(pivot).slice(0, 1) : pivotMeasures(pivot);
   const count2 = measures2.length;
   const levels = columns.names.length;
-  if (!levels) return [[...rowLabels, ...measures2.map((measure2) => measure2.caption)]];
+  if (!levels)
+    return [
+      [...rowLabels, ...valuesOnRows ? [null] : measures2.map((measure2) => measure2.caption)]
+    ];
   const compact3 = pivot.layout === "compact";
   const labelColumns = rowLabels.length;
   const width = labelColumns + columns.entries.length * count2;
   const rows = levels + 1 + Number(count2 > 1);
   const grid = Array.from({ length: rows }, () => Array(width).fill(null));
-  if (count2 === 1) grid[0][0] = pivot.valueCaption;
-  const titles = compact3 ? ["Column Labels"] : [...columns.names, ...count2 > 1 ? ["Values"] : []];
+  if (count2 === 1 && !valuesOnRows) grid[0][0] = pivot.valueCaption;
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
+  const titles = compact3 ? [caps.columnLabels] : [...columns.names, ...count2 > 1 ? [caps.values] : []];
   titles.forEach((title, i2) => {
     grid[0][labelColumns + i2] = title;
   });
@@ -24350,16 +24317,17 @@ function pivotColumnHeaders(pivot, columns, rowLabels) {
     if (entry3.kind === "leaf") {
       entry3.path.forEach((_index, level) => {
         const continued = entry3.path.slice(0, level + 1).every((p, i2) => p === previous[i2]);
-        if (!continued) grid[1 + level][at2] = label2(entry3.values[level]);
+        if (!continued) grid[1 + level][at2] = labelOf(columns.names[level], entry3.values[level]);
       });
       previous = entry3.path;
       if (count2 > 1) measures2.forEach((measure2, m) => grid[rows - 1][at2 + m] = measure2.caption);
       return;
     }
     const row3 = entry3.kind === "grand" ? 1 : entry3.path.length;
-    const name3 = entry3.kind === "grand" ? "" : String(label2(entry3.values.at(-1)));
+    const name3 = entry3.kind === "grand" ? "" : String(labelOf(columns.names[entry3.path.length - 1], entry3.values.at(-1)));
     measures2.forEach((measure2, m) => {
-      grid[row3][at2 + m] = count2 === 1 ? entry3.kind === "grand" ? "Grand Total" : `${name3} Total` : entry3.kind === "grand" ? `Total ${measure2.caption}` : `${name3} ${measure2.caption}`;
+      const custom = entry3.fn ? caps.functions[entry3.fn] : void 0;
+      grid[row3][at2 + m] = custom ? count2 === 1 ? `${name3} ${custom}` : `${name3} ${custom} of ${measure2.field}` : count2 === 1 ? entry3.kind === "grand" ? caps.grandTotal : fillCaption(caps.subtotal, name3) : entry3.kind === "grand" ? fillCaption(caps.measureTotal, measure2.caption) : `${name3} ${measure2.caption}`;
     });
   });
   return grid;
@@ -24384,7 +24352,7 @@ function pivotColumnItemsXml(entries, measures2, remap) {
       const prefix3 = sharedPrefix(path2, previous);
       const xs = path2.slice(prefix3).map((index3) => `<x${attrs2({ v: index3 || void 0 })}/>`);
       out.push(
-        `<i${attrs2({ t: entry3.kind === "subtotal" ? "default" : void 0, r: prefix3 || void 0, i: m || void 0 })}>${xs.join("")}</i>`
+        `<i${attrs2({ t: entry3.kind === "subtotal" ? entry3.fn ? PIVOT_SUBTOTALS[entry3.fn].item : "default" : void 0, r: prefix3 || void 0, i: m || void 0 })}>${xs.join("")}</i>`
       );
       previous = path2;
     }
@@ -24392,7 +24360,6 @@ function pivotColumnItemsXml(entries, measures2, remap) {
 }
 
 // xlsx/pivot/nested.ts
-var label3 = pivotItemLabel;
 var MAX_CELLS = 1e6;
 var node = (index3, value2) => ({
   index: index3,
@@ -24404,6 +24371,10 @@ var node = (index3, value2) => ({
 function nestedPivotGrid(pivot) {
   const names = pivotRowFields(pivot);
   const depth = names.length;
+  const valuesAt = pivotValuesIndex(pivot);
+  const onRows = valuesAt >= 0;
+  const levels = depth + (onRows ? 1 : 0);
+  const fieldOf = (level) => !onRows || level < valuesAt ? level : level === valuesAt ? -1 : level - 1;
   const axisItems = names.map((name3) => pivotItems(pivot, name3));
   const itemIndices = axisItems.map(
     (items) => new Map(items.map((item, index3) => [pivotValueKey(item), index3]))
@@ -24415,125 +24386,170 @@ function nestedPivotGrid(pivot) {
   const compact3 = layout3 === "compact";
   const tabular = layout3 === "tabular";
   const above = !tabular && (pivot.subtotalPosition ?? "top") === "top";
-  const labelColumns = compact3 ? 1 : depth;
+  const labelColumns = compact3 ? 1 : levels;
   const measures2 = pivotMeasures(pivot);
+  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
+  const caps = pivotCaptions(pivot);
+  const labelOf = pivotItemLabeler(pivot);
   const root = node(0, null);
   for (const record2 of pivot.records) {
     const keys = recordColumnKeys(record2, columnFields);
     let current = root;
-    for (let level = -1; level < depth; level++) {
-      if (level >= 0) {
-        const value2 = record2[fieldIndices[level]] ?? null;
+    for (let field2 = -1; field2 < depth; field2++) {
+      if (field2 >= 0) {
+        const value2 = record2[fieldIndices[field2]] ?? null;
         const key2 = pivotValueKey(value2);
         let child7 = current.children.get(key2);
         if (!child7) {
-          child7 = node(itemIndices[level].get(key2), value2);
+          child7 = node(itemIndices[field2].get(key2), value2);
           current.children.set(key2, child7);
         }
         current = child7;
       }
       current.records.push(record2);
-      for (let width = 1; width <= keys.length; width++) {
-        const key2 = columnKey(keys, width);
+      for (let width2 = 1; width2 <= keys.length; width2++) {
+        const key2 = columnKey(keys, width2);
         const list2 = current.columns.get(key2);
         if (list2) list2.push(record2);
         else current.columns.set(key2, [record2]);
       }
     }
   }
-  const dimensions3 = pivotColumnDimensions(pivot, columns, labelColumns);
-  const functions = names.map((name3) => fieldSubtotalFunctions(pivot, name3));
-  let rows = 1;
-  const count2 = (parent, level) => {
-    for (const child7 of parent.children.values()) {
-      rows++;
-      if (level < depth - 1) {
-        const f6 = functions[level];
-        rows += f6 === "auto" ? 1 : f6.length;
-        count2(child7, level + 1);
-      }
-    }
-  };
-  count2(root, 0);
-  if ((rows + dimensions3.rows) * dimensions3.width > MAX_CELLS)
-    throw new Error("The PivotTable result is too large.");
-  const values2 = pivotColumnHeaders(pivot, columns, compact3 ? ["Row Labels"] : names);
-  const firstDataRow = values2.length;
-  const indents = values2.map(() => 0);
+  const dimensions3 = pivotColumnDimensions(pivot, columns, labelColumns, onRows);
+  const rowTitles = names.map((name3) => name3);
+  if (onRows) rowTitles.splice(valuesAt, 0, caps.values);
+  let values2 = [];
+  let indents = [];
   const rowEntries = [];
-  const blanks = () => Array(dimensions3.width - labelColumns).fill(null);
-  const bands = (group, run2) => columns.entries.flatMap(
-    (entry3) => run2(entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [])
-  );
-  const numbers3 = (group) => bands(group, (records) => pivotNumbers(pivot, records));
-  const subtotalNumbers = (group, fn) => bands(
-    group,
-    (records) => measures2.map((measure2) => aggregateValues(records, pivot.fields.indexOf(measure2.field), fn))
-  );
-  const labelCells = (path2, shown, text8) => {
+  let counting = true;
+  let rowCount = 0;
+  const width = dimensions3.width - labelColumns;
+  const blanks = () => Array(width).fill(null);
+  const cells3 = (group, rowFn, measure2) => columns.entries.flatMap((entry3) => {
+    const records = entry3.kind === "grand" ? group.records : group.columns.get(entry3.key) ?? [];
+    const picked = measure2 === void 0 ? measures2 : [measures2[measure2]];
+    if (rowFn && entry3.fn && rowFn !== entry3.fn) return picked.map(() => null);
+    const fn = rowFn ?? entry3.fn;
+    return picked.map(
+      (one2) => fn ? aggregateValues(records, pivot.fields.indexOf(one2.field), fn) : pivotMeasureNumber(pivot, records, one2)
+    );
+  });
+  const labelCells = (path2, shown, level, text8) => {
     if (compact3) return [text8];
-    const cells3 = Array(depth).fill(null);
-    path2.forEach((value2, level) => {
-      if (shown[level]) cells3[level] = label3(value2);
+    const row3 = Array(levels).fill(null);
+    path2.labels.forEach((value2, at2) => {
+      if (shown[at2]) row3[at2] = value2;
     });
-    cells3[path2.length] = text8;
-    return cells3;
+    row3[level] = text8;
+    return row3;
   };
-  const push3 = (cells3, numbersOnRow, entry3, indent) => {
-    values2.push([...cells3, ...numbersOnRow]);
+  const push3 = (indent, build3) => {
+    if (counting) {
+      if ((++rowCount + dimensions3.rows) * dimensions3.width > MAX_CELLS)
+        throw new Error("The PivotTable result is too large.");
+      return;
+    }
+    const [cells4, numbers3, entry3] = build3();
+    values2.push([...cells4, ...numbers3]);
     rowEntries.push(entry3);
     indents.push(compact3 ? indent : 0);
   };
-  const emit = (parent, level, path2, indices, firsts) => {
-    const last = level === depth - 1;
-    const own2 = functions[level];
-    const children4 = [...parent.children.values()].sort((a2, b) => a2.index - b.index);
+  const entryOf = (indices, measure2, type) => ({
+    indices,
+    ...measure2 !== void 0 ? { measure: measure2 } : {},
+    ...type ? { type } : {}
+  });
+  const walk2 = (level, group, measure2, path2) => {
+    const field2 = fieldOf(level);
+    const last = level === levels - 1;
+    const repeated = Array.from(
+      { length: level },
+      (_v, k) => !!pivot.repeatLabels && fieldOf(k) >= 0
+    );
+    const leafShown = (firsts) => repeated.map((repeat, k) => repeat || tabular && firsts.slice(k + 1).every(Boolean));
+    if (field2 < 0) {
+      measures2.forEach((one2, m) => {
+        const here = {
+          labels: [...path2.labels, one2.caption],
+          indices: [...path2.indices, m],
+          firsts: [...path2.firsts, m === 0]
+        };
+        if (last)
+          return push3(level, () => [
+            labelCells(path2, leafShown(here.firsts), level, one2.caption),
+            cells3(group, void 0, m),
+            entryOf(here.indices, m)
+          ]);
+        if (!tabular)
+          push3(level, () => [
+            labelCells(path2, repeated, level, one2.caption),
+            blanks(),
+            entryOf(here.indices, m)
+          ]);
+        walk2(level + 1, group, m, here);
+      });
+      return;
+    }
+    const own2 = functions[field2];
+    const valuesAbove = !onRows || valuesAt < level;
+    const showsValue = above && own2 === "auto" && valuesAbove;
+    const children4 = [...group.children.values()].sort((a2, b) => a2.index - b.index);
     children4.forEach((child7, position2) => {
-      const here = [...path2, child7.value];
-      const at2 = [...indices, child7.index];
-      const firstHere = [...firsts, position2 === 0];
-      const repeated = Array(level).fill(!!pivot.repeatLabels);
-      if (last) {
-        const shown = repeated.map(
-          (repeat, k) => repeat || tabular && firstHere.slice(k + 1).every(Boolean)
-        );
-        push3(labelCells(path2, shown, label3(child7.value)), numbers3(child7), { indices: at2 }, level);
-        return;
-      }
+      const here = {
+        labels: [...path2.labels, labelOf(names[field2], child7.value)],
+        indices: [...path2.indices, child7.index],
+        firsts: [...path2.firsts, position2 === 0]
+      };
+      const text8 = labelOf(names[field2], child7.value);
+      if (last)
+        return push3(level, () => [
+          labelCells(path2, leafShown(here.firsts), level, text8),
+          cells3(child7, void 0, measure2),
+          entryOf(here.indices, measure2)
+        ]);
       if (!tabular)
-        push3(
-          labelCells(path2, repeated, label3(child7.value)),
-          own2 === "auto" && above ? numbers3(child7) : blanks(),
-          { indices: at2 },
-          level
-        );
-      emit(child7, level + 1, here, at2, firstHere);
-      const caption = String(label3(child7.value));
+        push3(level, () => [
+          labelCells(path2, repeated, level, text8),
+          showsValue ? cells3(child7, void 0, measure2) : blanks(),
+          entryOf(here.indices, measure2)
+        ]);
+      walk2(level + 1, child7, measure2, here);
+      if (field2 === depth - 1) return;
+      const caption = String(text8);
+      const subtotal = (title, fn, one2) => push3(level, () => [
+        labelCells(path2, repeated, level, title),
+        cells3(child7, fn, one2),
+        entryOf(here.indices, one2, fn ?? "default")
+      ]);
       if (own2 === "auto") {
-        if (!above)
-          push3(
-            labelCells(path2, repeated, `${caption} Total`),
-            numbers3(child7),
-            { indices: at2, type: "default" },
-            level
-          );
+        if (showsValue) return;
+        if (valuesAbove) subtotal(fillCaption(caps.subtotal, caption), void 0, measure2);
+        else measures2.forEach((one2, m) => subtotal(`${caption} ${one2.caption}`, void 0, m));
       } else
         for (const fn of own2)
-          push3(
-            labelCells(path2, repeated, `${caption} ${PIVOT_SUBTOTALS[fn].label}`),
-            subtotalNumbers(child7, fn),
-            { indices: at2, type: fn },
-            level
-          );
+          if (valuesAbove) subtotal(`${caption} ${caps.functions[fn]}`, fn, measure2);
+          else
+            measures2.forEach(
+              (one2, m) => subtotal(`${caption} ${caps.functions[fn]} of ${one2.field}`, fn, m)
+            );
     });
   };
-  emit(root, 0, [], [], []);
-  push3(
-    compact3 ? ["Grand Total"] : ["Grand Total", ...Array(depth - 1).fill(null)],
-    numbers3(root),
-    { indices: [0], type: "grand" },
-    0
-  );
+  const grand = (text8, measure2) => push3(0, () => [
+    compact3 ? [text8] : [text8, ...Array(levels - 1).fill(null)],
+    cells3(root, void 0, measure2),
+    entryOf([0], measure2, "grand")
+  ]);
+  const build2 = () => {
+    walk2(0, root, void 0, { labels: [], indices: [], firsts: [] });
+    if (onRows) measures2.forEach((one2, m) => grand(fillCaption(caps.measureTotal, one2.caption), m));
+    else grand(caps.grandTotal);
+  };
+  build2();
+  counting = false;
+  values2 = pivotColumnHeaders(pivot, columns, compact3 ? [caps.rowLabels] : rowTitles, onRows);
+  const firstDataRow = values2.length;
+  indents = values2.map(() => 0);
+  build2();
   return {
     values: values2,
     rowItems: axisItems[0],
@@ -24545,105 +24561,15 @@ function nestedPivotGrid(pivot) {
     rowEntries,
     firstDataRow,
     rowLabelColumns: labelColumns,
-    indents
+    indents,
+    ...onRows ? { firstHeaderRow: 1 } : {}
   };
 }
 
 // xlsx/pivot/aggregate.ts
 function pivotGrid(pivot) {
   validatePivotFields(pivot);
-  return prependPivotPage(pivotDataGrid(pivotPageProjection(pivot)), pivot);
-}
-function pivotDataGrid(pivot) {
-  if (pivot.valuesAxis !== "rows") return nestedPivotGrid(pivot);
-  if (pivot.secondRowField) return hierarchicalPivotGrid(pivot);
-  const rowItems = pivotItems(pivot, pivot.rowField);
-  const columnItems = pivot.columnField ? pivotItems(pivot, pivot.columnField) : [];
-  const compact3 = pivot.layout === "compact";
-  const headings = pivot.layout !== void 0 && pivot.layout !== "tabular";
-  const dimensions3 = pivotHeaderDimensions(pivot, columnItems.length, compact3 ? 1 : 2);
-  const dataRows = (rowItems.length + 1) * (1 + (pivot.additionalValues?.length ?? 0)) + (headings ? rowItems.length : 0);
-  if ((dataRows + dimensions3.rows) * dimensions3.width > 1e6)
-    throw new Error("The PivotTable result is too large.");
-  const label5 = pivotItemLabel;
-  const values2 = pivotHeaders(pivot, columnItems, [compact3 ? "Row Labels" : pivot.rowField], label5);
-  const rowField = pivot.fields.indexOf(pivot.rowField);
-  const colField = pivot.columnField ? pivot.fields.indexOf(pivot.columnField) : -1;
-  const groups = /* @__PURE__ */ new Map();
-  const cells3 = /* @__PURE__ */ new Map();
-  const columns = /* @__PURE__ */ new Map();
-  const collect = (map, key2, record2) => {
-    const found = map.get(key2);
-    if (found) found.push(record2);
-    else map.set(key2, [record2]);
-  };
-  for (const record2 of pivot.records) {
-    const key2 = pivotValueKey(record2[rowField] ?? null);
-    collect(groups, key2, record2);
-    if (pivot.columnField) {
-      const col = pivotValueKey(record2[colField] ?? null);
-      collect(columns, col, record2);
-      collect(cells3, JSON.stringify([key2, col]), record2);
-    }
-  }
-  const firstDataRow = values2.length;
-  const measures2 = pivotMeasures(pivot);
-  const rowEntries = [];
-  const indents = values2.map(() => 0);
-  const append = (caption, bands, index3, grand = false) => {
-    measures2.forEach((measure2, m) => {
-      values2.push([
-        ...compact3 ? [grand ? `Total ${measure2.caption}` : measure2.caption] : [
-          grand ? `Total ${measure2.caption}` : pivot.repeatLabels || !headings && m === 0 ? caption : null,
-          grand ? null : measure2.caption
-        ],
-        ...bands.map((band2) => band2[m] ?? null)
-      ]);
-      indents.push(compact3 && !grand ? 1 : 0);
-      rowEntries.push({
-        indices: grand ? [0] : [index3, m],
-        measure: m,
-        ...grand ? { type: "grand" } : {}
-      });
-    });
-  };
-  rowItems.forEach((item, index3) => {
-    const key2 = pivotValueKey(item);
-    if (headings) {
-      values2.push([label5(item), ...Array(dimensions3.width - 1).fill(null)]);
-      rowEntries.push({ indices: [index3] });
-      indents.push(0);
-    }
-    append(
-      label5(item),
-      [
-        ...columnItems.map(
-          (col) => pivotNumbers(pivot, cells3.get(JSON.stringify([key2, pivotValueKey(col)])) ?? [])
-        ),
-        pivotNumbers(pivot, groups.get(key2) ?? [])
-      ],
-      index3
-    );
-  });
-  append(
-    "Grand Total",
-    [
-      ...columnItems.map((col) => pivotNumbers(pivot, columns.get(pivotValueKey(col)) ?? [])),
-      pivotNumbers(pivot, pivot.records)
-    ],
-    0,
-    true
-  );
-  return {
-    values: values2,
-    rowItems,
-    columnItems,
-    firstDataRow,
-    rowLabelColumns: compact3 ? 1 : 2,
-    indents,
-    firstHeaderRow: 1,
-    rowEntries
-  };
+  return prependPivotPage(nestedPivotGrid(pivotPageProjection(pivot)), pivot);
 }
 function pivotTableAt(sheet, at2) {
   return sheet.pivotTables?.find((pivot) => rangeContains(pivot.location, at2));
@@ -24653,14 +24579,14 @@ function pivotTableAt(sheet, at2) {
 var X14 = "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main";
 var LAYOUT = "http://schemas.microsoft.com/office/spreadsheetml/2016/pivotdefaultlayout";
 var TABLE = {
-  pivotTableDefinition: "name cacheId dataCaption dataOnRows dataPosition updatedVersion minRefreshableVersion createdVersion applyNumberFormats applyBorderFormats applyFontFormats applyPatternFormats applyAlignmentFormats applyWidthHeightFormats useAutoFormatting itemPrintTitles indent compact compactData outline outlineData multipleFieldFilters rowGrandTotals colGrandTotals",
+  pivotTableDefinition: "name cacheId dataCaption grandTotalCaption rowHeaderCaption colHeaderCaption dataOnRows dataPosition updatedVersion minRefreshableVersion createdVersion applyNumberFormats applyBorderFormats applyFontFormats applyPatternFormats applyAlignmentFormats applyWidthHeightFormats useAutoFormatting itemPrintTitles indent compact compactData outline outlineData multipleFieldFilters rowGrandTotals colGrandTotals",
   location: "ref firstHeaderRow firstDataRow firstDataCol rowPageCount colPageCount",
   pageFields: "count",
   pageField: "fld item hier",
   pivotFields: "count",
   pivotField: "axis dataField compact outline showAll subtotalTop defaultSubtotal numFmtId sumSubtotal countASubtotal avgSubtotal maxSubtotal minSubtotal productSubtotal countSubtotal stdDevSubtotal stdDevPSubtotal varSubtotal varPSubtotal",
   items: "count",
-  item: "x t h",
+  item: "x t h n",
   rowFields: "count",
   colFields: "count",
   field: "x",
@@ -24761,8 +24687,8 @@ function inspect(node3, profile, cache3) {
   }
   for (const child7 of elements(node3)) inspect(child7, profile, cache3);
 }
-function assertPivotAdmission(table3, cache3) {
-  inspect(table3, TABLE, false);
+function assertPivotAdmission(table4, cache3) {
+  inspect(table4, TABLE, false);
   inspect(cache3, CACHE, true);
 }
 function assertPivotRecords(records) {
@@ -24773,6 +24699,121 @@ function assertPivotRecords(records) {
   );
 }
 
+// xlsx/pivot/captions-read.ts
+var ATTRIBUTES2 = {
+  rowHeaderCaption: "rowLabels",
+  colHeaderCaption: "columnLabels",
+  grandTotalCaption: "grandTotal",
+  dataCaption: "values"
+};
+function readPivotCaptionAttributes(root) {
+  const out = {};
+  for (const [attribute4, key2] of Object.entries(ATTRIBUTES2)) {
+    const text8 = att(root, attribute4);
+    if (text8 !== void 0)
+      out[key2] = decodeEscapes(text8);
+  }
+  return out;
+}
+function aggregateCaptionsOf(pivot) {
+  const out = {};
+  for (const measure2 of [
+    { field: pivot.valueField, aggregate: pivot.aggregate, caption: pivot.valueCaption },
+    ...pivot.additionalValues ?? []
+  ]) {
+    const at2 = measure2.caption.indexOf(measure2.field);
+    if (at2 < 0 || measure2.caption === measure2.field) continue;
+    const template = `${measure2.caption.slice(0, at2)}{0}${measure2.caption.slice(at2 + measure2.field.length)}`;
+    if (template !== ENGLISH_PIVOT_CAPTIONS.aggregates[measure2.aggregate])
+      out[measure2.aggregate] = template;
+  }
+  return Object.keys(out).length ? out : void 0;
+}
+var MARK = "
";
+var SENTINELS = {
+  rowLabels: `${MARK}R`,
+  columnLabels: `${MARK}C`,
+  grandTotal: `${MARK}G`,
+  values: `${MARK}V`,
+  all: `${MARK}A`,
+  blank: `${MARK}B`,
+  subtotal: `{0}${MARK}S`,
+  measureTotal: `${MARK}M{0}`,
+  functions: Object.fromEntries(
+    Object.keys(ENGLISH_PIVOT_CAPTIONS.functions).map((fn) => [fn, `${MARK}F${fn}`])
+  ),
+  aggregates: ENGLISH_PIVOT_CAPTIONS.aggregates
+};
+function templateOf(cached6, arg) {
+  if (!arg || !cached6.includes(arg)) return void 0;
+  if (cached6.startsWith(arg)) return `{0}${cached6.slice(arg.length)}`;
+  if (cached6.endsWith(arg)) return `${cached6.slice(0, -arg.length)}{0}`;
+  const at2 = cached6.indexOf(arg);
+  return `${cached6.slice(0, at2)}{0}${cached6.slice(at2 + arg.length)}`;
+}
+function inferPivotCaptions(pivot, sheet, named3) {
+  const known = pivotCaptions({ captions: named3 });
+  const probe = { ...SENTINELS };
+  for (const key2 of Object.keys(named3))
+    if (typeof named3[key2] === "string")
+      probe[key2] = known[key2];
+  const grid = pivotGrid({ ...pivot, captions: probe });
+  const found = /* @__PURE__ */ new Map();
+  const set = (key2, value2) => {
+    if (value2 === void 0) return;
+    const before = found.get(key2);
+    found.set(key2, before === void 0 || before === value2 ? value2 : null);
+  };
+  grid.values.forEach(
+    (line3, r) => line3.forEach((expected, c2) => {
+      if (typeof expected !== "string" || !expected.includes(MARK)) return;
+      const cached6 = getCell(
+        sheet,
+        pivot.location.start.row + r,
+        pivot.location.start.col + c2
+      )?.value;
+      if (typeof cached6 !== "string") return;
+      const kind = /\u0001([RCGVASMFB])(\w*)/.exec(expected);
+      if (!kind) return;
+      const at2 = kind.index;
+      switch (kind[1]) {
+        case "R":
+          return set("rowLabels", cached6);
+        case "C":
+          return set("columnLabels", cached6);
+        case "G":
+          return set("grandTotal", cached6);
+        case "V":
+          return set("values", cached6);
+        case "A":
+          return set("all", cached6);
+        case "B":
+          return set("blank", cached6);
+        case "S":
+          return set("subtotal", templateOf(cached6, expected.slice(0, at2)));
+        case "M":
+          return set("measureTotal", templateOf(cached6, expected.slice(at2 + 2)));
+        case "F": {
+          const item = expected.slice(0, at2 - 1);
+          const of = / of (.*)$/.exec(expected.slice(at2));
+          const word = cached6.slice(item.length + 1, of ? cached6.length - of[0].length : void 0);
+          if (cached6.startsWith(`${item} `) && (!of || cached6.endsWith(of[0])))
+            set(`function:${kind[2]}`, word);
+        }
+      }
+    })
+  );
+  const out = pivotCaptions({ captions: named3 });
+  const functions = { ...out.functions };
+  for (const [key2, value2] of found) {
+    if (value2 === null) continue;
+    if (key2.startsWith("function:")) functions[key2.slice(9)] = value2;
+    else out[key2] = value2;
+  }
+  out.functions = functions;
+  return trimmedCaptions(out);
+}
+
 // xlsx/slicer/read-slicers.ts
 var TABLE_SLICER_URI = "{2F2917AC-EB37-4324-AD4E-5DD8C200BD13}";
 var X152 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
@@ -24848,12 +24889,12 @@ function parseSlicerCache(xml, partName) {
   if (data) return void 0;
   const list2 = byLocal(root, "extLst");
   const ext = list2 ? elements(list2).find((node3) => node3.getAttribute("uri") === TABLE_SLICER_URI) : void 0;
-  const table3 = ext ? first(ext, "tableSlicerCache", X152) : void 0;
-  const tableId = numAttr(table3, "tableId");
-  const column2 = numAttr(table3, "column");
-  if (!table3 || tableId === void 0 || column2 === void 0) return void 0;
+  const table4 = ext ? first(ext, "tableSlicerCache", X152) : void 0;
+  const tableId = numAttr(table4, "tableId");
+  const column2 = numAttr(table4, "column");
+  if (!table4 || tableId === void 0 || column2 === void 0) return void 0;
   const cache3 = { ...common, source: { kind: "table", tableId, column: column2 } };
-  if (att(table3, "sortOrder") === "descending") cache3.sortOrder = "descending";
+  if (att(table4, "sortOrder") === "descending") cache3.sortOrder = "descending";
   if (elements(root).some((node3) => node3.localName === "pivotTables")) return void 0;
   return cache3;
 }
@@ -24938,14 +24979,14 @@ function parseTimelineCache(xml, partName) {
 }
 
 // xlsx/slicer/table-filter.ts
-function tableFilterBounds(table3) {
+function tableFilterBounds(table4) {
   return {
-    start: table3.range.start,
-    end: { ...table3.range.end, row: table3.range.end.row - (table3.totalsRow ? 1 : 0) }
+    start: table4.range.start,
+    end: { ...table4.range.end, row: table4.range.end.row - (table4.totalsRow ? 1 : 0) }
   };
 }
-function tableAutoFilter(table3) {
-  const columns = table3.columns.flatMap(
+function tableAutoFilter(table4) {
+  const columns = table4.columns.flatMap(
     (column2, offset2) => column2.filter ? [
       {
         offset: offset2,
@@ -24955,12 +24996,12 @@ function tableAutoFilter(table3) {
     ] : []
   );
   if (!columns.length) return void 0;
-  return { range: tableFilterBounds(table3), columns };
+  return { range: tableFilterBounds(table4), columns };
 }
-function applyTableFilter(workbook, sheet, table3) {
-  if (!table3.headerRow) return;
-  const bounds2 = tableFilterBounds(table3);
-  const filter2 = tableAutoFilter(table3);
+function applyTableFilter(workbook, sheet, table4) {
+  if (!table4.headerRow) return;
+  const bounds2 = tableFilterBounds(table4);
+  const filter2 = tableAutoFilter(table4);
   for (let row3 = bounds2.start.row + 1; row3 <= bounds2.end.row; row3++) {
     const visible = !filter2 || rowMatchesFilter(workbook, sheet, row3, filter2);
     setRowFiltered(sheet, row3, !visible, !!filter2);
@@ -24968,8 +25009,8 @@ function applyTableFilter(workbook, sheet, table3) {
 }
 function readTableFilteredRows(workbook) {
   for (const sheet of workbook.sheets)
-    for (const table3 of sheet.tables) {
-      const filter2 = tableAutoFilter(table3);
+    for (const table4 of sheet.tables) {
+      const filter2 = tableAutoFilter(table4);
       if (!filter2) continue;
       for (let row3 = filter2.range.start.row + 1; row3 <= filter2.range.end.row; row3++) {
         const info = sheet.rowInfo.get(row3);
@@ -25088,9 +25129,9 @@ function settleSlicers(workbook, warn) {
     if (cache3.source.kind === "table") {
       const { tableId, column: column2 } = cache3.source;
       for (const sheet of workbook.sheets) {
-        const table3 = sheet.tables.find((entry3) => entry3.id === tableId);
-        if (table3)
-          return table3.headerRow && !table3.filterNotModeled && table3.columns.some((entry3) => entry3.sourceId === column2);
+        const table4 = sheet.tables.find((entry3) => entry3.id === tableId);
+        if (table4)
+          return table4.headerRow && !table4.filterNotModeled && table4.columns.some((entry3) => entry3.sourceId === column2);
       }
       return false;
     }
@@ -25268,7 +25309,7 @@ function readFieldGroups(fields, names) {
       throw new Error("Unsupported pivot field group");
     const labels = children(list2, "s", NS.x).map((node3) => decodeEscapes(att(node3, "v") ?? ""));
     const expected = numberGroupLabels({ start, end, by });
-    if (elements(list2).length !== labels.length || labels.length !== expected.length || labels.some((label5, i2) => label5 !== expected[i2]))
+    if (elements(list2).length !== labels.length || labels.length !== expected.length || labels.some((label2, i2) => label2 !== expected[i2]))
       throw new Error("Unsupported pivot group items");
     groups.push({ field: names[index3] ?? "", start, end, by });
   });
@@ -25346,14 +25387,18 @@ function readDateGroups(fields, count2, names, dateFields, records, date1904) {
     const expected = dateGroupRange(group, serials);
     if (!close(expected.start, start) || !close(expected.end, end))
       throw unsupported("stale range");
+    const localized = {};
     for (const entry3 of list2) {
-      const labels = dateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
+      const labels = englishDateUnitLabels(entry3.unit, expected, dateGroupDays(group), date1904);
       const node3 = first(first(entry3.node, "fieldGroup", NS.x), "groupItems", NS.x);
       const actual = children(node3, "s", NS.x).map((item) => decodeEscapes(att(item, "v") ?? ""));
-      if (att(entry3.node, "name") === void 0 || decodeEscapes(att(entry3.node, "name")) !== dateGroupFieldName(entry3.unit, field2) || elements(node3).length !== actual.length || actual.length !== labels.length || actual.some((label5, i2) => label5 !== labels[i2]))
+      const name3 = decodeEscapes(att(entry3.node, "name") ?? "");
+      if (!name3 || elements(node3).length !== actual.length || actual.length !== labels.length || actual.some((label2) => !label2) || new Set(actual).size !== actual.length)
         throw unsupported("group items");
+      if (name3 !== dateGroupFieldName(entry3.unit, field2) || actual.some((l, i2) => l !== labels[i2]))
+        localized[entry3.unit] = { name: name3, labels: actual };
     }
-    groups.push(group);
+    groups.push(Object.keys(localized).length ? { ...group, localized } : group);
   }
   return groups;
 }
@@ -25406,12 +25451,32 @@ function readItemFilters(fields, names, shared) {
   return filters.length ? filters : void 0;
 }
 
+// xlsx/pivot/item-names-read.ts
+function readItemNames(tableFields, names, shared) {
+  const out = [];
+  tableFields.forEach((field2, index3) => {
+    const list2 = first(field2, "items", NS.x);
+    if (!list2 || index3 >= names.length) return;
+    for (const item of children(list2, "item", NS.x)) {
+      const name3 = att(item, "n");
+      if (name3 === void 0) continue;
+      const at2 = Number(att(item, "x"));
+      const value2 = shared[index3]?.[at2];
+      if (att(item, "t") !== void 0 || !Number.isInteger(at2) || value2 === void 0)
+        throw new Error("Unsupported pivot item name");
+      out.push({ field: names[index3], item: value2, name: decodeEscapes(name3) });
+    }
+  });
+  return out;
+}
+
 // xlsx/pivot/values-axis.ts
 function remapPivotRowEntries(entries, axes2) {
   return entries.map(
     (entry3) => entry3.type === "grand" ? entry3 : {
       ...entry3,
       indices: entry3.indices.map((item, axis) => {
+        if (axes2[axis] === null) return item;
         const index3 = axes2[axis]?.[item];
         if (index3 === void 0) throw new Error("Invalid report row axis item");
         return index3;
@@ -25430,7 +25495,7 @@ function pivotValueIndex(root, axis) {
   const position2 = root.getAttribute("dataPosition");
   if (position2 !== null && (!/^\d+$/.test(position2.trim()) || Number(position2) !== index3))
     throw new Error("Inconsistent Values axis position");
-  if (axis.length === 3 && index3 >= 0 && index3 < 2 && position2 === null)
+  if (index3 >= 0 && index3 < axis.length - 1 && position2 === null)
     throw new Error("Missing leading or between-field Values position");
   return index3;
 }
@@ -25445,7 +25510,7 @@ function pivotValueAxisItems(measures2) {
 function supportedPivotAxes(rows, columns, measures2, valuesOnRows) {
   const index3 = pivotFieldIndex;
   if (valuesOnRows)
-    return measures2 > 1 && (rows.length === 2 || rows.length === 3) && (index3(rows[0]) >= 0 || rows.length === 3) && rows.filter((field2) => index3(field2) === -2).length === 1 && rows.filter((field2) => index3(field2) !== -2).every((field2) => index3(field2) >= 0) && columns.length <= 1 && (!columns.length || index3(columns[0]) >= 0);
+    return measures2 > 1 && rows.length > 1 && rows.filter((field2) => index3(field2) === -2).length === 1 && rows.filter((field2) => index3(field2) !== -2).every((field2) => index3(field2) >= 0) && columns.every((field2) => index3(field2) >= 0);
   if (rows.some((field2) => !Number.isInteger(index3(field2)) || index3(field2) < 0)) return false;
   if (measures2 > 1 && (!columns.length || index3(columns.at(-1)) !== -2)) return false;
   return (measures2 > 1 ? columns.slice(0, -1) : columns).every(
@@ -25466,6 +25531,9 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
   literals(cache3);
   literals(recordRoot);
   const cacheFields = children(first(cache3, "cacheFields", NS.x), "cacheField", NS.x);
+  const all2 = expandDateGroups(pivot).fields;
+  const derived = all2.slice(pivot.fields.length).map((name3) => groupLabelsOf(pivot, name3) ?? []);
+  const sharedAll = [...shared, ...derived];
   if (pivot.columnField) {
     const column2 = children(first(root, "pivotFields", NS.x), "pivotField", NS.x)[pivot.fields.indexOf(pivot.columnField)];
     const list2 = first(column2, "extLst", NS.x);
@@ -25484,13 +25552,13 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
     ))
       throw new Error("Repeated report column labels are preserved");
   }
-  if (integer3(first(cache3, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== pivot.fields.length || integer3(cache3.getAttribute("recordCount")) !== pivot.records.length || integer3(recordRoot.getAttribute("count")) !== pivot.records.length)
+  if (integer3(first(cache3, "cacheFields", NS.x)?.getAttribute("count") ?? null) !== all2.length || integer3(cache3.getAttribute("recordCount")) !== pivot.records.length || integer3(recordRoot.getAttribute("count")) !== pivot.records.length)
     throw new Error("Inconsistent report cache counts");
   for (const name3 of [...pivotRowFields(pivot), pivot.columnField, pivot.pageFilter.field].filter(
     Boolean
   )) {
-    const field2 = pivot.fields.indexOf(name3);
-    if (integer3(first(cacheFields[field2], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field2].length)
+    const field2 = all2.indexOf(name3);
+    if (field2 < pivot.fields.length && integer3(first(cacheFields[field2], "sharedItems", NS.x)?.getAttribute("count") ?? null) !== shared[field2].length)
       throw new Error("Inconsistent report shared-item counts");
   }
   for (const name3 of ["rowFields", "colFields"]) {
@@ -25500,7 +25568,7 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
   }
   const projected = pivotPageProjection(pivot), fields = children(first(root, "pivotFields", NS.x), "pivotField", NS.x);
   const axisValues = (name3, axis) => {
-    const f6 = pivot.fields.indexOf(name3), node3 = fields[f6], list2 = first(node3, "items", NS.x), items = children(list2, "item", NS.x), count2 = shared[f6].length;
+    const f6 = all2.indexOf(name3), node3 = fields[f6], list2 = first(node3, "items", NS.x), items = children(list2, "item", NS.x), count2 = sharedAll[f6].length;
     if (node3.getAttribute("axis") !== axis) throw new Error("Inconsistent report axis field");
     const defaults = node3.getAttribute("defaultSubtotal") !== "0";
     if (!list2 || integer3(list2.getAttribute("count")) !== items.length || items.length !== count2 + Number(defaults))
@@ -25509,7 +25577,7 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
       const i2 = integer3(item.getAttribute("x"));
       if (item.hasAttribute("t") || !Number.isInteger(i2) || i2 >= count2)
         throw new Error("Invalid page-axis cache item");
-      return shared[f6][i2];
+      return sharedAll[f6][i2];
     });
     if (new Set(data.map(pivotValueKey)).size !== count2 || defaults && (items.at(-1)?.getAttribute("t") !== "default" || items.at(-1)?.hasAttribute("x")))
       throw new Error("Invalid page-axis default item");
@@ -25524,7 +25592,10 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
   };
   const rowAxes = pivotRowFields(pivot).map((name3) => axisValues(name3, "axisRow")), rowItems = read("rowItems");
   const grid = pivotGrid(pivot);
-  const entries = grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, rowAxes) : [
+  const valuesAt = pivotValuesIndex(pivot);
+  const levelAxes = [...rowAxes];
+  if (valuesAt >= 0) levelAxes.splice(valuesAt, 0, null);
+  const entries = grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, levelAxes) : [
     ...rowAxes[0].map((index3) => ({ indices: [index3] })),
     { indices: [0], type: "grand" }
   ];
@@ -25534,11 +25605,11 @@ function assertPageAxisItems(root, pivot, shared, cache3, recordRoot) {
     const expected2 = entries[i2];
     const xs = children(item, "x", NS.x).map((x) => integer3(x.getAttribute("v"), 0)), prefix3 = integer3(item.getAttribute("r"), 0);
     const type = expected2.type === void 0 || expected2.type === "default" || expected2.type === "grand" ? expected2.type : PIVOT_SUBTOTALS[expected2.type].item;
-    if (item.getAttribute("t") !== (type ?? null) || !Number.isInteger(prefix3) || prefix3 < 0 || prefix3 > previousRow.length || prefix3 >= expected2.indices.length || expected2.type === "grand" && prefix3 !== 0 || integer3(item.getAttribute("i"), 0) !== 0 || JSON.stringify([...previousRow.slice(0, prefix3), ...xs]) !== JSON.stringify(expected2.indices))
+    if (item.getAttribute("t") !== (type ?? null) || !Number.isInteger(prefix3) || prefix3 < 0 || prefix3 > previousRow.length || prefix3 >= expected2.indices.length || expected2.type === "grand" && prefix3 !== 0 || integer3(item.getAttribute("i"), 0) !== (expected2.measure ?? 0) || JSON.stringify([...previousRow.slice(0, prefix3), ...xs]) !== JSON.stringify(expected2.indices))
       throw new Error("Unmodeled page row item");
     previousRow = expected2.type === "grand" ? [] : expected2.indices;
   });
-  const measures2 = 1 + (pivot.additionalValues?.length ?? 0), columns = pivot.columnField ? axisValues(pivot.columnField, "axisCol") : void 0, expected = [];
+  const measures2 = valuesAt >= 0 ? 1 : 1 + (pivot.additionalValues?.length ?? 0), columns = pivot.columnField ? axisValues(pivot.columnField, "axisCol") : void 0, expected = [];
   if (columns)
     for (const col of columns)
       for (let m = 0; m < measures2; m++) expected.push(measures2 > 1 ? [col, m] : [col]);
@@ -25580,6 +25651,10 @@ function value(node3, date1904 = false) {
   if (node3.localName === "e" && isErrorCode(v)) return { error: v };
   throw new Error("Unsupported pivot cache item");
 }
+var namedAggregates = (pivot) => {
+  const aggregates = aggregateCaptionsOf(pivot);
+  return aggregates ? { aggregates } : {};
+};
 function readOne(workbook, source2, part) {
   const xml = source2.text(part);
   const root = parseXml(xml).documentElement;
@@ -25645,7 +25720,7 @@ function readOne(workbook, source2, part) {
     "dataField",
     NS.x
   );
-  if (rowFields.length < 1 || rowsAxis && rowFields.length > 3 || dataFields.length < 1 || dataFields.length > 16 || !supportedPivotAxes(rowFields, colFields, dataFields.length, rowsAxis) || root.getAttribute("rowGrandTotals") === "0" || root.getAttribute("colGrandTotals") === "0")
+  if (rowFields.length < 1 || dataFields.length < 1 || dataFields.length > 16 || !supportedPivotAxes(rowFields, colFields, dataFields.length, rowsAxis) || root.getAttribute("rowGrandTotals") === "0" || root.getAttribute("colGrandTotals") === "0")
     throw new Error("Unsupported pivot layout");
   const valueIndex = pivotValueIndex(root, rowsAxis ? rowFields : colFields);
   const measure2 = dataFields[0];
@@ -25715,8 +25790,8 @@ function readOne(workbook, source2, part) {
   const col = columnNames[0];
   const moreColumns = columnNames.slice(1);
   const columnDefinitions = columnDefs.map((field2) => tableFields[Number(att(field2, "x"))]);
-  if (fieldSubtotalsOf(columnDefinitions.slice(0, -1), columnNames.slice(0, -1)).length || columnNames.some((name3) => !name3))
-    throw new Error("Column subtotal settings are preserved");
+  if (columnNames.some((name3) => !name3)) throw new Error("Invalid pivot column fields");
+  const columnSubtotals = fieldSubtotalsOf(columnDefinitions, columnNames);
   const data = names[Number(att(measure2, "fld"))];
   const location = parseRange(att(first(root, "location", NS.x), "ref") ?? "");
   if (!row3 || !data || !location || hasColumn && !col || realRows.length === 2 && !second)
@@ -25726,6 +25801,7 @@ function readOne(workbook, source2, part) {
     location.start.row -= 2;
   }
   const itemFilters = readItemFilters(tableFields, names, shared);
+  const itemNames = readItemNames(tableFields, names, shared);
   const slicerCacheId = readSlicerCacheId(cache3);
   const fieldGroups = readFieldGroups(fields, names);
   const dateFields = readDateFields(fields, names);
@@ -25757,11 +25833,14 @@ function readOne(workbook, source2, part) {
   ]);
   if (dateFields.some((field2) => onAxis.has(field2)))
     throw new Error("Date fields used as rows, columns or values are preserved");
-  if ([...realRows, ...columnDefs].some((field2) => pivotFieldIndex(field2) >= databaseCount) && (pageFilter || dateFilter || itemFilters || slicerCacheId !== void 0))
-    throw new Error("Date groups with filters are preserved");
+  const fieldSubtotals = [
+    ...subtotalSettings.filter((entry4) => entry4.field !== row3 || entry4.functions.length),
+    ...columnSubtotals
+  ];
   const pivot = {
     ...pageFilter ? { pageFilter } : {},
     ...itemFilters ? { itemFilters } : {},
+    ...itemNames.length ? { itemNames } : {},
     ...fieldGroups.length ? { fieldGroups } : {},
     ...dateFields.length ? { dateFields } : {},
     ...dateGroups.length ? { dateGroups } : {},
@@ -25773,13 +25852,11 @@ function readOne(workbook, source2, part) {
     rowField: row3,
     layout: layout3,
     ...rowsAxis ? { valuesAxis: "rows" } : {},
-    ...rowsAxis && realRows.length === 2 && valueIndex < 2 ? { valuesPosition: valueIndex === 0 ? "first" : "between" } : {},
-    subtotalPosition: att(outer, "subtotalTop") === "0" ? "bottom" : "top",
-    ...subtotalSettings.some((entry4) => entry4.field !== row3 || entry4.functions.length) ? {
-      fieldSubtotals: subtotalSettings.filter(
-        (entry4) => entry4.field !== row3 || entry4.functions.length
-      )
+    ...rowsAxis && valueIndex < realRows.length ? {
+      valuesPosition: valueIndex === 0 ? "first" : valueIndex === 1 && realRows.length === 2 ? "between" : valueIndex
     } : {},
+    subtotalPosition: att(outer, "subtotalTop") === "0" ? "bottom" : "top",
+    ...fieldSubtotals.length ? { fieldSubtotals } : {},
     ...more.length ? { moreRowFields: more } : {},
     ...second ? { secondRowField: second, subtotals: subtotal, repeatLabels: repeat[0] ?? false } : {
       ...subtotal ? {} : { subtotals: false },
@@ -25806,6 +25883,12 @@ function readOne(workbook, source2, part) {
     ...col ? { columnField: col } : {},
     ...moreColumns.length ? { moreColumnFields: moreColumns } : {}
   };
+  const captions = trimmedCaptions(
+    pivotCaptions({
+      captions: { ...readPivotCaptionAttributes(root), ...namedAggregates(pivot) }
+    })
+  );
+  if (captions) pivot.captions = captions;
   if (pageFilter && moreColumns.length) throw new Error("Report filters support one column field");
   assertPageAxisItems(root, pivot, shared, cache3, recordRoot);
   return pivot;
@@ -25833,6 +25916,12 @@ function readPivotTables(workbook, source2, warn, slicers) {
           if (slicers.blocked.has(pivotKey(sheet.sheetId, name3)) || cache3 && (caches2.get(cache3) ?? 0) > 1)
             throw new Error("Shared pivot cache or unsupported slicer connection");
           const pivot = readOne(workbook, source2, part);
+          const inferred = inferPivotCaptions(pivot, sheet, {
+            ...readPivotCaptionAttributes(parseXml(pivot.sourceXml).documentElement),
+            ...namedAggregates(pivot)
+          });
+          if (inferred) pivot.captions = inferred;
+          else delete pivot.captions;
           const grid = pivotGrid(pivot);
           if (grid.values.length !== pivot.location.end.row - pivot.location.start.row + 1 || grid.values[0].length !== pivot.location.end.col - pivot.location.start.col + 1 || grid.values.some(
             (line3, r) => line3.some(
@@ -26472,7 +26561,7 @@ function mergeSpacedAreas(tokens3) {
   }
   return out;
 }
-function templateOf(formula) {
+function templateOf2(formula) {
   const cached6 = templates.get(formula);
   if (cached6 !== void 0) return cached6;
   const raw2 = safeTokens(formula);
@@ -26502,7 +26591,7 @@ function templateOf(formula) {
   return template;
 }
 function rewriteTemplate(formula, rewrite2) {
-  const template = templateOf(formula);
+  const template = templateOf2(formula);
   if (!template) return formula;
   let next;
   for (let i2 = 0; i2 < template.length; i2++) {
@@ -27803,14 +27892,14 @@ function readDataTable(f6) {
   const ref = parseRange(att(f6, "ref") ?? "");
   const r1 = att(f6, "r1");
   if (!ref || !r1) return void 0;
-  const table3 = { ref, r1 };
+  const table4 = { ref, r1 };
   const r2 = att(f6, "r2");
-  if (r2) table3.r2 = r2;
-  if (boolAttr(f6, "dt2D")) table3.dt2D = true;
-  if (boolAttr(f6, "dtr")) table3.dtr = true;
-  if (boolAttr(f6, "del1")) table3.del1 = true;
-  if (boolAttr(f6, "del2")) table3.del2 = true;
-  return table3;
+  if (r2) table4.r2 = r2;
+  if (boolAttr(f6, "dt2D")) table4.dt2D = true;
+  if (boolAttr(f6, "dtr")) table4.dtr = true;
+  if (boolAttr(f6, "del1")) table4.del1 = true;
+  if (boolAttr(f6, "del2")) table4.del2 = true;
+  return table4;
 }
 function readFormula(ctx, f6, row3, col, cell, masters, dynamic2, anchors, sheet) {
   const kind = att(f6, "t") ?? "normal";
@@ -27834,8 +27923,8 @@ function readFormula(ctx, f6, row3, col, cell, masters, dynamic2, anchors, sheet
   }
   if (kind === "dataTable") {
     delete cell.legacyFormula;
-    const table3 = readDataTable(f6);
-    if (table3) (sheet.dataTables ??= []).push(table3);
+    const table4 = readDataTable(f6);
+    if (table4) (sheet.dataTables ??= []).push(table4);
     else ctx.warn("A what-if data table formula could not be read; its cached values were kept.");
     return;
   }
@@ -28027,14 +28116,14 @@ function parseTable3(xml, partName) {
       if (id3 !== void 0 && Number.isInteger(id3) && id3 >= 0) column2.sourceId = id3;
       const fn = att(node3, "totalsRowFunction");
       if (fn && fn !== "none") column2.totalsRowFunction = fn;
-      const label5 = att(node3, "totalsRowLabel");
-      if (label5 !== void 0) column2.totalsRowLabel = label5;
+      const label2 = att(node3, "totalsRowLabel");
+      if (label2 !== void 0) column2.totalsRowLabel = label2;
       const calculated = xFirst(node3, "calculatedColumnFormula");
       if (calculated) column2.calculatedColumnFormula = stripFuturePrefixes(xText(calculated));
       return column2;
     }
   );
-  const table3 = {
+  const table4 = {
     id: numAttr(root, "id") ?? 1,
     name: name3,
     displayName: att(root, "displayName") ?? name3,
@@ -28044,26 +28133,26 @@ function parseTable3(xml, partName) {
     columns,
     partName
   };
-  readColumnFilters(root, table3);
+  readColumnFilters(root, table4);
   const info = xFirst(root, "tableStyleInfo");
   if (info) {
     const style3 = att(info, "name");
-    if (style3) table3.styleName = style3;
-    table3.showRowStripes = boolAttr(info, "showRowStripes", false);
-    table3.showColumnStripes = boolAttr(info, "showColumnStripes", false);
-    table3.showFirstColumn = boolAttr(info, "showFirstColumn", false);
-    table3.showLastColumn = boolAttr(info, "showLastColumn", false);
+    if (style3) table4.styleName = style3;
+    table4.showRowStripes = boolAttr(info, "showRowStripes", false);
+    table4.showColumnStripes = boolAttr(info, "showColumnStripes", false);
+    table4.showFirstColumn = boolAttr(info, "showFirstColumn", false);
+    table4.showLastColumn = boolAttr(info, "showLastColumn", false);
   }
-  return table3;
+  return table4;
 }
-function readColumnFilters(root, table3) {
+function readColumnFilters(root, table4) {
   const filter2 = xFirst(root, "autoFilter");
   for (const node3 of filter2 ? xChildren(filter2, "filterColumn") : []) {
-    const column2 = table3.columns[numAttr(node3, "colId") ?? -1];
+    const column2 = table4.columns[numAttr(node3, "colId") ?? -1];
     const filters = xChildren(node3, "filters");
     const simple = column2 && isValueListFilterColumn(node3);
     if (!simple) {
-      table3.filterNotModeled = true;
+      table4.filterNotModeled = true;
       continue;
     }
     const values2 = xChildren(filters[0], "filter").map((child7) => att(child7, "val") ?? "");
@@ -28142,8 +28231,8 @@ function readTables(ctx, partName, node3, sheet) {
     const rel = rels.get(relAttr(part, "id") ?? "");
     const target2 = rel ? ctx.source.target(partName, rel) : void 0;
     const xml = target2 ? ctx.source.text(target2) : void 0;
-    const table3 = target2 && xml ? parseTable3(xml, target2) : void 0;
-    if (table3) sheet.tables.push(table3);
+    const table4 = target2 && xml ? parseTable3(xml, target2) : void 0;
+    if (table4) sheet.tables.push(table4);
     else ctx.warn("A table part could not be read and was dropped.");
   }
 }
@@ -30613,14 +30702,14 @@ function unique(args, ctx) {
   const byCol = args.length > 1 && args[1] !== null && toBool(ctx.toScalar(args[1] ?? null));
   const once = args.length > 2 && args[2] !== null && toBool(ctx.toScalar(args[2] ?? null));
   if (byCol) m = transpose(m);
-  const keyOf2 = (row3) => JSON.stringify(
+  const keyOf3 = (row3) => JSON.stringify(
     row3.map(
       (v) => isError(v) ? `#${v.error}` : typeof v === "string" ? `s${v.toLowerCase()}` : v
     )
   );
   const counts = /* @__PURE__ */ new Map();
   for (const row3 of m.data) {
-    const key2 = keyOf2(row3);
+    const key2 = keyOf3(row3);
     const entry3 = counts.get(key2);
     if (entry3) entry3.count++;
     else counts.set(key2, { row: row3, count: 1 });
@@ -30905,30 +30994,30 @@ function gammaLn(z) {
 
 // xlsx/formula/functions/database.ts
 var C3 = "Database";
-var label4 = (value2) => value2 === null ? "" : typeof value2 === "string" ? value2 : String(value2);
+var label = (value2) => value2 === null ? "" : typeof value2 === "string" ? value2 : String(value2);
 function tableOf(ctx, value2) {
   const [head, ...records] = ctx.toMatrix(value2 ?? null).data;
   if (!head || records.length === 0) fail(ERR.VALUE);
-  return { headers: head.map((v) => label4(v).toLowerCase()), records };
+  return { headers: head.map((v) => label(v).toLowerCase()), records };
 }
-function fieldIndex(table3, field2) {
+function fieldIndex(table4, field2) {
   const value2 = scalar2(field2);
   if (isError(value2)) fail(value2);
   if (typeof value2 === "number") {
     const index4 = Math.trunc(value2) - 1;
-    if (index4 < 0 || index4 >= table3.headers.length) fail(ERR.VALUE);
+    if (index4 < 0 || index4 >= table4.headers.length) fail(ERR.VALUE);
     return index4;
   }
-  const index3 = table3.headers.indexOf(label4(value2).toLowerCase());
+  const index3 = table4.headers.indexOf(label(value2).toLowerCase());
   if (index3 < 0) fail(ERR.VALUE);
   return index3;
 }
-function recordFilter(table3, criteria) {
+function recordFilter(table4, criteria) {
   const [head, ...rows] = criteria;
   if (!head || rows.length === 0) fail(ERR.VALUE);
   const columns = head.map((name3) => {
     if (name3 === null || name3 === "") return -1;
-    return table3.headers.indexOf(label4(name3).toLowerCase());
+    return table4.headers.indexOf(label(name3).toLowerCase());
   });
   const alternatives = rows.map(
     (row3) => row3.flatMap((cell, c2) => {
@@ -30942,10 +31031,10 @@ function recordFilter(table3, criteria) {
   return (record2) => alternatives.some((tests) => tests.every((test) => test(record2)));
 }
 function selected(ctx, args) {
-  const table3 = tableOf(ctx, args[0]);
-  const column2 = fieldIndex(table3, args[1]);
-  const matches2 = recordFilter(table3, ctx.toMatrix(args[2] ?? null).data);
-  return table3.records.filter(matches2).map((record2) => record2[column2] ?? null);
+  const table4 = tableOf(ctx, args[0]);
+  const column2 = fieldIndex(table4, args[1]);
+  const matches2 = recordFilter(table4, ctx.toMatrix(args[2] ?? null).data);
+  return table4.records.filter(matches2).map((record2) => record2[column2] ?? null);
 }
 var numbers = (values2) => {
   for (const v of values2) if (isError(v)) fail(v);
@@ -31773,9 +31862,9 @@ var BESSEL_FUNCTIONS = [
 ];
 
 // xlsx/formula/functions/convert.ts
-var table = /* @__PURE__ */ new Map();
+var table2 = /* @__PURE__ */ new Map();
 var add3 = (dimension3, names, factor, extra = {}) => {
-  for (const name3 of names) table.set(name3, { dimension: dimension3, factor, ...extra });
+  for (const name3 of names) table2.set(name3, { dimension: dimension3, factor, ...extra });
 };
 add3("mass", ["g"], 1, { prefix: "metric" });
 add3("mass", ["sg"], 14593.9029372064);
@@ -31906,10 +31995,10 @@ var BINARY2 = {
   ki: 2 ** 10
 };
 function resolve(name3) {
-  const direct = table.get(name3);
+  const direct = table2.get(name3);
   if (direct) return { dimension: direct.dimension, factor: direct.factor };
   for (const length of [2, 1]) {
-    const unit3 = table.get(name3.slice(length));
+    const unit3 = table2.get(name3.slice(length));
     const prefix3 = name3.slice(0, length);
     if (!unit3?.prefix) continue;
     const scale2 = (unit3.prefix === "binary" ? BINARY2[prefix3] : void 0) ?? METRIC[prefix3];
@@ -33244,30 +33333,30 @@ function findTable(host, name3, sheet, row3, col) {
   if (name3) {
     const lower3 = name3.toLowerCase();
     for (let s = 0; s < sheets.length; s++) {
-      const table4 = sheets[s]?.tables.find(
+      const table5 = sheets[s]?.tables.find(
         (t) => t.displayName.toLowerCase() === lower3 || t.name.toLowerCase() === lower3
       );
-      if (table4) return { table: table4, sheet: s };
+      if (table5) return { table: table5, sheet: s };
     }
     return void 0;
   }
-  const table3 = sheets[sheet]?.tables.find(
+  const table4 = sheets[sheet]?.tables.find(
     (t) => row3 >= t.range.start.row && row3 <= t.range.end.row && col >= t.range.start.col && col <= t.range.end.col
   );
-  return table3 ? { table: table3, sheet } : void 0;
+  return table4 ? { table: table4, sheet } : void 0;
 }
 function resolveStructured(ref, frame2) {
   const found = findTable(frame2.host, ref.table, frame2.sheet, frame2.row, frame2.col);
   if (!found) return ref.table ? ERR.NAME : ERR.REF;
-  const { table: table3, sheet } = found;
-  const range2 = normalizeRange(table3.range);
-  const headerRow = table3.headerRow ? range2.start.row : -1;
-  const dataStart = range2.start.row + (table3.headerRow ? 1 : 0);
-  const dataEnd = range2.end.row - (table3.totalsRow ? 1 : 0);
-  const totalsRow = table3.totalsRow ? range2.end.row : -1;
+  const { table: table4, sheet } = found;
+  const range2 = normalizeRange(table4.range);
+  const headerRow = table4.headerRow ? range2.start.row : -1;
+  const dataStart = range2.start.row + (table4.headerRow ? 1 : 0);
+  const dataEnd = range2.end.row - (table4.totalsRow ? 1 : 0);
+  const totalsRow = table4.totalsRow ? range2.end.row : -1;
   const columnOf = (name3) => {
     const lower3 = name3.toLowerCase();
-    const index3 = table3.columns.findIndex((c3) => c3.name.toLowerCase() === lower3);
+    const index3 = table4.columns.findIndex((c3) => c3.name.toLowerCase() === lower3);
     return index3 < 0 ? -1 : range2.start.col + index3;
   };
   let c1 = range2.start.col;
@@ -34579,16 +34668,16 @@ function lookupArray(value2) {
 }
 function vhlookup(args, ctx, vertical2) {
   const lookup2 = blankAsZero(args);
-  const table3 = lookupArray(args[1] ?? null);
+  const table4 = lookupArray(args[1] ?? null);
   const index3 = int3(args[2]);
   const approximate2 = args.length < 4 ? true : bool(args[3]);
-  const { rows, cols } = shape(table3);
+  const { rows, cols } = shape(table4);
   if (index3 < 1) fail(ERR.VALUE);
   if (index3 > (vertical2 ? cols : rows)) fail(ERR.REF);
-  const keys = line2(ctx, table3, vertical2 ? "col" : "row", 0);
+  const keys = line2(ctx, table4, vertical2 ? "col" : "row", 0);
   const at2 = approximate2 ? findAscending(keys, lookup2) : findExact(keys, lookup2, true);
   if (at2 < 0) fail(ERR.NA);
-  return vertical2 ? cellOf(table3, at2, index3 - 1) : cellOf(table3, index3 - 1, at2);
+  return vertical2 ? cellOf(table4, at2, index3 - 1) : cellOf(table4, index3 - 1, at2);
 }
 function match(args, ctx) {
   const lookup2 = blankAsZero(args);
@@ -36032,10 +36121,10 @@ var REGRESSION_FUNCTIONS = [
       const lay = logs(layout2(ctx, args));
       const fit3 = fitLeastSquares(lay.x, lay.y, withConst(args, 2));
       const stats = !omitted(args, 3) && bool(args[3]);
-      const table3 = coefficientTable(fit3, stats, Math.exp);
-      if (!stats) return table3;
+      const table4 = coefficientTable(fit3, stats, Math.exp);
+      if (!stats) return table4;
       const plain5 = coefficientTable(fit3, true, (v) => v).data;
-      return new Matrix([table3.data[0] ?? [], ...plain5.slice(1)]);
+      return new Matrix([table4.data[0] ?? [], ...plain5.slice(1)]);
     },
     ARGS
   ),
@@ -38421,7 +38510,7 @@ function headerMode(args, i2, ctx, firstRow) {
   if (mode === 1 || mode === 3) return true;
   return fail(ERR.VALUE);
 }
-var keyOf = (values2) => JSON.stringify(values2);
+var keyOf2 = (values2) => JSON.stringify(values2);
 var plain2 = (v) => v === void 0 || isError(v) ? null : v;
 function compareBy(keys, rows) {
   return (a2, b) => {
@@ -38461,12 +38550,12 @@ function groupby(args, ctx) {
   if (rows.length === 0) fail(ERR.CALC);
   const groups = /* @__PURE__ */ new Map();
   for (const r of rows) {
-    const key2 = keyOf(keysM.data[r]);
+    const key2 = keyOf2(keysM.data[r]);
     const found = groups.get(key2);
     if (found) found.push(r);
     else groups.set(key2, [r]);
   }
-  const table3 = [...groups.values()].map((members3) => {
+  const table4 = [...groups.values()].map((members3) => {
     const key2 = keysM.data[members3[0]];
     const cells3 = Array.from(
       { length: vCols },
@@ -38478,8 +38567,8 @@ function groupby(args, ctx) {
     return [...key2, ...cells3];
   });
   for (const key2 of sort2) if (Math.abs(key2) > kCols + vCols) fail(ERR.VALUE);
-  const order = table3.map((_, i2) => i2).sort(compareBy(sort2, table3));
-  const out = order.map((i2) => table3[i2]);
+  const order = table4.map((_, i2) => i2).sort(compareBy(sort2, table4));
+  const out = order.map((i2) => table4[i2]);
   if (depth !== 0) {
     const total2 = [
       "Total",
@@ -38528,8 +38617,8 @@ function pivotby(args, ctx) {
   const colKeys = /* @__PURE__ */ new Map();
   for (const r of used) {
     for (const [map, key2] of [
-      [rowKeys, keyOf(rowsM.data[r])],
-      [colKeys, keyOf(colsM.data[r])]
+      [rowKeys, keyOf2(rowsM.data[r])],
+      [colKeys, keyOf2(colsM.data[r])]
     ]) {
       const found = map.get(key2);
       if (found) found.push(r);
@@ -39262,8 +39351,8 @@ function resolveName(node3, frame2) {
   const value2 = evaluateDefinedName(node3.name, sheet, node3.prefix !== void 0, frame2);
   if (value2 !== void 0) return value2;
   if (!node3.prefix) {
-    const table3 = resolveStructured({ table: node3.name, specials: [] }, frame2);
-    if (!(isError(table3) && table3.error === "#NAME?")) return table3;
+    const table4 = resolveStructured({ table: node3.name, specials: [] }, frame2);
+    if (!(isError(table4) && table4.error === "#NAME?")) return table4;
   }
   return ERR.NAME;
 }
@@ -40913,8 +41002,8 @@ function deleteSheetInFormula(formula, sheetName, tableNames = []) {
   for (const token of tokens3) {
     const prefix3 = token.prefix;
     const onSheet = prefix3 !== void 0 && prefix3.book === void 0 && prefix3.sheet2 === void 0 && same5(prefix3.sheet, sheetName);
-    const table3 = typeof token.value === "string" && tables.has(token.value.toLowerCase()) && (token.kind === "structured" || token.kind === "name" && !prefix3);
-    if ((token.kind === "ref" || token.kind === "name") && onSheet || table3) {
+    const table4 = typeof token.value === "string" && tables.has(token.value.toLowerCase()) && (token.kind === "structured" || token.kind === "name" && !prefix3);
+    if ((token.kind === "ref" || token.kind === "name") && onSheet || table4) {
       token.text = "#REF!";
       changed = true;
     }
@@ -40977,11 +41066,11 @@ function renameTableColumnInFormula(formula, tableName, oldName, newName, inside
 // xlsx/formula/structured-to-a1.ts
 var abs = (row3, col, rowAbs = true) => `$${columnLabel(col)}${rowAbs ? "$" : ""}${row3 + 1}`;
 function a1For(ref, t) {
-  const { table: table3 } = t;
-  const { start, end } = table3.range;
+  const { table: table4 } = t;
+  const { start, end } = table4.range;
   const index3 = (name3) => {
     if (name3 === void 0) return void 0;
-    const i2 = table3.columns.findIndex((c3) => c3.name.toLowerCase() === name3.toLowerCase());
+    const i2 = table4.columns.findIndex((c3) => c3.name.toLowerCase() === name3.toLowerCase());
     return i2 < 0 ? -1 : start.col + i2;
   };
   const c1 = index3(ref.column);
@@ -40989,10 +41078,10 @@ function a1For(ref, t) {
   if (c1 === -1 || c2 === -1) return "#REF!";
   const colLo = c1 ?? start.col;
   const colHi = c2 ?? end.col;
-  const headerRow = table3.headerRow ? start.row : void 0;
-  const totalsRow = table3.totalsRow ? end.row : void 0;
-  const dataLo = start.row + (table3.headerRow ? 1 : 0);
-  const dataHi = end.row - (table3.totalsRow ? 1 : 0);
+  const headerRow = table4.headerRow ? start.row : void 0;
+  const totalsRow = table4.totalsRow ? end.row : void 0;
+  const dataLo = start.row + (table4.headerRow ? 1 : 0);
+  const dataHi = end.row - (table4.totalsRow ? 1 : 0);
   const specials = new Set(ref.specials);
   let rowLo;
   let rowHi;
@@ -42425,8 +42514,8 @@ function sheetDataXml(ctx, sheet) {
   ].sort((a2, b) => a2 - b);
   const spills = new SpillPlan(sheet);
   const tables = /* @__PURE__ */ new Map();
-  for (const table3 of sheet.dataTables ?? [])
-    tables.set(`${table3.ref.start.row}:${table3.ref.start.col}`, table3);
+  for (const table4 of sheet.dataTables ?? [])
+    tables.set(`${table4.ref.start.row}:${table4.ref.start.col}`, table4);
   let out = "";
   for (const row3 of rows) {
     const cells3 = sheet.rows.get(row3);
@@ -42908,29 +42997,29 @@ function setChildText(doc, parent, local, text8, before) {
   node3.textContent = text8;
   if (!existing) insertBefore(parent, node3, before);
 }
-function tableFilterRange(table3) {
+function tableFilterRange(table4) {
   return {
-    start: table3.range.start,
-    end: { ...table3.range.end, row: table3.range.end.row - (table3.totalsRow ? 1 : 0) }
+    start: table4.range.start,
+    end: { ...table4.range.end, row: table4.range.end.row - (table4.totalsRow ? 1 : 0) }
   };
 }
-function sourceColumnsForPatch(root, table3, names) {
+function sourceColumnsForPatch(root, table4, names) {
   const list2 = xKid(root, "tableColumns");
   const source2 = list2 ? xKids(list2, "tableColumn") : [];
   const byId2 = new Map(source2.map((c2) => [Number(c2.getAttribute("id")), c2]));
   const byName2 = new Map(source2.map((c2) => [(c2.getAttribute("name") ?? "").toLowerCase(), c2]));
-  const tracked = table3.partName !== void 0 || table3.columns.some((c2) => c2.sourceId !== void 0);
+  const tracked = table4.partName !== void 0 || table4.columns.some((c2) => c2.sourceId !== void 0);
   const used = /* @__PURE__ */ new Set();
   return names.map((name3, index3) => {
-    const id3 = table3.columns[index3]?.sourceId;
+    const id3 = table4.columns[index3]?.sourceId;
     const match2 = id3 !== void 0 ? byId2.get(id3) : tracked ? void 0 : source2.length === names.length ? source2[index3] : byName2.get(name3.toLowerCase());
     if (!match2 || used.has(match2)) return void 0;
     used.add(match2);
     return match2;
   });
 }
-function syncColumnFilters(doc, filter2, table3) {
-  table3.columns.forEach((column2, index3) => {
+function syncColumnFilters(doc, filter2, table4) {
+  table4.columns.forEach((column2, index3) => {
     const node3 = xKids(filter2, "filterColumn").find(
       (n) => Number(n.getAttribute("colId")) === index3
     );
@@ -42952,29 +43041,29 @@ function syncColumnFilters(doc, filter2, table3) {
     }
   });
 }
-function patchAutoFilter(doc, root, table3, before, names) {
+function patchAutoFilter(doc, root, table4, before, names) {
   const existing = xKid(root, "autoFilter");
-  if (!table3.headerRow) {
+  if (!table4.headerRow) {
     if (existing) root.removeChild(existing);
     return;
   }
   const filter2 = existing ?? doc.createElementNS(NS.x, "autoFilter");
-  const range2 = tableFilterRange(table3);
+  const range2 = tableFilterRange(table4);
   filter2.setAttribute("ref", formatRange(range2));
   const list2 = xKid(root, "tableColumns");
   const original = list2 ? xKids(list2, "tableColumn") : [];
-  const current = new Map(sourceColumnsForPatch(root, table3, names).map((c2, index3) => [c2, index3]));
+  const current = new Map(sourceColumnsForPatch(root, table4, names).map((c2, index3) => [c2, index3]));
   for (const column2 of xKids(filter2, "filterColumn")) {
     const old = original[Number(column2.getAttribute("colId") ?? "0")];
     const index3 = old ? current.get(old) : void 0;
     if (index3 === void 0) filter2.removeChild(column2);
     else column2.setAttribute("colId", num(index3));
   }
-  syncColumnFilters(doc, filter2, table3);
+  syncColumnFilters(doc, filter2, table4);
   if (!existing) insertBefore(root, filter2, ["sortState", "tableColumns"]);
   const sort2 = xKid(filter2, "sortState") ?? xKid(root, "sortState");
   if (!sort2) return;
-  const moved = before.start.row !== table3.range.start.row || before.start.col !== table3.range.start.col || before.end.col !== table3.range.end.col;
+  const moved = before.start.row !== table4.range.start.row || before.start.col !== table4.range.start.col || before.end.col !== table4.range.end.col;
   if (moved) {
     sort2.parentNode?.removeChild(sort2);
     return;
@@ -42996,7 +43085,7 @@ function patchAutoFilter(doc, root, table3, before, names) {
   }
 }
 var COLUMN_CHILD_ORDER = ["calculatedColumnFormula", "totalsRowFormula", "xmlColumnPr", "extLst"];
-function patchColumns(doc, root, sheet, table3, names) {
+function patchColumns(doc, root, sheet, table4, names) {
   let list2 = xKid(root, "tableColumns");
   if (!list2) {
     list2 = doc.createElementNS(NS.x, "tableColumns");
@@ -43004,7 +43093,7 @@ function patchColumns(doc, root, sheet, table3, names) {
   }
   const sourceColumns = xKids(list2, "tableColumn");
   const ids = /* @__PURE__ */ new Set();
-  const picked = sourceColumnsForPatch(root, table3, names).map((match2) => {
+  const picked = sourceColumnsForPatch(root, table4, names).map((match2) => {
     if (!match2) return void 0;
     const id3 = Number(match2.getAttribute("id"));
     if (Number.isInteger(id3) && id3 >= 0 && !ids.has(id3)) ids.add(id3);
@@ -43013,15 +43102,15 @@ function patchColumns(doc, root, sheet, table3, names) {
   });
   for (const column2 of sourceColumns) list2.removeChild(column2);
   let nextId3 = Math.max(0, ...ids) + 1;
-  const totalsRow = table3.range.end.row;
+  const totalsRow = table4.range.end.row;
   names.forEach((name3, index3) => {
     const column2 = picked[index3] ?? doc.createElementNS(NS.x, "tableColumn");
     if (!column2.getAttribute("id")) column2.setAttribute("id", num(nextId3++));
     column2.setAttribute("name", name3);
-    const model = table3.columns[index3];
-    const fn = table3.totalsRow ? model?.totalsRowFunction : void 0;
+    const model = table4.columns[index3];
+    const fn = table4.totalsRow ? model?.totalsRowFunction : void 0;
     setOrRemove(column2, "totalsRowFunction", fn);
-    setOrRemove(column2, "totalsRowLabel", table3.totalsRow ? model?.totalsRowLabel : void 0);
+    setOrRemove(column2, "totalsRowLabel", table4.totalsRow ? model?.totalsRowLabel : void 0);
     const calculated = model?.calculatedColumnFormula;
     setChildText(
       doc,
@@ -43032,7 +43121,7 @@ function patchColumns(doc, root, sheet, table3, names) {
     );
     if (fn !== "custom") setChildText(doc, column2, "totalsRowFormula", void 0, []);
     else {
-      const cellFormula = sheet.rows.get(totalsRow)?.get(table3.range.start.col + index3)?.formula;
+      const cellFormula = sheet.rows.get(totalsRow)?.get(table4.range.start.col + index3)?.formula;
       if (cellFormula)
         setChildText(
           doc,
@@ -43046,19 +43135,19 @@ function patchColumns(doc, root, sheet, table3, names) {
   });
   list2.setAttribute("count", num(names.length));
 }
-function patchStyleInfo(doc, root, table3) {
+function patchStyleInfo(doc, root, table4) {
   let info = xKid(root, "tableStyleInfo");
   if (!info) {
     info = doc.createElementNS(NS.x, "tableStyleInfo");
     insertBefore(root, info, ["extLst"]);
   }
-  setOrRemove(info, "name", table3.styleName);
-  info.setAttribute("showFirstColumn", flag2(table3.showFirstColumn, false));
-  info.setAttribute("showLastColumn", flag2(table3.showLastColumn, false));
-  info.setAttribute("showRowStripes", flag2(table3.showRowStripes, true));
-  info.setAttribute("showColumnStripes", flag2(table3.showColumnStripes, false));
+  setOrRemove(info, "name", table4.styleName);
+  info.setAttribute("showFirstColumn", flag2(table4.showFirstColumn, false));
+  info.setAttribute("showLastColumn", flag2(table4.showLastColumn, false));
+  info.setAttribute("showRowStripes", flag2(table4.showRowStripes, true));
+  info.setAttribute("showColumnStripes", flag2(table4.showColumnStripes, false));
 }
-function patchTableXml(sourceXml, sheet, table3, id3, names) {
+function patchTableXml(sourceXml, sheet, table4, id3, names) {
   let doc;
   try {
     doc = parseXml(sourceXml, { label: "XLSX table" });
@@ -43067,80 +43156,80 @@ function patchTableXml(sourceXml, sheet, table3, id3, names) {
   }
   const root = doc.documentElement;
   if (root.localName !== "table") return void 0;
-  const before = parseRange(root.getAttribute("ref") ?? "") ?? table3.range;
+  const before = parseRange(root.getAttribute("ref") ?? "") ?? table4.range;
   root.setAttribute("id", num(id3));
-  root.setAttribute("name", table3.name);
-  root.setAttribute("displayName", table3.displayName || table3.name);
-  root.setAttribute("ref", formatRange(table3.range));
-  setOrRemove(root, "headerRowCount", table3.headerRow ? void 0 : "0");
-  if (table3.totalsRow) {
+  root.setAttribute("name", table4.name);
+  root.setAttribute("displayName", table4.displayName || table4.name);
+  root.setAttribute("ref", formatRange(table4.range));
+  setOrRemove(root, "headerRowCount", table4.headerRow ? void 0 : "0");
+  if (table4.totalsRow) {
     root.setAttribute("totalsRowCount", "1");
     root.removeAttribute("totalsRowShown");
   } else {
     root.removeAttribute("totalsRowCount");
     if (!root.hasAttribute("totalsRowShown")) root.setAttribute("totalsRowShown", "0");
   }
-  patchAutoFilter(doc, root, table3, before, names);
-  patchColumns(doc, root, sheet, table3, names);
-  patchStyleInfo(doc, root, table3);
+  patchAutoFilter(doc, root, table4, before, names);
+  patchColumns(doc, root, sheet, table4, names);
+  patchStyleInfo(doc, root, table4);
   return buildXml(doc);
 }
 
 // xlsx/write/tables.ts
 var headerTextOf = (value2) => typeof value2 === "string" ? value2 : typeof value2 === "number" || typeof value2 === "boolean" ? String(value2).toUpperCase() : void 0;
-function resolveTableColumns(sheet, table3) {
+function resolveTableColumns(sheet, table4) {
   const headerText = /* @__PURE__ */ new Map();
   const used = /* @__PURE__ */ new Set();
-  const width = table3.range.end.col - table3.range.start.col + 1;
+  const width = table4.range.end.col - table4.range.start.col + 1;
   const names = [];
   for (let i2 = 0; i2 < width; i2++) {
-    const col = table3.range.start.col + i2;
-    const row3 = table3.range.start.row;
-    const fromCell = table3.headerRow ? headerTextOf(sheet.rows.get(row3)?.get(col)?.value) : void 0;
-    let name3 = (fromCell?.trim() ? fromCell : void 0) ?? table3.columns[i2]?.name ?? `Column${i2 + 1}`;
+    const col = table4.range.start.col + i2;
+    const row3 = table4.range.start.row;
+    const fromCell = table4.headerRow ? headerTextOf(sheet.rows.get(row3)?.get(col)?.value) : void 0;
+    let name3 = (fromCell?.trim() ? fromCell : void 0) ?? table4.columns[i2]?.name ?? `Column${i2 + 1}`;
     if (!name3.trim()) name3 = `Column${i2 + 1}`;
     let unique4 = name3;
     for (let n = 2; used.has(unique4.toLowerCase()); n++) unique4 = `${name3}${n}`;
     used.add(unique4.toLowerCase());
     names.push(unique4);
     const cell = sheet.rows.get(row3)?.get(col);
-    if (table3.headerRow && (typeof cell?.value !== "string" || cell.value !== unique4))
+    if (table4.headerRow && (typeof cell?.value !== "string" || cell.value !== unique4))
       headerText.set(`${row3}:${col}`, unique4);
   }
   return { names, headerText };
 }
-function tableXml(table3, id3, names) {
-  const range2 = formatRange(table3.range);
-  const filterEnd = { ...table3.range.end, row: table3.range.end.row - (table3.totalsRow ? 1 : 0) };
-  const criteria = table3.columns.map((column2, index3) => column2.filter ? filterColumnXml(index3, column2.filter) : "").join("");
-  const filterRef = formatRange({ start: table3.range.start, end: filterEnd });
-  const filter2 = table3.headerRow ? criteria ? `<autoFilter ref="${filterRef}">${criteria}</autoFilter>` : `<autoFilter ref="${filterRef}"/>` : "";
+function tableXml(table4, id3, names) {
+  const range2 = formatRange(table4.range);
+  const filterEnd = { ...table4.range.end, row: table4.range.end.row - (table4.totalsRow ? 1 : 0) };
+  const criteria = table4.columns.map((column2, index3) => column2.filter ? filterColumnXml(index3, column2.filter) : "").join("");
+  const filterRef = formatRange({ start: table4.range.start, end: filterEnd });
+  const filter2 = table4.headerRow ? criteria ? `<autoFilter ref="${filterRef}">${criteria}</autoFilter>` : `<autoFilter ref="${filterRef}"/>` : "";
   const columns = names.map((name3, index3) => {
-    const column2 = table3.columns[index3];
+    const column2 = table4.columns[index3];
     const calculated = column2?.calculatedColumnFormula ? `<calculatedColumnFormula>${escapeText3(addFuturePrefixes(column2.calculatedColumnFormula))}</calculatedColumnFormula>` : "";
     const values2 = attrs2({
       id: index3 + 1,
       name: name3,
-      totalsRowFunction: table3.totalsRow ? column2?.totalsRowFunction : void 0,
-      totalsRowLabel: table3.totalsRow ? column2?.totalsRowLabel : void 0
+      totalsRowFunction: table4.totalsRow ? column2?.totalsRowFunction : void 0,
+      totalsRowLabel: table4.totalsRow ? column2?.totalsRowLabel : void 0
     });
     return calculated ? `<tableColumn${values2}>${calculated}</tableColumn>` : `<tableColumn${values2}/>`;
   }).join("");
   const style3 = attrs2({
-    name: table3.styleName,
-    showFirstColumn: table3.showFirstColumn ?? false,
-    showLastColumn: table3.showLastColumn ?? false,
-    showRowStripes: table3.showRowStripes ?? true,
-    showColumnStripes: table3.showColumnStripes ?? false
+    name: table4.styleName,
+    showFirstColumn: table4.showFirstColumn ?? false,
+    showLastColumn: table4.showLastColumn ?? false,
+    showRowStripes: table4.showRowStripes ?? true,
+    showColumnStripes: table4.showColumnStripes ?? false
   });
   const head = attrs2({
     id: id3,
-    name: table3.name,
-    displayName: table3.displayName || table3.name,
+    name: table4.name,
+    displayName: table4.displayName || table4.name,
     ref: range2,
-    headerRowCount: table3.headerRow ? void 0 : 0,
-    totalsRowCount: table3.totalsRow ? 1 : void 0,
-    totalsRowShown: table3.totalsRow ? void 0 : false
+    headerRowCount: table4.headerRow ? void 0 : 0,
+    totalsRowCount: table4.totalsRow ? 1 : void 0,
+    totalsRowShown: table4.totalsRow ? void 0 : false
   });
   return `${XML_HEADER}<table xmlns="${NS.x}"${head}>${filter2}<tableColumns count="${names.length}">${columns}</tableColumns><tableStyleInfo${style3}/></table>`;
 }
@@ -43154,24 +43243,24 @@ var SUBTOTAL_CODES = {
   sum: 109,
   var: 110
 };
-function totalsRowFormulas(sheet, table3, names) {
+function totalsRowFormulas(sheet, table4, names) {
   const out = /* @__PURE__ */ new Map();
-  if (!table3.totalsRow) return out;
-  const row3 = table3.range.end.row;
+  if (!table4.totalsRow) return out;
+  const row3 = table4.range.end.row;
   names.forEach((name3, index3) => {
-    const code = SUBTOTAL_CODES[table3.columns[index3]?.totalsRowFunction ?? ""];
+    const code = SUBTOTAL_CODES[table4.columns[index3]?.totalsRowFunction ?? ""];
     if (code === void 0) return;
-    const col = table3.range.start.col + index3;
+    const col = table4.range.start.col + index3;
     const escaped = name3.replace(/['#[\]]/g, "'$&");
-    const formula = `SUBTOTAL(${code},${table3.displayName || table3.name}[${escaped}])`;
+    const formula = `SUBTOTAL(${code},${table4.displayName || table4.name}[${escaped}])`;
     if (sheet.rows.get(row3)?.get(col)?.formula !== formula) out.set(`${row3}:${col}`, formula);
   });
   return out;
 }
-function resolveTableNames(table3, before, index3) {
-  const display = table3.displayName || table3.name;
+function resolveTableNames(table4, before, index3) {
+  const display = table4.displayName || table4.name;
   const displayName = before && before.displayName === display ? display : safeTableName(display, index3);
-  const name3 = before && before.name === table3.name ? table3.name : table3.name === display ? displayName : safeTableName(table3.name, index3);
+  const name3 = before && before.name === table4.name ? table4.name : table4.name === display ? displayName : safeTableName(table4.name, index3);
   return { name: name3, displayName };
 }
 function safeTableName(name3, index3) {
@@ -43264,21 +43353,21 @@ function writeTables(ctx, sheet, partName, rels, headerText, formulas) {
     const sourceXml = original.partName ? source2?.text(original.partName) : void 0;
     const before = sourceXml && original.partName ? parseTable3(sourceXml, original.partName) : void 0;
     const { name: name3, displayName } = resolveTableNames(original, before, index3 + 1);
-    const table3 = name3 === original.name && displayName === original.displayName ? original : { ...original, name: name3, displayName };
-    const { names, headerText: forced } = resolveTableColumns(sheet, table3);
+    const table4 = name3 === original.name && displayName === original.displayName ? original : { ...original, name: name3, displayName };
+    const { names, headerText: forced } = resolveTableColumns(sheet, table4);
     for (const [key2, text8] of forced) headerText.set(key2, text8);
-    const totals = totalsRowFormulas(sheet, table3, names);
+    const totals = totalsRowFormulas(sheet, table4, names);
     for (const [key2, formula] of totals) formulas.set(key2, formula);
-    let id3 = table3.id;
-    const unchanged = table3.partName && sourceXml && !writer.has(table3.partName) && !ctx.tableIds.has(id3) && forced.size === 0 && totals.size === 0 && table3 === original && sameModel(before, table3);
+    let id3 = table4.id;
+    const unchanged = table4.partName && sourceXml && !writer.has(table4.partName) && !ctx.tableIds.has(id3) && forced.size === 0 && totals.size === 0 && table4 === original && sameModel(before, table4);
     let part;
-    if (unchanged && table3.partName) {
-      part = table3.partName;
+    if (unchanged && table4.partName) {
+      part = table4.partName;
       writer.carry(part);
     } else {
       while (ctx.tableIds.has(id3) || id3 < 1) id3++;
-      part = table3.partName && !writer.has(table3.partName) ? table3.partName : writer.uniqueName((n) => `xl/tables/table${n}.xml`, ctx.reserved);
-      const xml = (sourceXml && patchTableXml(sourceXml, sheet, table3, id3, names)) ?? tableXml(table3, id3, names);
+      part = table4.partName && !writer.has(table4.partName) ? table4.partName : writer.uniqueName((n) => `xl/tables/table${n}.xml`, ctx.reserved);
+      const xml = (sourceXml && patchTableXml(sourceXml, sheet, table4, id3, names)) ?? tableXml(table4, id3, names);
       writer.add(part, xml, CONTENT_TYPES.table);
     }
     ctx.tableIds.add(id3);
@@ -43721,15 +43810,15 @@ function derivedFields(pivot, date1904) {
 function derivedFieldXml(pivot, entry3, date1904) {
   const range2 = { start: entry3.group.start, end: entry3.group.end };
   const days = dateGroupDays(entry3.group);
-  const labels = dateUnitLabels(entry3.unit, range2, days, date1904);
+  const labels = dateUnitLabels(entry3.unit, range2, days, date1904, entry3.group);
   const base2 = pivot.fields.indexOf(entry3.group.field);
-  return `<cacheField${attrs2({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base2}"><rangePr${attrs2({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range2.start, date1904), endDate: serialToIso(range2.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
+  return `<cacheField${attrs2({ name: encodeEscapes(entry3.name), numFmtId: 0, databaseField: false })}><fieldGroup base="${base2}"><rangePr${attrs2({ autoStart: entry3.autoStart ? void 0 : false, autoEnd: entry3.autoEnd ? void 0 : false, groupBy: entry3.unit, startDate: serialToIso(range2.start, date1904), endDate: serialToIso(range2.end, date1904), groupInterval: days > 1 ? days : void 0 })}/><groupItems count="${labels.length}">${labels.map((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup></cacheField>`;
 }
 function groupXml2(pivot, name3, index3) {
   const group = groupOf(pivot, name3);
   if (!group) return "";
   const labels = numberGroupLabels(group);
-  return `<fieldGroup base="${index3}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label5) => `<s v="${escapeAttr3(label5)}"/>`).join("")}</groupItems></fieldGroup>`;
+  return `<fieldGroup base="${index3}"><rangePr autoStart="0" autoEnd="0" startNum="${group.start}" endNum="${group.end}" groupInterval="${group.by}"/><groupItems count="${labels.length}">${labels.map((label2) => `<s v="${escapeAttr3(label2)}"/>`).join("")}</groupItems></fieldGroup>`;
 }
 function slicerExt(pivot) {
   if (pivot.slicerCacheId === void 0) return "";
@@ -43750,8 +43839,6 @@ function pivotTableXml(source2, cacheId, cache3) {
   const pivot = expandDateGroups(source2);
   const rowNames = pivotRowFields(pivot);
   const rowIdx = rowNames.map((name3) => pivot.fields.indexOf(name3));
-  const row3 = rowIdx[0];
-  const second = rowIdx[1] ?? -1;
   const page = pivot.pageFilter ? pivot.fields.indexOf(pivot.pageFilter.field) : -1;
   const pageItems = page >= 0 ? pivotItems(pivot, pivot.pageFilter.field) : [];
   const filtered2 = filteredFields(pivot);
@@ -43779,7 +43866,10 @@ function pivotTableXml(source2, cacheId, cache3) {
   const columnIndicesFull = columnNames.map(
     (_name, k) => itemIndices(visibleColumns[k], columnItemsFull[k])
   );
-  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, rowIndicesFull) : grid.rowEntries;
+  const valuesAt = pivotValuesIndex(pivot);
+  const levelAxes = [...rowIndicesFull];
+  if (valuesAt >= 0) levelAxes.splice(valuesAt, 0, null);
+  const rowEntries = anyFull && grid.rowEntries ? remapPivotRowEntries(grid.rowEntries, levelAxes) : grid.rowEntries;
   const pageOffset = page >= 0 ? 2 : 0;
   const col = columnIdx[0] ?? -1;
   const measures2 = pivotMeasures(pivot);
@@ -43788,13 +43878,17 @@ function pivotTableXml(source2, cacheId, cache3) {
   const compact3 = pivot.layout === "compact";
   const outline2 = pivot.layout === "compact" || pivot.layout === "outline";
   const top = (pivot.subtotalPosition ?? (outline2 ? "top" : "bottom")) === "top";
+  const named3 = (field2, item) => {
+    const text8 = pivotItemName(pivot, field2, item);
+    return text8 === void 0 ? "" : attrs2({ n: encodeEscapes(text8) });
+  };
   const fields = pivot.fields.map((name3, index3) => {
     const isDate = pivot.dateFields?.includes(name3) ?? false;
     const at2 = rowIdx.indexOf(index3);
     const colAt = columnIdx.indexOf(index3);
     const items2 = index3 === page ? pageItems : at2 >= 0 ? rowItemsFull[at2] : colAt >= 0 ? columnItemsFull[colAt] : groupLabelsOf(pivot, name3) ?? (filtered2.has(name3) || isDate ? pivotItems(pivot, name3) : void 0);
     const hidden = hiddenItemKeys(pivot, name3);
-    const functions = at2 >= 0 ? fieldSubtotalFunctions(pivot, name3) : "auto";
+    const functions = at2 >= 0 || colAt >= 0 ? fieldSubtotalFunctions(pivot, name3) : "auto";
     const automatic = functions === "auto";
     const custom = automatic ? [] : functions;
     const repeated = pivot.repeatLabels && at2 >= 0 ? `<extLst><ext uri="{2946ED86-A175-432a-8AC1-64E0C546D7DE}"><x14:pivotField xmlns:x14="${X143}" fillDownLabels="1"/></ext></extLst>` : "";
@@ -43802,37 +43896,27 @@ function pivotTableXml(source2, cacheId, cache3) {
       custom.map((fn) => [PIVOT_SUBTOTALS[fn].attr, true])
     );
     const entries = automatic ? '<item t="default"/>' : custom.map((fn) => `<item t="${PIVOT_SUBTOTALS[fn].item}"/>`).join("");
-    return `<pivotField${attrs2({ axis: index3 === page ? "axisPage" : at2 >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures2.some((measure2) => pivot.fields.indexOf(measure2.field) === index3) ? true : void 0, compact: compact3, outline: outline2, showAll: false, subtotalTop: at2 >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""} x="${itemX(index3, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
+    return `<pivotField${attrs2({ axis: index3 === page ? "axisPage" : at2 >= 0 ? "axisRow" : colAt >= 0 ? "axisCol" : void 0, dataField: measures2.some((measure2) => pivot.fields.indexOf(measure2.field) === index3) ? true : void 0, compact: compact3, outline: outline2, showAll: false, subtotalTop: at2 >= 0 ? top : void 0, numFmtId: isDate ? 14 : void 0, defaultSubtotal: automatic ? void 0 : false, ...flags })}>${items2 ? `<items count="${items2.length + (automatic ? 1 : custom.length)}">${items2.map((item) => `<item${hidden.has(pivotValueKey(item)) ? ' h="1"' : ""}${named3(name3, item)} x="${itemX(index3, item)}"/>`).join("")}${entries}</items>` : ""}${repeated}</pivotField>`;
   }).join("");
   const items = (count2, indices) => Array.from({ length: count2 }, (_v, i2) => `<i><x v="${indices?.[i2] ?? i2}"/></i>`).join("") + '<i t="grand"><x/></i>';
   const header = grid.firstHeaderRow !== void 0 ? grid.firstHeaderRow - pageOffset : col >= 0 ? 1 : grid.firstDataRow - pageOffset - 1;
-  const rowIndices = rowsAxis && pivot.valuesPosition === "first" ? [-2, row3, second] : rowsAxis && pivot.valuesPosition === "between" ? [row3, -2, second] : [...rowIdx, ...rowsAxis ? [-2] : []];
+  const rowIndices = [...rowIdx];
+  if (valuesAt >= 0) rowIndices.splice(valuesAt, 0, -2);
   let previous = [];
   const rowItems = rowEntries?.map((entry3) => {
     let prefix3 = 0;
     const type = entry3.type === void 0 || entry3.type === "default" || entry3.type === "grand" ? entry3.type : PIVOT_SUBTOTALS[entry3.type].item;
-    if (rowsAxis) {
-      if (entry3.type === "default" && pivot.valuesPosition === "first") prefix3 = 1;
-      else if (!entry3.type)
-        while (prefix3 < entry3.indices.length - 1 && entry3.indices[prefix3] === previous[prefix3])
-          prefix3++;
-      previous = entry3.type && !(entry3.type === "default" && pivot.valuesPosition === "first") ? [] : entry3.indices;
-    } else {
-      if (entry3.type !== "grand") prefix3 = sharedPrefix(entry3.indices, previous);
-      previous = entry3.type === "grand" ? [] : entry3.indices;
-    }
+    if (entry3.type !== "grand") prefix3 = sharedPrefix(entry3.indices, previous);
+    previous = entry3.type === "grand" ? [] : entry3.indices;
     return `<i${attrs2({ t: type, r: prefix3 || void 0, i: entry3.measure || void 0 })}>${entry3.indices.slice(prefix3).map((index3) => `<x${attrs2({ v: index3 || void 0 })}/>`).join("")}</i>`;
   }).join("") ?? items(grid.rowItems.length, rowIndicesFull[0]);
   let body = `<location${attrs2({ ref: formatRange({ ...pivot.location, start: { ...pivot.location.start, row: pivot.location.start.row + pageOffset } }), firstHeaderRow: header, firstDataRow: grid.firstDataRow - pageOffset, rowPageCount: page >= 0 ? 1 : void 0, colPageCount: page >= 0 ? 1 : void 0, firstDataCol: grid.rowLabelColumns ?? 1 })}/><pivotFields count="${pivot.fields.length}">${fields}</pivotFields><rowFields count="${rowIndices.length}">${rowIndices.map((index3) => `<field x="${index3}"/>`).join("")}</rowFields><rowItems count="${grid.rowEntries?.length ?? grid.rowItems.length + 1}">${rowItems}</rowItems>`;
-  if (!rowsAxis && col >= 0 && grid.columnEntries) {
-    const fieldsOnColumns = [...columnIdx, ...multiple ? [-2] : []];
-    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index3) => `<field x="${index3}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, measures2.length, (level, index3) => columnIndicesFull[level][index3])}`;
+  if (col >= 0 && grid.columnEntries) {
+    const fieldsOnColumns = [...columnIdx, ...multiple && !rowsAxis ? [-2] : []];
+    body += `<colFields count="${fieldsOnColumns.length}">${fieldsOnColumns.map((index3) => `<field x="${index3}"/>`).join("")}</colFields>${pivotColumnItemsXml(grid.columnEntries, rowsAxis ? 1 : measures2.length, (level, index3) => columnIndicesFull[level][index3])}`;
   } else if (multiple && !rowsAxis)
     body += `<colFields count="1"><field x="-2"/></colFields>${pivotValueAxisItems(measures2.length)}`;
-  else if (col >= 0)
-    body += `<colFields count="1"><field x="${col}"/></colFields><colItems count="${grid.columnItems.length + 1}">${items(grid.columnItems.length, columnIndicesFull[0])}</colItems>`;
-  else
-    body += rowsAxis ? '<colItems count="1"><i/></colItems>' : page >= 0 ? '<colItems count="1"><i/></colItems>' : '<colItems count="1"><i><x/></i></colItems>';
+  else body += '<colItems count="1"><i/></colItems>';
   if (page >= 0)
     body += `<pageFields count="1"><pageField${attrs2({ fld: page, hier: -1, item: pivot.pageFilter.item !== void 0 ? pageItems.findIndex((item) => pivotValueKey(item) === pivotValueKey(pivot.pageFilter.item)) : void 0 })}/></pageFields>`;
   body += `<dataFields count="${measures2.length}">${measures2.map((measure2) => `<dataField${attrs2({ name: encodeEscapes(measure2.caption), fld: pivot.fields.indexOf(measure2.field), subtotal: measure2.aggregate, baseField: 0, baseItem: 0 })}/>`).join("")}</dataFields>`;
@@ -43842,9 +43926,17 @@ function pivotTableXml(source2, cacheId, cache3) {
   const root = doc.documentElement;
   root.setAttribute("name", pivot.name);
   root.setAttribute("cacheId", String(cacheId));
+  const caps = pivotCaptions(pivot);
+  root.setAttribute("dataCaption", caps.values);
+  for (const [attribute4, key2] of [
+    ["rowHeaderCaption", "rowLabels"],
+    ["colHeaderCaption", "columnLabels"],
+    ["grandTotalCaption", "grandTotal"]
+  ])
+    if (caps[key2] !== ENGLISH_PIVOT_CAPTIONS[key2] || root.hasAttribute(attribute4))
+      root.setAttribute(attribute4, caps[key2]);
   root.setAttribute("dataOnRows", rowsAxis ? "1" : "0");
-  if (rowsAxis && (pivot.valuesPosition === "between" || pivot.valuesPosition === "first"))
-    root.setAttribute("dataPosition", pivot.valuesPosition === "first" ? "0" : "1");
+  if (rowsAxis && valuesAt < rowIdx.length) root.setAttribute("dataPosition", String(valuesAt));
   else root.removeAttribute("dataPosition");
   root.setAttribute("compact", compact3 ? "1" : "0");
   root.setAttribute("compactData", compact3 ? "1" : "0");
@@ -43910,7 +44002,8 @@ function pivotTableXml(source2, cacheId, cache3) {
 }
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  return `<filters count="1"><filter${attrs2({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id: 1, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
+  const id3 = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  return `<filters count="1"><filter${attrs2({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id: id3, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 
 // xlsx/pivot/write.ts
@@ -43965,7 +44058,7 @@ var PivotWritePlan = class {
           this.tableParts.set(pivot, pivot.partName);
           continue;
         }
-        const table3 = pivot.partName ?? writer.uniqueName((n) => `xl/pivotTables/pivotTable${n}.xml`, reserved);
+        const table4 = pivot.partName ?? writer.uniqueName((n) => `xl/pivotTables/pivotTable${n}.xml`, reserved);
         const definition = writer.uniqueName(
           (n) => `xl/pivotCache/pivotCacheDefinition${n}.xml`,
           reserved
@@ -43987,24 +44080,24 @@ var PivotWritePlan = class {
           TYPES2.definition
         );
         writer.rels(definition, cacheRels);
-        writer.add(table3, pivotTableXml(pivot, cacheId, cache3), TYPES2.table);
+        writer.add(table4, pivotTableXml(pivot, cacheId, cache3), TYPES2.table);
         const tableRels = new RelationshipSet();
-        tableRels.add(RELATIONSHIP_TYPES.pivotCacheDefinition, relativeTarget(table3, definition));
-        writer.rels(table3, tableRels);
+        tableRels.add(RELATIONSHIP_TYPES.pivotCacheDefinition, relativeTarget(table4, definition));
+        writer.rels(table4, tableRels);
         const rid2 = bookRels.add(
           RELATIONSHIP_TYPES.pivotCacheDefinition,
           relativeTarget(bookPart, definition)
         );
         entries.push(`<pivotCache cacheId="${cacheId++}" r:id="${rid2}"/>`);
-        this.tableParts.set(pivot, table3);
+        this.tableParts.set(pivot, table4);
       }
     this.cachesXml = owns ? entries.length ? `<pivotCaches>${entries.join("")}</pivotCaches>` : "" : void 0;
   }
   writeSheet(writer, sheet, part, rels) {
     for (const pivot of sheet.pivotTables ?? []) {
-      const table3 = this.tableParts.get(pivot);
-      writer.carry(table3);
-      rels.add(RELATIONSHIP_TYPES.pivotTable, relativeTarget(part, table3));
+      const table4 = this.tableParts.get(pivot);
+      writer.carry(table4);
+      rels.add(RELATIONSHIP_TYPES.pivotTable, relativeTarget(part, table4));
     }
   }
 };
@@ -44174,9 +44267,9 @@ function slicerTarget(workbook, cache3) {
   const source2 = cache3.source;
   for (const [sheetIndex2, sheet] of workbook.sheets.entries()) {
     if (source2.kind === "table") {
-      const table3 = sheet.tables.find((entry3) => entry3.id === source2.tableId);
-      const offset2 = table3?.columns.findIndex((column2) => column2.sourceId === source2.column) ?? -1;
-      if (table3 && offset2 >= 0) return { kind: "table", sheet, sheetIndex: sheetIndex2, table: table3, offset: offset2 };
+      const table4 = sheet.tables.find((entry3) => entry3.id === source2.tableId);
+      const offset2 = table4?.columns.findIndex((column2) => column2.sourceId === source2.column) ?? -1;
+      if (table4 && offset2 >= 0) return { kind: "table", sheet, sheetIndex: sheetIndex2, table: table4, offset: offset2 };
     } else {
       const first3 = source2.pivots[0];
       const pivot = first3 && sheet.sheetId === first3.tabId ? sheet.pivotTables?.find((entry3) => entry3.name === first3.name) : void 0;
@@ -44365,12 +44458,12 @@ function slicerCacheXml(cache3, facts) {
     ext.setAttribute("xmlns:x15", X153);
     list2.appendChild(ext);
   }
-  let table3 = first(ext, "tableSlicerCache", X153);
-  if (!table3) table3 = ext.appendChild(make2(X153, "x15:tableSlicerCache"));
-  table3.setAttribute("tableId", String(source2.tableId));
-  table3.setAttribute("column", String(source2.column));
-  if (cache3.sortOrder === "descending") table3.setAttribute("sortOrder", "descending");
-  else table3.removeAttribute("sortOrder");
+  let table4 = first(ext, "tableSlicerCache", X153);
+  if (!table4) table4 = ext.appendChild(make2(X153, "x15:tableSlicerCache"));
+  table4.setAttribute("tableId", String(source2.tableId));
+  table4.setAttribute("column", String(source2.column));
+  if (cache3.sortOrder === "descending") table4.setAttribute("sortOrder", "descending");
+  else table4.removeAttribute("sortOrder");
   return XML_HEADER + buildXml(root);
 }
 
@@ -44923,12 +45016,12 @@ function rewriteSheetFormulas(sheet, rewrite2, formulaCells) {
   }
   {
     const name3 = sheet.name;
-    for (const table3 of sheet.tables)
-      for (const [index3, column2] of table3.columns.entries())
+    for (const table4 of sheet.tables)
+      for (const [index3, column2] of table4.columns.entries())
         if (column2.calculatedColumnFormula !== void 0)
           column2.calculatedColumnFormula = safe(rewrite2, column2.calculatedColumnFormula, name3, {
-            row: table3.range.start.row + (table3.headerRow ? 1 : 0),
-            col: table3.range.start.col + index3
+            row: table4.range.start.row + (table4.headerRow ? 1 : 0),
+            col: table4.range.start.col + index3
           });
     if (formulaCells) {
       for (const at2 of formulaCells) {
@@ -44993,14 +45086,14 @@ function tableHeaderAt(sheet, row3, col) {
   );
 }
 function syncTableHeader(ctx, sheet, row3, col, formulaCells) {
-  const table3 = tableHeaderAt(sheet, row3, col);
-  if (!table3) return;
-  const column2 = table3.columns[col - table3.range.start.col];
+  const table4 = tableHeaderAt(sheet, row3, col);
+  if (!table4) return;
+  const column2 = table4.columns[col - table4.range.start.col];
   if (!column2) return;
   const text8 = displayText(ctx.workbook, getCell(sheet, row3, col)).trim();
   if (!text8 || column2.name === text8) return;
   const oldName = column2.name;
-  const others = table3.columns.filter((entry3) => entry3 !== column2).map((entry3) => entry3.name);
+  const others = table4.columns.filter((entry3) => entry3 !== column2).map((entry3) => entry3.name);
   const newName = uniqueHeaders([...others, text8]).at(-1);
   column2.name = newName;
   if (newName !== text8) writeValue(sheet, row3, col, newName);
@@ -45010,10 +45103,10 @@ function syncTableHeader(ctx, sheet, row3, col, formulaCells) {
     ctx.workbook,
     (formula, formulaSheet, at2) => renameTableColumnInFormula(
       formula,
-      table3.name,
+      table4.name,
       oldName,
       newName,
-      formulaSheet === sheet.name && !!at2 && rangeContains(table3.range, at2)
+      formulaSheet === sheet.name && !!at2 && rangeContains(table4.range, at2)
     ),
     cells3
   );
@@ -46137,11 +46230,11 @@ function uniqueColumnName(columns) {
   const taken = new Set(columns.map((c2) => c2.name.toLowerCase()));
   for (let n = 1; ; n++) if (!taken.has(`column${n}`)) return `Column${n}`;
 }
-function shiftTable(sheet, table3, shift2, moveRange) {
-  const old = table3.range;
+function shiftTable(sheet, table4, shift2, moveRange) {
+  const old = table4.range;
   const range2 = moveRange(old);
   if (!range2) return [];
-  const next = { ...table3, range: range2, columns: [...table3.columns] };
+  const next = { ...table4, range: range2, columns: [...table4.columns] };
   const widened = range2.end.col - range2.start.col !== old.end.col - old.start.col;
   if (shift2.axis === "col" && widened) {
     if (shift2.count > 0) {
@@ -46617,8 +46710,8 @@ function cellText(inner2) {
   ).replace(/ /g, " ").trim();
 }
 function parseHtmlTable(html, base2) {
-  const table3 = /<table\b[^>]*>([\s\S]*?)<\/table>/i.exec(html)?.[1];
-  if (table3 === void 0) return void 0;
+  const table4 = /<table\b[^>]*>([\s\S]*?)<\/table>/i.exec(html)?.[1];
+  if (table4 === void 0) return void 0;
   const classes = /* @__PURE__ */ new Map();
   for (const block of html.matchAll(/<style\b[^>]*>([\s\S]*?)<\/style>/gi))
     for (const rule2 of removeAll(block[1] ?? "", ["<!--", "-->"]).matchAll(
@@ -46631,7 +46724,7 @@ function parseHtmlTable(html, base2) {
   const hyperlinks = [];
   let r = 0;
   let spanned = 0;
-  for (const tr of table3.matchAll(/<tr\b[^>]*>([\s\S]*?)(?=<tr\b|<\/tbody|<\/table|$)/gi)) {
+  for (const tr of table4.matchAll(/<tr\b[^>]*>([\s\S]*?)(?=<tr\b|<\/tbody|<\/table|$)/gi)) {
     const row3 = grid[r] ??= [];
     let c2 = 0;
     for (const td of (tr[1] ?? "").matchAll(
@@ -47483,9 +47576,9 @@ function filterColumn(ctx, s, col, values2) {
 }
 function sortByColumn(ctx, s, col, descending) {
   const sheet = sheetAt(ctx.workbook, s);
-  const table3 = sheet.tables.find((t) => col >= t.range.start.col && col <= t.range.end.col);
+  const table4 = sheet.tables.find((t) => col >= t.range.start.col && col <= t.range.end.col);
   const filter2 = sheet.autoFilter;
-  const target2 = table3 ? { range: table3.range, header: table3.headerRow, totals: table3.totalsRow } : filter2 && rangeContains(filter2.range, { row: filter2.range.start.row, col }) ? { range: filter2.range, header: true, totals: false } : void 0;
+  const target2 = table4 ? { range: table4.range, header: table4.headerRow, totals: table4.totalsRow } : filter2 && rangeContains(filter2.range, { row: filter2.range.start.row, col }) ? { range: filter2.range, header: true, totals: false } : void 0;
   if (!target2) throw new Error("The column is not inside a table or an auto-filter range.");
   const range2 = target2.totals ? { start: target2.range.start, end: { ...target2.range.end, row: target2.range.end.row - 1 } } : target2.range;
   ctx.run(
@@ -47545,12 +47638,12 @@ function restore(sheet, saved) {
   Object.assign(cell, saved.fields);
 }
 var valueAt = (sheet, row3, col) => getCell(sheet, row3, col)?.value ?? null;
-function computeDataTable(workbook, calc, sheetIndex2, table3) {
+function computeDataTable(workbook, calc, sheetIndex2, table4) {
   const sheet = sheetAt(workbook, sheetIndex2);
-  const { ref } = table3;
-  const first3 = parseInputCell(sheet, table3.r1);
-  const second = table3.dt2D && table3.r2 ? parseInputCell(sheet, table3.r2) : void 0;
-  if (!first3 || table3.dt2D && !second || table3.del1 || table3.del2) return [];
+  const { ref } = table4;
+  const first3 = parseInputCell(sheet, table4.r1);
+  const second = table4.dt2D && table4.r2 ? parseInputCell(sheet, table4.r2) : void 0;
+  if (!first3 || table4.dt2D && !second || table4.del1 || table4.del2) return [];
   const inputs = [first3, ...second ? [second] : []];
   const saved = inputs.map((p) => save(sheet, p.row, p.col));
   const top = ref.start.row - 1;
@@ -47569,11 +47662,11 @@ function computeDataTable(workbook, calc, sheetIndex2, table3) {
     for (let row3 = ref.start.row; row3 <= ref.end.row; row3++) {
       for (let col = ref.start.col; col <= ref.end.col; col++) {
         let formulaAt;
-        if (table3.dt2D) {
+        if (table4.dt2D) {
           set(first3, valueAt(sheet, top, col));
           if (second) set(second, valueAt(sheet, row3, left2));
           formulaAt = { row: top, col: left2 };
-        } else if (table3.dtr) {
+        } else if (table4.dtr) {
           set(first3, valueAt(sheet, top, col));
           formulaAt = { row: row3, col: left2 };
         } else {
@@ -47598,8 +47691,8 @@ function computeDataTable(workbook, calc, sheetIndex2, table3) {
 function refreshDataTables(workbook, calc) {
   const changed = [];
   workbook.sheets.forEach((sheet, index3) => {
-    for (const table3 of sheet.dataTables ?? [])
-      changed.push(...computeDataTable(workbook, calc, index3, table3));
+    for (const table4 of sheet.dataTables ?? [])
+      changed.push(...computeDataTable(workbook, calc, index3, table4));
   });
   if (changed.length) calc.recalculateFrom(changed);
 }
@@ -47622,23 +47715,23 @@ function resolve2(sheet, request) {
   const ref = cellRange(range2.start.row + 1, range2.start.col + 1, range2.end.row, range2.end.col);
   if ([row3, col].some((p) => p && rangeContains(ref, p))) return { problem: "input-inside" };
   const name3 = (p) => formatAddress(p);
-  const table3 = { ref, r1: "" };
+  const table4 = { ref, r1: "" };
   if (row3 && col) {
-    table3.dt2D = true;
-    table3.dtr = true;
-    table3.r1 = name3(row3);
-    table3.r2 = name3(col);
+    table4.dt2D = true;
+    table4.dtr = true;
+    table4.r1 = name3(row3);
+    table4.r2 = name3(col);
   } else if (row3) {
-    table3.dtr = true;
-    table3.r1 = name3(row3);
-  } else if (col) table3.r1 = name3(col);
-  return { table: table3 };
+    table4.dtr = true;
+    table4.r1 = name3(row3);
+  } else if (col) table4.r1 = name3(col);
+  return { table: table4 };
 }
 function createDataTable(ctx, s, request) {
   const sheet = sheetAt(ctx.workbook, s);
   const result2 = resolve2(sheet, request);
   if ("problem" in result2) throw new Error(MESSAGES[result2.problem]);
-  const { table: table3 } = result2;
+  const { table: table4 } = result2;
   const range2 = normalizeRange(request.range);
   ctx.run(
     "Data Table",
@@ -47649,16 +47742,16 @@ function createDataTable(ctx, s, request) {
     ],
     () => {
       sheet.dataTables = (sheet.dataTables ?? []).filter((t) => !rangesIntersect(t.ref, range2));
-      sheet.dataTables.push(table3);
-      for (let row3 = table3.ref.start.row; row3 <= table3.ref.end.row; row3++)
-        for (let col = table3.ref.start.col; col <= table3.ref.end.col; col++) {
+      sheet.dataTables.push(table4);
+      for (let row3 = table4.ref.start.row; row3 <= table4.ref.end.row; row3++)
+        for (let col = table4.ref.start.col; col <= table4.ref.end.col; col++) {
           const cell = ensureCell(sheet, row3, col);
           delete cell.formula;
           delete cell.arrayRange;
           delete cell.legacyFormula;
           delete cell.dynamicArray;
         }
-      computeDataTable(ctx.workbook, ctx.calc, s, table3);
+      computeDataTable(ctx.workbook, ctx.calc, s, table4);
     },
     { sheet: s, ranges: [range2] }
   );
@@ -48895,7 +48988,7 @@ function pixelSizeToExtent(width, height) {
 }
 
 // xlsx/pivot/date-axes.ts
-var dateGroupAxisNames = (group) => dateGroupUnits(group).reverse().map((unit3) => dateGroupFieldName(unit3, group.field));
+var dateGroupAxisNames = (group) => dateGroupUnits(group).reverse().map((unit3) => dateGroupFieldName(unit3, group.field, group));
 function replace(list2, names, replacement) {
   const at2 = list2.findIndex((name3) => names.includes(name3));
   if (at2 < 0) return list2;
@@ -48931,7 +49024,9 @@ function reconcileDateAxes(next, previous) {
   if (columns.length > 1) next.moreColumnFields = columns.slice(1);
   else delete next.moreColumnFields;
   if (next.fieldSubtotals) {
-    const kept = next.fieldSubtotals.filter((entry3) => rows.includes(entry3.field));
+    const kept = next.fieldSubtotals.filter(
+      (entry3) => rows.includes(entry3.field) || columns.includes(entry3.field)
+    );
     if (kept.length) next.fieldSubtotals = kept;
     else delete next.fieldSubtotals;
   }
@@ -48973,7 +49068,7 @@ function plan(ctx, s, pivot, old) {
   if (![start.row, start.col].every(Number.isInteger) || start.row < 0 || start.col < 0 || location.end.row > MAX_ROW || location.end.col > MAX_COL)
     throw new Error("The PivotTable result does not fit on the worksheet.");
   const source2 = sparklineDataRange(ctx.workbook, s, pivot.source);
-  if (source2.sheet === s && rangesIntersect(source2.range, location) || sheet.merges.some((range2) => rangesIntersect(range2, location)) || sheet.tables.some((table3) => rangesIntersect(table3.range, location)) || sheet.pivotTables?.some((other) => other !== old && rangesIntersect(other.location, location)))
+  if (source2.sheet === s && rangesIntersect(source2.range, location) || sheet.merges.some((range2) => rangesIntersect(range2, location)) || sheet.tables.some((table4) => rangesIntersect(table4.range, location)) || sheet.pivotTables?.some((other) => other !== old && rangesIntersect(other.location, location)))
     throw new Error("The PivotTable would overlap source data, another table or merged cells.");
   let occupied = false;
   forEachCellInRange(sheet, location, (cell, row3, col) => {
@@ -48983,12 +49078,12 @@ function plan(ctx, s, pivot, old) {
   if (occupied) throw new Error("The PivotTable would overwrite existing cell content.");
   return { grid, location };
 }
-function writePivot(ctx, s, pivot, old, label5, inside2) {
+function writePivot(ctx, s, pivot, old, label2, inside2) {
   const sheet = sheetAt(ctx.workbook, s);
   const { grid, location } = plan(ctx, s, pivot, old);
   const ranges = [...old ? [old.location] : [], location];
   ctx.run(
-    label5 ?? (old ? "Refresh PivotTable" : "Create PivotTable"),
+    label2 ?? (old ? "Refresh PivotTable" : "Create PivotTable"),
     "annotations",
     [
       { kind: "parts", sheet: s, parts: ["pivotTables"] },
@@ -49045,8 +49140,10 @@ function createPivotTable(ctx, s, destination, options) {
   const name3 = options.name ?? uniqueName(ctx);
   checkName2(ctx, name3);
   const aggregate2 = options.aggregate ?? "sum";
+  const captions = authoredCaptions(options);
   const pivot = {
     ...data,
+    ...captions ? { captions } : {},
     name: name3,
     rowField: options.rowField,
     layout: options.layout ?? "tabular",
@@ -49060,12 +49157,12 @@ function createPivotTable(ctx, s, destination, options) {
     ...options.repeatLabels !== void 0 ? { repeatLabels: options.repeatLabels } : {},
     valueField: options.valueField,
     aggregate: aggregate2,
-    valueCaption: pivotCaption(aggregate2, options.valueField),
+    valueCaption: pivotCaption(aggregate2, options.valueField, { captions }),
     ...options.pageFilter !== void 0 ? { pageFilter: structuredClone(options.pageFilter) } : {},
     ...options.fieldGroups?.length ? { fieldGroups: structuredClone(options.fieldGroups) } : {},
     ...options.valuesAxis !== void 0 ? { valuesAxis: options.valuesAxis } : {},
     ...options.valuesPosition !== void 0 ? { valuesPosition: options.valuesPosition } : {},
-    ...options.additionalValues ? { additionalValues: normalizedPivotMeasures(options.additionalValues) } : {},
+    ...options.additionalValues ? { additionalValues: normalizedPivotMeasures(options.additionalValues, { captions }) } : {},
     location: { start: { ...destination }, end: { ...destination } },
     ...options.columnField ? { columnField: options.columnField } : {},
     ...options.columnField && options.moreColumnFields?.length ? { moreColumnFields: [...options.moreColumnFields] } : {}
@@ -49088,7 +49185,7 @@ function refreshPivotTable(ctx, s, name3, patch2 = {}) {
     rowField: patch2.rowField ?? old.rowField,
     valueField,
     aggregate: aggregate2,
-    valueCaption: aggregate2 === old.aggregate && valueField === old.valueField ? old.valueCaption : pivotCaption(aggregate2, valueField)
+    valueCaption: aggregate2 === old.aggregate && valueField === old.valueField ? old.valueCaption : pivotCaption(aggregate2, valueField, old)
   };
   if (patch2.columnField !== void 0) {
     if (patch2.columnField) next.columnField = patch2.columnField;
@@ -49138,7 +49235,7 @@ function refreshPivotTable(ctx, s, name3, patch2 = {}) {
   else if (patch2.valuesAxis === "columns" || patch2.secondRowField === "")
     delete next.valuesPosition;
   if (patch2.additionalValues !== void 0) {
-    const measures2 = normalizedPivotMeasures(patch2.additionalValues);
+    const measures2 = normalizedPivotMeasures(patch2.additionalValues, old);
     if (measures2.length) next.additionalValues = measures2;
     else delete next.additionalValues;
   }
@@ -49147,6 +49244,12 @@ function refreshPivotTable(ctx, s, name3, patch2 = {}) {
   else delete next.dateFields;
   roundDateRecords(next, dates, ctx.workbook.date1904);
   if (next.dateFilter && !dates.includes(next.dateFilter.field)) delete next.dateFilter;
+  if (patch2.fieldSubtotals === void 0 && next.fieldSubtotals) {
+    const onAxes = [...pivotRowFields(next), ...pivotColumnFields(next)];
+    const left2 = next.fieldSubtotals.filter((entry3) => onAxes.includes(entry3.field));
+    if (left2.length) next.fieldSubtotals = left2;
+    else delete next.fieldSubtotals;
+  }
   const kept = pruneItemFilters(next);
   if (kept) next.itemFilters = kept;
   else delete next.itemFilters;
@@ -49602,10 +49705,10 @@ function validatePatch(group, patch2) {
     delete next.manualMax;
   validateSettings(next);
 }
-function save2(ctx, s, next, label5, ranges) {
+function save2(ctx, s, next, label2, ranges) {
   const sheet = sheetAt(ctx.workbook, s);
   ctx.run(
-    label5,
+    label2,
     "annotations",
     [{ kind: "parts", sheet: s, parts: ["preserved"] }],
     () => sheet.preserved.set("extLst", next),
@@ -49723,20 +49826,20 @@ function setSlicerSelection(ctx, cacheName, keys) {
   const target2 = slicerTarget(ctx.workbook, cache3);
   if (!target2) throw new Error("The slicer has no data source.");
   if (target2.kind === "table") {
-    const { sheet, table: table3, offset: offset2 } = target2;
+    const { sheet, table: table4, offset: offset2 } = target2;
     ctx.run(
       keys === null ? "Clear slicer filter" : "Filter slicer",
       "view",
       [{ kind: "sheet", sheet: target2.sheetIndex }],
       () => {
-        const column2 = table3.columns[offset2];
+        const column2 = table4.columns[offset2];
         if (keys === null) delete column2.filter;
         else
           column2.filter = {
             values: keys.filter((key2) => key2 !== ""),
             ...keys.includes("") ? { blank: true } : {}
           };
-        applyTableFilter(ctx.workbook, sheet, table3);
+        applyTableFilter(ctx.workbook, sheet, table4);
       },
       { sheet: target2.sheetIndex, structural: true }
     );
@@ -49807,17 +49910,17 @@ function unique2(base2, taken) {
 function insertSlicer(ctx, s, ref) {
   const { workbook } = ctx;
   const sheet = sheetAt(workbook, s);
-  let table3;
+  let table4;
   let pivot;
   let field2;
   if (ref.kind === "table") {
-    table3 = sheet.tables.find(
+    table4 = sheet.tables.find(
       (entry3) => entry3.name === ref.table || entry3.displayName === ref.table
     );
-    if (!table3?.headerRow || table3.filterNotModeled)
+    if (!table4?.headerRow || table4.filterNotModeled)
       throw new Error("Choose a table with a header row and value filters.");
     field2 = ref.column;
-    if (!table3.columns.some((column2) => column2.name === field2))
+    if (!table4.columns.some((column2) => column2.name === field2))
       throw new Error("Choose a column of the table.");
   } else {
     pivot = sheet.pivotTables?.find((entry3) => entry3.name === ref.pivot);
@@ -49837,7 +49940,7 @@ function insertSlicer(ctx, s, ref) {
     (c2) => names.has(c2.toLowerCase())
   ).replace(/ /g, "_");
   const metrics = createGridMetrics(sheet, { zoom: 100 });
-  const anchorCell = table3 ? { row: table3.range.start.row, col: table3.range.end.col + 2 } : { row: pivot.location.start.row, col: pivot.location.end.col + 2 };
+  const anchorCell = table4 ? { row: table4.range.start.row, col: table4.range.end.col + 2 } : { row: pivot.location.start.row, col: pivot.location.end.col + 2 };
   const x = Math.max(metrics.colLeft(anchorCell.col), frameBounds(sheet) + 10);
   const box5 = { x, y: metrics.rowTop(anchorCell.row), ...SLICER_BOX };
   const anchor = pixelBoxToAnchor(sheet, box5, metrics, "twoCell");
@@ -49854,13 +49957,13 @@ function insertSlicer(ctx, s, ref) {
     () => {
       const book = cloneBook(workbook);
       let source2;
-      if (table3) {
-        if (table3.columns.some((column2) => column2.sourceId === void 0))
-          table3.columns.forEach((column2, index3) => column2.sourceId ??= index3 + 1);
+      if (table4) {
+        if (table4.columns.some((column2) => column2.sourceId === void 0))
+          table4.columns.forEach((column2, index3) => column2.sourceId ??= index3 + 1);
         source2 = {
           kind: "table",
-          tableId: table3.id,
-          column: table3.columns.find((column2) => column2.name === field2).sourceId
+          tableId: table4.id,
+          column: table4.columns.find((column2) => column2.name === field2).sourceId
         };
       } else {
         const target2 = pivot;
@@ -50346,9 +50449,9 @@ var SUBTOTAL = {
   var: 110
 };
 var escapeColumn = (name3) => name3.replace(/['#[\]]/g, "'$&");
-function applyTotalsRow(sheet, table3) {
-  const row3 = table3.range.end.row;
-  const { columns } = table3;
+function applyTotalsRow(sheet, table4) {
+  const row3 = table4.range.end.row;
+  const { columns } = table4;
   if (!columns.some((c2) => c2.totalsRowFunction || c2.totalsRowLabel)) {
     const first3 = columns[0];
     const last = columns[columns.length - 1];
@@ -50356,12 +50459,12 @@ function applyTotalsRow(sheet, table3) {
     if (last) last.totalsRowFunction = "sum";
   }
   columns.forEach((column2, i2) => {
-    const col = table3.range.start.col + i2;
+    const col = table4.range.start.col + i2;
     const code = SUBTOTAL[column2.totalsRowFunction ?? ""];
     if (code !== void 0) {
       const cell = ensureCell(sheet, row3, col);
       clearContents(cell);
-      cell.formula = `SUBTOTAL(${code},${table3.name}[${escapeColumn(column2.name)}])`;
+      cell.formula = `SUBTOTAL(${code},${table4.name}[${escapeColumn(column2.name)}])`;
     } else if (column2.totalsRowLabel && column2.totalsRowFunction !== "custom")
       writeValue(sheet, row3, col, column2.totalsRowLabel);
   });
@@ -50385,8 +50488,8 @@ function validateTableName(workbook, name3, self) {
   ) || workbook.definedNames.some((n) => n.name.toLowerCase() === lower3);
   return taken ? "That name is already used by another table or name." : void 0;
 }
-function renameTableIn(workbook, table3, name3) {
-  const old = table3.name;
+function renameTableIn(workbook, table4, name3) {
+  const old = table4.name;
   if (old === name3) return;
   const rename = (f6) => renameTableInFormula(f6, old, name3);
   rewriteFormulas(workbook, rename);
@@ -50395,73 +50498,73 @@ function renameTableIn(workbook, table3, name3) {
       for (const column2 of t.columns)
         if (column2.calculatedColumnFormula)
           column2.calculatedColumnFormula = rename(column2.calculatedColumnFormula);
-  table3.name = name3;
-  table3.displayName = name3;
+  table4.name = name3;
+  table4.displayName = name3;
 }
 var byId = (sheet, id3) => {
-  const table3 = sheet.tables.find((t) => t.id === id3);
-  if (!table3) throw new Error("The table disappeared during the edit.");
-  return table3;
+  const table4 = sheet.tables.find((t) => t.id === id3);
+  if (!table4) throw new Error("The table disappeared during the edit.");
+  return table4;
 };
-function insertBandRow(workbook, sheet, table3, row3) {
+function insertBandRow(workbook, sheet, table4, row3) {
   const shift2 = { axis: "row", at: row3, count: 1 };
-  const band2 = { lo: table3.range.start.col, hi: table3.range.end.col };
+  const band2 = { lo: table4.range.start.col, hi: table4.range.end.col };
   assertInsertFits(sheet, shift2, band2);
   rewriteFormulas(workbook, (f6, fs) => shiftFormulaInBand(f6, fs, sheet.name, shift2, band2));
   shiftSheetContent(sheet, shift2, band2);
 }
 function setHeaderRow(workbook, sheet, id3, on) {
-  let table3 = byId(sheet, id3);
-  if (table3.headerRow === on) return;
-  const { start, end } = table3.range;
+  let table4 = byId(sheet, id3);
+  if (table4.headerRow === on) return;
+  const { start, end } = table4.range;
   if (!on) {
     if (start.row === end.row) throw new Error("A table needs at least one row.");
     clearRow(sheet, start.row, start.col, end.col);
-    table3.range = { start: { row: start.row + 1, col: start.col }, end };
-    table3.headerRow = false;
+    table4.range = { start: { row: start.row + 1, col: start.col }, end };
+    table4.headerRow = false;
     return;
   }
   if (start.row === 0 || !rowIsEmpty(sheet, start.row - 1, start.col, end.col)) {
-    insertBandRow(workbook, sheet, table3, start.row);
-    table3 = byId(sheet, id3);
-  }
-  const top = table3.range.start.row - 1;
-  const left2 = table3.range.start.col;
-  table3.range = { start: { row: top, col: left2 }, end: table3.range.end };
-  table3.headerRow = true;
-  uniqueHeaders(table3.columns.map((c2) => c2.name)).forEach((name3, i2) => {
-    const column2 = table3.columns[i2];
+    insertBandRow(workbook, sheet, table4, start.row);
+    table4 = byId(sheet, id3);
+  }
+  const top = table4.range.start.row - 1;
+  const left2 = table4.range.start.col;
+  table4.range = { start: { row: top, col: left2 }, end: table4.range.end };
+  table4.headerRow = true;
+  uniqueHeaders(table4.columns.map((c2) => c2.name)).forEach((name3, i2) => {
+    const column2 = table4.columns[i2];
     if (column2) column2.name = name3;
     writeValue(sheet, top, left2 + i2, name3);
   });
 }
 function setTotalsRow(workbook, sheet, id3, on) {
-  let table3 = byId(sheet, id3);
-  if (table3.totalsRow === on) return;
-  const { start, end } = table3.range;
+  let table4 = byId(sheet, id3);
+  if (table4.totalsRow === on) return;
+  const { start, end } = table4.range;
   if (!on) {
     clearRow(sheet, end.row, start.col, end.col);
-    table3.range = { start, end: { row: end.row - 1, col: end.col } };
-    table3.totalsRow = false;
+    table4.range = { start, end: { row: end.row - 1, col: end.col } };
+    table4.totalsRow = false;
     return;
   }
   if (end.row === MAX_ROW) throw new RangeError("The insert area extends beyond the sheet.");
   if (!rowIsEmpty(sheet, end.row + 1, start.col, end.col)) {
-    insertBandRow(workbook, sheet, table3, end.row + 1);
-    table3 = byId(sheet, id3);
+    insertBandRow(workbook, sheet, table4, end.row + 1);
+    table4 = byId(sheet, id3);
   }
-  table3.range = { start: table3.range.start, end: { row: table3.range.end.row + 1, col: end.col } };
-  table3.totalsRow = true;
-  applyTotalsRow(sheet, table3);
+  table4.range = { start: table4.range.start, end: { row: table4.range.end.row + 1, col: end.col } };
+  table4.totalsRow = true;
+  applyTotalsRow(sheet, table4);
 }
-function resizedColumns(workbook, sheet, table3, range2) {
+function resizedColumns(workbook, sheet, table4, range2) {
   const width = range2.end.col - range2.start.col + 1;
-  const oldAt = (col) => col >= table3.range.start.col && col <= table3.range.end.col ? table3.columns[col - table3.range.start.col] : void 0;
+  const oldAt = (col) => col >= table4.range.start.col && col <= table4.range.end.col ? table4.columns[col - table4.range.start.col] : void 0;
   const texts = Array.from({ length: width }, (_v, i2) => {
     const col = range2.start.col + i2;
     const old = oldAt(col);
     if (old) return old.name;
-    return table3.headerRow ? displayText(workbook, getCell(sheet, range2.start.row, col)) : "";
+    return table4.headerRow ? displayText(workbook, getCell(sheet, range2.start.row, col)) : "";
   });
   return uniqueHeaders(texts).map((name3, i2) => {
     const old = oldAt(range2.start.col + i2);
@@ -50469,30 +50572,30 @@ function resizedColumns(workbook, sheet, table3, range2) {
   });
 }
 function resizeTableIn(workbook, sheet, id3, range2) {
-  const table3 = byId(sheet, id3);
+  const table4 = byId(sheet, id3);
   const r = normalizeRange(range2);
-  if (table3.headerRow && r.start.row !== table3.range.start.row)
+  if (table4.headerRow && r.start.row !== table4.range.start.row)
     throw new Error("The table headers must remain in the same row.");
-  if (!rangesIntersect(r, table3.range)) throw new Error("The new range must overlap the table.");
-  if (r.end.row - r.start.row + 1 < (table3.headerRow ? 2 : 1) + (table3.totalsRow ? 1 : 0))
+  if (!rangesIntersect(r, table4.range)) throw new Error("The new range must overlap the table.");
+  if (r.end.row - r.start.row + 1 < (table4.headerRow ? 2 : 1) + (table4.totalsRow ? 1 : 0))
     throw new Error("The table range is too small.");
-  if (sheet.tables.some((t) => t !== table3 && rangesIntersect(t.range, r)))
+  if (sheet.tables.some((t) => t !== table4 && rangesIntersect(t.range, r)))
     throw new Error("A table cannot overlap another table.");
   if (sheet.pivotTables?.some((pivot) => rangesIntersect(pivot.location, r)))
     throw new Error("A table cannot overlap a PivotTable.");
   if (sheet.merges.some((m) => rangesIntersect(m, r)))
     throw new Error("A table cannot contain merged cells.");
-  const oldEnd = table3.range.end.row;
-  table3.columns = resizedColumns(workbook, sheet, table3, r);
-  table3.range = r;
-  if (table3.headerRow)
-    table3.columns.forEach((column2, i2) => {
+  const oldEnd = table4.range.end.row;
+  table4.columns = resizedColumns(workbook, sheet, table4, r);
+  table4.range = r;
+  if (table4.headerRow)
+    table4.columns.forEach((column2, i2) => {
       const cell = getCell(sheet, r.start.row, r.start.col + i2);
       if (cell?.value !== column2.name) writeValue(sheet, r.start.row, r.start.col + i2, column2.name);
     });
-  if (table3.totalsRow) {
+  if (table4.totalsRow) {
     if (oldEnd !== r.end.row) clearRow(sheet, oldEnd, r.start.col, r.end.col);
-    applyTotalsRow(sheet, table3);
+    applyTotalsRow(sheet, table4);
   }
 }
 var STYLE_KEYS = [
@@ -50520,20 +50623,20 @@ function updateTable(ctx, s, ref, patch2) {
     "structure",
     [scope],
     () => {
-      const table3 = byId(sheet, id3);
-      if (renaming) renameTableIn(workbook, table3, name3);
+      const table4 = byId(sheet, id3);
+      if (renaming) renameTableIn(workbook, table4, name3);
       for (const key2 of STYLE_KEYS) {
         if (!(key2 in patch2)) continue;
         const value2 = patch2[key2];
-        if (value2 === void 0) delete table3[key2];
-        else table3[key2] = value2;
+        if (value2 === void 0) delete table4[key2];
+        else table4[key2] = value2;
       }
       if (patch2.columns) {
-        const width = table3.range.end.col - table3.range.start.col + 1;
+        const width = table4.range.end.col - table4.range.start.col + 1;
         if (patch2.columns.length !== width) throw new Error("Give one column per table column.");
-        const before = table3.columns;
-        table3.columns = structuredClone(patch2.columns);
-        for (const [index3, column2] of table3.columns.entries()) {
+        const before = table4.columns;
+        table4.columns = structuredClone(patch2.columns);
+        for (const [index3, column2] of table4.columns.entries()) {
           const sourceId = before[index3]?.sourceId;
           if (column2.sourceId === void 0 && sourceId !== void 0) column2.sourceId = sourceId;
           const filter2 = before[index3]?.filter;
@@ -50542,7 +50645,7 @@ function updateTable(ctx, s, ref, patch2) {
       }
       if (patch2.headerRow !== void 0) setHeaderRow(workbook, sheet, id3, patch2.headerRow);
       if (patch2.totalsRow !== void 0) setTotalsRow(workbook, sheet, id3, patch2.totalsRow);
-      else if (patch2.columns && table3.totalsRow) applyTotalsRow(sheet, byId(sheet, id3));
+      else if (patch2.columns && table4.totalsRow) applyTotalsRow(sheet, byId(sheet, id3));
       if (patch2.range) resizeTableIn(workbook, sheet, id3, patch2.range);
     },
     { sheet: s, ranges: [current.range], structural: true }
@@ -50562,13 +50665,13 @@ function resizeTable(ctx, s, ref, range2) {
 function convertTableToRange(ctx, s, ref) {
   const { workbook } = ctx;
   const sheet = sheetAt(workbook, s);
-  const table3 = sheet.tables[tableIndex(sheet, ref)];
+  const table4 = sheet.tables[tableIndex(sheet, ref)];
   ctx.run(
     "Convert to range",
     "structure",
     [{ kind: "workbook" }],
     () => {
-      const live2 = byId(sheet, table3.id);
+      const live2 = byId(sheet, table4.id);
       const base2 = { table: live2, tableSheet: sheet.name };
       const { start, end } = live2.range;
       for (const ws of workbook.sheets)
@@ -50593,7 +50696,7 @@ function convertTableToRange(ctx, s, ref) {
               });
       sheet.tables = sheet.tables.filter((t) => t.id !== live2.id);
     },
-    { sheet: s, ranges: [table3.range], structural: true }
+    { sheet: s, ranges: [table4.range], structural: true }
   );
 }
 
@@ -53499,7 +53602,7 @@ function createTable2(ctx, s, range2, hasHeader, styleName = "TableStyleMedium2"
       });
       const name3 = nextTableName(workbook);
       const id3 = Math.max(0, ...workbook.sheets.flatMap((ws) => ws.tables.map((t) => t.id))) + 1;
-      const table3 = {
+      const table4 = {
         id: id3,
         name: name3,
         displayName: name3,
@@ -53513,8 +53616,8 @@ function createTable2(ctx, s, range2, hasHeader, styleName = "TableStyleMedium2"
         showFirstColumn: false,
         showLastColumn: false
       };
-      sheet.tables.push(table3);
-      return table3;
+      sheet.tables.push(table4);
+      return table4;
     },
     { sheet: s, ranges: [r], structural: !hasHeader }
   );
@@ -53718,8 +53821,8 @@ function createEditSession(workbook, options = {}) {
       if (!workbook.warnings.includes(message)) workbook.warnings.push(message);
     }
   };
-  const begin = (label5, kind, info) => {
-    const step2 = { label: label5, entries: [], structural: info.structural ?? false };
+  const begin = (label2, kind, info) => {
+    const step2 = { label: label2, entries: [], structural: info.structural ?? false };
     if (info.calc) step2.calc = info.calc;
     return { step: step2, kind, sheet: info.sheet, ranges: [...info.ranges ?? []] };
   };
@@ -53743,7 +53846,7 @@ function createEditSession(workbook, options = {}) {
     }
     current.step.entries.length = from;
   };
-  const run2 = (label5, kind, scopes, fn, info = {}) => {
+  const run2 = (label2, kind, scopes, fn, info = {}) => {
     if (kind === "cells") {
       for (const scope of scopes)
         if (scope.kind === "cells" && workbook.sheets[scope.sheet]?.pivotTables?.some(
@@ -53760,7 +53863,7 @@ function createEditSession(workbook, options = {}) {
       }))
         throw new Error(DATA_TABLE_PART_ERROR);
     const outer = !open;
-    const current = open ?? begin(label5, kind, info);
+    const current = open ?? begin(label2, kind, info);
     if (!outer) {
       delete current.step.calc;
       if (info.structural) current.step.structural = true;
@@ -53891,9 +53994,9 @@ function createEditSession(workbook, options = {}) {
     removeConditionalFormat: (s, index3) => removeConditionalFormat(ctx, s, index3),
     setConditionalRulePriority: (s, f6, r, priority) => setConditionalRulePriority(ctx, s, f6, r, priority),
     moveConditionalRule: (s, f6, r, direction) => moveConditionalRule(ctx, s, f6, r, direction),
-    updateTable: (s, table3, patch2) => updateTable(ctx, s, table3, patch2),
-    resizeTable: (s, table3, range2) => resizeTable(ctx, s, table3, range2),
-    convertTableToRange: (s, table3) => convertTableToRange(ctx, s, table3),
+    updateTable: (s, table4, patch2) => updateTable(ctx, s, table4, patch2),
+    resizeTable: (s, table4, range2) => resizeTable(ctx, s, table4, range2),
+    convertTableToRange: (s, table4) => convertTableToRange(ctx, s, table4),
     applyCellStyle: (s, ranges, name3) => applyCellStyle(ctx, s, ranges, name3),
     setPageSetup: (s, patch2) => setPageSetup(ctx, s, patch2),
     setPageBreak: (s, axis, before, present) => setPageBreak(ctx, s, axis, before, present),
@@ -53930,12 +54033,12 @@ function createEditSession(workbook, options = {}) {
     validate: (s, r, c2, value2) => validateCellInput(workbook, s, r, c2, value2, {
       evaluate: (formula, at2) => calc.evaluate(formula, at2)
     }),
-    batch(label5, fn) {
+    batch(label2, fn) {
       if (open) {
         fn();
         return;
       }
-      const current = begin(label5, "batch", {});
+      const current = begin(label2, "batch", {});
       open = current;
       try {
         fn();
@@ -54615,9 +54718,9 @@ var VisioPackage = class _VisioPackage {
 };
 
 // visio/metadata.ts
-function metadata(value2, max, label5) {
+function metadata(value2, max, label2) {
   if (value2.length > max)
-    throw new VisioPackageError("METADATA_LIMIT", `${label5} exceeds its metadata length limit.`);
+    throw new VisioPackageError("METADATA_LIMIT", `${label2} exceeds its metadata length limit.`);
   return value2;
 }
 function metadataAttributes(node3) {
@@ -58569,15 +58672,15 @@ function legacyFillGradient(cells3, width, height, resolve3) {
 
 // ../../node_modules/.bun/@christophervr+ole2@0.13.0/node_modules/@christophervr/ole2/dist/utils/png-encoder.js
 var CRC_TABLE = (() => {
-  const table3 = new Uint32Array(256);
+  const table4 = new Uint32Array(256);
   for (let n = 0; n < 256; n++) {
     let c2 = n;
     for (let k = 0; k < 8; k++) {
       c2 = c2 & 1 ? 3988292384 ^ c2 >>> 1 : c2 >>> 1;
     }
-    table3[n] = c2 >>> 0;
+    table4[n] = c2 >>> 0;
   }
-  return table3;
+  return table4;
 })();
 function crc322(bytes) {
   let crc = 4294967295;
@@ -61251,7 +61354,7 @@ function property(row3, budget, report) {
       "Shape data has no supported current cached typed value; original cached text is retained."
     );
   }
-  const label5 = get("Label"), format5 = get("Format"), prompt = get("Prompt"), sortKey = get("SortKey");
+  const label2 = get("Label"), format5 = get("Format"), prompt = get("Prompt"), sortKey = get("SortKey");
   const invisible = boolean(row3.cells, "Invisible", budget, report);
   const dataLinked = row3.cells.has("DataLinked") ? boolean(row3.cells, "DataLinked", budget, report) : void 0;
   const unit3 = row3.cells.get("Value")?.unit, error = row3.cells.get("Value")?.error;
@@ -61263,7 +61366,7 @@ function property(row3, budget, report) {
     ...rawType === void 0 ? {} : { rawType },
     ...rawValue === void 0 ? {} : { rawValue },
     ...value2 === void 0 ? {} : { value: value2 },
-    ...label5 === void 0 ? {} : { label: label5 },
+    ...label2 === void 0 ? {} : { label: label2 },
     ...format5 === void 0 ? {} : { format: format5 },
     ...prompt === void 0 ? {} : { prompt },
     ...sortKey === void 0 ? {} : { sortKey },
@@ -61496,9 +61599,9 @@ async function readDataRecordsets(pkg, documentPart, check3) {
     const declared = children3(children3(set, "DataColumns")[0], "DataColumn");
     const columns = (declared.length ? declared : []).map((node3) => {
       const name4 = attribute3(node3, "ColumnNameID") ?? attribute3(node3, "Name") ?? "";
-      const label5 = attribute3(node3, "Label") ?? attribute3(node3, "Name") ?? name4;
-      if (!name4 || name4.length > 255 || label5.length > 255) invalid2("Invalid data column.");
-      return { name: name4, label: label5, type: typeFromCode(attribute3(node3, "DataType")) };
+      const label2 = attribute3(node3, "Label") ?? attribute3(node3, "Name") ?? name4;
+      if (!name4 || name4.length > 255 || label2.length > 255) invalid2("Invalid data column.");
+      return { name: name4, label: label2, type: typeFromCode(attribute3(node3, "DataType")) };
     });
     if (!columns.length)
       for (const column2 of ado.columns)
@@ -68161,18 +68264,18 @@ function advances(family, bold) {
   const key2 = `${name3}|${bold ? "b" : "r"}`;
   const known = decoded.get(key2);
   if (known) return known;
-  const table3 = Object.hasOwn(DESIGN_ADVANCES, name3) ? DESIGN_ADVANCES[name3] : void 0;
-  if (!table3) return void 0;
-  const values2 = (bold ? table3.bold : table3.regular).split(" ").map(Number);
+  const table4 = Object.hasOwn(DESIGN_ADVANCES, name3) ? DESIGN_ADVANCES[name3] : void 0;
+  if (!table4) return void 0;
+  const values2 = (bold ? table4.bold : table4.regular).split(" ").map(Number);
   decoded.set(key2, values2);
   return values2;
 }
 function designTextWidthEm(text8, family, bold = false) {
-  const table3 = advances(family, bold);
-  if (!table3) return void 0;
+  const table4 = advances(family, bold);
+  if (!table4) return void 0;
   let units2 = 0;
   for (let index3 = 0; index3 < text8.length; ++index3) {
-    const advance = table3[text8.charCodeAt(index3) - FIRST];
+    const advance = table4[text8.charCodeAt(index3) - FIRST];
     if (advance === void 0 || Number.isNaN(advance)) return void 0;
     units2 += advance;
   }
@@ -71383,9 +71486,9 @@ function visioBorderShapes(style3, width, height, title = VISIO_DEFAULT_TITLE) {
 // visio/edit-page-setup-commands.ts
 var VISIO_SCALE_UNITS = Object.freeze(["IN", "FT", "MM", "CM", "M"]);
 var isVisioPageSetupEdit = (edit) => edit.type === "set-page-alt-text" || edit.type === "set-page-setup" || edit.type === "set-page-properties" || edit.type === "set-page-decoration" || edit.type === "set-page-layout" || edit.type === "set-snap-glue";
-var pageId = (value2, label5) => {
+var pageId = (value2, label2) => {
   if (typeof value2 !== "string" || !value2 || value2.length > 256)
-    fail2("INVALID_EDIT", `Invalid ${label5}.`);
+    fail2("INVALID_EDIT", `Invalid ${label2}.`);
   return value2;
 };
 var newPageId = (value2) => {
@@ -71492,11 +71595,11 @@ var VISIO_SHAPE_DATA_TYPES = [
   "date"
 ];
 var invalidText2 = /[\u0000-\u0008\u000b\u000c\u000e-\u001f￾￿]|[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/u;
-function shapeDataText(value2, label5) {
+function shapeDataText(value2, label2) {
   if (typeof value2 !== "string" || value2.length > VISIO_METADATA_TEXT_LIMIT)
-    fail2("INVALID_EDIT", `${label5} must be a string within the length limit.`);
+    fail2("INVALID_EDIT", `${label2} must be a string within the length limit.`);
   if (invalidText2.test(value2) || /[\r\n\t]/.test(value2))
-    fail2("INVALID_EDIT_TEXT", `${label5} contains invalid characters.`);
+    fail2("INVALID_EDIT_TEXT", `${label2} contains invalid characters.`);
   return value2;
 }
 function shapeDataRowName(value2) {
@@ -71504,9 +71607,9 @@ function shapeDataRowName(value2) {
     fail2("INVALID_EDIT", "Shape Data row names use letters, digits and underscores.");
   return value2;
 }
-function visioShapeDataRowName(label5, taken = []) {
+function visioShapeDataRowName(label2, taken = []) {
   const used = new Set([...taken].map((name4) => name4.toLowerCase()));
-  let base2 = label5.normalize("NFKD").replace(/[^\w]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 48);
+  let base2 = label2.normalize("NFKD").replace(/[^\w]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 48);
   if (!base2) base2 = "Property";
   if (/^\d/.test(base2)) base2 = `_${base2}`;
   let name3 = base2;
@@ -71578,18 +71681,18 @@ var TYPES3 = [
   "unlink-data-rows"
 ];
 var isVisioDataEdit = (edit) => TYPES3.includes(edit.type);
-var id = (value2, label5) => {
+var id = (value2, label2) => {
   if (typeof value2 !== "string" || !/^(0|[1-9]\d{0,9})$/.test(value2) || Number(value2) > 4294967295)
-    fail2("INVALID_EDIT", `Invalid ${label5}.`);
+    fail2("INVALID_EDIT", `Invalid ${label2}.`);
   return value2;
 };
-var name = (value2, label5) => {
-  const text8 = shapeDataText(value2, label5);
+var name = (value2, label2) => {
+  const text8 = shapeDataText(value2, label2);
   if (!text8.trim() || text8.length > 255)
-    fail2("INVALID_EDIT", `${label5} must be 1 to 255 characters.`);
+    fail2("INVALID_EDIT", `${label2} must be 1 to 255 characters.`);
   return text8;
 };
-function table2(columns, rows) {
+function table3(columns, rows) {
   if (!Array.isArray(columns) || !columns.length || columns.length > VISIO_DATA_LIMITS.maxColumns)
     fail2("INVALID_EDIT", `A recordset needs 1 to ${VISIO_DATA_LIMITS.maxColumns} columns.`);
   if (!Array.isArray(rows) || rows.length > VISIO_DATA_LIMITS.maxRows)
@@ -71635,14 +71738,14 @@ function snapshotDataEdit(edit) {
         type: edit.type,
         pageId: pageId2,
         name: name(edit.name, "The recordset name"),
-        ...table2(edit.columns, edit.rows)
+        ...table3(edit.columns, edit.rows)
       };
     case "refresh-data-recordset":
       return {
         type: edit.type,
         pageId: pageId2,
         recordsetId: id(edit.recordsetId, "recordset"),
-        ...table2(edit.columns, edit.rows)
+        ...table3(edit.columns, edit.rows)
       };
     case "delete-data-recordset":
       return { type: edit.type, pageId: pageId2, recordsetId: id(edit.recordsetId, "recordset") };
@@ -71701,16 +71804,16 @@ function snapshotPageTheme(edit) {
 var isVisioCommentEdit = (edit) => edit.type === "add-comment" || edit.type === "edit-comment" || edit.type === "delete-comment";
 var invalidText3 = /[\u0000-\u0008\u000b\u000c\u000e-\u001f￾￿]|[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/u;
 var dateTime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,7})?(?:Z|[+-]\d{2}:\d{2})?$/;
-function string(value2, limit3, label5, required = true) {
+function string(value2, limit3, label2, required = true) {
   if (typeof value2 !== "string" || value2.length > limit3 || required && !value2.trim())
-    fail2("INVALID_EDIT", `${label5} must be a non-empty string within its length limit.`);
+    fail2("INVALID_EDIT", `${label2} must be a non-empty string within its length limit.`);
   if (invalidText3.test(value2))
-    fail2("INVALID_EDIT_TEXT", `${label5} contains invalid XML characters.`);
+    fail2("INVALID_EDIT_TEXT", `${label2} contains invalid XML characters.`);
   return value2;
 }
-var id2 = (value2, label5) => {
+var id2 = (value2, label2) => {
   if (typeof value2 !== "string" || !/^(0|[1-9]\d{0,9})$/.test(value2) || Number(value2) > 4294967295)
-    fail2("INVALID_EDIT", `${label5} must be a canonical unsigned integer.`);
+    fail2("INVALID_EDIT", `${label2} must be a canonical unsigned integer.`);
   return value2;
 };
 var date = (value2) => {
@@ -72233,7 +72336,7 @@ async function editVsdxMasterInstance(pkg, parts, pages, edit, limits, maxOutput
 
 // visio/paper-sizes.ts
 var mm = (value2) => value2 / 25.4;
-var size = (id3, label5, width, height, paperKind) => Object.freeze({ id: id3, label: label5, width, height, ...paperKind === void 0 ? {} : { paperKind } });
+var size = (id3, label2, width, height, paperKind) => Object.freeze({ id: id3, label: label2, width, height, ...paperKind === void 0 ? {} : { paperKind } });
 var VISIO_PAPER_SIZES = Object.freeze([
   size("letter", "Letter", 8.5, 11, 1),
   size("tabloid", "Tabloid", 11, 17, 3),
@@ -73603,7 +73706,7 @@ function snapshotFormatting(edit) {
       if (!Number.isInteger(value2)) fail2("INVALID_EDIT", "Paint patterns require integers.");
       result2[name3] = value2;
     }
-    for (const [name3, maximum, label5] of [
+    for (const [name3, maximum, label2] of [
       ["beginArrow", 45, "Arrowheads are numbered 0 to 45."],
       ["endArrow", 45, "Arrowheads are numbered 0 to 45."],
       ["beginArrowSize", 6, "Arrowhead sizes are numbered 0 to 6."],
@@ -73617,7 +73720,7 @@ function snapshotFormatting(edit) {
       const value2 = edit[name3];
       if (value2 === void 0) continue;
       if (typeof value2 !== "number" || !Number.isInteger(value2) || value2 < 0 || value2 > maximum)
-        fail2("INVALID_EDIT", label5);
+        fail2("INVALID_EDIT", label2);
       result2[name3] = value2;
     }
     if (edit.rounding !== void 0) result2.rounding = points(edit.rounding, 0, 720);