@superdoc-dev/cli 0.16.0-next.13 → 0.16.0-next.15

package/dist/index.js

@@ -68110,7 +68110,7 @@ var init_remark_gfm_BhnWr3yf_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter-CcHCWpfX.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-CvwFiCth.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -77655,6 +77655,46 @@ function effectiveTableCellSpacing(spacing, isBoundary, padding) {
     return 0;
   return isBoundary ? Math.max(0, spacing - padding) : spacing;
 }
+function selectHeaderFooterVariantForPage({ documentPageNumber, sectionPageNumber, titlePg, alternateHeaders }) {
+  if (!Number.isFinite(documentPageNumber) || !Number.isFinite(sectionPageNumber))
+    return null;
+  if (sectionPageNumber < 1)
+    return null;
+  if (sectionPageNumber === 1 && titlePg === true)
+    return "first";
+  if (alternateHeaders === true)
+    return documentPageNumber % 2 === 0 ? "even" : "odd";
+  return "default";
+}
+function candidateVariantsFor(variant) {
+  return variant === "odd" ? ["odd", "default"] : [variant];
+}
+function sectionRefsFor(section, kind) {
+  return kind === "header" ? section?.headerRefs : section?.footerRefs;
+}
+function resolveEffectiveHeaderFooterRef({ sections, sectionIndex, kind, variant }) {
+  if (sectionIndex < 0)
+    return null;
+  const sectionsByIndex = /* @__PURE__ */ new Map;
+  for (const section of sections)
+    sectionsByIndex.set(section.sectionIndex, section);
+  const candidates = candidateVariantsFor(variant);
+  for (let currentIndex = sectionIndex;currentIndex >= 0; currentIndex -= 1) {
+    const refs = sectionRefsFor(sectionsByIndex.get(currentIndex), kind);
+    if (!refs)
+      continue;
+    for (const candidate of candidates) {
+      const refId = refs[candidate];
+      if (refId)
+        return {
+          refId,
+          matchedSectionIndex: currentIndex,
+          matchedVariant: candidate
+        };
+    }
+  }
+  return null;
+}
 function rescaleColumnWidths(measureColumnWidths, measureTotalWidth, fragmentWidth) {
   if (!measureColumnWidths || measureColumnWidths.length === 0 || measureTotalWidth <= fragmentWidth || measureTotalWidth <= 0)
     return;
@@ -78058,6 +78098,77 @@ function getSdtContainerKeyForBlock(block) {
     return null;
   return getSdtContainerKey(block.attrs?.sdt, block.attrs?.containerSdt);
 }
+function toUpperRoman$1(value) {
+  if (value < 1 || value > 3999)
+    return String(value);
+  const values = [
+    1000,
+    900,
+    500,
+    400,
+    100,
+    90,
+    50,
+    40,
+    10,
+    9,
+    5,
+    4,
+    1
+  ];
+  const numerals = [
+    "M",
+    "CM",
+    "D",
+    "CD",
+    "C",
+    "XC",
+    "L",
+    "XL",
+    "X",
+    "IX",
+    "V",
+    "IV",
+    "I"
+  ];
+  let remaining = value;
+  let result = "";
+  for (let i$1 = 0;i$1 < values.length; i$1 += 1)
+    while (remaining >= values[i$1]) {
+      result += numerals[i$1];
+      remaining -= values[i$1];
+    }
+  return result;
+}
+function toUpperLetter$1(value) {
+  const normalized = Math.max(1, value);
+  const index2 = (normalized - 1) % 26;
+  const repeatCount = Math.floor((normalized - 1) / 26) + 1;
+  return String.fromCharCode(65 + index2).repeat(repeatCount);
+}
+function formatPageNumber(pageNumber, format) {
+  const value = Math.max(1, Math.trunc(Number.isFinite(pageNumber) ? pageNumber : 1));
+  switch (format) {
+    case "upperRoman":
+      return toUpperRoman$1(value);
+    case "lowerRoman":
+      return toUpperRoman$1(value).toLowerCase();
+    case "upperLetter":
+      return toUpperLetter$1(value);
+    case "lowerLetter":
+      return toUpperLetter$1(value).toLowerCase();
+    case "numberInDash":
+      return `- ${value} -`;
+    case "decimal":
+    default:
+      return String(value);
+  }
+}
+function formatPageNumberFieldValue$1(pageNumber, fieldFormat) {
+  const format = fieldFormat?.format ?? "decimal";
+  const formatted = formatPageNumber(pageNumber, format);
+  return fieldFormat?.zeroPadding && format === "decimal" ? formatted.padStart(fieldFormat.zeroPadding, "0") : formatted;
+}
 function resolveSpacingIndent(style, numbering) {
   const spacing = {
     before: style.spacing?.before ?? 0,
@@ -82446,10 +82557,48 @@ function convertTiffToPng(data) {
     return null;
   }
 }
-function preProcessPageInstruction(nodesToCombine, _instrText, fieldRunRPr = null) {
+function parsePageNumberFieldSwitches(instruction, fieldType) {
+  const normalizedInstruction = typeof instruction === "string" ? instruction.trim().replace(/\s+/g, " ") : fieldType;
+  const result = {};
+  if (normalizedInstruction && normalizedInstruction !== fieldType)
+    result.instruction = normalizedInstruction;
+  for (const match of normalizedInstruction.matchAll(/\\\*\s+("[^"]+"|\S+)/g)) {
+    const rawValue = unquote(match[1]);
+    const mapped = GENERAL_FORMATS.get(rawValue) ?? CASE_INSENSITIVE_GENERAL_FORMATS.get(rawValue.toLowerCase());
+    if (mapped) {
+      result.pageNumberFormat = mapped;
+      break;
+    }
+  }
+  for (const match of normalizedInstruction.matchAll(/\\#\s+("[^"]+"|\S+)/g)) {
+    const picture = unquote(match[1]);
+    if (/^0+$/.test(picture)) {
+      result.pageNumberFormat ??= "decimal";
+      result.pageNumberZeroPadding = picture.length;
+      break;
+    }
+  }
+  return result;
+}
+function formatPageNumberFieldValue(pageNumber, attrs = {}) {
+  return formatPageNumberFieldValue$1(pageNumber, {
+    format: attrs.pageNumberFormat || "decimal",
+    zeroPadding: attrs.pageNumberZeroPadding ?? undefined
+  });
+}
+function unquote(value) {
+  return value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1) : value;
+}
+function preProcessPageInstruction(nodesToCombine, instrText = "PAGE", options = {}) {
+  const fieldRunRPr = options.fieldRunRPr ?? null;
+  const normalizedInstruction = typeof instrText === "string" && instrText.trim() ? instrText.trim().replace(/\s+/g, " ") : "PAGE";
   const pageNumNode = {
     name: "sd:autoPageNumber",
-    type: "element"
+    type: "element",
+    attributes: {
+      instruction: normalizedInstruction,
+      ...parsePageNumberFieldSwitches(normalizedInstruction, "PAGE")
+    }
   };
   let foundContentRPr = false;
   nodesToCombine.forEach((n) => {
@@ -82463,11 +82612,12 @@ function preProcessPageInstruction(nodesToCombine, _instrText, fieldRunRPr = nul
     pageNumNode.elements = [fieldRunRPr];
   return [pageNumNode];
 }
-function preProcessNumPagesInstruction(nodesToCombine, _instrText, fieldRunRPr = null) {
+function preProcessNumPagesInstruction(nodesToCombine, instrText = "NUMPAGES", options = {}) {
+  const fieldRunRPr = options.fieldRunRPr ?? null;
   const totalPageNumNode = {
     name: "sd:totalPageNumber",
     type: "element",
-    attributes: {}
+    attributes: { ...parsePageNumberFieldSwitches(instrText, "NUMPAGES") }
   };
   const cachedText = extractCachedText$1(nodesToCombine);
   if (cachedText)
@@ -82496,7 +82646,7 @@ function extractCachedText$1(nodes) {
   }
   return texts.join("");
 }
-function preProcessPageRefInstruction(nodesToCombine, instrText) {
+function preProcessPageRefInstruction(nodesToCombine, instrText, options = {}) {
   return [{
     name: "sd:pageReference",
     type: "element",
@@ -82505,7 +82655,7 @@ function preProcessPageRefInstruction(nodesToCombine, instrText) {
   }];
 }
 function resolveHyperlinkAttributes(instruction, docx) {
-  const urlMatch = instruction.match(/HYPERLINK\s+"([^"]+)"/);
+  const urlMatch = instruction.match(/^\s*HYPERLINK\s+"([^"]+)"/i);
   if (urlMatch && urlMatch.length >= 2) {
     const url2 = urlMatch[1];
     const relationships = docx?.["word/_rels/document.xml.rels"]?.elements?.find((el) => el.name === "Relationships");
@@ -82545,7 +82695,8 @@ function resolveHyperlinkAttributes(instruction, docx) {
     return null;
   return { ...parsedSwitches };
 }
-function preProcessHyperlinkInstruction(nodesToCombine, instruction, docx) {
+function preProcessHyperlinkInstruction(nodesToCombine, instruction, options = {}) {
+  const docx = options.docx;
   return [{
     name: "w:hyperlink",
     type: "element",
@@ -82553,7 +82704,7 @@ function preProcessHyperlinkInstruction(nodesToCombine, instruction, docx) {
     elements: nodesToCombine
   }];
 }
-function preProcessTocInstruction(nodesToCombine, instrText) {
+function preProcessTocInstruction(nodesToCombine, instrText, options = {}) {
   return [{
     name: "sd:tableOfContents",
     type: "element",
@@ -82604,10 +82755,11 @@ function buildBlockFieldNode(xmlName, nodesToCombine, instrText, instructionToke
     elements: normalizeFieldContentToParagraphs(nodesToCombine)
   }];
 }
-function preProcessIndexInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
-  return buildBlockFieldNode("sd:index", nodesToCombine, instrText, instructionTokens);
+function preProcessIndexInstruction(nodesToCombine, instrText, options = {}, legacyInstructionTokens = null) {
+  return buildBlockFieldNode("sd:index", nodesToCombine, instrText, options?.instructionTokens ?? legacyInstructionTokens);
 }
-function preProcessXeInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
+function preProcessXeInstruction(nodesToCombine, instrText, options = {}) {
+  const instructionTokens = options.instructionTokens ?? null;
   return [{
     name: "sd:indexEntry",
     type: "element",
@@ -82618,7 +82770,8 @@ function preProcessXeInstruction(nodesToCombine, instrText, _docx, instructionTo
     elements: nodesToCombine
   }];
 }
-function preProcessTcInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
+function preProcessTcInstruction(nodesToCombine, instrText, options = {}) {
+  const instructionTokens = options.instructionTokens ?? null;
   return [{
     name: "sd:tableOfContentsEntry",
     type: "element",
@@ -82629,7 +82782,7 @@ function preProcessTcInstruction(nodesToCombine, instrText, _docx, instructionTo
     elements: nodesToCombine
   }];
 }
-function preProcessRefInstruction(nodesToCombine, instrText) {
+function preProcessRefInstruction(nodesToCombine, instrText, options = {}) {
   return [{
     name: "sd:crossReference",
     type: "element",
@@ -82640,7 +82793,7 @@ function preProcessRefInstruction(nodesToCombine, instrText) {
     elements: nodesToCombine
   }];
 }
-function preProcessNoterefInstruction(nodesToCombine, instrText) {
+function preProcessNoterefInstruction(nodesToCombine, instrText, options = {}) {
   return [{
     name: "sd:crossReference",
     type: "element",
@@ -82651,7 +82804,7 @@ function preProcessNoterefInstruction(nodesToCombine, instrText) {
     elements: nodesToCombine
   }];
 }
-function preProcessStylerefInstruction(nodesToCombine, instrText) {
+function preProcessStylerefInstruction(nodesToCombine, instrText, options = {}) {
   return [{
     name: "sd:crossReference",
     type: "element",
@@ -82662,7 +82815,8 @@ function preProcessStylerefInstruction(nodesToCombine, instrText) {
     elements: nodesToCombine
   }];
 }
-function preProcessSeqInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
+function preProcessSeqInstruction(nodesToCombine, instrText, options = {}) {
+  const instructionTokens = options.instructionTokens ?? null;
   return [{
     name: "sd:sequenceField",
     type: "element",
@@ -82673,7 +82827,8 @@ function preProcessSeqInstruction(nodesToCombine, instrText, _docx, instructionT
     elements: nodesToCombine
   }];
 }
-function preProcessCitationInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
+function preProcessCitationInstruction(nodesToCombine, instrText, options = {}) {
+  const instructionTokens = options.instructionTokens ?? null;
   return [{
     name: "sd:citation",
     type: "element",
@@ -82684,10 +82839,11 @@ function preProcessCitationInstruction(nodesToCombine, instrText, _docx, instruc
     elements: nodesToCombine
   }];
 }
-function preProcessBibliographyInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
-  return buildBlockFieldNode("sd:bibliography", nodesToCombine, instrText, instructionTokens);
+function preProcessBibliographyInstruction(nodesToCombine, instrText, options = {}, legacyInstructionTokens = null) {
+  return buildBlockFieldNode("sd:bibliography", nodesToCombine, instrText, options?.instructionTokens ?? legacyInstructionTokens);
 }
-function preProcessTaInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
+function preProcessTaInstruction(nodesToCombine, instrText, options = {}) {
+  const instructionTokens = options.instructionTokens ?? null;
   return [{
     name: "sd:authorityEntry",
     type: "element",
@@ -82698,11 +82854,11 @@ function preProcessTaInstruction(nodesToCombine, instrText, _docx, instructionTo
     elements: nodesToCombine
   }];
 }
-function preProcessToaInstruction(nodesToCombine, instrText, _docx, instructionTokens = null) {
-  return buildBlockFieldNode("sd:tableOfAuthorities", nodesToCombine, instrText, instructionTokens);
+function preProcessToaInstruction(nodesToCombine, instrText, options = {}, legacyInstructionTokens = null) {
+  return buildBlockFieldNode("sd:tableOfAuthorities", nodesToCombine, instrText, options?.instructionTokens ?? legacyInstructionTokens);
 }
-function preProcessDocumentStatInstruction(nodesToCombine, instrText, _docxOrFieldRunRPr = null, instructionTokensOrFieldRunRPr = null, fieldRunRPr = null) {
-  const effectiveFieldRunRPr = fieldRunRPr ?? (instructionTokensOrFieldRunRPr?.name === "w:rPr" ? instructionTokensOrFieldRunRPr : null) ?? (_docxOrFieldRunRPr?.name === "w:rPr" ? _docxOrFieldRunRPr : null);
+function preProcessDocumentStatInstruction(nodesToCombine, instrText, options = {}) {
+  const fieldRunRPr = options.fieldRunRPr ?? null;
   const statFieldNode = {
     name: "sd:documentStatField",
     type: "element",
@@ -82719,10 +82875,13 @@ function preProcessDocumentStatInstruction(nodesToCombine, instrText, _docxOrFie
       foundContentRPr = true;
     }
   });
-  if (!foundContentRPr && effectiveFieldRunRPr && effectiveFieldRunRPr.name === "w:rPr")
-    statFieldNode.elements = [effectiveFieldRunRPr, ...nodesToCombine];
+  if (!foundContentRPr && fieldRunRPr && fieldRunRPr.name === "w:rPr")
+    statFieldNode.elements = [fieldRunRPr, ...nodesToCombine];
   return [statFieldNode];
 }
+function extractFieldKeyword(instruction) {
+  return String(instruction ?? "").trim().split(/\s+/)[0].toUpperCase();
+}
 function scanFieldSequence(nodes, beginIndex) {
   let instrText = "";
   let separateIndex = -1;
@@ -82754,7 +82913,7 @@ function scanFieldSequence(nodes, beginIndex) {
   if (endIndex === -1)
     return null;
   return {
-    fieldType: instrText.trim().split(" ")[0],
+    fieldType: extractFieldKeyword(instrText),
     instrText: instrText.trim(),
     contentNodes,
     fieldRunRPr,
@@ -98239,7 +98398,16 @@ function parseSeqInstruction(instruction) {
 function extractResolvedText(content$2) {
   if (!Array.isArray(content$2))
     return "";
-  return content$2.filter((n) => n.type === "text").map((n) => n.text || "").join("");
+  let text$2 = "";
+  for (const node3 of content$2) {
+    if (!node3)
+      continue;
+    if (node3.type === "text")
+      text$2 += node3.text || "";
+    if (Array.isArray(node3.content))
+      text$2 += extractResolvedText(node3.content);
+  }
+  return text$2;
 }
 function deriveRightAlignPageNumbers(content$2) {
   for (const para of content$2) {
@@ -98250,6 +98418,33 @@ function deriveRightAlignPageNumbers(content$2) {
   }
   return true;
 }
+function pageNumberFormatToInstructionSwitch(pageNumberFormat) {
+  for (const [switchName, format] of Object.entries(PAGE_VALUE_FORMAT_SWITCHES))
+    if (format === pageNumberFormat)
+      return switchName;
+}
+function getPageNumberFieldAttrs$1(node3) {
+  const attrs = {};
+  if (node3.attributes?.instruction)
+    attrs.instruction = node3.attributes.instruction;
+  if (node3.attributes?.pageNumberFormat)
+    attrs.pageNumberFormat = node3.attributes.pageNumberFormat;
+  if (node3.attributes?.pageNumberZeroPadding != null)
+    attrs.pageNumberZeroPadding = Number(node3.attributes.pageNumberZeroPadding);
+  return attrs;
+}
+function getPageInstructionText(attrs = {}) {
+  if (typeof attrs.instruction === "string" && attrs.instruction.trim())
+    return attrs.instruction.trim();
+  if (typeof attrs.pageNumberFormat === "string") {
+    const instructionSwitch = pageNumberFormatToInstructionSwitch(attrs.pageNumberFormat);
+    if (instructionSwitch)
+      return `PAGE \\* ${instructionSwitch}${typeof attrs.pageNumberZeroPadding === "number" && attrs.pageNumberZeroPadding > 0 ? ` \\# ${"0".repeat(attrs.pageNumberZeroPadding)}` : ""}`;
+  }
+  if (typeof attrs.pageNumberZeroPadding === "number" && attrs.pageNumberZeroPadding > 0)
+    return `PAGE \\# ${"0".repeat(attrs.pageNumberZeroPadding)}`;
+  return "PAGE";
+}
 function buildComplexFieldRuns({ instruction, cachedText, outputMarks, dirty }) {
   const beginAttrs = { "w:fldCharType": "begin" };
   if (dirty)
@@ -98315,10 +98510,24 @@ function buildComplexFieldRuns({ instruction, cachedText, outputMarks, dirty })
     }
   ];
 }
+function getPageNumberFieldAttrs(node3) {
+  const attrs = {};
+  if (node3.attributes?.instruction)
+    attrs.instruction = node3.attributes.instruction;
+  if (node3.attributes?.pageNumberFormat)
+    attrs.pageNumberFormat = node3.attributes.pageNumberFormat;
+  if (node3.attributes?.pageNumberZeroPadding != null)
+    attrs.pageNumberZeroPadding = Number(node3.attributes.pageNumberZeroPadding);
+  return attrs;
+}
 function resolveCachedPageCount(params3, node3) {
   const cacheMap = params3.statFieldCacheMap;
-  if (cacheMap?.has?.("NUMPAGES"))
+  if (cacheMap?.has?.("NUMPAGES")) {
+    const pageCount = Number(cacheMap.get("NUMPAGES"));
+    if (node3.attrs?.pageNumberFormat || node3.attrs?.pageNumberZeroPadding)
+      return formatPageNumberFieldValue(pageCount, node3.attrs);
     return String(cacheMap.get("NUMPAGES"));
+  }
   if (node3.attrs?.resolvedText)
     return String(node3.attrs.resolvedText);
   if (node3.attrs?.importedCachedText)
@@ -102320,6 +102529,18 @@ function computeWordParagraphLayout(input) {
   };
   return layout;
 }
+function getPageNumberFieldFormat(attrs) {
+  if (!attrs)
+    return;
+  const format = typeof attrs.pageNumberFormat === "string" ? attrs.pageNumberFormat : undefined;
+  const zeroPadding = typeof attrs.pageNumberZeroPadding === "number" && Number.isFinite(attrs.pageNumberZeroPadding) ? attrs.pageNumberZeroPadding : undefined;
+  if (!format && !zeroPadding)
+    return;
+  return {
+    ...format ? { format } : {},
+    ...zeroPadding ? { zeroPadding } : {}
+  };
+}
 function textNodeToRun({ node: node3, positions, storyKey, defaultFont, defaultSize, inheritedMarks = [], sdtMetadata, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, enableComments, runProperties, inlineRunProperties, converterContext }) {
   let run$1 = {
     text: node3.text || "",
@@ -103545,6 +103766,9 @@ function tokenNodeToRun({ node: node3, positions, storyKey, defaultFont, default
     fontFamily: defaultFont,
     fontSize: defaultSize
   };
+  const pageNumberFieldFormat = getPageNumberFieldFormat(node3.attrs);
+  if (pageNumberFieldFormat)
+    run$1.pageNumberFieldFormat = pageNumberFieldFormat;
   const pos = positions.get(node3);
   if (pos) {
     run$1.pmStart = pos.start;
@@ -107647,31 +107871,29 @@ function createHeaderFooterPart(editor, input) {
     throw new Error(`[createHeaderFooterPart] Failed to create ${newPartPath}: mutation rolled back (possible afterCommit degradation).`);
   return finalResult;
 }
-function resolveEffectiveRef(editor, sections, startSectionIndex, kind, variant) {
-  for (let i$1 = startSectionIndex - 1;i$1 >= 0; i$1--) {
-    const section = sections.find((s) => s.range.sectionIndex === i$1);
-    if (!section)
-      continue;
-    const sectPr = readTargetSectPr(editor, section);
-    if (!sectPr)
-      continue;
-    const refs = readSectPrHeaderFooterRefs(sectPr, kind);
-    if (!refs)
-      continue;
-    if (refs[variant])
-      return {
-        refId: refs[variant],
-        resolvedFromSection: section.address,
-        resolvedVariant: variant
-      };
-    if (variant !== "default" && refs.default)
-      return {
-        refId: refs.default,
-        resolvedFromSection: section.address,
-        resolvedVariant: "default"
-      };
-  }
-  return null;
+function resolveEffectiveRef(sections, startSectionIndex, kind, variant) {
+  const refsFor = (section, refKind) => refKind === "header" ? section.range.headerRefs ?? section.domain.headerRefs : section.range.footerRefs ?? section.domain.footerRefs;
+  const resolved = resolveEffectiveHeaderFooterRef({
+    sections: sections.map((section) => ({
+      sectionIndex: section.range.sectionIndex,
+      titlePg: section.range.titlePg,
+      headerRefs: refsFor(section, "header"),
+      footerRefs: refsFor(section, "footer")
+    })),
+    sectionIndex: startSectionIndex - 1,
+    kind,
+    variant
+  });
+  if (!resolved)
+    return null;
+  const resolvedSection = sections.find((section) => section.range.sectionIndex === resolved.matchedSectionIndex);
+  if (!resolvedSection)
+    return null;
+  return {
+    refId: resolved.refId,
+    resolvedFromSection: resolvedSection.address,
+    resolvedVariant: resolved.matchedVariant
+  };
 }
 function getConverter$5(editor) {
   return editor.converter;
@@ -107748,7 +107970,7 @@ function setLinkedToPreviousMutation(sectPr, projection, sections, kind, variant
         message: `${operationName} already has an explicit reference.`
       }
     };
-  const resolved = resolveEffectiveRef(editor, sections, projection.range.sectionIndex, kind, variant);
+  const resolved = resolveEffectiveRef(sections, projection.range.sectionIndex, kind, variant);
   if (dryRun) {
     setSectPrHeaderFooterRef(sectPr, kind, variant, "(dry-run)");
     return;
@@ -108264,7 +108486,7 @@ function ensureExplicitHeaderFooterSlot(editor, input) {
         created: false
       };
   }
-  const inheritedRef = resolveEffectiveRef(editor, sections, sections.indexOf(projection), kind, variant);
+  const inheritedRef = resolveEffectiveRef(sections, sections.indexOf(projection), kind, variant);
   const effectiveSourceRefId = sourceRefId ?? inheritedRef?.refId ?? undefined;
   let result = null;
   if (!compoundMutation({
@@ -108331,7 +108553,7 @@ function resolveHeaderFooterSlotRuntime(hostEditor, locator, options = {}) {
         storyKey,
         resolution
       });
-    effectiveRefId = resolveEffectiveRef(hostEditor, sections, projection.range.sectionIndex, headerFooterKind, variant)?.refId ?? null;
+    effectiveRefId = resolveEffectiveRef(sections, projection.range.sectionIndex, headerFooterKind, variant)?.refId ?? null;
   }
   const isInherited = explicitRefId === null;
   const onWrite = locator.onWrite ?? "materializeIfInherited";
@@ -118931,8 +119153,9 @@ var isRegExp = (value) => {
   domEnvironment$1 = env || null;
 }, MM_ANISOTROPIC = 8, EMF_SIGNATURE = 1179469088, EMF_PLUS_SIGNATURE = 726027589, EMR_COMMENT = 70, EMF_PLUS_OBJECT = 16392, EMF_PLUS_OBJECT_TYPE_IMAGE = 5, EMF_PLUS_IMAGE_TYPE_BITMAP = 1, EMF_PLUS_BITMAP_TYPE_PIXEL = 0, EMF_PLUS_BITMAP_TYPE_COMPRESSED = 1, EMF_PLUS_PIXEL_FORMAT_INDEXED_FLAG = 65536, EMF_PLUS_PIXEL_FORMAT_24BPP_RGB = 137224, EMF_PLUS_PIXEL_FORMAT_32BPP_RGB = 139273, EMF_PLUS_PIXEL_FORMAT_32BPP_ARGB = 2498570, EMF_PLUS_PIXEL_FORMAT_32BPP_PARGB = 925707, MAX_PIXEL_BITMAP_PIXELS = 1e8, base64ToArrayBuffer, require_common, require_trees, require_adler32, require_crc32, require_messages, require_deflate$1, require_strings, require_zstream, require_deflate, require_inffast, require_inftrees, require_inflate$1, require_constants2, require_gzheader, require_inflate, require_pako, import_UTIF, domEnvironment = null, MAX_PIXEL_COUNT = 1e8, setTiffDomEnvironment = (env) => {
   domEnvironment = env || null;
-}, getInstructionPreProcessor = (instruction) => {
-  switch (instruction.split(" ")[0]) {
+}, GENERAL_FORMATS, CASE_INSENSITIVE_GENERAL_FORMATS, getInstructionPreProcessor = (instruction) => {
+  const rawInstructionType = String(instruction ?? "").trim().split(/\s+/)[0];
+  switch (extractFieldKeyword(instruction)) {
     case "PAGE":
       return preProcessPageInstruction;
     case "NUMPAGES":
@@ -118959,6 +119182,8 @@ var isRegExp = (value) => {
     case "STYLEREF":
       return preProcessStylerefInstruction;
     case "SEQ":
+      if (rawInstructionType !== "SEQ")
+        return null;
       return preProcessSeqInstruction;
     case "CITATION":
       return preProcessCitationInstruction;
@@ -119032,10 +119257,9 @@ var isRegExp = (value) => {
     if (node3.name === "w:fldSimple") {
       const instr = node3.attributes?.["w:instr"];
       if (typeof instr === "string") {
-        const instructionType = instr.trim().split(" ")[0];
-        const instructionPreProcessor = getInstructionPreProcessor(instructionType);
+        const instructionPreProcessor = getInstructionPreProcessor(instr);
         if (instructionPreProcessor) {
-          const processed = instructionPreProcessor(node3.elements ?? [], instr, docx, null);
+          const processed = instructionPreProcessor(node3.elements ?? [], instr, { docx });
           if (collecting) {
             collectedNodesStack[collectedNodesStack.length - 1].push(...processed);
             rawCollectedNodesStack[rawCollectedNodesStack.length - 1].push(...processed);
@@ -119167,11 +119391,14 @@ var isRegExp = (value) => {
     unpairedEndPreserveRaw
   };
 }, _processCombinedNodesForFldChar = (nodesToCombine = [], instrText, docx, instructionTokens, fieldRunRPr) => {
-  const instructionType = instrText.trim().split(" ")[0];
-  const instructionPreProcessor = getInstructionPreProcessor(instructionType);
+  const instructionPreProcessor = getInstructionPreProcessor(instrText);
   if (instructionPreProcessor)
     return {
-      nodes: instructionPreProcessor(nodesToCombine, instrText, docx, instructionTokens, fieldRunRPr),
+      nodes: instructionPreProcessor(nodesToCombine, instrText, {
+        docx,
+        instructionTokens,
+        fieldRunRPr
+      }),
       handled: true
     };
   return {
@@ -119179,7 +119406,7 @@ var isRegExp = (value) => {
     handled: false
   };
 }, applyConstructiveFieldInterpretation = (rawNodes, instrText, docx) => {
-  if (instrText.split(" ")[0] !== "HYPERLINK")
+  if (extractFieldKeyword(instrText) !== "HYPERLINK")
     return;
   const linkAttributes = resolveHyperlinkAttributes(instrText, docx);
   if (!linkAttributes)
@@ -119334,8 +119561,7 @@ var isRegExp = (value) => {
     const fldType = node3.elements?.find((el) => el.name === "w:fldChar")?.attributes?.["w:fldCharType"];
     if (node3.name === "w:fldSimple") {
       const instrAttr = node3.attributes?.["w:instr"] || "";
-      const fieldType = instrAttr.trim().split(/\s+/)[0];
-      const fldSimplePreprocessor = getHeaderFooterFieldPreprocessor(fieldType);
+      const fldSimplePreprocessor = getHeaderFooterFieldPreprocessor(extractFieldKeyword(instrAttr));
       if (fldSimplePreprocessor) {
         const contentNodes = node3.elements || [];
         let fieldRunRPr = null;
@@ -119346,7 +119572,7 @@ var isRegExp = (value) => {
             break;
           }
         }
-        const processedField = fldSimplePreprocessor(contentNodes, instrAttr.trim(), fieldRunRPr);
+        const processedField = fldSimplePreprocessor(contentNodes, instrAttr.trim(), { fieldRunRPr });
         processedNodes.push(...processedField);
         i$1++;
         continue;
@@ -119368,7 +119594,7 @@ var isRegExp = (value) => {
       if (fieldInfo && complexFieldPreprocessor) {
         const preprocessor = complexFieldPreprocessor;
         const contentNodes = fieldInfo.contentNodes;
-        const processedField = preprocessor(contentNodes, fieldInfo.instrText, fieldInfo.fieldRunRPr);
+        const processedField = preprocessor(contentNodes, fieldInfo.instrText, { fieldRunRPr: fieldInfo.fieldRunRPr });
         processedNodes.push(...processedField);
         i$1 = fieldInfo.endIndex + 1;
         continue;
@@ -119384,7 +119610,7 @@ var isRegExp = (value) => {
       }
     }
     if (node3.name === "w:r" && node3.elements?.some((el) => el.name === "w:pgNum")) {
-      const processedField = preProcessPageInstruction([], "", node3.elements.find((el) => el.name === "w:rPr") || null);
+      const processedField = preProcessPageInstruction([], "", { fieldRunRPr: node3.elements.find((el) => el.name === "w:rPr") || null });
       processedNodes.push(...processedField);
       i$1++;
       continue;
@@ -125170,16 +125396,26 @@ var isRegExp = (value) => {
       }]
     }
   ];
-}, config$9, translator$26, XML_NODE_NAME$7 = "sd:autoPageNumber", SD_NODE_NAME$7 = "page-number", encode$11 = (params3) => {
+}, config$9, translator$26, PAGE_VALUE_FORMAT_SWITCHES, XML_NODE_NAME$7 = "sd:autoPageNumber", SD_NODE_NAME$7 = "page-number", encode$11 = (params3) => {
   const { nodes = [] } = params3 || {};
-  const rPr = nodes[0].elements?.find((el) => el.name === "w:rPr");
-  return {
+  const node3 = nodes[0];
+  const rPr = node3.elements?.find((el) => el.name === "w:rPr");
+  const processedNode = {
     type: "page-number",
-    attrs: { marksAsAttrs: parseMarks(rPr || { elements: [] }) }
+    attrs: {
+      marksAsAttrs: parseMarks(rPr || { elements: [] }),
+      ...getPageNumberFieldAttrs$1(node3)
+    }
   };
+  if (typeof node3.attributes?.instruction === "string")
+    processedNode.attrs.instruction = node3.attributes.instruction;
+  if (typeof node3.attributes?.pageNumberFormat === "string")
+    processedNode.attrs.pageNumberFormat = node3.attributes.pageNumberFormat;
+  return processedNode;
 }, decode$11 = (params3) => {
   const { node: node3 } = params3;
   const outputMarks = processOutputMarks(node3.attrs?.marksAsAttrs || []);
+  const instruction = getPageInstructionText(node3.attrs);
   return [
     {
       name: "w:r",
@@ -125201,7 +125437,7 @@ var isRegExp = (value) => {
         attributes: { "xml:space": "preserve" },
         elements: [{
           type: "text",
-          text: " PAGE"
+          text: ` ${instruction}`
         }]
       }]
     },
@@ -125234,17 +125470,20 @@ var isRegExp = (value) => {
     type: "total-page-number",
     attrs: {
       marksAsAttrs: parseMarks(rPr || { elements: [] }),
-      importedCachedText: node3.attributes?.importedCachedText || null
+      importedCachedText: node3.attributes?.importedCachedText || null,
+      ...getPageNumberFieldAttrs(node3)
     }
   };
 }, decode$10 = (params3) => {
   const { node: node3 } = params3;
   const outputMarks = processOutputMarks(node3.attrs?.marksAsAttrs || []);
+  const cachedText = resolveCachedPageCount(params3, node3);
+  const dirty = !params3.statFieldCacheMap?.has?.("NUMPAGES");
   return buildComplexFieldRuns({
-    instruction: "NUMPAGES",
-    cachedText: resolveCachedPageCount(params3, node3),
+    instruction: node3.attrs?.instruction || "NUMPAGES",
+    cachedText,
     outputMarks,
-    dirty: !params3.statFieldCacheMap?.has?.("NUMPAGES")
+    dirty
   });
 }, config$7, translator$28, XML_NODE_NAME$5 = "sd:documentStatField", SD_NODE_NAME$5 = "documentStatField", encode$9 = (params3) => {
   const { nodes = [] } = params3 || {};
@@ -130806,7 +131045,7 @@ var isRegExp = (value) => {
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_CcHCWpfX_es = __esm(() => {
+var init_SuperConverter_CvwFiCth_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -159390,6 +159629,16 @@ var init_SuperConverter_CcHCWpfX_es = __esm(() => {
       })(UTIF, pako$1);
     })();
   }))(), 1);
+  GENERAL_FORMATS = new Map([
+    ["Arabic", "decimal"],
+    ["roman", "lowerRoman"],
+    ["Roman", "upperRoman"],
+    ["ROMAN", "upperRoman"],
+    ["alphabetic", "lowerLetter"],
+    ["ALPHABETIC", "upperLetter"],
+    ["ArabicDash", "numberInDash"]
+  ]);
+  CASE_INSENSITIVE_GENERAL_FORMATS = new Map([["arabic", "decimal"], ["arabicdash", "numberInDash"]]);
   TRACK_CHANGE_ELEMENT_NAMES = new Set([
     "w:del",
     "w:ins",
@@ -167092,6 +167341,15 @@ var init_SuperConverter_CcHCWpfX_es = __esm(() => {
     decode: decode$12
   };
   translator$26 = NodeTranslator.from(config$9);
+  PAGE_VALUE_FORMAT_SWITCHES = {
+    Arabic: "decimal",
+    Roman: "upperRoman",
+    ROMAN: "upperRoman",
+    roman: "lowerRoman",
+    ALPHABETIC: "upperLetter",
+    alphabetic: "lowerLetter",
+    ArabicDash: "numberInDash"
+  };
   config$8 = {
     xmlName: XML_NODE_NAME$7,
     sdNodeOrKeyName: SD_NODE_NAME$7,
@@ -169580,7 +169838,7 @@ var init_SuperConverter_CcHCWpfX_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DKwoydAR.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-DdDLS67b.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -179911,8 +180169,8 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, normalizeActorId = (value) => {
     }
   };
 };
-var init_create_headless_toolbar_DKwoydAR_es = __esm(() => {
-  init_SuperConverter_CcHCWpfX_es();
+var init_create_headless_toolbar_DdDLS67b_es = __esm(() => {
+  init_SuperConverter_CvwFiCth_es();
   init_uuid_qzgm05fK_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
@@ -229075,7 +229333,7 @@ var init_remark_gfm_eZN6yzWQ_es = __esm(() => {
   init_remark_gfm_BhnWr3yf_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-C8mTdIvv.es.js
+// ../../packages/superdoc/dist/chunks/src-BbNQjpxw.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -260004,7 +260262,7 @@ function headerFootersResolveAdapter(editor, input2) {
         section: projection.address
       };
   }
-  const resolved = resolveEffectiveRef(editor, sections, projection.range.sectionIndex, headerFooterKind, variant);
+  const resolved = resolveEffectiveRef(sections, projection.range.sectionIndex, headerFooterKind, variant);
   if (resolved)
     return {
       status: "inherited",
@@ -268737,6 +268995,55 @@ function convertOmmlToMathml(ommlJson, doc$12) {
 function isMinimalWordLayout$1(value) {
   return isMinimalWordLayout(value);
 }
+function pageContextSignature(context) {
+  return [
+    context.pageNumber,
+    context.totalPages,
+    context.pageNumberText ?? "",
+    context.displayPageNumber ?? ""
+  ].join("|");
+}
+function hasPageContextTokenInShapeText(textContent$1) {
+  return Array.isArray(textContent$1?.parts) && textContent$1.parts.some((part) => part.fieldType === "PAGE" || part.fieldType === "NUMPAGES");
+}
+function hasPageContextTokenInShapeGroup(shapes) {
+  return Array.isArray(shapes) && shapes.some((shape) => {
+    if (shape.shapeType !== "vectorShape")
+      return false;
+    return hasPageContextTokenInShapeText(shape.attrs.textContent);
+  });
+}
+function hasPageContextTokenInBlock(block) {
+  if (!block)
+    return false;
+  if (block.kind === "paragraph") {
+    for (const run2 of block.runs)
+      if ("token" in run2 && (run2.token === "pageNumber" || run2.token === "totalPageCount"))
+        return true;
+  } else if (block.kind === "list") {
+    const list5 = block;
+    for (const item of list5.items ?? [])
+      if (hasPageContextTokenInBlock(item.paragraph))
+        return true;
+  } else if (block.kind === "table") {
+    const table2 = block;
+    for (const row2 of table2.rows ?? [])
+      for (const cell2 of row2.cells ?? [])
+        if ((cell2.blocks ? cell2.blocks : cell2.paragraph ? [cell2.paragraph] : []).some(hasPageContextTokenInBlock))
+          return true;
+  } else if (block.kind === "drawing") {
+    const drawing = block;
+    if (drawing.drawingKind === "vectorShape")
+      return hasPageContextTokenInShapeText(drawing.textContent);
+    if (drawing.drawingKind === "shapeGroup")
+      return hasPageContextTokenInShapeGroup(drawing.shapes);
+  }
+  return false;
+}
+function needsRebuildForPageContext(currentContext, nextContext, resolvedItem) {
+  const block = resolvedItem?.kind === "fragment" && "block" in resolvedItem ? resolvedItem.block : undefined;
+  return pageContextSignature(currentContext) !== pageContextSignature(nextContext) && hasPageContextTokenInBlock(block);
+}
 function roundSnapshotMetric(value) {
   if (!Number.isFinite(value))
     return null;
@@ -269533,6 +269840,7 @@ function resolveLayout(input2) {
     footnoteReserved: page.footnoteReserved,
     displayNumber: page.displayNumber,
     numberText: page.numberText,
+    effectivePageNumber: page.effectivePageNumber,
     vAlign: page.vAlign,
     baseMargins: page.baseMargins,
     sectionIndex: page.sectionIndex,
@@ -271952,85 +272260,6 @@ function createPaginator(opts) {
     pruneTrailingEmptyPages
   };
 }
-function toUpperRoman2(num) {
-  if (num < 1 || num > 3999)
-    return String(num);
-  const values = [
-    1000,
-    900,
-    500,
-    400,
-    100,
-    90,
-    50,
-    40,
-    10,
-    9,
-    5,
-    4,
-    1
-  ];
-  const numerals = [
-    "M",
-    "CM",
-    "D",
-    "CD",
-    "C",
-    "XC",
-    "L",
-    "XL",
-    "X",
-    "IX",
-    "V",
-    "IV",
-    "I"
-  ];
-  let result = "";
-  let remaining = num;
-  for (let i4 = 0;i4 < values.length; i4++)
-    while (remaining >= values[i4]) {
-      result += numerals[i4];
-      remaining -= values[i4];
-    }
-  return result;
-}
-function toLowerRoman(num) {
-  return toUpperRoman2(num).toLowerCase();
-}
-function toUpperLetter2(num) {
-  if (num < 1)
-    return "A";
-  let result = "";
-  let n = num;
-  while (n > 0) {
-    const remainder = (n - 1) % 26;
-    result = String.fromCharCode(65 + remainder) + result;
-    n = Math.floor((n - 1) / 26);
-  }
-  return result;
-}
-function toLowerLetter(num) {
-  return toUpperLetter2(num).toLowerCase();
-}
-function formatPageNumber(pageNumber, format) {
-  const num = Math.max(1, pageNumber);
-  switch (format) {
-    case "decimal":
-      return String(num);
-    case "upperRoman":
-      return toUpperRoman2(num);
-    case "lowerRoman":
-      return toLowerRoman(num);
-    case "upperLetter":
-      return toUpperLetter2(num);
-    case "lowerLetter":
-      return toLowerLetter(num);
-    case "numberInDash":
-      return `-${num}-`;
-    default:
-      return String(num);
-  }
-}
 function computeDisplayPageNumber(pages, sections) {
   const result = [];
   if (pages.length === 0)
@@ -272495,7 +272724,6 @@ function resolvePageNumberTokens(layout, blocks2, measures, numberingCtx) {
       console.warn(`[resolvePageTokens] No display page info for page ${page.number} - skipping`);
       continue;
     }
-    const displayPageText = displayPageInfo.displayText;
     for (const fragment2 of page.fragments)
       if (fragment2.kind === "para") {
         const blockId = fragment2.blockId;
@@ -272510,7 +272738,7 @@ function resolvePageNumberTokens(layout, blocks2, measures, numberingCtx) {
           processedBlocks.add(blockId);
           continue;
         }
-        const clonedBlock = cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr);
+        const clonedBlock = cloneBlockWithResolvedTokens(block, displayPageInfo, totalPagesStr, numberingCtx.totalPages);
         updatedBlocks.set(blockId, clonedBlock);
         affectedBlockIds.add(blockId);
         processedBlocks.add(blockId);
@@ -272528,20 +272756,20 @@ function hasPageTokens$1(block) {
       return true;
   return false;
 }
-function cloneBlockWithResolvedTokens(block, displayPageText, totalPagesStr) {
+function cloneBlockWithResolvedTokens(block, displayPageInfo, totalPagesStr, totalPages) {
   const clonedRuns = block.runs.map((run2) => {
     if ("token" in run2 && run2.token) {
       if (run2.token === "pageNumber") {
-        const { token: _token, ...runWithoutToken } = run2;
+        const { token: _token, pageNumberFieldFormat, ...runWithoutToken } = run2;
         return {
           ...runWithoutToken,
-          text: displayPageText
+          text: pageNumberFieldFormat ? formatPageNumberFieldValue$1(displayPageInfo.displayNumber, pageNumberFieldFormat) : displayPageInfo.displayText
         };
       } else if (run2.token === "totalPageCount") {
         const { token: _token, ...runWithoutToken } = run2;
         return {
           ...runWithoutToken,
-          text: totalPagesStr
+          text: run2.pageNumberFieldFormat ? formatPageNumberFieldValue$1(totalPages, run2.pageNumberFieldFormat) : totalPagesStr
         };
       }
     }
@@ -272731,13 +272959,6 @@ function layoutDocument(blocks2, measures, options = {}) {
   const headerContentHeightsBySectionRef = options.headerContentHeightsBySectionRef;
   const footerContentHeightsByRId = options.footerContentHeightsByRId;
   const footerContentHeightsBySectionRef = options.footerContentHeightsBySectionRef;
-  const getVariantTypeForPage = (args$1) => {
-    if (args$1.sectionPageNumber === 1 && args$1.titlePgEnabled)
-      return "first";
-    if (args$1.alternateHeaders)
-      return args$1.parityPageNumber % 2 === 0 ? "even" : "odd";
-    return "default";
-  };
   const getHeaderHeightForPage = (variantType, headerRef, sectionIndex) => {
     if (headerRef && sectionIndex != null) {
       const sectionKey = buildSectionAwareReferenceKey(headerRef, sectionIndex);
@@ -272804,9 +273025,7 @@ function layoutDocument(blocks2, measures, options = {}) {
   const maxFooterContentHeight = footerContentHeights ? Math.max(0, validateContentHeight(footerContentHeights.default), validateContentHeight(footerContentHeights.first), validateContentHeight(footerContentHeights.even), validateContentHeight(footerContentHeights.odd)) : 0;
   const headerDistance = margins.header ?? margins.top;
   const footerDistance = margins.footer ?? margins.bottom;
-  const defaultHeaderHeight = getHeaderHeightForPage("default", undefined, 0);
-  const defaultFooterHeight = getFooterHeightForPage("default", undefined, 0);
-  const effectiveMargins = clampHeaderFooterInflatedMargins(calculateEffectiveTopMargin(defaultHeaderHeight, headerDistance, margins.top), calculateEffectiveBottomMargin(defaultFooterHeight, footerDistance, margins.bottom), margins.top, margins.bottom, pageSize.h);
+  const effectiveMargins = clampHeaderFooterInflatedMargins(calculateEffectiveTopMargin(0, headerDistance, margins.top), calculateEffectiveBottomMargin(0, footerDistance, margins.bottom), margins.top, margins.bottom, pageSize.h);
   let activeTopMargin = effectiveMargins.top;
   let activeBottomMargin = effectiveMargins.bottom;
   let activeLeftMargin = margins.left;
@@ -272911,7 +273130,7 @@ function layoutDocument(blocks2, measures, options = {}) {
       const firstMetadataIndex = typeof firstSectionIndexRaw === "number" ? firstSectionIndexRaw : Number(firstSectionIndexRaw ?? NaN);
       if (Number.isFinite(firstMetadataIndex))
         activeSectionIndex = firstMetadataIndex;
-      const firstSectionMetadata = Number.isFinite(firstMetadataIndex) ? sectionMetadataList[firstMetadataIndex] : undefined;
+      const firstSectionMetadata = Number.isFinite(firstMetadataIndex) ? getSectionMetadata(firstMetadataIndex) : undefined;
       if (firstSectionMetadata?.numbering) {
         if (firstSectionMetadata.numbering.format)
           activeNumberFormat = firstSectionMetadata.numbering.format;
@@ -272969,7 +273188,7 @@ function layoutDocument(blocks2, measures, options = {}) {
     const metadataIndex = typeof sectionIndexRaw === "number" ? sectionIndexRaw : Number(sectionIndexRaw ?? NaN);
     if (Number.isFinite(metadataIndex))
       pendingSectionIndex = metadataIndex;
-    const sectionMetadata = Number.isFinite(metadataIndex) ? sectionMetadataList[metadataIndex] : undefined;
+    const sectionMetadata = Number.isFinite(metadataIndex) ? getSectionMetadata(metadataIndex) : undefined;
     if (sectionMetadata?.numbering)
       pendingNumbering = { ...sectionMetadata.numbering };
     else if (block.numbering)
@@ -273212,6 +273431,29 @@ function layoutDocument(blocks2, measures, options = {}) {
     };
   };
   const sectionMetadataList = options.sectionMetadata ?? [];
+  const getSectionMetadata = (sectionIndex) => sectionMetadataList.find((section, fallbackIndex) => (section.sectionIndex ?? fallbackIndex) === sectionIndex);
+  const runtimeSectionRefsByIndex = /* @__PURE__ */ new Map;
+  const buildHeaderFooterResolutionSections = () => {
+    const sectionIndexes = /* @__PURE__ */ new Set;
+    sectionMetadataList.forEach((section, fallbackIndex) => sectionIndexes.add(section.sectionIndex ?? fallbackIndex));
+    runtimeSectionRefsByIndex.forEach((_refs, sectionIndex) => sectionIndexes.add(sectionIndex));
+    if (sectionIndexes.size === 0)
+      sectionIndexes.add(0);
+    return Array.from(sectionIndexes).sort((a2, b$1) => a2 - b$1).map((sectionIndex) => {
+      const metadata = getSectionMetadata(sectionIndex);
+      const runtimeRefs = runtimeSectionRefsByIndex.get(sectionIndex);
+      return {
+        sectionIndex,
+        titlePg: metadata?.titlePg === true,
+        headerRefs: runtimeRefs?.headerRefs ?? metadata?.headerRefs,
+        footerRefs: runtimeRefs?.footerRefs ?? metadata?.footerRefs
+      };
+    });
+  };
+  const hasAnyHeaderFooterRefs = (sections, kind) => {
+    const refKey = kind === "header" ? "headerRefs" : "footerRefs";
+    return sections.some((section) => Object.values(section[refKey] ?? {}).some(Boolean));
+  };
   const initialSectionMetadata = sectionMetadataList[0];
   if (initialSectionMetadata?.numbering?.format)
     activeNumberFormat = initialSectionMetadata.numbering.format;
@@ -273221,11 +273463,13 @@ function layoutDocument(blocks2, measures, options = {}) {
   }
   let activeSectionRefs = null;
   let pendingSectionRefs = null;
-  if (initialSectionMetadata?.headerRefs || initialSectionMetadata?.footerRefs)
+  if (initialSectionMetadata?.headerRefs || initialSectionMetadata?.footerRefs) {
     activeSectionRefs = {
       ...initialSectionMetadata.headerRefs && { headerRefs: initialSectionMetadata.headerRefs },
       ...initialSectionMetadata.footerRefs && { footerRefs: initialSectionMetadata.footerRefs }
     };
+    runtimeSectionRefsByIndex.set(initialSectionMetadata.sectionIndex ?? 0, activeSectionRefs);
+  }
   if (initialSectionMetadata?.vAlign)
     activeVAlign = initialSectionMetadata.vAlign;
   let activeSectionIndex = initialSectionMetadata?.sectionIndex ?? 0;
@@ -273317,6 +273561,8 @@ function layoutDocument(blocks2, measures, options = {}) {
           activeSectionIndex = pendingSectionIndex;
           pendingSectionIndex = null;
         }
+        if (activeSectionRefs)
+          runtimeSectionRefsByIndex.set(activeSectionIndex, activeSectionRefs);
         if (pendingVAlign !== undefined) {
           activeVAlign = pendingVAlign;
           pendingVAlign = undefined;
@@ -273336,53 +273582,42 @@ function layoutDocument(blocks2, measures, options = {}) {
         if (isEnteringNewSection || !sectionFirstPageNumbers.has(activeSectionIndex))
           sectionFirstPageNumbers.set(activeSectionIndex, newPageNumber);
         const sectionPageNumber = newPageNumber - (sectionFirstPageNumbers.get(activeSectionIndex) ?? newPageNumber) + 1;
-        const titlePgEnabled = sectionMetadataList[activeSectionIndex]?.titlePg ?? false;
+        const titlePgEnabled = getSectionMetadata(activeSectionIndex)?.titlePg ?? false;
         const alternateHeaders = options.alternateHeaders ?? false;
-        const variantType = getVariantTypeForPage({
+        const variantType = selectHeaderFooterVariantForPage({
           sectionPageNumber,
-          parityPageNumber: activePageCounter,
-          titlePgEnabled,
+          documentPageNumber: activePageCounter,
+          titlePg: titlePgEnabled,
           alternateHeaders
         });
-        let headerRef = activeSectionRefs?.headerRefs?.[variantType];
-        let footerRef = activeSectionRefs?.footerRefs?.[variantType];
-        let effectiveVariantType = variantType;
-        if (!headerRef && variantType !== "default" && activeSectionIndex > 0) {
-          const prevSectionMetadata = sectionMetadataList[activeSectionIndex - 1];
-          if (prevSectionMetadata?.headerRefs?.[variantType]) {
-            headerRef = prevSectionMetadata.headerRefs[variantType];
-            layoutLog(`[Layout] Page ${newPageNumber}: Inheriting header '${variantType}' from section ${activeSectionIndex - 1}: ${headerRef}`);
-          }
-        }
-        if (!footerRef && variantType !== "default" && activeSectionIndex > 0) {
-          const prevSectionMetadata = sectionMetadataList[activeSectionIndex - 1];
-          if (prevSectionMetadata?.footerRefs?.[variantType]) {
-            footerRef = prevSectionMetadata.footerRefs[variantType];
-            layoutLog(`[Layout] Page ${newPageNumber}: Inheriting footer '${variantType}' from section ${activeSectionIndex - 1}: ${footerRef}`);
-          }
-        }
-        const defaultHeaderRef = activeSectionRefs?.headerRefs?.default;
-        const defaultFooterRef = activeSectionRefs?.footerRefs?.default;
-        const shouldUseDefaultHeaderRef = variantType !== "default" && defaultHeaderRef && (!alternateHeaders || variantType === "odd");
-        const shouldUseDefaultFooterRef = variantType !== "default" && defaultFooterRef && (!alternateHeaders || variantType === "odd");
-        if (!headerRef && shouldUseDefaultHeaderRef) {
-          headerRef = defaultHeaderRef;
-          effectiveVariantType = "default";
-        }
-        if (!footerRef && shouldUseDefaultFooterRef)
-          footerRef = defaultFooterRef;
-        const headerHeight = getHeaderHeightForPage(effectiveVariantType, headerRef, activeSectionIndex);
-        const footerHeight = getFooterHeightForPage(variantType !== "default" && !activeSectionRefs?.footerRefs?.[variantType] ? "default" : variantType, footerRef, activeSectionIndex);
+        const resolutionSections = buildHeaderFooterResolutionSections();
+        const headerResolved = variantType && resolveEffectiveHeaderFooterRef({
+          sections: resolutionSections,
+          sectionIndex: activeSectionIndex,
+          kind: "header",
+          variant: variantType
+        });
+        const footerResolved = variantType && resolveEffectiveHeaderFooterRef({
+          sections: resolutionSections,
+          sectionIndex: activeSectionIndex,
+          kind: "footer",
+          variant: variantType
+        });
+        const hasHeaderRefs = hasAnyHeaderFooterRefs(resolutionSections, "header");
+        const hasFooterRefs = hasAnyHeaderFooterRefs(resolutionSections, "footer");
+        const headerHeight = headerResolved ? getHeaderHeightForPage(headerResolved.matchedVariant, headerResolved.refId, activeSectionIndex) : variantType && !hasHeaderRefs ? getHeaderHeightForPage(variantType, undefined, activeSectionIndex) : 0;
+        const footerHeight = footerResolved ? getFooterHeightForPage(footerResolved.matchedVariant, footerResolved.refId, activeSectionIndex) : variantType && !hasFooterRefs ? getFooterHeightForPage(variantType, undefined, activeSectionIndex) : 0;
         const adjustedMargins = clampHeaderFooterInflatedMargins(calculateEffectiveTopMargin(headerHeight, activeHeaderDistance, activeSectionBaseTopMargin), calculateEffectiveBottomMargin(footerHeight, activeFooterDistance, activeSectionBaseBottomMargin), activeSectionBaseTopMargin, activeSectionBaseBottomMargin, activePageSize.h);
         activeTopMargin = adjustedMargins.top;
         activeBottomMargin = adjustedMargins.bottom;
-        layoutLog(`[Layout] Page ${newPageNumber}: Using variant '${variantType}' - headerHeight: ${headerHeight}, footerHeight: ${footerHeight}`);
+        layoutLog(`[Layout] Page ${newPageNumber}: Using variant '${variantType ?? "none"}' - headerHeight: ${headerHeight}, footerHeight: ${footerHeight}`);
         layoutLog(`[Layout] Page ${newPageNumber}: Adjusted margins - top: ${activeTopMargin}, bottom: ${activeBottomMargin} (base: ${activeSectionBaseTopMargin}, ${activeSectionBaseBottomMargin})`);
         return;
       }
       if (state?.page) {
         state.page.displayNumber = activePageCounter;
         state.page.numberText = formatPageNumber(activePageCounter, activeNumberFormat);
+        state.page.effectivePageNumber = activePageCounter;
         state.page.sectionIndex = activeSectionIndex;
         layoutLog(`[Layout] Page ${state.page.number}: Stamped sectionIndex:`, activeSectionIndex);
         if (activeSectionRefs) {
@@ -273691,7 +273926,7 @@ function layoutDocument(blocks2, measures, options = {}) {
           activeSectionIndex = metadataIndex;
         else
           pendingSectionIndex = metadataIndex;
-      const sectionMetadata = Number.isFinite(metadataIndex) ? sectionMetadataList[metadataIndex] : undefined;
+      const sectionMetadata = Number.isFinite(metadataIndex) ? getSectionMetadata(metadataIndex) : undefined;
       if (sectionMetadata?.numbering)
         if (isFirstSection) {
           if (sectionMetadata.numbering.format)
@@ -274672,6 +274907,25 @@ function extractParagraphIndent(indent2) {
     hanging: typeof indent2?.hanging === "number" && Number.isFinite(indent2.hanging) ? indent2.hanging : 0
   };
 }
+function refreshResolutionSections(identifier) {
+  if (identifier.sectionCount === 0 && identifier.sectionHeaderIds.size === 0 && identifier.sectionFooterIds.size === 0 && identifier.sectionTitlePg.size === 0) {
+    identifier.sections = [];
+    return;
+  }
+  const maxIndex = Math.max(identifier.sectionCount - 1, ...Array.from(identifier.sectionHeaderIds.keys()), ...Array.from(identifier.sectionFooterIds.keys()), ...Array.from(identifier.sectionTitlePg.keys()));
+  const sections = [];
+  for (let sectionIndex = 0;sectionIndex <= maxIndex; sectionIndex += 1)
+    sections.push({
+      sectionIndex,
+      titlePg: identifier.sectionTitlePg.get(sectionIndex) ?? false,
+      headerRefs: identifier.sectionHeaderIds.get(sectionIndex),
+      footerRefs: identifier.sectionFooterIds.get(sectionIndex)
+    });
+  identifier.sections = sections;
+}
+function getSectionTitlePg(identifier, sectionIndex) {
+  return identifier.sectionTitlePg.get(sectionIndex) ?? false;
+}
 function buildMultiSectionIdentifier(sectionMetadata, pageStyles$1, converterIds) {
   const identifier = defaultMultiSectionIdentifier();
   identifier.alternateHeaders = Boolean(pageStyles$1?.alternateHeaders ?? false);
@@ -274692,7 +274946,8 @@ function buildMultiSectionIdentifier(sectionMetadata, pageStyles$1, converterIds
         even: section.footerRefs.even ?? null,
         odd: section.footerRefs.odd ?? null
       });
-    identifier.sectionTitlePg.set(idx, section.titlePg === true);
+    if (Object.prototype.hasOwnProperty.call(section, "titlePg"))
+      identifier.sectionTitlePg.set(idx, section.titlePg === true);
   }
   const section0Headers = identifier.sectionHeaderIds.get(0);
   const section0Footers = identifier.sectionFooterIds.get(0);
@@ -274717,45 +274972,28 @@ function buildMultiSectionIdentifier(sectionMetadata, pageStyles$1, converterIds
     identifier.footerIds.even = identifier.footerIds.even ?? converterIds.footerIds.even ?? null;
     identifier.footerIds.odd = identifier.footerIds.odd ?? converterIds.footerIds.odd ?? null;
   }
+  refreshResolutionSections(identifier);
   return identifier;
 }
 function getHeaderFooterTypeForSection(pageNumber, sectionIndex, identifier, options) {
-  if (pageNumber <= 0)
+  if (!Number.isFinite(pageNumber))
     return null;
   const kind = options?.kind ?? "header";
   const sectionPageNumber = options?.sectionPageNumber ?? pageNumber;
-  const parityPageNumber = options?.parityPageNumber ?? pageNumber;
-  const ids = (kind === "header" ? identifier.sectionHeaderIds.get(sectionIndex) : identifier.sectionFooterIds.get(sectionIndex)) ?? (kind === "header" ? identifier.headerIds : identifier.footerIds);
-  const hasFirst = Boolean(ids.first);
-  const hasEven = Boolean(ids.even);
-  const hasOdd = Boolean(ids.odd);
-  const hasDefault = Boolean(ids.default);
-  const legacyIds = kind === "header" ? identifier.headerIds : identifier.footerIds;
-  let hasAny = hasFirst || hasEven || hasOdd || hasDefault;
-  if (!hasAny)
-    for (let index2 = sectionIndex - 1;index2 >= 0; index2 -= 1) {
-      const inheritedIds = kind === "header" ? identifier.sectionHeaderIds.get(index2) : identifier.sectionFooterIds.get(index2);
-      if (inheritedIds?.first || inheritedIds?.even || inheritedIds?.odd || inheritedIds?.default) {
-        hasAny = true;
-        break;
-      }
-    }
-  if (!hasAny)
-    hasAny = Boolean(legacyIds.first || legacyIds.even || legacyIds.odd || legacyIds.default);
-  const titlePgEnabled = (identifier.sectionTitlePg.has(sectionIndex) ? identifier.sectionTitlePg.get(sectionIndex) : identifier.titlePg) === true;
-  if (sectionPageNumber === 1 && titlePgEnabled) {
-    if (hasAny)
-      return "first";
+  const variant = selectHeaderFooterVariantForPage({
+    documentPageNumber: options?.parityPageNumber ?? pageNumber,
+    sectionPageNumber,
+    titlePg: getSectionTitlePg(identifier, sectionIndex),
+    alternateHeaders: identifier.alternateHeaders
+  });
+  if (!variant)
     return null;
-  }
-  if (identifier.alternateHeaders) {
-    if (!hasAny)
-      return null;
-    return parityPageNumber % 2 === 0 ? "even" : "odd";
-  }
-  if (hasDefault)
-    return "default";
-  return null;
+  return resolveEffectiveHeaderFooterRef({
+    sections: identifier.sections,
+    sectionIndex,
+    kind,
+    variant
+  }) ? variant : null;
 }
 function isNoneBorder(value) {
   return typeof value === "object" && value !== null && "none" in value && value.none === true;
@@ -274780,7 +275018,7 @@ function forEachParagraphBlock(blocks2, visit2) {
             forEachParagraphBlock([cell2.paragraph], visit2);
     }
 }
-function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberText) {
+function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberText, displayPageNumber) {
   if (!blocks2 || blocks2.length === 0)
     return;
   if (!Number.isFinite(pageNumber) || pageNumber < 1) {
@@ -274793,13 +275031,14 @@ function resolveHeaderFooterTokens(blocks2, pageNumber, totalPages, pageNumberTe
   }
   const pageNumberStr = pageNumberText ?? String(pageNumber);
   const totalPagesStr = String(totalPages);
+  const displayNumber = displayPageNumber ?? pageNumber;
   forEachParagraphBlock(blocks2, (paraBlock) => {
     for (const run2 of paraBlock.runs)
       if ("token" in run2 && run2.token) {
         if (run2.token === "pageNumber")
-          run2.text = pageNumberStr;
+          run2.text = run2.pageNumberFieldFormat ? formatPageNumberFieldValue$1(displayNumber, run2.pageNumberFieldFormat) : pageNumberStr;
         else if (run2.token === "totalPageCount")
-          run2.text = totalPagesStr;
+          run2.text = run2.pageNumberFieldFormat ? formatPageNumberFieldValue$1(totalPages, run2.pageNumberFieldFormat) : totalPagesStr;
       }
   });
 }
@@ -274864,17 +275103,122 @@ function getBucketRepresentative(bucket) {
       return 5000;
   }
 }
+function getBucketForDigitCount(digitCount) {
+  if (digitCount <= 1)
+    return "d1";
+  if (digitCount === 2)
+    return "d2";
+  if (digitCount === 3)
+    return "d3";
+  return "d4";
+}
+function getBucketForRenderedPageNumberText(text5) {
+  const digitCount = (text5.match(/\d/g) ?? []).length;
+  if (digitCount <= 0)
+    return null;
+  return getBucketForDigitCount(digitCount);
+}
+function forEachPageNumberRun(blocks2, visit2) {
+  for (const block of blocks2)
+    if (block.kind === "paragraph") {
+      const paraBlock = block;
+      for (const run2 of paraBlock.runs)
+        if ("token" in run2 && run2.token === "pageNumber")
+          visit2(run2);
+    } else if (block.kind === "list") {
+      const list5 = block;
+      for (const item of list5.items ?? [])
+        for (const run2 of item.paragraph.runs)
+          if ("token" in run2 && run2.token === "pageNumber")
+            visit2(run2);
+    } else if (block.kind === "table") {
+      const table2 = block;
+      for (const row2 of table2.rows ?? [])
+        for (const cell2 of row2.cells ?? [])
+          forEachPageNumberRun(cell2.blocks ? cell2.blocks : cell2.paragraph ? [cell2.paragraph] : [], visit2);
+    }
+}
+function buildCompatibleFieldFormatKey(fieldFormat) {
+  return `${fieldFormat.format ?? "decimal"}:${fieldFormat.zeroPadding ?? ""}`;
+}
+function getPageNumberBucketingStrategy(blocks2) {
+  let sawImplicitPageNumber = false;
+  const explicitFieldFormats = /* @__PURE__ */ new Map;
+  forEachPageNumberRun(blocks2, (run2) => {
+    const fieldFormat = run2.pageNumberFieldFormat;
+    if (!fieldFormat) {
+      sawImplicitPageNumber = true;
+      return;
+    }
+    if (!isDigitBucketCompatiblePageNumberFormat(fieldFormat.format)) {
+      explicitFieldFormats.clear();
+      sawImplicitPageNumber = true;
+      return;
+    }
+    explicitFieldFormats.set(buildCompatibleFieldFormatKey(fieldFormat), fieldFormat);
+  });
+  if (explicitFieldFormats.size === 0)
+    return sawImplicitPageNumber ? { kind: "displayText" } : null;
+  if (sawImplicitPageNumber || explicitFieldFormats.size > 1)
+    return null;
+  return {
+    kind: "fieldFormat",
+    fieldFormat: explicitFieldFormats.values().next().value
+  };
+}
+function canUseDigitBucketingForVariant(blocks2, docTotalPages, pageResolver) {
+  const strategy = getPageNumberBucketingStrategy(blocks2);
+  if (!strategy)
+    return false;
+  const renderedBucketForPage = (pageNumber) => {
+    const pageInfo = pageResolver(pageNumber);
+    const renderedText = strategy.kind === "fieldFormat" ? Number.isFinite(pageInfo.displayNumber) ? formatPageNumberFieldValue$1(pageInfo.displayNumber ?? pageNumber, strategy.fieldFormat) : null : pageInfo.displayText;
+    return renderedText ? getBucketForRenderedPageNumberText(renderedText) : null;
+  };
+  const expectedRenderedBuckets = /* @__PURE__ */ new Map;
+  for (let pageNumber = 1;pageNumber <= docTotalPages; pageNumber += 1) {
+    const physicalBucket = getBucketForPageNumber(pageNumber);
+    const renderedBucket = renderedBucketForPage(pageNumber);
+    if (!renderedBucket)
+      return false;
+    const expectedBucket = expectedRenderedBuckets.get(physicalBucket);
+    if (!expectedBucket) {
+      expectedRenderedBuckets.set(physicalBucket, renderedBucket);
+      continue;
+    }
+    if (expectedBucket !== renderedBucket)
+      return false;
+  }
+  for (const [physicalBucket, expectedRenderedBucket] of expectedRenderedBuckets)
+    if (renderedBucketForPage(getBucketRepresentative(physicalBucket)) !== expectedRenderedBucket)
+      return false;
+  return true;
+}
 function paragraphHasPageToken(para) {
   for (const run2 of para.runs)
     if ("token" in run2 && (run2.token === "pageNumber" || run2.token === "totalPageCount"))
       return true;
   return false;
 }
+function isDigitBucketCompatiblePageNumberFormat(format) {
+  return !format || format === "decimal" || format === "numberInDash";
+}
+function paragraphRequiresPerPageLayout(para) {
+  for (const run2 of para.runs)
+    if ("token" in run2 && run2.token === "pageNumber" && run2.pageNumberFieldFormat && !isDigitBucketCompatiblePageNumberFormat(run2.pageNumberFieldFormat.format))
+      return true;
+  return false;
+}
 function hasPageTokens(blocks2) {
   for (const block of blocks2)
     if (block.kind === "paragraph") {
       if (paragraphHasPageToken(block))
         return true;
+    } else if (block.kind === "list") {
+      const list5 = block;
+      for (const item of list5.items ?? [])
+        if (paragraphHasPageToken(item.paragraph))
+          return true;
     } else if (block.kind === "table") {
       const table2 = block;
       for (const row2 of table2.rows ?? [])
@@ -274884,6 +275228,25 @@ function hasPageTokens(blocks2) {
     }
   return false;
 }
+function hasPageNumberTokensRequiringPerPageLayout(blocks2) {
+  for (const block of blocks2)
+    if (block.kind === "paragraph") {
+      if (paragraphRequiresPerPageLayout(block))
+        return true;
+    } else if (block.kind === "list") {
+      const list5 = block;
+      for (const item of list5.items ?? [])
+        if (paragraphRequiresPerPageLayout(item.paragraph))
+          return true;
+    } else if (block.kind === "table") {
+      const table2 = block;
+      for (const row2 of table2.rows ?? [])
+        for (const cell2 of row2.cells ?? [])
+          if (hasPageNumberTokensRequiringPerPageLayout(cell2.blocks ? cell2.blocks : cell2.paragraph ? [cell2.paragraph] : []))
+            return true;
+    }
+  return false;
+}
 async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1, cache$2 = sharedHeaderFooterCache, totalPages, pageResolver, kind) {
   const result = {};
   if (!pageResolver) {
@@ -274919,7 +275282,7 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
       continue;
     }
     let pagesToLayout;
-    if (!useBucketing) {
+    if (!(useBucketing && !hasPageNumberTokensRequiringPerPageLayout(blocks2) && canUseDigitBucketingForVariant(blocks2, docTotalPages, pageResolver))) {
       pagesToLayout = Array.from({ length: docTotalPages }, (_$1, i4) => i4 + 1);
       HeaderFooterCacheLogger.logBucketingDecision(docTotalPages, false);
     } else {
@@ -274932,8 +275295,8 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
     const pages = [];
     for (const pageNum of pagesToLayout) {
       const clonedBlocks = cloneHeaderFooterBlocks(blocks2);
-      const { displayText, totalPages: totalPagesForPage } = pageResolver(pageNum);
-      resolveHeaderFooterTokens(clonedBlocks, pageNum, totalPagesForPage, displayText);
+      const { displayText, displayNumber, totalPages: totalPagesForPage } = pageResolver(pageNum);
+      resolveHeaderFooterTokens(clonedBlocks, pageNum, totalPagesForPage, displayText, displayNumber);
       const measures = await cache$2.measureBlocks(clonedBlocks, constraints, measureBlock$1);
       const pageLayout = layoutHeaderFooter(clonedBlocks, measures, constraints, kind);
       const measuresById = /* @__PURE__ */ new Map;
@@ -274952,9 +275315,11 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
       }) ?? [];
       pages.push({
         number: pageNum,
+        displayNumber,
         blocks: clonedBlocks,
         measures,
-        fragments: fragmentsWithLines
+        fragments: fragmentsWithLines,
+        numberText: displayText
       });
     }
     const firstPageLayout = pages[0] ? layoutHeaderFooter(pages[0].blocks, pages[0].measures, constraints, kind) : {
@@ -274968,7 +275333,9 @@ async function layoutHeaderFooterWithCache(sections, constraints, measureBlock$1
       renderHeight: firstPageLayout.renderHeight,
       pages: pages.map((p$12) => ({
         number: p$12.number,
+        displayNumber: p$12.displayNumber,
         fragments: p$12.fragments,
+        numberText: p$12.numberText,
         blocks: p$12.blocks,
         measures: p$12.measures
       }))
@@ -275588,6 +275955,8 @@ function computeHeaderFooterContentHash(blocks2) {
           parts.push("i");
         if ("token" in run2 && run2.token)
           parts.push(`token:${run2.token}`);
+        if ("pageNumberFormat" in run2 && run2.pageNumberFormat)
+          parts.push(`pnf:${run2.pageNumberFormat}`);
       }
   }
   return parts.join("|");
@@ -276960,8 +277329,10 @@ async function incrementalLayout(previousBlocks, _previousLayout, nextBlocks, op
     const numberingCtx = buildNumberingContext(layout, sections);
     const pageResolver = FeatureFlags.HEADER_FOOTER_PAGE_TOKENS ? (pageNumber) => {
       const pageIndex = pageNumber - 1;
+      const displayInfo = numberingCtx.displayPages[pageIndex];
       return {
-        displayText: numberingCtx.displayPages[pageIndex]?.displayText ?? String(pageNumber),
+        displayText: displayInfo?.displayText ?? String(pageNumber),
+        displayNumber: displayInfo?.displayNumber ?? pageNumber,
         totalPages: numberingCtx.totalPages
       };
     } : undefined;
@@ -283976,7 +284347,7 @@ async function measureParagraphBlock(block, maxWidth) {
           toChar: 1,
           width: 0,
           maxFontSize: lastFontSize,
-          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo,
+          maxFontInfo: hasSeenTextRun ? undefined : fallbackFontInfo ?? getFontInfoFromRun(run2),
           maxWidth: getEffectiveWidth(lines.length === 0 ? initialAvailableWidth : bodyContentWidth),
           segments: [],
           spaceCount: 0
@@ -285267,8 +285638,10 @@ async function layoutPerRIdHeaderFooters(headerFooterInput, layout, sectionMetad
   const displayPages = computeDisplayPageNumber(layout.pages, sectionMetadata);
   const totalPages = layout.pages.length;
   const pageResolver = (pageNumber) => {
+    const displayInfo = displayPages[pageNumber - 1];
     return {
-      displayText: displayPages[pageNumber - 1]?.displayText ?? String(pageNumber),
+      displayText: displayInfo?.displayText ?? String(pageNumber),
+      displayNumber: displayInfo?.displayNumber ?? pageNumber,
       totalPages
     };
   };
@@ -285371,6 +285744,10 @@ async function layoutWithPerSectionConstraints(kind, blocksByRId, sectionMetadat
     }
   }
 }
+function hasSectionRefsForKind(identifier, kind) {
+  const refKey = kind === "header" ? "headerRefs" : "footerRefs";
+  return Boolean(identifier?.sections?.some((section) => section[refKey] !== undefined));
+}
 function buildSurfacePmEntries(surface) {
   const nodes = Array.from(surface.querySelectorAll("[data-pm-start][data-pm-end]"));
   const nonLeaf = /* @__PURE__ */ new WeakSet;
@@ -285475,6 +285852,18 @@ function buildHeaderFooterStory(kind, id2) {
 function storyIdFromHeaderFooterLayoutKey(key2) {
   return key2.replace(/::s\d+$/, "");
 }
+function refForVariant(refs, variant) {
+  const ref$1 = refs?.[variant];
+  if (ref$1)
+    return {
+      refId: ref$1,
+      matchedVariant: variant
+    };
+  return variant === "odd" && refs?.default ? {
+    refId: refs.default,
+    matchedVariant: "default"
+  } : undefined;
+}
 function resolveResult(result, storyId) {
   const story = buildHeaderFooterStory(result.kind, storyId ?? String(result.type));
   return resolveHeaderFooterLayout(result.layout, result.blocks, result.measures, story);
@@ -285491,19 +285880,34 @@ function shiftResolvedPaintItemY(item, yOffset) {
     y: item.y + yOffset
   };
 }
-function normalizeDecorationFragments(fragments, layoutMinY) {
-  if (layoutMinY >= 0)
+function isExplicitBehindDocMediaFragment(fragment2) {
+  return (fragment2.kind === "image" || fragment2.kind === "drawing") && fragment2.behindDoc === true;
+}
+function getDecorationNormalizationMinY(fragments, layoutMinY) {
+  if (!Number.isFinite(layoutMinY) || layoutMinY >= 0)
+    return 0;
+  let minY = Infinity;
+  for (const fragment2 of fragments) {
+    if (isExplicitBehindDocMediaFragment(fragment2))
+      continue;
+    if (Number.isFinite(fragment2.y))
+      minY = Math.min(minY, fragment2.y);
+  }
+  return minY < 0 ? minY : 0;
+}
+function normalizeDecorationFragments(fragments, normalizationMinY) {
+  if (normalizationMinY >= 0)
     return fragments;
-  const yOffset = -layoutMinY;
+  const yOffset = -normalizationMinY;
   return fragments.map((fragment2) => ({
     ...fragment2,
     y: fragment2.y + yOffset
   }));
 }
-function normalizeDecorationItems(items, layoutMinY) {
-  if (layoutMinY >= 0)
+function normalizeDecorationItems(items, normalizationMinY) {
+  if (normalizationMinY >= 0)
     return items;
-  const yOffset = -layoutMinY;
+  const yOffset = -normalizationMinY;
   return items.map((item) => shiftResolvedPaintItemY(item, yOffset));
 }
 function createStoryHiddenHost(doc$12, widthPx, options = {}) {
@@ -306208,6 +306612,7 @@ menclose::after {
   highlight: run2.highlight ?? null,
   textTransform: run2.textTransform ?? null,
   token: run2.token ?? null,
+  pageNumberFieldFormat: run2.pageNumberFieldFormat ?? null,
   pageRefMetadata: run2.pageRefMetadata ?? null,
   trackedChange: run2.trackedChange ?? null,
   trackedChanges: run2.trackedChanges ?? null,
@@ -309326,10 +309731,16 @@ menclose::after {
     return "";
   if (!runToken)
     return run2.text ?? "";
-  if (runToken === "pageNumber")
+  if (runToken === "pageNumber") {
+    if (run2.pageNumberFieldFormat)
+      return formatPageNumberFieldValue$1(context.displayPageNumber ?? context.pageNumber, run2.pageNumberFieldFormat);
     return context.pageNumberText ?? String(context.pageNumber);
-  if (runToken === "totalPageCount")
+  }
+  if (runToken === "totalPageCount") {
+    if (run2.pageNumberFieldFormat)
+      return formatPageNumberFieldValue$1(context.totalPages || 1, run2.pageNumberFieldFormat);
     return context.totalPages ? String(context.totalPages) : run2.text ?? "";
+  }
   return run2.text ?? "";
 }, extractLinkData = (run2) => {
   if (run2.kind === "tab" || run2.kind === "image" || run2.kind === "lineBreak" || run2.kind === "math")
@@ -310062,20 +310473,39 @@ menclose::after {
   if (!("text" in run2) || !run2.text)
     return null;
   return renderTextRun(run2, context, renderContext, trackedConfig);
-}, renderInlineTabRun = (run2, line, doc$12, layoutEpoch, styleId) => {
+}, getRunUnderline = (run2) => ("underline" in run2) ? run2.underline : undefined, getRunFontSize = (run2) => ("fontSize" in run2) && typeof run2.fontSize === "number" ? run2.fontSize : 16, getRunColor = (run2) => ("color" in run2) && typeof run2.color === "string" ? run2.color : undefined, underlineStyleForRun = (run2) => getRunUnderline(run2)?.style ?? "single", canPaintUnderlineAsBorder = (run2) => {
+  if (!getRunUnderline(run2))
+    return false;
+  const style2 = underlineStyleForRun(run2);
+  return style2 !== "none" && style2 !== "words";
+}, canPaintUnderlineOverlay = (run2) => {
+  if (!canPaintUnderlineAsBorder(run2))
+    return false;
+  const style2 = underlineStyleForRun(run2);
+  return style2 === "single" || style2 === "double" || style2 === "dotted" || style2 === "dashed";
+}, underlineBorderForRun = (run2) => {
+  if (!canPaintUnderlineAsBorder(run2))
+    return;
+  const underlineStyle = underlineStyleForRun(run2);
+  const borderStyle = underlineStyle === "double" || underlineStyle === "dotted" || underlineStyle === "dashed" ? underlineStyle : "solid";
+  const underlineColor = getRunUnderline(run2)?.color ?? getRunColor(run2) ?? "#000000";
+  return `${underlineThicknessPx(getRunFontSize(run2))}px ${borderStyle} ${underlineColor}`;
+}, renderInlineTabRun = (run2, line, doc$12, layoutEpoch, styleId, paintUnderline = true) => {
   const tabEl = doc$12.createElement("span");
   tabEl.classList.add("superdoc-tab");
   const tabWidth = run2.width ?? 48;
   tabEl.style.display = "inline-block";
   tabEl.style.width = `${tabWidth}px`;
-  if (run2.underline) {
+  const shouldPaintUnderline = paintUnderline && canPaintUnderlineAsBorder(run2);
+  if (shouldPaintUnderline) {
     tabEl.style.height = `${underlineOffsetFromLineTop(line)}px`;
     tabEl.style.verticalAlign = "top";
   } else {
     tabEl.style.height = `${line.lineHeight}px`;
     tabEl.style.verticalAlign = "bottom";
   }
-  applyTabUnderlineBorder(tabEl, run2);
+  if (shouldPaintUnderline)
+    applyTabUnderlineBorder(tabEl, run2);
   if (styleId)
     tabEl.setAttribute("styleid", styleId);
   if (run2.pmStart != null)
@@ -310084,7 +310514,7 @@ menclose::after {
     tabEl.dataset.pmEnd = String(run2.pmEnd);
   tabEl.dataset.layoutEpoch = String(layoutEpoch);
   return tabEl;
-}, renderPositionedTabRun = (run2, line, doc$12, layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId) => {
+}, renderPositionedTabRun = (run2, line, doc$12, layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId, paintUnderline = true) => {
   const measuredTabEndX = tabStartX + (run2.width ?? 0);
   const tabEndX = immediateNextSegment?.precedingTabEndX ?? immediateNextSegment?.x ?? measuredTabEndX;
   const actualTabWidth = tabEndX - tabStartX;
@@ -310093,12 +310523,14 @@ menclose::after {
   tabEl.style.left = `${tabStartX + indentOffset}px`;
   tabEl.style.top = "0px";
   tabEl.style.width = `${actualTabWidth}px`;
-  tabEl.style.height = run2.underline ? `${underlineOffsetFromLineTop(line)}px` : `${line.lineHeight}px`;
+  const shouldPaintUnderline = paintUnderline && canPaintUnderlineAsBorder(run2);
+  tabEl.style.height = shouldPaintUnderline ? `${underlineOffsetFromLineTop(line)}px` : `${line.lineHeight}px`;
   tabEl.style.display = "inline-block";
   tabEl.style.pointerEvents = "none";
   tabEl.style.zIndex = "1";
-  applyTabUnderlineBorder(tabEl, run2);
-  if (!run2.underline)
+  if (shouldPaintUnderline)
+    applyTabUnderlineBorder(tabEl, run2);
+  else
     tabEl.style.visibility = "hidden";
   if (styleId)
     tabEl.setAttribute("styleid", styleId);
@@ -310115,13 +310547,10 @@ menclose::after {
 }, underlineOffsetFromLineTop = (line) => {
   return Math.max(0, (line.lineHeight - line.ascent - line.descent) / 2) + line.ascent + Math.min(line.descent, line.lineHeight * 0.08);
 }, applyTabUnderlineBorder = (tabEl, run2) => {
-  if (!run2.underline)
+  const border = underlineBorderForRun(run2);
+  if (!border)
     return;
-  const underlineStyle = run2.underline.style ?? "single";
-  const underlineColor = run2.underline.color ?? "#000000";
-  const borderStyle = underlineStyle === "double" ? "double" : "solid";
-  const fontSize = run2.fontSize ?? 16;
-  tabEl.style.borderBottom = `${underlineThicknessPx(fontSize)}px ${borderStyle} ${underlineColor}`;
+  tabEl.style.borderBottom = border;
 }, applyStyles$1 = (el, styles) => {
   Object.entries(styles).forEach(([key2, value]) => {
     if (value != null && value !== "" && key2 in el.style)
@@ -310226,6 +310655,73 @@ menclose::after {
       break;
     }
   return merged;
+}, isTextRun$5 = (run2) => (run2.kind === "text" || run2.kind === undefined) && ("text" in run2), isOverlaySafeRunKind = (run2) => {
+  const kind = run2.kind ?? "text";
+  return kind === "text" || kind === "tab" || kind === "lineBreak" || kind === "break";
+}, shouldUseLineUnderlineOverlay = (runsForLine) => runsForLine.every(isOverlaySafeRunKind) && runsForLine.some((run2) => run2.kind === "tab" && canPaintUnderlineOverlay(run2)), cloneRunWithoutUnderline = (run2) => ({
+  ...run2,
+  underline: undefined
+}), appendUnderlineOverlaySpan = (spans, from$1, to, border) => {
+  if (!border || to <= from$1)
+    return;
+  const last2 = spans[spans.length - 1];
+  if (last2 && last2.border === border && Math.abs(last2.to - from$1) < 0.5) {
+    last2.to = to;
+    return;
+  }
+  spans.push({
+    from: from$1,
+    to,
+    border
+  });
+}, runInlinePaintWidth = (run2, runIndex, segmentsByRun, spacingPerSpace) => {
+  if (run2.kind === "tab")
+    return run2.width ?? 48;
+  const segments = segmentsByRun.get(runIndex);
+  if (segments?.length)
+    return segments.reduce((sum, segment) => {
+      const text5 = isTextRun$5(run2) ? (run2.text ?? "").slice(segment.fromChar, segment.toChar) : "";
+      return sum + segment.width + spacingPerSpace * countSpaces$1(text5);
+    }, 0);
+  if ("width" in run2 && typeof run2.width === "number")
+    return run2.width;
+  return 0;
+}, buildInlineUnderlineSpans = (block, line, spacingPerSpace, lineTextStartOffsetPx) => {
+  const segmentsByRun = /* @__PURE__ */ new Map;
+  line.segments?.forEach((segment) => {
+    const segments = segmentsByRun.get(segment.runIndex);
+    if (segments)
+      segments.push(segment);
+    else
+      segmentsByRun.set(segment.runIndex, [segment]);
+  });
+  const spans = [];
+  let currentX = lineTextStartOffsetPx;
+  for (let runIndex = line.fromRun;runIndex <= line.toRun; runIndex += 1) {
+    const run2 = block.runs[runIndex];
+    if (!run2)
+      continue;
+    const width = runInlinePaintWidth(run2, runIndex, segmentsByRun, spacingPerSpace);
+    if (canPaintUnderlineOverlay(run2))
+      appendUnderlineOverlaySpan(spans, currentX, currentX + width, underlineBorderForRun(run2));
+    currentX += width;
+  }
+  return spans;
+}, renderUnderlineSpans = (spans, top$1, el, doc$12) => {
+  spans.forEach((span) => {
+    const overlay = doc$12.createElement("div");
+    overlay.classList.add("superdoc-underline-overlay");
+    overlay.setAttribute("aria-hidden", "true");
+    overlay.style.position = "absolute";
+    overlay.style.left = `${span.from}px`;
+    overlay.style.top = `${top$1}px`;
+    overlay.style.width = `${Math.max(0, span.to - span.from)}px`;
+    overlay.style.height = "0px";
+    overlay.style.borderTop = span.border;
+    overlay.style.pointerEvents = "none";
+    overlay.style.zIndex = "2";
+    el.appendChild(overlay);
+  });
 }, renderLine = ({ block, line, context, availableWidthOverride, lineIndex, skipJustify, preExpandedRuns, resolvedListTextStartPx, indentOffsetOverride, paragraphMarkLeftOffsetOverride, runContext }) => {
   const expandedBlock = {
     ...block,
@@ -310320,6 +310816,11 @@ menclose::after {
     shouldJustify: justifyShouldApply
   });
   const lineContainsInlineImage = runsForLine.some((run2) => isImageRun$1(run2));
+  const useSegmentPositioning = shouldUseSegmentPositioning(hasExplicitPositioning ?? false, Boolean(line.segments), isRtl);
+  const overlayAlignment = block.attrs?.alignment;
+  const overlayIndent = block.attrs?.indent;
+  const inlineOverlayOriginMatchesContent = overlayAlignment !== "center" && overlayAlignment !== "right" && (overlayIndent?.hanging ?? 0) === 0 && (overlayIndent?.left ?? 0) >= 0;
+  const useLineUnderlineOverlay = Boolean(line.segments) && !isRtl && shouldUseLineUnderlineOverlay(runsForLine) && (useSegmentPositioning || inlineOverlayOriginMatchesContent);
   const resolveLineIndentOffset = () => {
     if (indentOffsetOverride != null)
       return indentOffsetOverride;
@@ -310339,7 +310840,8 @@ menclose::after {
   const paragraphMarkLeftOffsetPx = lineTextStartOffsetPx;
   if (spacingPerSpace !== 0)
     el.style.wordSpacing = `${spacingPerSpace}px`;
-  if (shouldUseSegmentPositioning(hasExplicitPositioning ?? false, Boolean(line.segments), isRtl))
+  const underlineSpans = [];
+  if (useSegmentPositioning)
     renderExplicitlyPositionedRuns({
       block,
       line,
@@ -310350,9 +310852,11 @@ menclose::after {
       styleId,
       runContext,
       trackedConfig,
-      lineContainsInlineImage
+      lineContainsInlineImage,
+      useLineUnderlineOverlay,
+      underlineSpanCollector: useLineUnderlineOverlay ? underlineSpans : undefined
     });
-  else
+  else {
     renderInlineRuns({
       runsForLine,
       line,
@@ -310361,8 +310865,14 @@ menclose::after {
       styleId,
       runContext,
       trackedConfig,
-      lineContainsInlineImage
+      lineContainsInlineImage,
+      useLineUnderlineOverlay
     });
+    if (useLineUnderlineOverlay)
+      underlineSpans.push(...buildInlineUnderlineSpans(expandedBlock, line, spacingPerSpace, lineTextStartOffsetPx));
+  }
+  if (useLineUnderlineOverlay && underlineSpans.length > 0)
+    renderUnderlineSpans(underlineSpans, underlineOffsetFromLineTop(line), el, runContext.doc);
   appendFormattingParagraphMark(el, line, expandedBlock.runs, paragraphMarkLeftOffsetPx, availableWidth, hasExplicitPositioning ?? false, runContext.doc, runContext.showFormattingMarks);
   el.querySelectorAll("a[href]").forEach((anchor) => {
     const pendingTooltip = runContext.pendingTooltips.get(anchor);
@@ -310372,7 +310882,7 @@ menclose::after {
     }
   });
   return el;
-}, renderExplicitlyPositionedRuns = ({ block, line, context, el, lineTextStartOffsetPx, spacingPerSpace, styleId, runContext, trackedConfig, lineContainsInlineImage }) => {
+}, renderExplicitlyPositionedRuns = ({ block, line, context, el, lineTextStartOffsetPx, spacingPerSpace, styleId, runContext, trackedConfig, lineContainsInlineImage, useLineUnderlineOverlay, underlineSpanCollector }) => {
   const indentOffset = lineTextStartOffsetPx;
   let cumulativeX = 0;
   const segments = line.segments;
@@ -310441,8 +310951,11 @@ menclose::after {
     if (baseRun.kind === "tab") {
       const immediateNextSegment = findImmediateNextSegment(runIndex);
       const tabStartX = cumulativeX;
-      const { element: tabEl, tabEndX, actualTabWidth } = renderPositionedTabRun(baseRun, line, runContext.doc, runContext.layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId);
+      const coveredByOverlay$1 = useLineUnderlineOverlay && canPaintUnderlineOverlay(baseRun);
+      const { element: tabEl, tabEndX, actualTabWidth } = renderPositionedTabRun(baseRun, line, runContext.doc, runContext.layoutEpoch, tabStartX, indentOffset, immediateNextSegment, styleId, !coveredByOverlay$1);
       appendToLineGeo(tabEl, baseRun, tabStartX + indentOffset, actualTabWidth);
+      if (coveredByOverlay$1 && underlineSpanCollector)
+        appendUnderlineOverlaySpan(underlineSpanCollector, tabStartX + indentOffset, tabStartX + indentOffset + actualTabWidth, underlineBorderForRun(baseRun));
       cumulativeX = tabEndX;
       continue;
     }
@@ -310521,6 +311034,7 @@ menclose::after {
     const baseText = baseRun.text ?? "";
     const runPmStart = baseRun.pmStart ?? null;
     const fallbackPmEnd = runPmStart != null && baseRun.pmEnd == null ? runPmStart + baseText.length : baseRun.pmEnd ?? null;
+    const coveredByOverlay = useLineUnderlineOverlay && canPaintUnderlineOverlay(baseRun);
     runSegments.forEach((segment) => {
       const segmentText = baseText.slice(segment.fromChar, segment.toChar);
       if (!segmentText)
@@ -310531,10 +311045,13 @@ menclose::after {
         ...baseRun,
         text: segmentText,
         pmStart: pmSliceStart,
-        pmEnd: pmSliceEnd
+        pmEnd: pmSliceEnd,
+        ...coveredByOverlay ? { underline: undefined } : {}
       };
       const elem = renderRun(segmentRun, context, runContext, trackedConfig);
       if (elem) {
+        if (coveredByOverlay)
+          elem.style.textDecorationLine = segmentRun.strike ? "line-through" : "none";
         if (styleId)
           elem.setAttribute("styleid", styleId);
         alignNormalTextBesideInlineImage(elem, segmentRun, lineContainsInlineImage);
@@ -310544,6 +311061,8 @@ menclose::after {
         elem.style.left = `${xPos}px`;
         appendToLineGeo(elem, segmentRun, xPos, segment.width);
         const visualWidth = segment.width + (spacingPerSpace !== 0 ? spacingPerSpace * countSpaces$1(segmentText) : 0);
+        if (coveredByOverlay && underlineSpanCollector)
+          appendUnderlineOverlaySpan(underlineSpanCollector, xPos, xPos + visualWidth, underlineBorderForRun(baseRun));
         cumulativeX = baseX + visualWidth;
         if (geoSdtWrapper)
           geoSdtMaxRight = Math.max(geoSdtMaxRight, xPos + visualWidth);
@@ -310551,7 +311070,7 @@ menclose::after {
     });
   }
   closeGeoSdtWrapper();
-}, renderInlineRuns = ({ runsForLine, line, context, el, styleId, runContext, trackedConfig, lineContainsInlineImage }) => {
+}, renderInlineRuns = ({ runsForLine, line, context, el, styleId, runContext, trackedConfig, lineContainsInlineImage, useLineUnderlineOverlay }) => {
   let currentInlineSdtWrapper = null;
   let currentInlineSdtId = null;
   const closeCurrentWrapper = () => {
@@ -310566,11 +311085,15 @@ menclose::after {
     const runSdtId = resolved?.sdtId ?? null;
     if (runSdtId !== currentInlineSdtId)
       closeCurrentWrapper();
-    const elem = run2.kind === "tab" ? renderInlineTabRun(run2, line, runContext.doc, runContext.layoutEpoch, styleId) : renderRun(run2, context, runContext, trackedConfig);
+    const suppressUnderline = useLineUnderlineOverlay && canPaintUnderlineOverlay(run2);
+    const runForRender = suppressUnderline ? cloneRunWithoutUnderline(run2) : run2;
+    const elem = run2.kind === "tab" ? renderInlineTabRun(runForRender, line, runContext.doc, runContext.layoutEpoch, styleId, !suppressUnderline) : renderRun(runForRender, context, runContext, trackedConfig);
     if (elem) {
+      if (suppressUnderline && run2.kind !== "tab")
+        elem.style.textDecorationLine = "strike" in runForRender && runForRender.strike ? "line-through" : "none";
       if (styleId)
         elem.setAttribute("styleid", styleId);
-      alignNormalTextBesideInlineImage(elem, run2, lineContainsInlineImage);
+      alignNormalTextBesideInlineImage(elem, runForRender, lineContainsInlineImage);
       if (resolved) {
         if (!currentInlineSdtWrapper) {
           currentInlineSdtWrapper = runContext.createInlineSdtWrapper(resolved.sdt);
@@ -311474,6 +311997,7 @@ menclose::after {
       totalPages: this.totalPages,
       section: "body",
       pageNumberText: page.numberText,
+      displayPageNumber: page.displayNumber,
       pageIndex
     };
     const resolvedItems = page.items;
@@ -311688,6 +312212,7 @@ menclose::after {
       section: kind,
       story: resolveDecorationStory(kind, data),
       pageNumberText: page.numberText,
+      displayPageNumber: page.displayNumber,
       pageIndex
     };
     const decorationItems = data.items ?? [];
@@ -311833,6 +312358,7 @@ menclose::after {
       totalPages: this.totalPages,
       section: "body",
       pageNumberText: page.numberText,
+      displayPageNumber: page.displayNumber,
       pageIndex
     };
     resolvedItems.forEach((resolvedItem, index2) => {
@@ -311849,9 +312375,10 @@ menclose::after {
         const geometryChanged = hasFragmentGeometryChanged(current.fragment, fragment2);
         const sdtBoundaryMismatch = shouldRebuildForSdtBoundary(current.element, sdtBoundary);
         const betweenBorderMismatch = current.element.dataset.betweenBorder === "true" !== (betweenInfo?.showBetweenBorder ?? false) || current.element.dataset.suppressTopBorder === "true" !== (betweenInfo?.suppressTopBorder ?? false) || (current.element.dataset.gapBelow ?? "") !== (betweenInfo?.gapBelow ? String(betweenInfo.gapBelow) : "");
+        const pageContextChanged = needsRebuildForPageContext(current.context, contextBase, resolvedItem);
         const newPmStart = fragment2.pmStart;
         const mappingUnreliable = this.currentMapping != null && newPmStart != null && current.element.dataset.pmStart != null && this.currentMapping.map(Number(current.element.dataset.pmStart)) !== newPmStart;
-        if (geometryChanged || this.changedBlocks.has(fragment2.blockId) || current.signature !== resolvedSig || sdtBoundaryMismatch || betweenBorderMismatch || mappingUnreliable) {
+        if (geometryChanged || this.changedBlocks.has(fragment2.blockId) || current.signature !== resolvedSig || sdtBoundaryMismatch || betweenBorderMismatch || pageContextChanged || mappingUnreliable) {
           const replacement = this.renderFragment(fragment2, contextBase, sdtBoundary, betweenInfo, resolvedItem);
           pageEl.replaceChild(replacement, current.element);
           current.element = replacement;
@@ -311933,6 +312460,7 @@ menclose::after {
       totalPages: this.totalPages,
       section: "body",
       pageNumberText: page.numberText,
+      displayPageNumber: page.displayNumber,
       pageIndex
     };
     const resolvedItems = page.items;
@@ -313429,7 +313957,13 @@ menclose::after {
           run2.text ?? "",
           "tab",
           run2.underline?.style ?? "",
-          run2.underline?.color ?? ""
+          run2.underline?.color ?? "",
+          run2.fontSize ?? "",
+          run2.fontFamily ?? "",
+          run2.bold ? 1 : 0,
+          run2.italic ? 1 : 0,
+          getFontConfigVersion(),
+          run2.color ?? ""
         ].join(",");
       if (run2.kind === "fieldAnnotation") {
         const fieldRun = run2;
@@ -313477,6 +314011,7 @@ menclose::after {
         textRun.vertAlign ?? "",
         textRun.baselineShift != null ? textRun.baselineShift : "",
         textRun.token ?? "",
+        textRun.pageNumberFieldFormat ? JSON.stringify(textRun.pageNumberFieldFormat) : "",
         trackedVersion,
         textRun.comments?.length ?? 0,
         textRun.bidi ? JSON.stringify(textRun.bidi) : ""
@@ -313633,6 +314168,9 @@ menclose::after {
               hash$3 = hashString(hash$3, getRunBooleanProp(run2, "strike") ? "1" : "");
               hash$3 = hashString(hash$3, getRunStringProp(run2, "vertAlign"));
               hash$3 = hashNumber(hash$3, getRunNumberProp(run2, "baselineShift"));
+              hash$3 = hashString(hash$3, getRunStringProp(run2, "token"));
+              const pageNumberFieldFormat = run2.pageNumberFieldFormat;
+              hash$3 = hashString(hash$3, pageNumberFieldFormat ? JSON.stringify(pageNumberFieldFormat) : "");
               const bidi = run2.bidi;
               hash$3 = hashString(hash$3, bidi ? JSON.stringify(bidi) : "");
               hash$3 = hashString(hash$3, trackedChangeVersion(run2));
@@ -314026,7 +314564,8 @@ menclose::after {
   sectionCount: 0,
   sectionHeaderIds: /* @__PURE__ */ new Map,
   sectionFooterIds: /* @__PURE__ */ new Map,
-  sectionTitlePg: /* @__PURE__ */ new Map
+  sectionTitlePg: /* @__PURE__ */ new Map,
+  sections: []
 }), fieldAnnotationKey = (run2) => {
   if (run2.kind !== "fieldAnnotation")
     return "";
@@ -321184,17 +321723,20 @@ menclose::after {
   }
   #computeExpectedSectionType(kind, page, sectionFirstPageNumbers) {
     const pageNumber = page.number;
+    const effectivePageNumber = page.effectivePageNumber ?? page.displayNumber ?? pageNumber;
     const sectionIndex = page.sectionIndex ?? 0;
     const isFirstPageOfSection = sectionFirstPageNumbers.get(sectionIndex) === pageNumber;
     const converter = this.#options.editor.converter;
-    const hasAlternateHeaders = converter?.pageStyles?.alternateHeaders === true;
+    const hasAlternateHeaders = this.#multiSectionIdentifier?.alternateHeaders === true || converter?.pageStyles?.alternateHeaders === true;
     const headerIds = converter?.headerIds;
     const footerIds = converter?.footerIds;
-    const titlePgEnabled = headerIds?.titlePg === true || footerIds?.titlePg === true;
+    let titlePgEnabled = headerIds?.titlePg === true || footerIds?.titlePg === true;
+    if (this.#multiSectionIdentifier?.sectionTitlePg?.has(sectionIndex))
+      titlePgEnabled = this.#multiSectionIdentifier.sectionTitlePg.get(sectionIndex) === true;
     if (isFirstPageOfSection && titlePgEnabled)
       return "first";
     if (hasAlternateHeaders)
-      return (page.displayNumber ?? page.number) % 2 === 0 ? "even" : "odd";
+      return effectivePageNumber % 2 === 0 ? "even" : "odd";
     return "default";
   }
   #stripFootnoteReserveFromBottomMargin(margins, page) {
@@ -321575,37 +322117,33 @@ menclose::after {
       if (!sectionFirstPageNumbers.has(idx))
         sectionFirstPageNumbers.set(idx, p$12.number);
     }
+    const hasSectionResolution = hasSectionRefsForKind(multiSectionId, kind);
     return (pageNumber, pageMargins, page) => {
       const sectionIndex = page?.sectionIndex ?? 0;
+      const effectivePageNumber = page?.effectivePageNumber ?? page?.displayNumber ?? pageNumber;
       const firstPageInSection = sectionFirstPageNumbers.get(sectionIndex);
       const sectionPageNumber = typeof firstPageInSection === "number" ? pageNumber - firstPageInSection + 1 : pageNumber;
-      const parityPageNumber = page?.displayNumber ?? pageNumber;
-      const headerFooterType = multiSectionId ? getHeaderFooterTypeForSection(pageNumber, sectionIndex, multiSectionId, {
+      const headerFooterType = hasSectionResolution ? getHeaderFooterTypeForSection(effectivePageNumber, sectionIndex, multiSectionId, {
         kind,
         sectionPageNumber,
-        parityPageNumber
+        parityPageNumber: effectivePageNumber
       }) : getHeaderFooterType2(pageNumber, legacyIdentifier, {
         kind,
-        parityPageNumber
-      });
-      let sectionRId;
-      if (page?.sectionRefs && kind === "header") {
-        sectionRId = page.sectionRefs.headerRefs?.[headerFooterType];
-        if (!sectionRId && headerFooterType && headerFooterType !== "default" && sectionIndex > 0 && multiSectionId)
-          sectionRId = multiSectionId.sectionHeaderIds.get(sectionIndex - 1)?.[headerFooterType] ?? undefined;
-        const shouldUseDefaultHeaderRef = headerFooterType !== "default" && page.sectionRefs.headerRefs?.default && (!multiSectionId?.alternateHeaders || headerFooterType === "odd");
-        if (!sectionRId && shouldUseDefaultHeaderRef)
-          sectionRId = page.sectionRefs.headerRefs?.default;
-      } else if (page?.sectionRefs && kind === "footer") {
-        sectionRId = page.sectionRefs.footerRefs?.[headerFooterType];
-        if (!sectionRId && headerFooterType && headerFooterType !== "default" && sectionIndex > 0 && multiSectionId)
-          sectionRId = multiSectionId.sectionFooterIds.get(sectionIndex - 1)?.[headerFooterType] ?? undefined;
-        const shouldUseDefaultFooterRef = headerFooterType !== "default" && page.sectionRefs.footerRefs?.default && (!multiSectionId?.alternateHeaders || headerFooterType === "odd");
-        if (!sectionRId && shouldUseDefaultFooterRef)
-          sectionRId = page.sectionRefs.footerRefs?.default;
-      }
+        parityPageNumber: effectivePageNumber
+      });
       if (!headerFooterType)
         return null;
+      const pageSectionRefs = kind === "header" ? page?.sectionRefs?.headerRefs : page?.sectionRefs?.footerRefs;
+      const sectionResolvedRef = hasSectionResolution ? resolveEffectiveHeaderFooterRef({
+        sections: multiSectionId.sections,
+        sectionIndex,
+        kind,
+        variant: headerFooterType
+      }) : null;
+      const legacyRefs = kind === "header" ? legacyIdentifier.headerIds : legacyIdentifier.footerIds;
+      const resolvedRef = refForVariant(pageSectionRefs, headerFooterType) ?? sectionResolvedRef ?? (!hasSectionResolution ? refForVariant(legacyRefs, headerFooterType) : undefined);
+      const sectionRId = resolvedRef?.refId;
+      const layoutVariantType = resolvedRef?.matchedVariant ?? headerFooterType;
       const compositeKey = sectionRId ? `${sectionRId}::s${sectionIndex}` : undefined;
       const rIdLayoutKey = compositeKey && layoutsByRId.has(compositeKey) && compositeKey || sectionRId && layoutsByRId.has(sectionRId) && sectionRId || undefined;
       if (rIdLayoutKey) {
@@ -321628,8 +322166,9 @@ menclose::after {
             const rawLayoutHeight$1 = rIdLayout.layout.height ?? 0;
             const metrics$1 = this.#computeMetrics(kind, rawLayoutHeight$1, box$1, pageHeight$1, margins$1?.footer ?? 0);
             const layoutMinY$1 = rIdLayout.layout.minY ?? 0;
-            const normalizedFragments$1 = normalizeDecorationFragments(fragments$1, layoutMinY$1);
-            const normalizedItems$1 = normalizeDecorationItems(alignedItems, layoutMinY$1);
+            const normalizationMinY$1 = getDecorationNormalizationMinY(fragments$1, layoutMinY$1);
+            const normalizedFragments$1 = normalizeDecorationFragments(fragments$1, normalizationMinY$1);
+            const normalizedItems$1 = normalizeDecorationItems(alignedItems, normalizationMinY$1);
             const isActiveHeaderFooter$1 = this.#isActiveDecoration(kind, sectionRId, pageNumber);
             return {
               fragments: normalizedFragments$1,
@@ -321661,7 +322200,7 @@ menclose::after {
       }
       if (!results || results.length === 0)
         return null;
-      const variantIndex = results.findIndex((entry) => entry.type === headerFooterType);
+      const variantIndex = results.findIndex((entry) => entry.type === layoutVariantType);
       const variant = variantIndex >= 0 ? results[variantIndex] : undefined;
       if (!variant || !variant.layout?.pages?.length)
         return null;
@@ -321672,7 +322211,7 @@ menclose::after {
       const fallbackId = this.#headerFooterManager?.getVariantId(kind, headerFooterType);
       const finalHeaderId = sectionRId ?? fallbackId ?? undefined;
       const resolvedVariant = resolvedResults?.[variantIndex];
-      const alignedVariantItems = this.resolveAlignedDecorationItems(fragments, slotPage.number, variant, resolvedVariant, `variant '${headerFooterType}' page ${pageNumber}`, finalHeaderId ?? headerFooterType);
+      const alignedVariantItems = this.resolveAlignedDecorationItems(fragments, slotPage.number, variant, resolvedVariant, `variant '${layoutVariantType}' page ${pageNumber}`, finalHeaderId ?? headerFooterType);
       if (!alignedVariantItems)
         return null;
       const pageHeight = page?.height ?? resolvedLayout.pages[0]?.height ?? layoutOptions.pageSize?.h ?? defaultPageSize.h;
@@ -321682,8 +322221,9 @@ menclose::after {
       const rawLayoutHeight = variant.layout.height ?? 0;
       const metrics = this.#computeMetrics(kind, rawLayoutHeight, box, pageHeight, margins?.footer ?? 0);
       const layoutMinY = variant.layout.minY ?? 0;
-      const normalizedFragments = normalizeDecorationFragments(fragments, layoutMinY);
-      const normalizedItems = normalizeDecorationItems(alignedVariantItems, layoutMinY);
+      const normalizationMinY = getDecorationNormalizationMinY(fragments, layoutMinY);
+      const normalizedFragments = normalizeDecorationFragments(fragments, normalizationMinY);
+      const normalizedItems = normalizeDecorationItems(alignedVariantItems, normalizationMinY);
       const isActiveHeaderFooter = this.#isActiveDecoration(kind, finalHeaderId, pageNumber);
       return {
         fragments: normalizedFragments,
@@ -322264,13 +322804,13 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_C8mTdIvv_es = __esm(() => {
+var init_src_BbNQjpxw_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_CcHCWpfX_es();
+  init_SuperConverter_CvwFiCth_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_qzgm05fK_es();
-  init_create_headless_toolbar_DKwoydAR_es();
+  init_create_headless_toolbar_DdDLS67b_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
@@ -329150,10 +329690,24 @@ ${err.toString()}`);
       } };
     },
     addAttributes() {
-      return { marksAsAttrs: {
-        default: null,
-        rendered: false
-      } };
+      return {
+        marksAsAttrs: {
+          default: null,
+          rendered: false
+        },
+        instruction: {
+          default: null,
+          rendered: false
+        },
+        pageNumberFormat: {
+          default: null,
+          rendered: false
+        },
+        pageNumberZeroPadding: {
+          default: null,
+          rendered: false
+        }
+      };
     },
     addNodeView() {
       return ({ node: node3, editor, getPos, decorations }) => {
@@ -329210,6 +329764,18 @@ ${err.toString()}`);
           default: null,
           rendered: false
         },
+        instruction: {
+          default: null,
+          rendered: false
+        },
+        pageNumberFormat: {
+          default: null,
+          rendered: false
+        },
+        pageNumberZeroPadding: {
+          default: null,
+          rendered: false
+        },
         importedCachedText: {
           default: null,
           rendered: false
@@ -356620,11 +357186,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CEjelItp.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-Dzh6dolN.es.js
 var MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS;
-var init_create_super_doc_ui_CEjelItp_es = __esm(() => {
-  init_SuperConverter_CcHCWpfX_es();
-  init_create_headless_toolbar_DKwoydAR_es();
+var init_create_super_doc_ui_Dzh6dolN_es = __esm(() => {
+  init_SuperConverter_CvwFiCth_es();
+  init_create_headless_toolbar_DdDLS67b_es();
   MOD_ALIASES = new Set([
     "Mod",
     "Meta",
@@ -356666,16 +357232,16 @@ var init_zipper_yaJVJ4z9_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_C8mTdIvv_es();
-  init_SuperConverter_CcHCWpfX_es();
+  init_src_BbNQjpxw_es();
+  init_SuperConverter_CvwFiCth_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_DKwoydAR_es();
+  init_create_headless_toolbar_DdDLS67b_es();
   init_constants_D_X7xF4s_es();
   init_dist_B8HfvhaK_es();
   init_unified_Dsuw2be5_es();
   init_DocxZipper_nv_KfOqb_es();
-  init_create_super_doc_ui_CEjelItp_es();
+  init_create_super_doc_ui_Dzh6dolN_es();
   init_ui_C5PAS9hY_es();
   init_eventemitter3_BnGqBE_Q_es();
   init_errors_CNaD6vcg_es();