@a3s-lab/office 0.39.0 → 0.41.0

package/dist/0~work-docx-export.js

@@ -1,6 +1,6 @@
 import jszip from "jszip";
-import { normalizeDocumentBookmarkName, normalizeDocumentEmphasisMark, DOCUMENT_STRIKE_STYLE_ATTRIBUTE, applyDocumentImageIdentityToElement, documentEmphasisMarkFromElement, DOCUMENT_PAGE_BORDER_EDGES, DOCUMENT_UNDERLINE_STYLE_ATTRIBUTE, createDocumentImageIdentityRegistry, normalizeDocumentColumns, normalizeDocumentTableVerticalAlign, normalizeDocumentTextCase, documentCharacterSpacingTwipsFromElement, documentCharacterPositionHalfPointsFromElement, documentTableColumnPercentagesFromElement, documentTableCellMarginOverridesFromElement, applyDocumentTableRowIdentityToElement, normalizeDocumentBookmarksHtml, documentImageIdentityFromElement, documentTableGeometryFromElement, normalizeDocumentTableRowHeightRule, documentNoteKey, DOCUMENT_LEGACY_TEXT_EMBOSS_ATTRIBUTE, normalizeDocumentHiddenText, documentLegacyTextEffectsConflict, normalizeDocumentTableBorderWidth, normalizeDocumentCharacterSpacingTwips, documentStrikeFormattingFromElement, normalizeDocumentTableBorderStyle, normalizeDocumentBookmarkReferencesHtml, documentCitationInstruction, documentImageWrapContourFromElement, documentImagePositionFromElement, normalizeDocumentCharacterScalePercent, normalizeDocumentUnderlineStyle, normalizeDocumentPageChrome, documentPageMarginsForLayout, normalizeDocumentImageLayer, documentKerningThresholdHalfPointsFromElement, documentImageCropFromElement, documentBookmarkReferenceInstruction, normalizeDocumentPageBorders, documentImageLayerFromElement, normalizeDocumentLegacyTextEffects, documentCaptionLabel, documentCaptionKind, DOCUMENT_LEGACY_TEXT_IMPRINT_ATTRIBUTE, isContourImageLayout, serializeDocumentOpenTypeFeatures, normalizeDocumentImageIdentity, normalizeDocumentStrikeStyle, normalizeTableColor, normalizeDocumentOpenTypeFeatures, documentCitationTags, docxDocumentFieldKind, documentTableBordersFromElement, documentSections, wrapsBesideImage, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentKerningThresholdHalfPoints, defaultDocumentImageWrapContour, parseDocumentOpenTypeFeatures, normalizeDocumentPaperSource, DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE, documentEquationFromElement, documentLegacyTextEffectsFromElement, parseDocumentCharacterFormatting, documentUnderlineFormattingFromElement, DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE, normalizeDocumentEquation, parseDocumentParagraphFormatting, documentOpenTypeFeaturesFromElement, normalizeDocumentBookmarkNativeId, documentTableRowIdentityFromElement, DOCUMENT_PAGE_MARGIN_KEYS, uniqueDocumentImageIdentity, documentHiddenTextFromElement, collectDocumentNotes, documentImageLayoutFromElement, documentPageHorizontalMarginTwips, DOCUMENT_OPEN_TYPE_ATTRIBUTE, documentPageGeometryForLayout, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, documentCharacterScalePercentFromElement, normalizeDocumentPageMargins, normalizeDocumentLegacyTextEffect, documentNoteKind } from "./4174.js";
-import { normalizeDocumentRunBorder, parseDocumentScriptFonts, normalizeDocumentIndexesHtml, parseXml, parseDocumentRunShading, applyDocumentParagraphIdentityToElement, DOCUMENT_RUN_SHADING_ATTRIBUTE, documentScriptFontSlotFromElement, DOCUMENT_HIGHLIGHT_ATTRIBUTE, parseDocxThemeReference, serializeDocumentScriptFonts, attribute as work_ooxml_package_attribute, createDocumentParagraphIdentityRegistry, uniqueDocumentParagraphIdentity, DOCUMENT_NO_PROOF_ATTRIBUTE, documentHighlightForCssColor, directChildren, documentTableOfContentsValueFromElement, DOCUMENT_PROOFING_LANGUAGES_ATTRIBUTE, DocxThemePatchCollector, normalizeDocumentScriptFonts, normalizeDocumentParagraphIdentity, normalizeDocumentHighlight, normalizeDocumentParagraphBorders, serializeUtf8Xml, DOCUMENT_PARAGRAPH_BORDER_EDGES, parseDocumentRunBorder, normalizeDocumentNoProof, decodeXmlBytes, documentParagraphIdentityFromElement, normalizeDocumentParagraphId, documentIndexValueFromElement, descendants, resolvePartTarget, documentProofingLanguagesFromElement, documentScriptFontFamily, parseDocumentRunShadingElement, parseDocumentProofingLanguages, documentHighlightFromElement, parseDocumentParagraphBordersElement, DOCUMENT_RUN_BORDER_ATTRIBUTE, parseDocumentRunBorderElement, xmlNamespacePrefix, documentScriptFontSlotFromHint, documentNoProofFromElement, documentScriptFontsFromElement, normalizeDocumentRunShading, documentIndexEntryFromElement, directChild, normalizeDocumentScriptFontSlot, patchDocxThemeReferences, parseDocumentParagraphShadingElement, documentFontNameFromCssFamily } from "./4121.js";
+import { normalizeDocumentBookmarkName, normalizeDocumentEmphasisMark, DOCUMENT_STRIKE_STYLE_ATTRIBUTE, applyDocumentImageIdentityToElement, documentEmphasisMarkFromElement, DOCUMENT_PAGE_BORDER_EDGES, DOCUMENT_UNDERLINE_STYLE_ATTRIBUTE, createDocumentImageIdentityRegistry, normalizeDocumentColumns, normalizeDocumentTableVerticalAlign, normalizeDocumentTextCase, documentCharacterSpacingTwipsFromElement, documentCharacterPositionHalfPointsFromElement, documentTableColumnPercentagesFromElement, documentTableCellMarginOverridesFromElement, applyDocumentTableRowIdentityToElement, normalizeDocumentBookmarksHtml, documentImageIdentityFromElement, documentTableGeometryFromElement, normalizeDocumentTableRowHeightRule, documentNoteKey, DOCUMENT_LEGACY_TEXT_EMBOSS_ATTRIBUTE, normalizeDocumentHiddenText, documentLegacyTextEffectsConflict, normalizeDocumentTableBorderWidth, normalizeDocumentCharacterSpacingTwips, documentStrikeFormattingFromElement, normalizeDocumentTableBorderStyle, parseDocumentNumberingChange, normalizeDocumentBookmarkReferencesHtml, documentCitationInstruction, documentImageWrapContourFromElement, documentImagePositionFromElement, normalizeDocumentCharacterScalePercent, normalizeDocumentUnderlineStyle, normalizeDocumentPageChrome, documentPageMarginsForLayout, normalizeDocumentImageLayer, documentKerningThresholdHalfPointsFromElement, documentImageCropFromElement, documentBookmarkReferenceInstruction, normalizeDocumentPageBorders, documentImageLayerFromElement, serializeDocumentOpenTypeFeatures, documentCaptionLabel, documentCaptionKind, isContourImageLayout, normalizeDocumentLegacyTextEffects, DOCUMENT_LEGACY_TEXT_IMPRINT_ATTRIBUTE, normalizeDocumentImageIdentity, normalizeDocumentStrikeStyle, normalizeTableColor, normalizeDocumentOpenTypeFeatures, documentCitationTags, docxDocumentFieldKind, documentTableBordersFromElement, documentSections, wrapsBesideImage, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentKerningThresholdHalfPoints, defaultDocumentImageWrapContour, parseDocumentOpenTypeFeatures, normalizeDocumentPaperSource, DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE, documentEquationFromElement, parseDocumentCharacterFormatting, documentLegacyTextEffectsFromElement, documentUnderlineFormattingFromElement, DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE, normalizeDocumentEquation, parseDocumentParagraphFormatting, documentOpenTypeFeaturesFromElement, normalizeDocumentBookmarkNativeId, documentTableRowIdentityFromElement, DOCUMENT_PAGE_MARGIN_KEYS, uniqueDocumentImageIdentity, documentHiddenTextFromElement, collectDocumentNotes, documentImageLayoutFromElement, documentPageHorizontalMarginTwips, DOCUMENT_OPEN_TYPE_ATTRIBUTE, MAX_DOCUMENT_NUMBERING_START, documentPageGeometryForLayout, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, documentCharacterScalePercentFromElement, normalizeDocumentPageMargins, normalizeDocumentLegacyTextEffect, documentNoteKind } from "./4174.js";
+import { normalizeDocumentRunBorder, parseDocumentScriptFonts, parseDocxThemeReference, parseXml, parseDocumentRunShading, applyDocumentParagraphIdentityToElement, DOCUMENT_RUN_SHADING_ATTRIBUTE, documentScriptFontSlotFromElement, DOCUMENT_HIGHLIGHT_ATTRIBUTE, normalizeDocumentIndexesHtml, serializeDocumentScriptFonts, attribute as work_ooxml_package_attribute, createDocumentParagraphIdentityRegistry, uniqueDocumentParagraphIdentity, DOCUMENT_NO_PROOF_ATTRIBUTE, documentHighlightForCssColor, directChildren, documentTableOfContentsValueFromElement, DOCUMENT_PROOFING_LANGUAGES_ATTRIBUTE, DocxThemePatchCollector, normalizeDocumentScriptFonts, normalizeDocumentParagraphIdentity, normalizeDocumentHighlight, normalizeDocumentParagraphBorders, serializeUtf8Xml, DOCUMENT_PARAGRAPH_BORDER_EDGES, parseDocumentRunBorder, normalizeDocumentNoProof, decodeXmlBytes, documentParagraphIdentityFromElement, normalizeDocumentParagraphId, documentScriptFontFamily, descendants, resolvePartTarget, documentProofingLanguagesFromElement, documentHighlightFromElement, parseDocumentRunShadingElement, parseDocumentProofingLanguages, patchDocxThemeReferences, parseDocumentParagraphBordersElement, DOCUMENT_RUN_BORDER_ATTRIBUTE, parseDocumentRunBorderElement, xmlNamespacePrefix, documentScriptFontSlotFromHint, documentNoProofFromElement, documentScriptFontsFromElement, normalizeDocumentRunShading, normalizeDocumentScriptFontSlot, directChild, documentIndexEntryFromElement, documentIndexValueFromElement, parseDocumentParagraphShadingElement, documentFontNameFromCssFamily } from "./4121.js";
 import { assignDocxNoteIds, patchDocxPageColor, normalizeDocxCommentId, assignDocxCommentThreads } from "./0~4980.js";
 import { paragraphTabStops, mergeDocxIgnorableExtensionsAtPairs, DOCX_WORD_2010_NAMESPACE, docxKerningThresholdValue, patchDocxBibliography, documentIndexInstruction, docxCharacterScaleValue, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, paragraphAlignment, xmlNamespaceUri, paragraphSpacingOptions, docxCharacterPositionValue, documentIndexEntryInstruction, docxEmphasisMarkRunOptions, hasNonWhitespaceXmlText, patchDocxExplicitZeroCharacterSpacing, cloneXmlElement, cssColorToHex, xmlDeclaredPrefix, assertXmlRoot, DOCX_WORDPROCESSING_NAMESPACES, paragraphIndent, domDirection, xmlAttributeNamespace, paragraphBidirectional, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, mergeDocxIgnorableExtensions, DocxParagraphDefaultCollapsedPatchCollector, dataBoolean, patchDocxParagraphDefaultCollapsed, patchDocxExplicitZeroKerningThresholds, parseDocxColorSchemeMappingElement, paragraphPaginationOptions, DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, documentProofingLanguageDocxOptions, xmlAttributeLocalName, cssFontSize, paragraphDirectionOptions, cssFontFamily, docxCharacterSpacingValue } from "./0~5024.js";
 import { normalizeDocumentHref } from "./0~work-document-links.js";
@@ -757,285 +757,6 @@ function hasAncestor(element, localName) {
     }
     return false;
 }
-const DOCX_RUN_PROPERTY_ORDER = [
-    'rStyle',
-    'rFonts',
-    'b',
-    'bCs',
-    'i',
-    'iCs',
-    'caps',
-    'smallCaps',
-    'strike',
-    'dstrike',
-    'outline',
-    'shadow',
-    'emboss',
-    'imprint',
-    'noProof',
-    'snapToGrid',
-    'vanish',
-    'webHidden',
-    'color',
-    'spacing',
-    'w',
-    'kern',
-    'position',
-    'sz',
-    'szCs',
-    'highlight',
-    'u',
-    'effect',
-    'bdr',
-    'shd',
-    'fitText',
-    'vertAlign',
-    'rtl',
-    'cs',
-    'em',
-    'lang',
-    'eastAsianLayout',
-    'specVanish',
-    'rPrChange'
-];
-const DOCX_RUN_PROPERTY_RANK = new Map(DOCX_RUN_PROPERTY_ORDER.map((name, index)=>[
-        name,
-        index
-    ]));
-const HIDDEN_TEXT_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
-const VANISH_RANK = DOCX_RUN_PROPERTY_RANK.get('vanish') ?? 0;
-class DocxHiddenTextPatchCollector {
-    patches = [];
-    nextMarker = 1;
-    occupied;
-    patchesByMarker = new Map();
-    markersByValueAndStyle = new Map();
-    constructor(source){
-        this.occupied = source;
-    }
-    marker(value, inheritedStyle) {
-        const style = this.originalStyle(inheritedStyle);
-        const key = JSON.stringify([
-            value,
-            style ?? null
-        ]);
-        const existing = this.markersByValueAndStyle.get(key);
-        if (existing) return existing;
-        let marker = '';
-        do {
-            marker = `A3SOfficeHiddenText${value ? 'On' : 'Off'}${String(this.nextMarker).padStart(8, '0')}`;
-            this.nextMarker += 1;
-        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
-        const patch = {
-            marker,
-            value,
-            ...style ? {
-                style
-            } : {}
-        };
-        this.patches.push(patch);
-        this.patchesByMarker.set(marker, patch);
-        this.markersByValueAndStyle.set(key, marker);
-        return marker;
-    }
-    lookup(marker) {
-        return marker ? this.patchesByMarker.get(marker) : void 0;
-    }
-    originalStyle(style) {
-        let current = style;
-        const seen = new Set();
-        while(current && !seen.has(current)){
-            seen.add(current);
-            const patch = this.patchesByMarker.get(current);
-            if (!patch) break;
-            current = patch.style;
-        }
-        return current;
-    }
-}
-async function patchDocxHiddenText(buffer, patches) {
-    if (!patches.length) return buffer;
-    const archive = await jszip.loadAsync(buffer);
-    const byMarker = new Map(patches.map((patch)=>[
-            patch.marker,
-            patch
-        ]));
-    const applied = new Set();
-    for (const entry of Object.values(archive.files)){
-        if (entry.dir || !HIDDEN_TEXT_PART_PATTERN.test(entry.name)) continue;
-        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
-        let changed = false;
-        for (const properties of descendants(document, 'rPr')){
-            if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
-            const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
-                if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
-                const marker = wordValue(style);
-                return null !== marker && byMarker.has(marker);
-            });
-            if (!markerStyles.length) continue;
-            if (1 !== markerStyles.length) throw new Error('Generated DOCX hidden-text marker is duplicated in one run.');
-            const marker = wordValue(markerStyles[0]);
-            const patch = marker ? byMarker.get(marker) : void 0;
-            if (!marker || !patch) continue;
-            const existing = directChildren(properties, 'vanish').filter((element)=>DOCX_WORDPROCESSING_NAMESPACES.has(element.namespaceURI ?? ''));
-            if (existing.length) throw new Error('Generated DOCX hidden-text marker unexpectedly has a native value.');
-            if (patch.style) setWordValue(markerStyles[0], patch.style);
-            else markerStyles[0].remove();
-            insertHiddenTextProperty(document, properties, patch.value);
-            applied.add(marker);
-            changed = true;
-        }
-        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
-    }
-    const missing = patches.filter((patch)=>!applied.has(patch.marker));
-    if (missing.length) throw new Error(`DOCX hidden-text markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
-}
-function insertHiddenTextProperty(document, properties, value) {
-    const namespace = properties.namespaceURI ?? '';
-    const prefix = properties.prefix || 'w';
-    const vanish = document.createElementNS(namespace, `${prefix}:vanish`);
-    if (!value) vanish.setAttributeNS(namespace, `${prefix}:val`, '0');
-    const next = directChildren(properties).find((child)=>{
-        if (!DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '')) return true;
-        return (DOCX_RUN_PROPERTY_RANK.get(child.localName) ?? 1 / 0) > VANISH_RANK;
-    });
-    properties.insertBefore(vanish, next ?? null);
-}
-function wordValue(element) {
-    const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
-    return 1 === values.length ? values[0].value : null;
-}
-function setWordValue(element, value) {
-    const namespace = element.namespaceURI ?? '';
-    const prefix = element.prefix || 'w';
-    for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
-    element.setAttributeNS(namespace, `${prefix}:val`, value);
-}
-const LEGACY_TEXT_EFFECTS_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
-class DocxLegacyTextEffectsPatchCollector {
-    patches = [];
-    nextMarker = 1;
-    occupied;
-    patchesByMarker = new Map();
-    markersByEffectsAndStyle = new Map();
-    constructor(source){
-        this.occupied = source;
-    }
-    marker(value, inheritedStyle) {
-        const effects = normalizeDocumentLegacyTextEffects(value);
-        if (!effects || !Object.keys(effects).length) throw new Error('Document contains invalid legacy text effects.');
-        const style = this.originalStyle(inheritedStyle);
-        const key = JSON.stringify([
-            DOCUMENT_LEGACY_TEXT_EFFECT_NAMES.map((name)=>effects[name] ?? null),
-            style ?? null
-        ]);
-        const existing = this.markersByEffectsAndStyle.get(key);
-        if (existing) return existing;
-        let marker = '';
-        do {
-            marker = `A3SOfficeLegacyTextEffects${String(this.nextMarker).padStart(8, '0')}`;
-            this.nextMarker += 1;
-        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
-        const patch = {
-            marker,
-            effects,
-            ...style ? {
-                style
-            } : {}
-        };
-        this.patches.push(patch);
-        this.patchesByMarker.set(marker, patch);
-        this.markersByEffectsAndStyle.set(key, marker);
-        return marker;
-    }
-    lookup(marker) {
-        return marker ? this.patchesByMarker.get(marker) : void 0;
-    }
-    originalStyle(style) {
-        let current = style;
-        const seen = new Set();
-        while(current && !seen.has(current)){
-            seen.add(current);
-            const patch = this.patchesByMarker.get(current);
-            if (!patch) break;
-            current = patch.style;
-        }
-        return current;
-    }
-}
-async function patchDocxLegacyTextEffects(buffer, patches) {
-    if (!patches.length) return buffer;
-    const byMarker = new Map();
-    for (const patch of patches){
-        const effects = normalizeDocumentLegacyTextEffects(patch.effects);
-        if (!patch.marker || !effects || !Object.keys(effects).length || byMarker.has(patch.marker)) throw new Error('Document contains invalid legacy text-effect patches.');
-        byMarker.set(patch.marker, {
-            ...patch,
-            effects
-        });
-    }
-    const archive = await jszip.loadAsync(buffer);
-    const applied = new Set();
-    for (const entry of Object.values(archive.files)){
-        if (entry.dir || !LEGACY_TEXT_EFFECTS_PART_PATTERN.test(entry.name)) continue;
-        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
-        let changed = false;
-        for (const properties of descendants(document, 'rPr')){
-            if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
-            const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
-                if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
-                const marker = work_docx_legacy_text_effects_export_wordValue(style);
-                return null !== marker && byMarker.has(marker);
-            });
-            if (!markerStyles.length) continue;
-            if (1 !== markerStyles.length) throw new Error('Generated DOCX legacy text-effect marker is duplicated in one run.');
-            const marker = work_docx_legacy_text_effects_export_wordValue(markerStyles[0]);
-            const patch = marker ? byMarker.get(marker) : void 0;
-            if (marker && patch) {
-                if (DOCUMENT_LEGACY_TEXT_EFFECT_NAMES.some((name)=>directChildren(properties, name).length > 0)) throw new Error('Generated DOCX legacy text-effect marker unexpectedly has a native value.');
-                if (patch.style) work_docx_legacy_text_effects_export_setWordValue(markerStyles[0], patch.style);
-                else markerStyles[0].remove();
-                for (const name of DOCUMENT_LEGACY_TEXT_EFFECT_NAMES){
-                    const value = patch.effects[name];
-                    if (void 0 !== value) insertLegacyTextEffectProperty(document, properties, name, value);
-                }
-                applied.add(marker);
-                changed = true;
-            }
-        }
-        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
-    }
-    const missing = patches.filter((patch)=>!applied.has(patch.marker));
-    if (missing.length) throw new Error(`DOCX legacy text-effect markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
-}
-function insertLegacyTextEffectProperty(document, properties, name, value) {
-    const namespace = properties.namespaceURI ?? '';
-    const prefix = properties.prefix || 'w';
-    const effect = document.createElementNS(namespace, `${prefix}:${name}`);
-    if (!value) effect.setAttributeNS(namespace, `${prefix}:val`, '0');
-    const rank = DOCX_RUN_PROPERTY_RANK.get(name) ?? 0;
-    const next = directChildren(properties).find((child)=>{
-        if (!DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '')) return true;
-        return (DOCX_RUN_PROPERTY_RANK.get(child.localName) ?? 1 / 0) > rank;
-    });
-    properties.insertBefore(effect, next ?? null);
-}
-function work_docx_legacy_text_effects_export_wordValue(element) {
-    const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
-    return 1 === values.length ? values[0].value : null;
-}
-function work_docx_legacy_text_effects_export_setWordValue(element, value) {
-    const namespace = element.namespaceURI ?? '';
-    const prefix = element.prefix || 'w';
-    for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
-    element.setAttributeNS(namespace, `${prefix}:val`, value);
-}
 const MATH_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/math';
 const work_docx_equation_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const WORD_DATE_UTC_NAMESPACE = 'http://schemas.microsoft.com/office/word/2023/wordml/word16du';
@@ -2280,278 +2001,99 @@ async function imageToDocx(element, docx, cropPatches, wrapPatches, layerPatches
         return new docx.TextRun(`[${alt}]`);
     }
 }
-function documentImageFloatingOptions(element, docx) {
-    const image = documentImageLayoutFromElement(element);
-    const position = documentImagePositionFromElement(element);
-    if ('inline' === image.layout) return;
-    const layer = documentImageLayerFromElement(element);
-    const distance = Math.round(36000 * image.wrapDistance);
-    const align = 'left' === image.alignment ? docx.HorizontalPositionAlign.LEFT : 'right' === image.alignment ? docx.HorizontalPositionAlign.RIGHT : docx.HorizontalPositionAlign.CENTER;
-    return {
-        horizontalPosition: {
-            relative: horizontalPositionReference(position?.horizontalReference ?? 'column', docx),
-            ...position?.horizontalOffset !== null && position?.horizontalOffset !== void 0 ? {
-                offset: millimetersToEmus(position.horizontalOffset)
-            } : {
-                align
-            }
-        },
-        verticalPosition: {
-            relative: verticalPositionReference(position?.verticalReference ?? 'paragraph', docx),
-            offset: millimetersToEmus(position?.verticalOffset ?? 0)
-        },
-        allowOverlap: layer.allowOverlap,
-        behindDocument: layer.behindDocument,
-        layoutInCell: layer.layoutInCell,
-        lockAnchor: layer.lockAnchor,
-        zIndex: layer.relativeHeight,
-        margins: {
-            top: distance,
-            right: distance,
-            bottom: distance,
-            left: distance
-        },
-        wrap: {
-            type: 'none' === image.layout ? docx.TextWrappingType.NONE : wrapsBesideImage(image.layout) ? 'square' === image.layout ? docx.TextWrappingType.SQUARE : docx.TextWrappingType.TIGHT : docx.TextWrappingType.TOP_AND_BOTTOM,
-            ...wrapsBesideImage(image.layout) ? {
-                side: textWrappingSide(image.wrapSide, docx)
-            } : {}
-        }
-    };
-}
-function textWrappingSide(value, docx) {
-    if ('left' === value) return docx.TextWrappingSide.LEFT;
-    if ('right' === value) return docx.TextWrappingSide.RIGHT;
-    if ('largest' === value) return docx.TextWrappingSide.LARGEST;
-    return docx.TextWrappingSide.BOTH_SIDES;
-}
-function horizontalPositionReference(value, docx) {
-    if ('margin' === value) return docx.HorizontalPositionRelativeFrom.MARGIN;
-    if ('page' === value) return docx.HorizontalPositionRelativeFrom.PAGE;
-    return docx.HorizontalPositionRelativeFrom.COLUMN;
-}
-function verticalPositionReference(value, docx) {
-    if ('margin' === value) return docx.VerticalPositionRelativeFrom.MARGIN;
-    if ('page' === value) return docx.VerticalPositionRelativeFrom.PAGE;
-    return docx.VerticalPositionRelativeFrom.PARAGRAPH;
-}
-function millimetersToEmus(value) {
-    return Math.round(36000 * value);
-}
-function docxImageType(contentType, source) {
-    const value = `${contentType} ${source}`.toLowerCase();
-    if (value.includes('png')) return 'png';
-    if (value.includes('jpeg') || value.includes('jpg')) return 'jpg';
-    if (value.includes('gif')) return 'gif';
-    if (value.includes('bmp')) return 'bmp';
-    return null;
-}
-function imageDimensions(blob) {
-    return new Promise((resolve, reject)=>{
-        const url = URL.createObjectURL(blob);
-        const image = new window.Image();
-        image.addEventListener('load', ()=>{
-            URL.revokeObjectURL(url);
-            resolve({
-                width: image.naturalWidth || 640,
-                height: image.naturalHeight || 360
-            });
-        }, {
-            once: true
-        });
-        image.addEventListener('error', ()=>{
-            URL.revokeObjectURL(url);
-            reject(new Error('Image dimensions could not be read'));
-        }, {
-            once: true
-        });
-        image.src = url;
-    });
-}
-function docxDocumentFieldRun(element, docx) {
-    const instruction = element.dataset.fieldInstruction?.trim() ?? '';
-    const display = element.dataset.fieldDisplay?.trim() || element.textContent?.trim() || '';
-    if (!docxDocumentFieldKind(instruction)) return new docx.TextRun(display);
-    return new docx.SimpleField(instruction, display);
-}
-const work_docx_index_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
-const work_docx_index_export_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
-class DocxIndexPatchCollector {
-    patches = [];
-    add(element) {
-        const value = documentIndexValueFromElement(element);
-        const patch = {
-            marker: `__A3S_WORK_DOCUMENT_INDEX_${this.patches.length + 1}__`,
-            options: value.options,
-            entries: value.entries
-        };
-        this.patches.push(patch);
-        return patch;
-    }
-}
-function docxDocumentIndex(element, docx, collector) {
-    const patch = collector.add(element);
-    return [
-        new docx.Paragraph({
-            children: [
-                new docx.TextRun(patch.marker)
-            ]
-        })
-    ];
-}
-function docxIndexEntryRun(element, docx) {
-    const value = documentIndexEntryFromElement(element);
-    return value ? new docx.SimpleField(documentIndexEntryInstruction(value)) : null;
-}
-async function patchDocxIndexes(buffer, patches) {
-    if (!patches.length) return buffer;
-    const archive = await jszip.loadAsync(buffer);
-    const entry = archive.file('word/document.xml');
-    if (!entry) return buffer;
-    const document = parseXml(await entry.async('text'), 'generated DOCX word/document.xml');
-    const paragraphs = descendants(document, 'p');
-    for (const patch of patches){
-        const paragraph = paragraphs.find((candidate)=>descendants(candidate, 't').some((text)=>(text.textContent ?? '').includes(patch.marker)));
-        if (!paragraph) throw new Error(`Generated DOCX did not emit the marker for document index ${patch.marker}.`);
-        paragraph.replaceWith(createIndexContentControl(document, patch));
-    }
-    archive.file('word/document.xml', new XMLSerializer().serializeToString(document));
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
-}
-function createIndexContentControl(document, patch) {
-    const control = wordElement(document, 'sdt');
-    const properties = wordElement(document, 'sdtPr');
-    const documentPart = wordElement(document, 'docPartObj');
-    const gallery = wordElement(document, 'docPartGallery');
-    work_docx_index_export_setWordAttribute(document, gallery, 'val', 'Indexes');
-    documentPart.append(gallery, wordElement(document, 'docPartUnique'));
-    properties.append(documentPart);
-    const content = wordElement(document, 'sdtContent');
-    const fieldStart = indexFieldStartParagraph(document, patch.options);
-    content.append(fieldStart);
-    const cached = cachedIndexParagraphs(document, patch);
-    if (!cached.length) cached.push(emptyIndexParagraph(document));
-    const last = cached.at(-1);
-    last?.append(fieldCharacterRun(document, 'end'));
-    content.append(...cached);
-    control.append(properties, content);
-    return control;
-}
-function indexFieldStartParagraph(document, options) {
-    const paragraph = wordElement(document, 'p');
-    paragraph.append(fieldCharacterRun(document, 'begin'));
-    const instructionRun = wordElement(document, 'r');
-    const instruction = wordElement(document, 'instrText');
-    instruction.setAttributeNS(work_docx_index_export_XML_NAMESPACE, 'xml:space', 'preserve');
-    instruction.textContent = ` ${documentIndexInstruction(options)} `;
-    instructionRun.append(instruction);
-    paragraph.append(instructionRun, fieldCharacterRun(document, 'separate'));
-    return paragraph;
-}
-function cachedIndexParagraphs(document, patch) {
-    const paragraphs = [];
-    let currentMain = '';
-    for (const entry of patch.entries){
-        if (entry.subEntry && entry.mainEntry !== currentMain) paragraphs.push(cachedIndexParagraph(document, patch.options, {
-            style: 'Index1',
-            term: entry.mainEntry,
-            crossReference: '',
-            pages: []
-        }));
-        paragraphs.push(cachedIndexParagraph(document, patch.options, {
-            style: entry.subEntry ? 'Index2' : 'Index1',
-            term: entry.subEntry || entry.mainEntry,
-            crossReference: entry.crossReference,
-            pages: entry.pages
-        }));
-        currentMain = entry.mainEntry;
-    }
-    return paragraphs;
-}
-function cachedIndexParagraph(document, options, source) {
-    const paragraph = wordElement(document, 'p');
-    const properties = wordElement(document, 'pPr');
-    const style = wordElement(document, 'pStyle');
-    work_docx_index_export_setWordAttribute(document, style, 'val', source.style);
-    properties.append(style);
-    if (source.pages.length && options.rightAlignPageNumbers) {
-        const tabs = wordElement(document, 'tabs');
-        const tab = wordElement(document, 'tab');
-        work_docx_index_export_setWordAttribute(document, tab, 'val', 'right');
-        const leader = docxIndexLeader(options.leader);
-        if (leader) work_docx_index_export_setWordAttribute(document, tab, 'leader', leader);
-        work_docx_index_export_setWordAttribute(document, tab, 'pos', '9360');
-        tabs.append(tab);
-        properties.append(tabs);
-    }
-    paragraph.append(properties, textRun(document, source.term));
-    if (source.crossReference) {
-        paragraph.append(textRun(document, `, See ${source.crossReference}`));
-        return paragraph;
-    }
-    if (!source.pages.length) return paragraph;
-    paragraph.append(options.rightAlignPageNumbers ? tabRun(document) : textRun(document, ', '));
-    for (const [index, page] of source.pages.entries()){
-        if (index > 0) paragraph.append(textRun(document, ', '));
-        paragraph.append(textRun(document, String(page.pageNumber), {
-            bold: page.pageBold,
-            italic: page.pageItalic
-        }));
-    }
-    return paragraph;
+function documentImageFloatingOptions(element, docx) {
+    const image = documentImageLayoutFromElement(element);
+    const position = documentImagePositionFromElement(element);
+    if ('inline' === image.layout) return;
+    const layer = documentImageLayerFromElement(element);
+    const distance = Math.round(36000 * image.wrapDistance);
+    const align = 'left' === image.alignment ? docx.HorizontalPositionAlign.LEFT : 'right' === image.alignment ? docx.HorizontalPositionAlign.RIGHT : docx.HorizontalPositionAlign.CENTER;
+    return {
+        horizontalPosition: {
+            relative: horizontalPositionReference(position?.horizontalReference ?? 'column', docx),
+            ...position?.horizontalOffset !== null && position?.horizontalOffset !== void 0 ? {
+                offset: millimetersToEmus(position.horizontalOffset)
+            } : {
+                align
+            }
+        },
+        verticalPosition: {
+            relative: verticalPositionReference(position?.verticalReference ?? 'paragraph', docx),
+            offset: millimetersToEmus(position?.verticalOffset ?? 0)
+        },
+        allowOverlap: layer.allowOverlap,
+        behindDocument: layer.behindDocument,
+        layoutInCell: layer.layoutInCell,
+        lockAnchor: layer.lockAnchor,
+        zIndex: layer.relativeHeight,
+        margins: {
+            top: distance,
+            right: distance,
+            bottom: distance,
+            left: distance
+        },
+        wrap: {
+            type: 'none' === image.layout ? docx.TextWrappingType.NONE : wrapsBesideImage(image.layout) ? 'square' === image.layout ? docx.TextWrappingType.SQUARE : docx.TextWrappingType.TIGHT : docx.TextWrappingType.TOP_AND_BOTTOM,
+            ...wrapsBesideImage(image.layout) ? {
+                side: textWrappingSide(image.wrapSide, docx)
+            } : {}
+        }
+    };
 }
-function emptyIndexParagraph(document) {
-    const paragraph = wordElement(document, 'p');
-    const properties = wordElement(document, 'pPr');
-    const style = wordElement(document, 'pStyle');
-    work_docx_index_export_setWordAttribute(document, style, 'val', 'Index1');
-    properties.append(style);
-    paragraph.append(properties);
-    return paragraph;
+function textWrappingSide(value, docx) {
+    if ('left' === value) return docx.TextWrappingSide.LEFT;
+    if ('right' === value) return docx.TextWrappingSide.RIGHT;
+    if ('largest' === value) return docx.TextWrappingSide.LARGEST;
+    return docx.TextWrappingSide.BOTH_SIDES;
 }
-function textRun(document, value, style = {}) {
-    const run = wordElement(document, 'r');
-    if (style.bold || style.italic) {
-        const properties = wordElement(document, 'rPr');
-        if (style.bold) properties.append(wordElement(document, 'b'));
-        if (style.italic) properties.append(wordElement(document, 'i'));
-        run.append(properties);
-    }
-    const text = wordElement(document, 't');
-    if (/^\s|\s$/.test(value)) text.setAttributeNS(work_docx_index_export_XML_NAMESPACE, 'xml:space', 'preserve');
-    text.textContent = value;
-    run.append(text);
-    return run;
+function horizontalPositionReference(value, docx) {
+    if ('margin' === value) return docx.HorizontalPositionRelativeFrom.MARGIN;
+    if ('page' === value) return docx.HorizontalPositionRelativeFrom.PAGE;
+    return docx.HorizontalPositionRelativeFrom.COLUMN;
 }
-function tabRun(document) {
-    const run = wordElement(document, 'r');
-    run.append(wordElement(document, 'tab'));
-    return run;
+function verticalPositionReference(value, docx) {
+    if ('margin' === value) return docx.VerticalPositionRelativeFrom.MARGIN;
+    if ('page' === value) return docx.VerticalPositionRelativeFrom.PAGE;
+    return docx.VerticalPositionRelativeFrom.PARAGRAPH;
 }
-function fieldCharacterRun(document, type) {
-    const run = wordElement(document, 'r');
-    const character = wordElement(document, 'fldChar');
-    work_docx_index_export_setWordAttribute(document, character, 'fldCharType', type);
-    run.append(character);
-    return run;
+function millimetersToEmus(value) {
+    return Math.round(36000 * value);
 }
-function docxIndexLeader(value) {
-    if ('dash' === value) return 'hyphen';
-    if ('underline' === value) return 'underscore';
-    if ('dot' === value) return 'dot';
+function docxImageType(contentType, source) {
+    const value = `${contentType} ${source}`.toLowerCase();
+    if (value.includes('png')) return 'png';
+    if (value.includes('jpeg') || value.includes('jpg')) return 'jpg';
+    if (value.includes('gif')) return 'gif';
+    if (value.includes('bmp')) return 'bmp';
     return null;
 }
-function wordElement(document, localName) {
-    return document.createElementNS(work_docx_index_export_WORD_NAMESPACE, wordQualifiedName(document.documentElement, localName));
-}
-function work_docx_index_export_setWordAttribute(document, element, localName, value) {
-    for (const candidate of Array.from(element.attributes))if (candidate.localName === localName && (candidate.namespaceURI === work_docx_index_export_WORD_NAMESPACE || !candidate.namespaceURI)) element.removeAttributeNode(candidate);
-    element.setAttributeNS(work_docx_index_export_WORD_NAMESPACE, wordQualifiedName(document.documentElement, localName), value);
+function imageDimensions(blob) {
+    return new Promise((resolve, reject)=>{
+        const url = URL.createObjectURL(blob);
+        const image = new window.Image();
+        image.addEventListener('load', ()=>{
+            URL.revokeObjectURL(url);
+            resolve({
+                width: image.naturalWidth || 640,
+                height: image.naturalHeight || 360
+            });
+        }, {
+            once: true
+        });
+        image.addEventListener('error', ()=>{
+            URL.revokeObjectURL(url);
+            reject(new Error('Image dimensions could not be read'));
+        }, {
+            once: true
+        });
+        image.src = url;
+    });
 }
-function wordQualifiedName(root, localName) {
-    return `${xmlNamespacePrefix(root, work_docx_index_export_WORD_NAMESPACE) ?? 'w'}:${localName}`;
+function docxDocumentFieldRun(element, docx) {
+    const instruction = element.dataset.fieldInstruction?.trim() ?? '';
+    const display = element.dataset.fieldDisplay?.trim() || element.textContent?.trim() || '';
+    if (!docxDocumentFieldKind(instruction)) return new docx.TextRun(display);
+    return new docx.SimpleField(instruction, display);
 }
 const work_docx_run_shading_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 class DocxRunShadingPatchCollector {
@@ -2735,16 +2277,16 @@ async function patchDocxOpenTypeFeatures(buffer, patches) {
             if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
             const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
                 if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
-                const marker = work_docx_opentype_export_wordValue(style);
+                const marker = wordValue(style);
                 return null !== marker && byMarker.has(marker);
             });
             if (!markerStyles.length) continue;
             if (1 !== markerStyles.length) throw new Error('Generated DOCX OpenType marker is duplicated in one run.');
-            const marker = work_docx_opentype_export_wordValue(markerStyles[0]);
+            const marker = wordValue(markerStyles[0]);
             const patch = marker ? byMarker.get(marker) : void 0;
             if (marker && patch) {
                 if (directChildren(properties).some((child)=>child.namespaceURI === DOCX_WORD_2010_NAMESPACE && OPEN_TYPE_PROPERTY_ORDER.includes(child.localName))) throw new Error('Generated DOCX OpenType marker unexpectedly has a native value.');
-                if (patch.style) work_docx_opentype_export_setWordValue(markerStyles[0], patch.style);
+                if (patch.style) setWordValue(markerStyles[0], patch.style);
                 else markerStyles[0].remove();
                 appendDocxOpenTypeProperties(document, properties, patch.features);
                 applied.add(marker);
@@ -2818,11 +2360,11 @@ function ensureIgnorable(root, word2010Prefix) {
     if (!tokens.includes(word2010Prefix)) tokens.push(word2010Prefix);
     root.setAttributeNS(work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE, `${prefix}:Ignorable`, tokens.join(' '));
 }
-function work_docx_opentype_export_wordValue(element) {
+function wordValue(element) {
     const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
     return 1 === values.length ? values[0].value : null;
 }
-function work_docx_opentype_export_setWordValue(element, value) {
+function setWordValue(element, value) {
     const namespace = element.namespaceURI ?? '';
     const prefix = element.prefix || 'w';
     for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
@@ -2928,17 +2470,17 @@ function setRunFormattingChange(document, run, patch) {
     if (existing.length > 1) throw new Error('Generated DOCX run contains duplicate properties.');
     const properties = existing[0] ?? insertRunProperties(document, run, wordNamespace, prefix);
     if (directChildren(properties, 'rPrChange').some((element)=>element.namespaceURI === wordNamespace)) throw new Error('Generated DOCX run already contains a formatting revision.');
-    const change = work_docx_format_change_export_wordElement(document, wordNamespace, prefix, 'rPrChange');
+    const change = wordElement(document, wordNamespace, prefix, 'rPrChange');
     work_docx_format_change_export_setWordAttribute(change, wordNamespace, prefix, 'id', String(patch.id));
     work_docx_format_change_export_setWordAttribute(change, wordNamespace, prefix, 'author', patch.author);
     work_docx_format_change_export_setWordAttribute(change, wordNamespace, prefix, 'date', patch.date);
-    const before = work_docx_format_change_export_wordElement(document, wordNamespace, prefix, 'rPr');
+    const before = wordElement(document, wordNamespace, prefix, 'rPr');
     appendFormattingProperties(document, before, wordNamespace, prefix, patch.before);
     change.append(before);
     properties.append(change);
 }
 function insertRunProperties(document, run, namespace, prefix) {
-    const properties = work_docx_format_change_export_wordElement(document, namespace, prefix, 'rPr');
+    const properties = wordElement(document, namespace, prefix, 'rPr');
     run.insertBefore(properties, run.firstChild);
     return properties;
 }
@@ -2982,13 +2524,13 @@ function appendOpenTypeProperties(document, properties, mark) {
 function appendNoProofProperty(document, properties, namespace, prefix, mark) {
     const noProof = normalizeDocumentNoProof(mark?.attrs?.noProof);
     if (null === noProof) return;
-    if (noProof) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, 'noProof'));
+    if (noProof) properties.append(wordElement(document, namespace, prefix, 'noProof'));
     else appendValuedProperty(document, properties, namespace, prefix, 'noProof', '0');
 }
 function appendProofingLanguagesProperty(document, properties, namespace, prefix, mark) {
     const languages = parseDocumentProofingLanguages(mark?.attrs?.proofingLanguages);
     if (!languages) return;
-    const element = work_docx_format_change_export_wordElement(document, namespace, prefix, 'lang');
+    const element = wordElement(document, namespace, prefix, 'lang');
     if (languages.latin) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'val', languages.latin);
     if (languages.eastAsia) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'eastAsia', languages.eastAsia);
     if (languages.bidi) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'bidi', languages.bidi);
@@ -2997,7 +2539,7 @@ function appendProofingLanguagesProperty(document, properties, namespace, prefix
 function appendRunBorderProperty(document, properties, namespace, prefix, mark) {
     const border = parseDocumentRunBorder(mark?.attrs?.runBorder);
     if (!border) return;
-    const element = work_docx_format_change_export_wordElement(document, namespace, prefix, 'bdr');
+    const element = wordElement(document, namespace, prefix, 'bdr');
     work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'val', border.style);
     if (border.color) {
         work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'color', 'auto' === border.color.value ? 'auto' : border.color.value.slice(1).toUpperCase());
@@ -3016,7 +2558,7 @@ function appendRunBorderProperty(document, properties, namespace, prefix, mark)
 function appendRunShadingProperty(document, properties, namespace, prefix, mark) {
     const shading = parseDocumentRunShading(mark?.attrs?.runShading);
     if (!shading) return;
-    const element = work_docx_format_change_export_wordElement(document, namespace, prefix, 'shd');
+    const element = wordElement(document, namespace, prefix, 'shd');
     if (!setDocxRunShadingAttributes(document, element, shading)) return;
     properties.append(element);
 }
@@ -3047,14 +2589,14 @@ function appendLegacyTextEffectsProperties(document, properties, namespace, pref
     if (documentLegacyTextEffectsConflict(effects)) throw new Error('Document contains conflicting legacy text effects.');
     for (const name of DOCUMENT_LEGACY_TEXT_EFFECT_NAMES){
         const value = effects[name];
-        if (void 0 !== value) if (value) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, name));
+        if (void 0 !== value) if (value) properties.append(wordElement(document, namespace, prefix, name));
         else appendValuedProperty(document, properties, namespace, prefix, name, '0');
     }
 }
 function appendHiddenTextProperty(document, properties, namespace, prefix, mark) {
     const hiddenText = normalizeDocumentHiddenText(mark?.attrs?.hiddenText);
     if (null === hiddenText) return;
-    if (hiddenText) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, 'vanish'));
+    if (hiddenText) properties.append(wordElement(document, namespace, prefix, 'vanish'));
     else appendValuedProperty(document, properties, namespace, prefix, 'vanish', '0');
 }
 function appendEmphasisMarkProperty(document, properties, namespace, prefix, mark) {
@@ -3085,7 +2627,7 @@ function appendCharacterSpacingProperty(document, properties, namespace, prefix,
 function appendFontProperties(document, properties, namespace, prefix, mark) {
     const scriptFonts = parseDocumentScriptFonts('string' == typeof mark?.attrs?.scriptFonts ? mark.attrs.scriptFonts : void 0);
     if (scriptFonts) {
-        const fonts = work_docx_format_change_export_wordElement(document, namespace, prefix, 'rFonts');
+        const fonts = wordElement(document, namespace, prefix, 'rFonts');
         for (const [name, value] of [
             [
                 'ascii',
@@ -3129,7 +2671,7 @@ function appendFontProperties(document, properties, namespace, prefix, mark) {
     }
     const family = firstFontFamily(mark?.attrs?.fontFamily);
     if (!family) return;
-    const fonts = work_docx_format_change_export_wordElement(document, namespace, prefix, 'rFonts');
+    const fonts = wordElement(document, namespace, prefix, 'rFonts');
     for (const name of [
         'ascii',
         'hAnsi',
@@ -3143,7 +2685,7 @@ function appendUnderlineProperty(document, properties, namespace, prefix, mark)
     const style = normalizeDocumentUnderlineStyle(mark.attrs?.underlineStyle) ?? 'single';
     const color = normalizedHex(mark.attrs?.underlineColor);
     const theme = themeReference(mark.attrs?.underlineThemeColor);
-    const underline = work_docx_format_change_export_wordElement(document, namespace, prefix, 'u');
+    const underline = wordElement(document, namespace, prefix, 'u');
     work_docx_format_change_export_setWordAttribute(underline, namespace, prefix, 'val', style);
     const resolved = color ?? normalizedHex(theme?.resolved);
     if (resolved) work_docx_format_change_export_setWordAttribute(underline, namespace, prefix, 'color', resolved);
@@ -3151,7 +2693,7 @@ function appendUnderlineProperty(document, properties, namespace, prefix, mark)
     properties.append(underline);
 }
 function appendBooleanProperty(document, properties, namespace, prefix, marks, mark, property) {
-    if (marks.has(mark)) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, property));
+    if (marks.has(mark)) properties.append(wordElement(document, namespace, prefix, property));
 }
 function appendStrikeProperties(document, properties, namespace, prefix, mark) {
     if (!mark) return;
@@ -3160,14 +2702,14 @@ function appendStrikeProperties(document, properties, namespace, prefix, mark) {
     appendValuedProperty(document, properties, namespace, prefix, 'dstrike', 'double' === style ? '1' : '0');
 }
 function appendValuedProperty(document, properties, namespace, prefix, property, value) {
-    const element = work_docx_format_change_export_wordElement(document, namespace, prefix, property);
+    const element = wordElement(document, namespace, prefix, property);
     work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'val', value);
     properties.append(element);
 }
 function appendTextCaseProperties(document, properties, namespace, prefix, mark) {
     const textCase = mark?.attrs?.textCase;
-    if ('all-caps' === textCase) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, 'caps'));
-    else if ('small-caps' === textCase) properties.append(work_docx_format_change_export_wordElement(document, namespace, prefix, 'smallCaps'));
+    if ('all-caps' === textCase) properties.append(wordElement(document, namespace, prefix, 'caps'));
+    else if ('small-caps' === textCase) properties.append(wordElement(document, namespace, prefix, 'smallCaps'));
     else if ('none' === textCase) {
         appendValuedProperty(document, properties, namespace, prefix, 'caps', '0');
         appendValuedProperty(document, properties, namespace, prefix, 'smallCaps', '0');
@@ -3177,7 +2719,7 @@ function appendColorProperty(document, properties, namespace, prefix, mark) {
     const color = normalizedHex(mark?.attrs?.color);
     const theme = themeReference(mark?.attrs?.themeColor);
     if (!color && !theme) return;
-    const element = work_docx_format_change_export_wordElement(document, namespace, prefix, 'color');
+    const element = wordElement(document, namespace, prefix, 'color');
     work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'val', color ?? normalizedHex(theme?.resolved) ?? '000000');
     if (theme) setThemeAttributes(element, namespace, prefix, theme, 'themeColor');
     properties.append(element);
@@ -3195,7 +2737,7 @@ function appendHighlightProperty(document, properties, namespace, prefix, mark,
     const fill = normalizedHex(mark?.attrs?.color);
     const theme = themeReference(mark?.attrs?.themeFill);
     if (!fill && !theme) return;
-    const shading = work_docx_format_change_export_wordElement(document, namespace, prefix, 'shd');
+    const shading = wordElement(document, namespace, prefix, 'shd');
     work_docx_format_change_export_setWordAttribute(shading, namespace, prefix, 'val', 'clear');
     work_docx_format_change_export_setWordAttribute(shading, namespace, prefix, 'color', 'auto');
     work_docx_format_change_export_setWordAttribute(shading, namespace, prefix, 'fill', fill ?? normalizedHex(theme?.resolved) ?? 'FFFFFF');
@@ -3243,18 +2785,175 @@ function normalizedHex(value) {
     const match = /^#?([0-9a-f]{6})$/i.exec(value.trim());
     return match?.[1]?.toUpperCase() ?? null;
 }
-function work_docx_format_change_export_wordElement(document, namespace, prefix, name) {
+function wordElement(document, namespace, prefix, name) {
     return document.createElementNS(namespace, `${prefix}:${name}`);
 }
-function work_docx_format_change_export_setWordAttribute(element, namespace, prefix, name, value) {
-    element.setAttributeNS(namespace, `${prefix}:${name}`, value);
+function work_docx_format_change_export_setWordAttribute(element, namespace, prefix, name, value) {
+    element.setAttributeNS(namespace, `${prefix}:${name}`, value);
+}
+function normalizedRevisionDate(value) {
+    const time = Date.parse(value ?? '');
+    return Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString();
+}
+function duplicateMarker(marker) {
+    return new Error(`Generated DOCX marker '${marker}' is duplicated.`);
+}
+const DOCX_RUN_PROPERTY_ORDER = [
+    'rStyle',
+    'rFonts',
+    'b',
+    'bCs',
+    'i',
+    'iCs',
+    'caps',
+    'smallCaps',
+    'strike',
+    'dstrike',
+    'outline',
+    'shadow',
+    'emboss',
+    'imprint',
+    'noProof',
+    'snapToGrid',
+    'vanish',
+    'webHidden',
+    'color',
+    'spacing',
+    'w',
+    'kern',
+    'position',
+    'sz',
+    'szCs',
+    'highlight',
+    'u',
+    'effect',
+    'bdr',
+    'shd',
+    'fitText',
+    'vertAlign',
+    'rtl',
+    'cs',
+    'em',
+    'lang',
+    'eastAsianLayout',
+    'specVanish',
+    'rPrChange'
+];
+const DOCX_RUN_PROPERTY_RANK = new Map(DOCX_RUN_PROPERTY_ORDER.map((name, index)=>[
+        name,
+        index
+    ]));
+const HIDDEN_TEXT_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
+const VANISH_RANK = DOCX_RUN_PROPERTY_RANK.get('vanish') ?? 0;
+class DocxHiddenTextPatchCollector {
+    patches = [];
+    nextMarker = 1;
+    occupied;
+    patchesByMarker = new Map();
+    markersByValueAndStyle = new Map();
+    constructor(source){
+        this.occupied = source;
+    }
+    marker(value, inheritedStyle) {
+        const style = this.originalStyle(inheritedStyle);
+        const key = JSON.stringify([
+            value,
+            style ?? null
+        ]);
+        const existing = this.markersByValueAndStyle.get(key);
+        if (existing) return existing;
+        let marker = '';
+        do {
+            marker = `A3SOfficeHiddenText${value ? 'On' : 'Off'}${String(this.nextMarker).padStart(8, '0')}`;
+            this.nextMarker += 1;
+        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
+        const patch = {
+            marker,
+            value,
+            ...style ? {
+                style
+            } : {}
+        };
+        this.patches.push(patch);
+        this.patchesByMarker.set(marker, patch);
+        this.markersByValueAndStyle.set(key, marker);
+        return marker;
+    }
+    lookup(marker) {
+        return marker ? this.patchesByMarker.get(marker) : void 0;
+    }
+    originalStyle(style) {
+        let current = style;
+        const seen = new Set();
+        while(current && !seen.has(current)){
+            seen.add(current);
+            const patch = this.patchesByMarker.get(current);
+            if (!patch) break;
+            current = patch.style;
+        }
+        return current;
+    }
+}
+async function patchDocxHiddenText(buffer, patches) {
+    if (!patches.length) return buffer;
+    const archive = await jszip.loadAsync(buffer);
+    const byMarker = new Map(patches.map((patch)=>[
+            patch.marker,
+            patch
+        ]));
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !HIDDEN_TEXT_PART_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
+        let changed = false;
+        for (const properties of descendants(document, 'rPr')){
+            if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
+            const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
+                if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
+                const marker = work_docx_hidden_text_export_wordValue(style);
+                return null !== marker && byMarker.has(marker);
+            });
+            if (!markerStyles.length) continue;
+            if (1 !== markerStyles.length) throw new Error('Generated DOCX hidden-text marker is duplicated in one run.');
+            const marker = work_docx_hidden_text_export_wordValue(markerStyles[0]);
+            const patch = marker ? byMarker.get(marker) : void 0;
+            if (!marker || !patch) continue;
+            const existing = directChildren(properties, 'vanish').filter((element)=>DOCX_WORDPROCESSING_NAMESPACES.has(element.namespaceURI ?? ''));
+            if (existing.length) throw new Error('Generated DOCX hidden-text marker unexpectedly has a native value.');
+            if (patch.style) work_docx_hidden_text_export_setWordValue(markerStyles[0], patch.style);
+            else markerStyles[0].remove();
+            insertHiddenTextProperty(document, properties, patch.value);
+            applied.add(marker);
+            changed = true;
+        }
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`DOCX hidden-text markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function insertHiddenTextProperty(document, properties, value) {
+    const namespace = properties.namespaceURI ?? '';
+    const prefix = properties.prefix || 'w';
+    const vanish = document.createElementNS(namespace, `${prefix}:vanish`);
+    if (!value) vanish.setAttributeNS(namespace, `${prefix}:val`, '0');
+    const next = directChildren(properties).find((child)=>{
+        if (!DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '')) return true;
+        return (DOCX_RUN_PROPERTY_RANK.get(child.localName) ?? 1 / 0) > VANISH_RANK;
+    });
+    properties.insertBefore(vanish, next ?? null);
 }
-function normalizedRevisionDate(value) {
-    const time = Date.parse(value ?? '');
-    return Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString();
+function work_docx_hidden_text_export_wordValue(element) {
+    const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
+    return 1 === values.length ? values[0].value : null;
 }
-function duplicateMarker(marker) {
-    return new Error(`Generated DOCX marker '${marker}' is duplicated.`);
+function work_docx_hidden_text_export_setWordValue(element, value) {
+    const namespace = element.namespaceURI ?? '';
+    const prefix = element.prefix || 'w';
+    for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
+    element.setAttributeNS(namespace, `${prefix}:val`, value);
 }
 class DocxImageCropPatchCollector {
     patches = [];
@@ -3438,119 +3137,420 @@ async function patchDocxImageLayers(buffer, patches) {
         }
         if (changed) archive.file(entry.name, new XMLSerializer().serializeToString(document));
     }
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function imageLayerPatch(properties, patches) {
+    for (const property of Array.from(properties.attributes))for (const [marker, patch] of patches)if (property.value.includes(marker)) return patch;
+    return null;
+}
+function removeLayerMarker(properties, marker) {
+    for (const property of Array.from(properties.attributes))if (property.value.includes(marker)) property.value = property.value.replace(marker, '');
+}
+function closestAnchor(element) {
+    let current = element;
+    while(current){
+        if ('anchor' === current.localName) return current;
+        current = current.parentElement;
+    }
+    return null;
+}
+function applyImageLayer(anchor, source) {
+    const layer = normalizeDocumentImageLayer(source);
+    anchor.setAttribute('relativeHeight', String(layer.relativeHeight));
+    anchor.setAttribute('behindDoc', layer.behindDocument ? '1' : '0');
+    anchor.setAttribute('allowOverlap', layer.allowOverlap ? '1' : '0');
+    anchor.setAttribute('layoutInCell', layer.layoutInCell ? '1' : '0');
+    anchor.setAttribute('locked', layer.lockAnchor ? '1' : '0');
+}
+const WORDPROCESSING_DRAWING_NAMESPACE = 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing';
+class DocxImageWrapPatchCollector {
+    patches = [];
+    nextMarker = 1;
+    marker(options, contour) {
+        if (!isContourImageLayout(options.layout)) return '';
+        const marker = `__A3S_IMAGE_WRAP_${this.nextMarker}__`;
+        this.nextMarker += 1;
+        this.patches.push({
+            marker,
+            layout: options.layout,
+            options,
+            contour: contour ?? defaultDocumentImageWrapContour()
+        });
+        return marker;
+    }
+}
+async function patchDocxImageWraps(buffer, patches) {
+    if (!patches.length) return buffer;
+    const archive = await jszip.loadAsync(buffer);
+    const byMarker = new Map(patches.map((patch)=>[
+            patch.marker,
+            patch
+        ]));
+    const entries = Object.values(archive.files).filter((entry)=>!entry.dir && /^word\/(?:document|header\d+|footer\d+|footnotes|endnotes|comments)\.xml$/.test(entry.name));
+    for (const entry of entries){
+        const document = parseXml(await entry.async('text'), entry.name);
+        let changed = false;
+        for (const properties of descendants(document, 'docPr')){
+            const patch = imageWrapPatch(properties, byMarker);
+            if (!patch) continue;
+            removeWrapMarker(properties, patch.marker);
+            changed = true;
+            const anchor = work_docx_image_wrap_closestAnchor(properties);
+            const source = anchor ? wrappingElement(anchor) : null;
+            if (anchor && source) source.parentNode?.replaceChild(createWrappingElement(anchor, patch), source);
+        }
+        if (changed) archive.file(entry.name, new XMLSerializer().serializeToString(document));
+    }
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function imageWrapPatch(properties, patches) {
+    for (const attribute of Array.from(properties.attributes))for (const [marker, patch] of patches)if (attribute.value.includes(marker)) return patch;
+    return null;
+}
+function removeWrapMarker(properties, marker) {
+    for (const attribute of Array.from(properties.attributes))if (attribute.value.includes(marker)) attribute.value = attribute.value.replace(marker, '');
+}
+function work_docx_image_wrap_closestAnchor(element) {
+    let current = element;
+    while(current){
+        if ('anchor' === current.localName) return current;
+        current = current.parentElement;
+    }
+    return null;
+}
+function wrappingElement(anchor) {
+    return directChildren(anchor).find((element)=>[
+            'wrapNone',
+            'wrapSquare',
+            'wrapTight',
+            'wrapThrough',
+            'wrapTopAndBottom'
+        ].includes(element.localName)) ?? null;
+}
+function createWrappingElement(anchor, patch) {
+    const document = anchor.ownerDocument;
+    const namespace = anchor.namespaceURI ?? WORDPROCESSING_DRAWING_NAMESPACE;
+    const prefix = anchor.prefix ? `${anchor.prefix}:` : '';
+    const wrap = document.createElementNS(namespace, `${prefix}${'tight' === patch.layout ? 'wrapTight' : 'wrapThrough'}`);
+    wrap.setAttribute('wrapText', patch.options.wrapSide);
+    const distance = String(Math.round(36000 * patch.options.wrapDistance));
+    wrap.setAttribute('distL', distance);
+    wrap.setAttribute('distR', distance);
+    const polygon = document.createElementNS(namespace, `${prefix}wrapPolygon`);
+    polygon.setAttribute('edited', patch.contour.edited ? '1' : '0');
+    patch.contour.points.forEach((point, index)=>{
+        const child = document.createElementNS(namespace, `${prefix}${0 === index ? 'start' : 'lineTo'}`);
+        child.setAttribute('x', String(point.x));
+        child.setAttribute('y', String(point.y));
+        polygon.append(child);
+    });
+    wrap.append(polygon);
+    return wrap;
+}
+const work_docx_index_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const work_docx_index_export_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
+class DocxIndexPatchCollector {
+    patches = [];
+    add(element) {
+        const value = documentIndexValueFromElement(element);
+        const patch = {
+            marker: `__A3S_WORK_DOCUMENT_INDEX_${this.patches.length + 1}__`,
+            options: value.options,
+            entries: value.entries
+        };
+        this.patches.push(patch);
+        return patch;
+    }
+}
+function docxDocumentIndex(element, docx, collector) {
+    const patch = collector.add(element);
+    return [
+        new docx.Paragraph({
+            children: [
+                new docx.TextRun(patch.marker)
+            ]
+        })
+    ];
+}
+function docxIndexEntryRun(element, docx) {
+    const value = documentIndexEntryFromElement(element);
+    return value ? new docx.SimpleField(documentIndexEntryInstruction(value)) : null;
+}
+async function patchDocxIndexes(buffer, patches) {
+    if (!patches.length) return buffer;
+    const archive = await jszip.loadAsync(buffer);
+    const entry = archive.file('word/document.xml');
+    if (!entry) return buffer;
+    const document = parseXml(await entry.async('text'), 'generated DOCX word/document.xml');
+    const paragraphs = descendants(document, 'p');
+    for (const patch of patches){
+        const paragraph = paragraphs.find((candidate)=>descendants(candidate, 't').some((text)=>(text.textContent ?? '').includes(patch.marker)));
+        if (!paragraph) throw new Error(`Generated DOCX did not emit the marker for document index ${patch.marker}.`);
+        paragraph.replaceWith(createIndexContentControl(document, patch));
+    }
+    archive.file('word/document.xml', new XMLSerializer().serializeToString(document));
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function createIndexContentControl(document, patch) {
+    const control = work_docx_index_export_wordElement(document, 'sdt');
+    const properties = work_docx_index_export_wordElement(document, 'sdtPr');
+    const documentPart = work_docx_index_export_wordElement(document, 'docPartObj');
+    const gallery = work_docx_index_export_wordElement(document, 'docPartGallery');
+    work_docx_index_export_setWordAttribute(document, gallery, 'val', 'Indexes');
+    documentPart.append(gallery, work_docx_index_export_wordElement(document, 'docPartUnique'));
+    properties.append(documentPart);
+    const content = work_docx_index_export_wordElement(document, 'sdtContent');
+    const fieldStart = indexFieldStartParagraph(document, patch.options);
+    content.append(fieldStart);
+    const cached = cachedIndexParagraphs(document, patch);
+    if (!cached.length) cached.push(emptyIndexParagraph(document));
+    const last = cached.at(-1);
+    last?.append(fieldCharacterRun(document, 'end'));
+    content.append(...cached);
+    control.append(properties, content);
+    return control;
+}
+function indexFieldStartParagraph(document, options) {
+    const paragraph = work_docx_index_export_wordElement(document, 'p');
+    paragraph.append(fieldCharacterRun(document, 'begin'));
+    const instructionRun = work_docx_index_export_wordElement(document, 'r');
+    const instruction = work_docx_index_export_wordElement(document, 'instrText');
+    instruction.setAttributeNS(work_docx_index_export_XML_NAMESPACE, 'xml:space', 'preserve');
+    instruction.textContent = ` ${documentIndexInstruction(options)} `;
+    instructionRun.append(instruction);
+    paragraph.append(instructionRun, fieldCharacterRun(document, 'separate'));
+    return paragraph;
+}
+function cachedIndexParagraphs(document, patch) {
+    const paragraphs = [];
+    let currentMain = '';
+    for (const entry of patch.entries){
+        if (entry.subEntry && entry.mainEntry !== currentMain) paragraphs.push(cachedIndexParagraph(document, patch.options, {
+            style: 'Index1',
+            term: entry.mainEntry,
+            crossReference: '',
+            pages: []
+        }));
+        paragraphs.push(cachedIndexParagraph(document, patch.options, {
+            style: entry.subEntry ? 'Index2' : 'Index1',
+            term: entry.subEntry || entry.mainEntry,
+            crossReference: entry.crossReference,
+            pages: entry.pages
+        }));
+        currentMain = entry.mainEntry;
+    }
+    return paragraphs;
+}
+function cachedIndexParagraph(document, options, source) {
+    const paragraph = work_docx_index_export_wordElement(document, 'p');
+    const properties = work_docx_index_export_wordElement(document, 'pPr');
+    const style = work_docx_index_export_wordElement(document, 'pStyle');
+    work_docx_index_export_setWordAttribute(document, style, 'val', source.style);
+    properties.append(style);
+    if (source.pages.length && options.rightAlignPageNumbers) {
+        const tabs = work_docx_index_export_wordElement(document, 'tabs');
+        const tab = work_docx_index_export_wordElement(document, 'tab');
+        work_docx_index_export_setWordAttribute(document, tab, 'val', 'right');
+        const leader = docxIndexLeader(options.leader);
+        if (leader) work_docx_index_export_setWordAttribute(document, tab, 'leader', leader);
+        work_docx_index_export_setWordAttribute(document, tab, 'pos', '9360');
+        tabs.append(tab);
+        properties.append(tabs);
+    }
+    paragraph.append(properties, textRun(document, source.term));
+    if (source.crossReference) {
+        paragraph.append(textRun(document, `, See ${source.crossReference}`));
+        return paragraph;
+    }
+    if (!source.pages.length) return paragraph;
+    paragraph.append(options.rightAlignPageNumbers ? tabRun(document) : textRun(document, ', '));
+    for (const [index, page] of source.pages.entries()){
+        if (index > 0) paragraph.append(textRun(document, ', '));
+        paragraph.append(textRun(document, String(page.pageNumber), {
+            bold: page.pageBold,
+            italic: page.pageItalic
+        }));
+    }
+    return paragraph;
+}
+function emptyIndexParagraph(document) {
+    const paragraph = work_docx_index_export_wordElement(document, 'p');
+    const properties = work_docx_index_export_wordElement(document, 'pPr');
+    const style = work_docx_index_export_wordElement(document, 'pStyle');
+    work_docx_index_export_setWordAttribute(document, style, 'val', 'Index1');
+    properties.append(style);
+    paragraph.append(properties);
+    return paragraph;
+}
+function textRun(document, value, style = {}) {
+    const run = work_docx_index_export_wordElement(document, 'r');
+    if (style.bold || style.italic) {
+        const properties = work_docx_index_export_wordElement(document, 'rPr');
+        if (style.bold) properties.append(work_docx_index_export_wordElement(document, 'b'));
+        if (style.italic) properties.append(work_docx_index_export_wordElement(document, 'i'));
+        run.append(properties);
+    }
+    const text = work_docx_index_export_wordElement(document, 't');
+    if (/^\s|\s$/.test(value)) text.setAttributeNS(work_docx_index_export_XML_NAMESPACE, 'xml:space', 'preserve');
+    text.textContent = value;
+    run.append(text);
+    return run;
 }
-function imageLayerPatch(properties, patches) {
-    for (const property of Array.from(properties.attributes))for (const [marker, patch] of patches)if (property.value.includes(marker)) return patch;
-    return null;
+function tabRun(document) {
+    const run = work_docx_index_export_wordElement(document, 'r');
+    run.append(work_docx_index_export_wordElement(document, 'tab'));
+    return run;
 }
-function removeLayerMarker(properties, marker) {
-    for (const property of Array.from(properties.attributes))if (property.value.includes(marker)) property.value = property.value.replace(marker, '');
+function fieldCharacterRun(document, type) {
+    const run = work_docx_index_export_wordElement(document, 'r');
+    const character = work_docx_index_export_wordElement(document, 'fldChar');
+    work_docx_index_export_setWordAttribute(document, character, 'fldCharType', type);
+    run.append(character);
+    return run;
 }
-function closestAnchor(element) {
-    let current = element;
-    while(current){
-        if ('anchor' === current.localName) return current;
-        current = current.parentElement;
-    }
+function docxIndexLeader(value) {
+    if ('dash' === value) return 'hyphen';
+    if ('underline' === value) return 'underscore';
+    if ('dot' === value) return 'dot';
     return null;
 }
-function applyImageLayer(anchor, source) {
-    const layer = normalizeDocumentImageLayer(source);
-    anchor.setAttribute('relativeHeight', String(layer.relativeHeight));
-    anchor.setAttribute('behindDoc', layer.behindDocument ? '1' : '0');
-    anchor.setAttribute('allowOverlap', layer.allowOverlap ? '1' : '0');
-    anchor.setAttribute('layoutInCell', layer.layoutInCell ? '1' : '0');
-    anchor.setAttribute('locked', layer.lockAnchor ? '1' : '0');
+function work_docx_index_export_wordElement(document, localName) {
+    return document.createElementNS(work_docx_index_export_WORD_NAMESPACE, wordQualifiedName(document.documentElement, localName));
 }
-const WORDPROCESSING_DRAWING_NAMESPACE = 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing';
-class DocxImageWrapPatchCollector {
+function work_docx_index_export_setWordAttribute(document, element, localName, value) {
+    for (const candidate of Array.from(element.attributes))if (candidate.localName === localName && (candidate.namespaceURI === work_docx_index_export_WORD_NAMESPACE || !candidate.namespaceURI)) element.removeAttributeNode(candidate);
+    element.setAttributeNS(work_docx_index_export_WORD_NAMESPACE, wordQualifiedName(document.documentElement, localName), value);
+}
+function wordQualifiedName(root, localName) {
+    return `${xmlNamespacePrefix(root, work_docx_index_export_WORD_NAMESPACE) ?? 'w'}:${localName}`;
+}
+const LEGACY_TEXT_EFFECTS_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
+class DocxLegacyTextEffectsPatchCollector {
     patches = [];
     nextMarker = 1;
-    marker(options, contour) {
-        if (!isContourImageLayout(options.layout)) return '';
-        const marker = `__A3S_IMAGE_WRAP_${this.nextMarker}__`;
-        this.nextMarker += 1;
-        this.patches.push({
+    occupied;
+    patchesByMarker = new Map();
+    markersByEffectsAndStyle = new Map();
+    constructor(source){
+        this.occupied = source;
+    }
+    marker(value, inheritedStyle) {
+        const effects = normalizeDocumentLegacyTextEffects(value);
+        if (!effects || !Object.keys(effects).length) throw new Error('Document contains invalid legacy text effects.');
+        const style = this.originalStyle(inheritedStyle);
+        const key = JSON.stringify([
+            DOCUMENT_LEGACY_TEXT_EFFECT_NAMES.map((name)=>effects[name] ?? null),
+            style ?? null
+        ]);
+        const existing = this.markersByEffectsAndStyle.get(key);
+        if (existing) return existing;
+        let marker = '';
+        do {
+            marker = `A3SOfficeLegacyTextEffects${String(this.nextMarker).padStart(8, '0')}`;
+            this.nextMarker += 1;
+        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
+        const patch = {
             marker,
-            layout: options.layout,
-            options,
-            contour: contour ?? defaultDocumentImageWrapContour()
-        });
+            effects,
+            ...style ? {
+                style
+            } : {}
+        };
+        this.patches.push(patch);
+        this.patchesByMarker.set(marker, patch);
+        this.markersByEffectsAndStyle.set(key, marker);
         return marker;
     }
+    lookup(marker) {
+        return marker ? this.patchesByMarker.get(marker) : void 0;
+    }
+    originalStyle(style) {
+        let current = style;
+        const seen = new Set();
+        while(current && !seen.has(current)){
+            seen.add(current);
+            const patch = this.patchesByMarker.get(current);
+            if (!patch) break;
+            current = patch.style;
+        }
+        return current;
+    }
 }
-async function patchDocxImageWraps(buffer, patches) {
+async function patchDocxLegacyTextEffects(buffer, patches) {
     if (!patches.length) return buffer;
+    const byMarker = new Map();
+    for (const patch of patches){
+        const effects = normalizeDocumentLegacyTextEffects(patch.effects);
+        if (!patch.marker || !effects || !Object.keys(effects).length || byMarker.has(patch.marker)) throw new Error('Document contains invalid legacy text-effect patches.');
+        byMarker.set(patch.marker, {
+            ...patch,
+            effects
+        });
+    }
     const archive = await jszip.loadAsync(buffer);
-    const byMarker = new Map(patches.map((patch)=>[
-            patch.marker,
-            patch
-        ]));
-    const entries = Object.values(archive.files).filter((entry)=>!entry.dir && /^word\/(?:document|header\d+|footer\d+|footnotes|endnotes|comments)\.xml$/.test(entry.name));
-    for (const entry of entries){
-        const document = parseXml(await entry.async('text'), entry.name);
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !LEGACY_TEXT_EFFECTS_PART_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
         let changed = false;
-        for (const properties of descendants(document, 'docPr')){
-            const patch = imageWrapPatch(properties, byMarker);
-            if (!patch) continue;
-            removeWrapMarker(properties, patch.marker);
-            changed = true;
-            const anchor = work_docx_image_wrap_closestAnchor(properties);
-            const source = anchor ? wrappingElement(anchor) : null;
-            if (anchor && source) source.parentNode?.replaceChild(createWrappingElement(anchor, patch), source);
+        for (const properties of descendants(document, 'rPr')){
+            if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
+            const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
+                if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
+                const marker = work_docx_legacy_text_effects_export_wordValue(style);
+                return null !== marker && byMarker.has(marker);
+            });
+            if (!markerStyles.length) continue;
+            if (1 !== markerStyles.length) throw new Error('Generated DOCX legacy text-effect marker is duplicated in one run.');
+            const marker = work_docx_legacy_text_effects_export_wordValue(markerStyles[0]);
+            const patch = marker ? byMarker.get(marker) : void 0;
+            if (marker && patch) {
+                if (DOCUMENT_LEGACY_TEXT_EFFECT_NAMES.some((name)=>directChildren(properties, name).length > 0)) throw new Error('Generated DOCX legacy text-effect marker unexpectedly has a native value.');
+                if (patch.style) work_docx_legacy_text_effects_export_setWordValue(markerStyles[0], patch.style);
+                else markerStyles[0].remove();
+                for (const name of DOCUMENT_LEGACY_TEXT_EFFECT_NAMES){
+                    const value = patch.effects[name];
+                    if (void 0 !== value) insertLegacyTextEffectProperty(document, properties, name, value);
+                }
+                applied.add(marker);
+                changed = true;
+            }
         }
-        if (changed) archive.file(entry.name, new XMLSerializer().serializeToString(document));
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
     }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`DOCX legacy text-effect markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
     return archive.generateAsync({
         type: 'arraybuffer'
     });
 }
-function imageWrapPatch(properties, patches) {
-    for (const attribute of Array.from(properties.attributes))for (const [marker, patch] of patches)if (attribute.value.includes(marker)) return patch;
-    return null;
-}
-function removeWrapMarker(properties, marker) {
-    for (const attribute of Array.from(properties.attributes))if (attribute.value.includes(marker)) attribute.value = attribute.value.replace(marker, '');
-}
-function work_docx_image_wrap_closestAnchor(element) {
-    let current = element;
-    while(current){
-        if ('anchor' === current.localName) return current;
-        current = current.parentElement;
-    }
-    return null;
+function insertLegacyTextEffectProperty(document, properties, name, value) {
+    const namespace = properties.namespaceURI ?? '';
+    const prefix = properties.prefix || 'w';
+    const effect = document.createElementNS(namespace, `${prefix}:${name}`);
+    if (!value) effect.setAttributeNS(namespace, `${prefix}:val`, '0');
+    const rank = DOCX_RUN_PROPERTY_RANK.get(name) ?? 0;
+    const next = directChildren(properties).find((child)=>{
+        if (!DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '')) return true;
+        return (DOCX_RUN_PROPERTY_RANK.get(child.localName) ?? 1 / 0) > rank;
+    });
+    properties.insertBefore(effect, next ?? null);
 }
-function wrappingElement(anchor) {
-    return directChildren(anchor).find((element)=>[
-            'wrapNone',
-            'wrapSquare',
-            'wrapTight',
-            'wrapThrough',
-            'wrapTopAndBottom'
-        ].includes(element.localName)) ?? null;
+function work_docx_legacy_text_effects_export_wordValue(element) {
+    const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
+    return 1 === values.length ? values[0].value : null;
 }
-function createWrappingElement(anchor, patch) {
-    const document = anchor.ownerDocument;
-    const namespace = anchor.namespaceURI ?? WORDPROCESSING_DRAWING_NAMESPACE;
-    const prefix = anchor.prefix ? `${anchor.prefix}:` : '';
-    const wrap = document.createElementNS(namespace, `${prefix}${'tight' === patch.layout ? 'wrapTight' : 'wrapThrough'}`);
-    wrap.setAttribute('wrapText', patch.options.wrapSide);
-    const distance = String(Math.round(36000 * patch.options.wrapDistance));
-    wrap.setAttribute('distL', distance);
-    wrap.setAttribute('distR', distance);
-    const polygon = document.createElementNS(namespace, `${prefix}wrapPolygon`);
-    polygon.setAttribute('edited', patch.contour.edited ? '1' : '0');
-    patch.contour.points.forEach((point, index)=>{
-        const child = document.createElementNS(namespace, `${prefix}${0 === index ? 'start' : 'lineTo'}`);
-        child.setAttribute('x', String(point.x));
-        child.setAttribute('y', String(point.y));
-        polygon.append(child);
-    });
-    wrap.append(polygon);
-    return wrap;
+function work_docx_legacy_text_effects_export_setWordValue(element, value) {
+    const namespace = element.namespaceURI ?? '';
+    const prefix = element.prefix || 'w';
+    for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
+    element.setAttributeNS(namespace, `${prefix}:val`, value);
 }
 function documentParagraphShadingDocxOptions(element, themePatches) {
     const shading = parseDocumentParagraphShadingElement(element);
@@ -3580,7 +3580,7 @@ async function listToDocxParagraphs(list, docx, context, inlineRuns, depth = 0)
     const ordered = 'ol' === list.tagName.toLowerCase();
     const numbering = ordered ? registerOrderedListNumbering(list, level, docx, context) : registerBulletListNumbering(list, level, docx, context);
     const items = Array.from(list.children).filter((child)=>child instanceof HTMLElement && 'li' === child.tagName.toLowerCase());
-    for (const item of items){
+    for (const [itemIndex, item] of items.entries()){
         const directBlocks = Array.from(item.children).filter((child)=>child instanceof HTMLElement && 'ol' !== child.tagName.toLowerCase() && 'ul' !== child.tagName.toLowerCase());
         const contentBlocks = directBlocks.length ? directBlocks : [
             directListItemContentRoot(item)
@@ -3589,8 +3589,13 @@ async function listToDocxParagraphs(list, docx, context, inlineRuns, depth = 0)
             const tag = block.tagName.toLowerCase();
             const heading = 'h1' === tag ? docx.HeadingLevel.HEADING_1 : 'h2' === tag ? docx.HeadingLevel.HEADING_2 : 'h3' === tag ? docx.HeadingLevel.HEADING_3 : void 0;
             const runs = await inlineRuns(block);
+            const numberingChangeMarker = ordered && 0 === blockIndex ? context.numberingChangeMarker?.(list, itemIndex) : null;
+            const paragraphChildren = numberingChangeMarker ? [
+                new docx.TextRun(numberingChangeMarker),
+                ...runs
+            ] : runs;
             paragraphs.push(new docx.Paragraph({
-                children: runs.length ? runs : [
+                children: paragraphChildren.length ? paragraphChildren : [
                     new docx.TextRun('')
                 ],
                 heading,
@@ -4023,13 +4028,105 @@ async function patchDocxNumberingRestartRules(buffer, rules) {
             restart.setAttributeNS(work_docx_numbering_WORD_NAMESPACE, work_docx_numbering_wordQualifiedName(document.documentElement, 'val'), String(restartAfterLevel));
         }
     }
-    archive.file('word/numbering.xml', new XMLSerializer().serializeToString(document));
+    archive.file('word/numbering.xml', new XMLSerializer().serializeToString(document));
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function work_docx_numbering_wordQualifiedName(root, localName) {
+    return `${xmlNamespacePrefix(root, work_docx_numbering_WORD_NAMESPACE) ?? root.prefix ?? 'w'}:${localName}`;
+}
+const work_docx_numbering_change_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const MAX_NUMBERING_CHANGE_PATCHES = 65536;
+const NUMBERING_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes)\.xml$/i;
+class DocxNumberingChangePatchCollector {
+    patches = [];
+    register(list, itemIndex, id) {
+        if ('ol' !== list.tagName.toLowerCase() || 'numbering' !== list.dataset.changeKind || !list.hasAttribute('data-document-change')) return null;
+        const key = list.dataset.changeId?.trim() ?? '';
+        const author = list.dataset.changeAuthor?.trim() ?? '';
+        const date = work_docx_numbering_change_export_normalizedRevisionDate(list.dataset.changeDate);
+        const snapshot = parseDocumentNumberingChange(list.dataset.changeBefore ?? '');
+        const value = snapshot ? snapshot.start + itemIndex : 0;
+        if (!key || !author || author.length > 255 || /[\u0000-\u001f\u007f]/.test(author) || !snapshot || !Number.isSafeInteger(itemIndex) || itemIndex < 0 || value < 1 || value > MAX_DOCUMENT_NUMBERING_START) throw new Error('Document contains an invalid numbering revision.');
+        if (this.patches.length >= MAX_NUMBERING_CHANGE_PATCHES) throw new Error('Document exceeds the numbering revision limit.');
+        const marker = `__A3S_WORK_NUMBERING_CHANGE_EXPORT_${this.patches.length + 1}__`;
+        this.patches.push({
+            marker,
+            id,
+            author,
+            date,
+            original: `%${snapshot.level + 1}:${value}:${snapshot.originalFormat}:${snapshot.originalSuffix}`
+        });
+        return marker;
+    }
+}
+async function patchDocxNumberingChanges(buffer, patches) {
+    if (!patches.length) return buffer;
+    if (patches.length > MAX_NUMBERING_CHANGE_PATCHES) throw new Error('Document exceeds the numbering revision limit.');
+    const archive = await jszip.loadAsync(buffer);
+    const byMarker = new Map(patches.map((patch)=>[
+            patch.marker,
+            patch
+        ]));
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !NUMBERING_PART_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
+        let changed = false;
+        for (const paragraph of descendants(document, 'p').filter((element)=>element.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE))for (const marker of numberingMarkers(paragraph, byMarker)){
+            if (applied.has(marker.patch.marker)) throw new Error(`Generated DOCX contains a duplicate numbering revision marker: ${marker.patch.marker}.`);
+            setNumberingChange(document, paragraph, marker.patch);
+            marker.run.remove();
+            applied.add(marker.patch.marker);
+            changed = true;
+        }
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`DOCX numbering revision markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
     return archive.generateAsync({
         type: 'arraybuffer'
     });
 }
-function work_docx_numbering_wordQualifiedName(root, localName) {
-    return `${xmlNamespacePrefix(root, work_docx_numbering_WORD_NAMESPACE) ?? root.prefix ?? 'w'}:${localName}`;
+function numberingMarkers(paragraph, patches) {
+    return directChildren(paragraph, 'r').flatMap((run)=>{
+        if (run.namespaceURI !== work_docx_numbering_change_export_WORD_NAMESPACE) return [];
+        const texts = directChildren(run, 't').filter((text)=>text.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE);
+        if (1 !== texts.length || !work_docx_numbering_change_export_runHasOnlyMarkerText(run, texts[0])) return [];
+        const patch = patches.get(texts[0]?.textContent ?? '');
+        return patch ? [
+            {
+                patch,
+                run
+            }
+        ] : [];
+    });
+}
+function work_docx_numbering_change_export_runHasOnlyMarkerText(run, markerText) {
+    return Boolean(markerText && directChildren(run).every((child)=>child === markerText || 'rPr' === child.localName && child.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE));
+}
+function setNumberingChange(document, paragraph, patch) {
+    const propertyNodes = directChildren(paragraph, 'pPr').filter((element)=>element.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE);
+    if (1 !== propertyNodes.length) throw new Error('Generated DOCX numbered paragraph must contain one property node.');
+    const numberingNodes = directChildren(propertyNodes[0], 'numPr').filter((element)=>element.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE);
+    if (1 !== numberingNodes.length) throw new Error('Generated DOCX numbered paragraph must contain one numbering property node.');
+    const numbering = numberingNodes[0];
+    if (directChildren(numbering, 'numberingChange').some((element)=>element.namespaceURI === work_docx_numbering_change_export_WORD_NAMESPACE)) throw new Error('Generated DOCX paragraph already contains a numbering revision.');
+    const prefix = xmlNamespacePrefix(document.documentElement, work_docx_numbering_change_export_WORD_NAMESPACE) ?? 'w';
+    const change = document.createElementNS(work_docx_numbering_change_export_WORD_NAMESPACE, `${prefix}:numberingChange`);
+    work_docx_numbering_change_export_setWordAttribute(change, prefix, 'id', String(patch.id));
+    work_docx_numbering_change_export_setWordAttribute(change, prefix, 'author', patch.author);
+    work_docx_numbering_change_export_setWordAttribute(change, prefix, 'date', patch.date);
+    work_docx_numbering_change_export_setWordAttribute(change, prefix, 'original', patch.original);
+    numbering.append(change);
+}
+function work_docx_numbering_change_export_setWordAttribute(element, prefix, name, value) {
+    element.setAttributeNS(work_docx_numbering_change_export_WORD_NAMESPACE, `${prefix}:${name}`, value);
+}
+function work_docx_numbering_change_export_normalizedRevisionDate(value) {
+    const time = Date.parse(value?.trim() ?? '');
+    return Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString();
 }
 const work_docx_paragraph_format_change_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const work_docx_paragraph_format_change_export_WORD_2012_NAMESPACE = 'http://schemas.microsoft.com/office/word/2012/wordml';
@@ -4370,25 +4467,254 @@ function work_docx_paragraph_identity_ensureIgnorableNamespace(root, prefix, nam
     attribute?.ownerElement?.removeAttributeNode(attribute);
     root.setAttributeNS(work_docx_paragraph_identity_MARKUP_COMPATIBILITY_NAMESPACE, `${compatibilityPrefix}:Ignorable`, tokens.join(' '));
 }
-function work_docx_paragraph_identity_ensureNamespacePrefix(root, preferred, namespace) {
-    const existing = xmlDeclaredPrefix(root, namespace);
-    if (existing) return existing;
-    if (!xmlNamespaceUri(root, preferred)) {
-        root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${preferred}`, namespace);
-        return preferred;
-    }
-    let suffix = 1;
-    let prefix = '';
-    do {
-        prefix = `a3s${suffix}`;
-        suffix += 1;
-    }while (xmlNamespaceUri(root, prefix))
-    root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${prefix}`, namespace);
-    return prefix;
+function work_docx_paragraph_identity_ensureNamespacePrefix(root, preferred, namespace) {
+    const existing = xmlDeclaredPrefix(root, namespace);
+    if (existing) return existing;
+    if (!xmlNamespaceUri(root, preferred)) {
+        root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${preferred}`, namespace);
+        return preferred;
+    }
+    let suffix = 1;
+    let prefix = '';
+    do {
+        prefix = `a3s${suffix}`;
+        suffix += 1;
+    }while (xmlNamespaceUri(root, prefix))
+    root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${prefix}`, namespace);
+    return prefix;
+}
+function isParagraphPartRoot(root, path) {
+    const expected = /^word\/header\d*\.xml$/i.test(path) ? 'hdr' : /^word\/footer\d*\.xml$/i.test(path) ? 'ftr' : /^word\/footnotes\.xml$/i.test(path) ? 'footnotes' : /^word\/endnotes\.xml$/i.test(path) ? 'endnotes' : 'document';
+    return root.localName === expected && DOCX_WORDPROCESSING_NAMESPACES.has(root.namespaceURI ?? '');
+}
+const work_docx_run_border_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+class DocxRunBorderPatchCollector {
+    patches = [];
+    nextMarker = 1;
+    usedColors;
+    constructor(sourceHtml){
+        this.usedColors = work_docx_run_border_export_sourceColors(sourceHtml);
+    }
+    marker(source) {
+        const border = normalizeDocumentRunBorder(source);
+        if (!border) return null;
+        let marker = '';
+        do {
+            const value = 0xc00000 + this.nextMarker;
+            if (value > 0xcfffff) throw new Error('DOCX character border marker space is exhausted.');
+            marker = value.toString(16).padStart(6, '0').toUpperCase();
+            this.nextMarker += 1;
+        }while (this.usedColors.has(marker))
+        this.usedColors.add(marker);
+        this.patches.push({
+            marker,
+            border
+        });
+        return marker;
+    }
+    hasMarker(value) {
+        const marker = value?.toUpperCase();
+        return Boolean(marker && this.patches.some((patch)=>patch.marker === marker));
+    }
+}
+function documentRunBorderDocxOptions(source, collector) {
+    const marker = collector.marker(source);
+    return marker ? {
+        border: {
+            style: 'single',
+            color: marker,
+            size: 2,
+            space: 0
+        }
+    } : {};
+}
+async function patchDocxRunBorders(buffer, patches) {
+    if (!patches.length) return buffer;
+    const archive = await jszip.loadAsync(buffer);
+    const byMarker = new Map(patches.map((patch)=>[
+            patch.marker,
+            patch
+        ]));
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !/^word\/(?:document|header\d+|footer\d+|footnotes|endnotes|comments)\.xml$/i.test(entry.name)) continue;
+        const document = parseXml(await entry.async('text'), entry.name);
+        let changed = false;
+        for (const element of Array.from(document.getElementsByTagName('*'))){
+            if ('bdr' !== element.localName || element.namespaceURI !== work_docx_run_border_export_WORD_NAMESPACE || element.parentElement?.localName !== 'rPr') continue;
+            const marker = work_docx_run_border_export_wordAttribute(element, 'color')?.toUpperCase();
+            const patch = marker ? byMarker.get(marker) : void 0;
+            if (marker && patch) {
+                replaceRunBorderAttributes(document, element, patch.border);
+                applied.add(marker);
+                changed = true;
+            }
+        }
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`Generated DOCX is missing ${missing.length} character border marker(s).`);
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function setDocxRunBorderAttributes(document, element, border) {
+    work_docx_run_border_export_setWordAttribute(document, element, 'val', border.style);
+    const color = border.color;
+    if (color) {
+        work_docx_run_border_export_setWordAttribute(document, element, 'color', 'auto' === color.value ? 'auto' : color.value.slice(1).toUpperCase());
+        if (color.theme) {
+            work_docx_run_border_export_setWordAttribute(document, element, 'themeColor', color.theme.theme);
+            if (color.theme.tint) work_docx_run_border_export_setWordAttribute(document, element, 'themeTint', color.theme.tint);
+            if (color.theme.shade) work_docx_run_border_export_setWordAttribute(document, element, 'themeShade', color.theme.shade);
+        }
+    }
+    if (void 0 !== border.size) work_docx_run_border_export_setWordAttribute(document, element, 'sz', String(border.size));
+    if (void 0 !== border.space) work_docx_run_border_export_setWordAttribute(document, element, 'space', String(border.space));
+    if (void 0 !== border.shadow) work_docx_run_border_export_setWordAttribute(document, element, 'shadow', border.shadow ? '1' : '0');
+    if (void 0 !== border.frame) work_docx_run_border_export_setWordAttribute(document, element, 'frame', border.frame ? '1' : '0');
+}
+function replaceRunBorderAttributes(document, element, border) {
+    for (const attribute of Array.from(element.attributes))if ('xmlns' !== attribute.name && !attribute.name.startsWith('xmlns:')) element.removeAttributeNode(attribute);
+    element.replaceChildren();
+    setDocxRunBorderAttributes(document, element, border);
+}
+function work_docx_run_border_export_sourceColors(source) {
+    const colors = new Set();
+    for (const match of source.matchAll(/#([0-9a-f]{6})\b/gi))if (match[1]) colors.add(match[1].toUpperCase());
+    return colors;
+}
+function work_docx_run_border_export_wordAttribute(element, name) {
+    return element.getAttributeNS(work_docx_run_border_export_WORD_NAMESPACE, name) ?? element.getAttribute(`w:${name}`);
+}
+function work_docx_run_border_export_setWordAttribute(document, element, name, value) {
+    const prefix = xmlNamespacePrefix(document.documentElement, work_docx_run_border_export_WORD_NAMESPACE) ?? 'w';
+    element.setAttributeNS(work_docx_run_border_export_WORD_NAMESPACE, `${prefix}:${name}`, value);
+}
+const RUN_FONT_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
+const WORD_FONT_ATTRIBUTE_NAMES = new Set([
+    'ascii',
+    'hAnsi',
+    'eastAsia',
+    'cs',
+    'asciiTheme',
+    'hAnsiTheme',
+    'eastAsiaTheme',
+    'cstheme',
+    'hint'
+]);
+class DocxRunFontsPatchCollector {
+    patches = [];
+    nextMarker = 1;
+    occupied;
+    markersByFonts = new Map();
+    constructor(source){
+        this.occupied = source;
+    }
+    marker(source, slot, currentFontFamily) {
+        const fonts = normalizeDocumentScriptFonts(source);
+        const normalizedSlot = normalizeDocumentScriptFontSlot(slot) ?? documentScriptFontSlotFromHint(fonts?.hint);
+        const expected = fonts ? documentScriptFontFamily(fonts, normalizedSlot) : void 0;
+        const current = documentFontNameFromCssFamily(currentFontFamily);
+        if (!fonts || (expected ? documentFontNameFromCssFamily(expected)?.toLocaleLowerCase() !== current?.toLocaleLowerCase() : Boolean(currentFontFamily.trim()))) return null;
+        const key = serializeDocumentScriptFonts(fonts);
+        if (!key) return null;
+        const existing = this.markersByFonts.get(key);
+        if (existing) return existing;
+        let marker = '';
+        do {
+            marker = `A3SOfficeRunFonts${String(this.nextMarker).padStart(8, '0')}`;
+            this.nextMarker += 1;
+        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
+        this.patches.push({
+            marker,
+            fonts
+        });
+        this.markersByFonts.set(key, marker);
+        return marker;
+    }
+}
+async function patchDocxRunFonts(buffer, patches) {
+    if (!patches.length) return buffer;
+    const archive = await jszip.loadAsync(buffer);
+    const byMarker = new Map(patches.map((patch)=>[
+            patch.marker,
+            patch.fonts
+        ]));
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !RUN_FONT_PART_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
+        let changedPart = false;
+        for (const element of descendants(document, 'rFonts')){
+            if (!DOCX_WORDPROCESSING_NAMESPACES.has(element.namespaceURI ?? '')) continue;
+            const marker = wordFontAttribute(element, 'ascii');
+            if (!marker) continue;
+            const fonts = byMarker.get(marker);
+            if (fonts) {
+                replaceWordFontAttributes(element, fonts);
+                applied.add(marker);
+                changedPart = true;
+            }
+        }
+        if (changedPart) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`DOCX run-font markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function replaceWordFontAttributes(element, fonts) {
+    for (const item of Array.from(element.attributes))if (item.namespaceURI !== work_docx_settings_xml_XMLNS_NAMESPACE && WORD_FONT_ATTRIBUTE_NAMES.has(xmlAttributeLocalName(item)) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, item) ?? '')) element.removeAttributeNode(item);
+    const values = [
+        [
+            'ascii',
+            fonts.ascii?.name
+        ],
+        [
+            'hAnsi',
+            fonts.highAnsi?.name
+        ],
+        [
+            'eastAsia',
+            fonts.eastAsia?.name
+        ],
+        [
+            'cs',
+            fonts.complexScript?.name
+        ],
+        [
+            'asciiTheme',
+            fonts.ascii?.theme
+        ],
+        [
+            'hAnsiTheme',
+            fonts.highAnsi?.theme
+        ],
+        [
+            'eastAsiaTheme',
+            fonts.eastAsia?.theme
+        ],
+        [
+            'cstheme',
+            fonts.complexScript?.theme
+        ],
+        [
+            'hint',
+            fonts.hint
+        ]
+    ];
+    for (const [name, value] of values)if (value) setWordFontAttribute(element, name, value);
+}
+function wordFontAttribute(element, name) {
+    const values = Array.from(element.attributes).filter((item)=>xmlAttributeLocalName(item) === name && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, item) ?? ''));
+    return 1 === values.length ? values[0]?.value ?? null : null;
 }
-function isParagraphPartRoot(root, path) {
-    const expected = /^word\/header\d*\.xml$/i.test(path) ? 'hdr' : /^word\/footer\d*\.xml$/i.test(path) ? 'ftr' : /^word\/footnotes\.xml$/i.test(path) ? 'footnotes' : /^word\/endnotes\.xml$/i.test(path) ? 'endnotes' : 'document';
-    return root.localName === expected && DOCX_WORDPROCESSING_NAMESPACES.has(root.namespaceURI ?? '');
+function setWordFontAttribute(element, name, value) {
+    const namespace = element.namespaceURI ?? '';
+    const prefix = element.prefix || 'w';
+    element.setAttributeNS(namespace, `${prefix}:${name}`, value);
 }
 const TWIPS_PER_PIXEL = 15;
 function documentTableCellDocxOptions(cell, docx, themePatches) {
@@ -8331,235 +8657,6 @@ function docxParagraphPartPaths(pathsByLower, contentTypes) {
 function isObfuscatedFontContentType(type) {
     return type?.trim().toLowerCase() === 'application/vnd.openxmlformats-officedocument.obfuscatedfont';
 }
-const RUN_FONT_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
-const WORD_FONT_ATTRIBUTE_NAMES = new Set([
-    'ascii',
-    'hAnsi',
-    'eastAsia',
-    'cs',
-    'asciiTheme',
-    'hAnsiTheme',
-    'eastAsiaTheme',
-    'cstheme',
-    'hint'
-]);
-class DocxRunFontsPatchCollector {
-    patches = [];
-    nextMarker = 1;
-    occupied;
-    markersByFonts = new Map();
-    constructor(source){
-        this.occupied = source;
-    }
-    marker(source, slot, currentFontFamily) {
-        const fonts = normalizeDocumentScriptFonts(source);
-        const normalizedSlot = normalizeDocumentScriptFontSlot(slot) ?? documentScriptFontSlotFromHint(fonts?.hint);
-        const expected = fonts ? documentScriptFontFamily(fonts, normalizedSlot) : void 0;
-        const current = documentFontNameFromCssFamily(currentFontFamily);
-        if (!fonts || (expected ? documentFontNameFromCssFamily(expected)?.toLocaleLowerCase() !== current?.toLocaleLowerCase() : Boolean(currentFontFamily.trim()))) return null;
-        const key = serializeDocumentScriptFonts(fonts);
-        if (!key) return null;
-        const existing = this.markersByFonts.get(key);
-        if (existing) return existing;
-        let marker = '';
-        do {
-            marker = `A3SOfficeRunFonts${String(this.nextMarker).padStart(8, '0')}`;
-            this.nextMarker += 1;
-        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
-        this.patches.push({
-            marker,
-            fonts
-        });
-        this.markersByFonts.set(key, marker);
-        return marker;
-    }
-}
-async function patchDocxRunFonts(buffer, patches) {
-    if (!patches.length) return buffer;
-    const archive = await jszip.loadAsync(buffer);
-    const byMarker = new Map(patches.map((patch)=>[
-            patch.marker,
-            patch.fonts
-        ]));
-    const applied = new Set();
-    for (const entry of Object.values(archive.files)){
-        if (entry.dir || !RUN_FONT_PART_PATTERN.test(entry.name)) continue;
-        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
-        let changedPart = false;
-        for (const element of descendants(document, 'rFonts')){
-            if (!DOCX_WORDPROCESSING_NAMESPACES.has(element.namespaceURI ?? '')) continue;
-            const marker = wordFontAttribute(element, 'ascii');
-            if (!marker) continue;
-            const fonts = byMarker.get(marker);
-            if (fonts) {
-                replaceWordFontAttributes(element, fonts);
-                applied.add(marker);
-                changedPart = true;
-            }
-        }
-        if (changedPart) archive.file(entry.name, serializeUtf8Xml(document));
-    }
-    const missing = patches.filter((patch)=>!applied.has(patch.marker));
-    if (missing.length) throw new Error(`DOCX run-font markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
-}
-function replaceWordFontAttributes(element, fonts) {
-    for (const item of Array.from(element.attributes))if (item.namespaceURI !== work_docx_settings_xml_XMLNS_NAMESPACE && WORD_FONT_ATTRIBUTE_NAMES.has(xmlAttributeLocalName(item)) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, item) ?? '')) element.removeAttributeNode(item);
-    const values = [
-        [
-            'ascii',
-            fonts.ascii?.name
-        ],
-        [
-            'hAnsi',
-            fonts.highAnsi?.name
-        ],
-        [
-            'eastAsia',
-            fonts.eastAsia?.name
-        ],
-        [
-            'cs',
-            fonts.complexScript?.name
-        ],
-        [
-            'asciiTheme',
-            fonts.ascii?.theme
-        ],
-        [
-            'hAnsiTheme',
-            fonts.highAnsi?.theme
-        ],
-        [
-            'eastAsiaTheme',
-            fonts.eastAsia?.theme
-        ],
-        [
-            'cstheme',
-            fonts.complexScript?.theme
-        ],
-        [
-            'hint',
-            fonts.hint
-        ]
-    ];
-    for (const [name, value] of values)if (value) setWordFontAttribute(element, name, value);
-}
-function wordFontAttribute(element, name) {
-    const values = Array.from(element.attributes).filter((item)=>xmlAttributeLocalName(item) === name && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, item) ?? ''));
-    return 1 === values.length ? values[0]?.value ?? null : null;
-}
-function setWordFontAttribute(element, name, value) {
-    const namespace = element.namespaceURI ?? '';
-    const prefix = element.prefix || 'w';
-    element.setAttributeNS(namespace, `${prefix}:${name}`, value);
-}
-const work_docx_run_border_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
-class DocxRunBorderPatchCollector {
-    patches = [];
-    nextMarker = 1;
-    usedColors;
-    constructor(sourceHtml){
-        this.usedColors = work_docx_run_border_export_sourceColors(sourceHtml);
-    }
-    marker(source) {
-        const border = normalizeDocumentRunBorder(source);
-        if (!border) return null;
-        let marker = '';
-        do {
-            const value = 0xc00000 + this.nextMarker;
-            if (value > 0xcfffff) throw new Error('DOCX character border marker space is exhausted.');
-            marker = value.toString(16).padStart(6, '0').toUpperCase();
-            this.nextMarker += 1;
-        }while (this.usedColors.has(marker))
-        this.usedColors.add(marker);
-        this.patches.push({
-            marker,
-            border
-        });
-        return marker;
-    }
-    hasMarker(value) {
-        const marker = value?.toUpperCase();
-        return Boolean(marker && this.patches.some((patch)=>patch.marker === marker));
-    }
-}
-function documentRunBorderDocxOptions(source, collector) {
-    const marker = collector.marker(source);
-    return marker ? {
-        border: {
-            style: 'single',
-            color: marker,
-            size: 2,
-            space: 0
-        }
-    } : {};
-}
-async function patchDocxRunBorders(buffer, patches) {
-    if (!patches.length) return buffer;
-    const archive = await jszip.loadAsync(buffer);
-    const byMarker = new Map(patches.map((patch)=>[
-            patch.marker,
-            patch
-        ]));
-    const applied = new Set();
-    for (const entry of Object.values(archive.files)){
-        if (entry.dir || !/^word\/(?:document|header\d+|footer\d+|footnotes|endnotes|comments)\.xml$/i.test(entry.name)) continue;
-        const document = parseXml(await entry.async('text'), entry.name);
-        let changed = false;
-        for (const element of Array.from(document.getElementsByTagName('*'))){
-            if ('bdr' !== element.localName || element.namespaceURI !== work_docx_run_border_export_WORD_NAMESPACE || element.parentElement?.localName !== 'rPr') continue;
-            const marker = work_docx_run_border_export_wordAttribute(element, 'color')?.toUpperCase();
-            const patch = marker ? byMarker.get(marker) : void 0;
-            if (marker && patch) {
-                replaceRunBorderAttributes(document, element, patch.border);
-                applied.add(marker);
-                changed = true;
-            }
-        }
-        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
-    }
-    const missing = patches.filter((patch)=>!applied.has(patch.marker));
-    if (missing.length) throw new Error(`Generated DOCX is missing ${missing.length} character border marker(s).`);
-    return archive.generateAsync({
-        type: 'arraybuffer'
-    });
-}
-function setDocxRunBorderAttributes(document, element, border) {
-    work_docx_run_border_export_setWordAttribute(document, element, 'val', border.style);
-    const color = border.color;
-    if (color) {
-        work_docx_run_border_export_setWordAttribute(document, element, 'color', 'auto' === color.value ? 'auto' : color.value.slice(1).toUpperCase());
-        if (color.theme) {
-            work_docx_run_border_export_setWordAttribute(document, element, 'themeColor', color.theme.theme);
-            if (color.theme.tint) work_docx_run_border_export_setWordAttribute(document, element, 'themeTint', color.theme.tint);
-            if (color.theme.shade) work_docx_run_border_export_setWordAttribute(document, element, 'themeShade', color.theme.shade);
-        }
-    }
-    if (void 0 !== border.size) work_docx_run_border_export_setWordAttribute(document, element, 'sz', String(border.size));
-    if (void 0 !== border.space) work_docx_run_border_export_setWordAttribute(document, element, 'space', String(border.space));
-    if (void 0 !== border.shadow) work_docx_run_border_export_setWordAttribute(document, element, 'shadow', border.shadow ? '1' : '0');
-    if (void 0 !== border.frame) work_docx_run_border_export_setWordAttribute(document, element, 'frame', border.frame ? '1' : '0');
-}
-function replaceRunBorderAttributes(document, element, border) {
-    for (const attribute of Array.from(element.attributes))if ('xmlns' !== attribute.name && !attribute.name.startsWith('xmlns:')) element.removeAttributeNode(attribute);
-    element.replaceChildren();
-    setDocxRunBorderAttributes(document, element, border);
-}
-function work_docx_run_border_export_sourceColors(source) {
-    const colors = new Set();
-    for (const match of source.matchAll(/#([0-9a-f]{6})\b/gi))if (match[1]) colors.add(match[1].toUpperCase());
-    return colors;
-}
-function work_docx_run_border_export_wordAttribute(element, name) {
-    return element.getAttributeNS(work_docx_run_border_export_WORD_NAMESPACE, name) ?? element.getAttribute(`w:${name}`);
-}
-function work_docx_run_border_export_setWordAttribute(document, element, name, value) {
-    const prefix = xmlNamespacePrefix(document.documentElement, work_docx_run_border_export_WORD_NAMESPACE) ?? 'w';
-    element.setAttributeNS(work_docx_run_border_export_WORD_NAMESPACE, `${prefix}:${name}`, value);
-}
 async function createDocxBlob(content, sourcePackage) {
     const docx = await import("docx");
     const normalizedContent = {
@@ -8605,11 +8702,13 @@ async function createDocxBlob(content, sourcePackage) {
         usedNativeTextEffectMarkers: new Set(),
         usedOpenTypeMarkers: new Set(),
         paragraphFormattingChangePatches: new DocxParagraphFormattingChangePatchCollector(),
+        numberingChangePatches: new DocxNumberingChangePatchCollector(),
         tableOfContentsPatches: new DocxTableOfContentsPatchCollector(),
         indexPatches: new DocxIndexPatchCollector(),
         hasExplicitZeroCharacterSpacing: false,
         hasExplicitZeroKerningThreshold: false
     };
+    noteContext.numberingChangeMarker = (list, itemIndex)=>noteContext.numberingChangePatches.register(list, itemIndex, docxRevisionId(list, noteContext, `numbering:${noteContext.numberingChangePatches.patches.length + 1}`));
     const commentRecords = createDocxCommentRecords(commentThreads, docx, noteContext.commentIds);
     const sections = [];
     let usesOddEvenPageChrome = false;
@@ -8681,7 +8780,8 @@ async function createDocxBlob(content, sourcePackage) {
     const tableOfContentsPatched = await patchDocxTableOfContents(paragraphIdentityPatched, noteContext.tableOfContentsPatches.patches);
     const indexPatched = await patchDocxIndexes(tableOfContentsPatched, noteContext.indexPatches.patches);
     const paragraphFormattingChangesPatched = await patchDocxParagraphFormattingChanges(indexPatched, noteContext.paragraphFormattingChangePatches.patches);
-    const equationPatched = await patchDocxEquations(paragraphFormattingChangesPatched, noteContext.equationPatches.patches);
+    const numberingChangesPatched = await patchDocxNumberingChanges(paragraphFormattingChangesPatched, noteContext.numberingChangePatches.patches);
+    const equationPatched = await patchDocxEquations(numberingChangesPatched, noteContext.equationPatches.patches);
     const patched = await patchDocxPageColor(equationPatched, normalizedContent.pageColor);
     const preserved = sourcePackage ? await preserveDocxSourcePackage(patched, sourcePackage, {
         numberingIdentities: noteContext.numberingSourceIdentities
@@ -9234,8 +9334,9 @@ function docxTextRevision(element, kind, context) {
         date: Number.isFinite(time) ? new Date(time).toISOString() : new Date().toISOString()
     };
 }
-function docxRevisionId(element, context) {
-    const key = element.dataset.changeId?.trim() || `change-${context.nextChangeId}`;
+function docxRevisionId(element, context, suffix) {
+    const baseKey = element.dataset.changeId?.trim() || `change-${context.nextChangeId}`;
+    const key = suffix ? `${baseKey}:${suffix}` : baseKey;
     let id = context.changeIds.get(key);
     if (!id) {
         id = context.nextChangeId;
@@ -9246,7 +9347,7 @@ function docxRevisionId(element, context) {
 }
 function documentHasTrackedChanges(html) {
     const document = new DOMParser().parseFromString(html, 'text/html');
-    return Boolean(document.body.querySelector('ins[data-document-change], del[data-document-change], span[data-document-change][data-change-kind="formatting"], [data-document-change][data-change-kind="paragraph-formatting"]'));
+    return Boolean(document.body.querySelector('ins[data-document-change], del[data-document-change], span[data-document-change][data-change-kind="formatting"], [data-document-change][data-change-kind="paragraph-formatting"], [data-document-change][data-change-kind="numbering"]'));
 }
 function anchoredDocumentComments(content) {
     const document = new DOMParser().parseFromString(content.html, 'text/html');