@a3s-lab/office 0.28.0 → 0.30.0

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

@@ -1,8 +1,8 @@
 import jszip from "jszip";
-import { normalizeDocumentBookmarkName, normalizeDocumentEmphasisMark, DOCUMENT_STRIKE_STYLE_ATTRIBUTE, applyDocumentImageIdentityToElement, documentEmphasisMarkFromElement, DOCUMENT_PAGE_BORDER_EDGES, DOCUMENT_UNDERLINE_STYLE_ATTRIBUTE, documentScriptFontSlotFromElement, normalizeDocumentColumns, createDocumentImageIdentityRegistry, serializeDocumentScriptFonts, documentCharacterSpacingTwipsFromElement, uniqueDocumentParagraphIdentity, documentCharacterPositionHalfPointsFromElement, normalizeDocumentTableVerticalAlign, documentTableColumnPercentagesFromElement, normalizeDocumentTextCase, documentTableCellMarginOverridesFromElement, applyDocumentTableRowIdentityToElement, normalizeDocumentBookmarksHtml, documentImageIdentityFromElement, documentTableGeometryFromElement, normalizeDocumentTableRowHeightRule, normalizeDocumentScriptFonts, documentNoteKey, DOCUMENT_LEGACY_TEXT_EMBOSS_ATTRIBUTE, normalizeDocumentHiddenText, normalizeDocumentParagraphBorders, documentLegacyTextEffectsConflict, normalizeDocumentTableBorderWidth, normalizeDocumentCharacterSpacingTwips, normalizeDocumentParagraphId, documentStrikeFormattingFromElement, normalizeDocumentTableBorderStyle, normalizeDocumentBookmarkReferencesHtml, documentCitationInstruction, parseDocumentParagraphBordersElement, documentImageWrapContourFromElement, documentImagePositionFromElement, normalizeDocumentCharacterScalePercent, documentScriptFontsFromElement, normalizeDocumentUnderlineStyle, documentPageMarginsForLayout, normalizeDocumentPageChrome, normalizeDocumentImageLayer, documentFontNameFromCssFamily, documentBookmarkReferenceInstruction, documentImageCropFromElement, documentKerningThresholdHalfPointsFromElement, normalizeDocumentPageBorders, documentImageLayerFromElement, normalizeDocumentLegacyTextEffects, documentCaptionLabel, documentCaptionKind, applyDocumentParagraphIdentityToElement, DOCUMENT_LEGACY_TEXT_IMPRINT_ATTRIBUTE, isContourImageLayout, parseDocumentScriptFonts, normalizeDocumentStrikeStyle, parseDocxThemeReference, createDocumentParagraphIdentityRegistry, documentCitationTags, docxDocumentFieldKind, normalizeDocumentImageIdentity, normalizeTableColor, documentTableBordersFromElement, wrapsBesideImage, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentKerningThresholdHalfPoints, DocxThemePatchCollector, defaultDocumentImageWrapContour, documentSections, normalizeDocumentParagraphIdentity, normalizeDocumentPaperSource, DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE, documentEquationFromElement, DOCUMENT_PARAGRAPH_BORDER_EDGES, documentLegacyTextEffectsFromElement, parseDocumentCharacterFormatting, documentScriptFontFamily, documentParagraphIdentityFromElement, DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE, normalizeDocumentEquation, documentUnderlineFormattingFromElement, normalizeDocumentBookmarkNativeId, patchDocxThemeReferences, DOCUMENT_PAGE_MARGIN_KEYS, uniqueDocumentImageIdentity, documentHiddenTextFromElement, parseDocumentParagraphShadingElement, documentImageLayoutFromElement, documentScriptFontSlotFromHint, parseDocumentParagraphFormatting, documentPageHorizontalMarginTwips, documentTableRowIdentityFromElement, collectDocumentNotes, documentPageGeometryForLayout, normalizeDocumentScriptFontSlot, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, documentCharacterScalePercentFromElement, normalizeDocumentPageMargins, normalizeDocumentLegacyTextEffect, documentNoteKind } from "./6282.js";
-import { serializeUtf8Xml, directChildren, xmlNamespacePrefix, parseXml, decodeXmlBytes, descendants, resolvePartTarget, directChild, attribute as work_ooxml_package_attribute } from "./5184.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, normalizeDocumentBookmarkReferencesHtml, documentCitationInstruction, documentImageWrapContourFromElement, documentImagePositionFromElement, normalizeDocumentCharacterScalePercent, normalizeDocumentUnderlineStyle, normalizeDocumentPageChrome, documentPageMarginsForLayout, normalizeDocumentImageLayer, documentKerningThresholdHalfPointsFromElement, documentImageCropFromElement, documentBookmarkReferenceInstruction, normalizeDocumentPageBorders, documentImageLayerFromElement, normalizeDocumentLegacyTextEffects, documentCaptionLabel, documentCaptionKind, DOCUMENT_LEGACY_TEXT_IMPRINT_ATTRIBUTE, isContourImageLayout, normalizeDocumentImageIdentity, normalizeTableColor, normalizeDocumentStrikeStyle, documentTableBordersFromElement, documentSections, documentCitationTags, docxDocumentFieldKind, wrapsBesideImage, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentKerningThresholdHalfPoints, defaultDocumentImageWrapContour, normalizeDocumentPaperSource, DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE, documentEquationFromElement, documentLegacyTextEffectsFromElement, parseDocumentCharacterFormatting, documentUnderlineFormattingFromElement, DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE, normalizeDocumentEquation, parseDocumentParagraphFormatting, documentTableRowIdentityFromElement, normalizeDocumentBookmarkNativeId, collectDocumentNotes, DOCUMENT_PAGE_MARGIN_KEYS, uniqueDocumentImageIdentity, documentHiddenTextFromElement, documentImageLayoutFromElement, documentPageHorizontalMarginTwips, documentPageGeometryForLayout, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, documentCharacterScalePercentFromElement, normalizeDocumentPageMargins, normalizeDocumentLegacyTextEffect, documentNoteKind } from "./6282.js";
+import { normalizeDocumentRunBorder, parseDocumentScriptFonts, parseDocxThemeReference, parseXml, parseDocumentRunShading, applyDocumentParagraphIdentityToElement, DOCUMENT_RUN_SHADING_ATTRIBUTE, documentScriptFontSlotFromElement, DOCUMENT_HIGHLIGHT_ATTRIBUTE, 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, parseDocumentParagraphShadingElement, documentFontNameFromCssFamily } from "./4121.js";
 import { assignDocxNoteIds, patchDocxPageColor, normalizeDocxCommentId, assignDocxCommentThreads } from "./0~4980.js";
-import { paragraphTabStops, mergeDocxIgnorableExtensionsAtPairs, patchDocxBibliography, docxKerningThresholdValue, docxCharacterPositionValue, docxCharacterScaleValue, docxEmphasisMarkRunOptions, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, paragraphAlignment, paragraphSpacingOptions, xmlNamespaceUri, hasNonWhitespaceXmlText, patchDocxExplicitZeroCharacterSpacing, cloneXmlElement, cssColorToHex, DocxParagraphDefaultCollapsedPatchCollector, assertXmlRoot, xmlDeclaredPrefix, paragraphIndent, domDirection, DOCX_WORDPROCESSING_NAMESPACES, paragraphBidirectional, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, patchDocxParagraphDefaultCollapsed, xmlAttributeNamespace, dataBoolean, mergeDocxIgnorableExtensions, patchDocxExplicitZeroKerningThresholds, parseDocxColorSchemeMappingElement, paragraphPaginationOptions, DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, xmlAttributeLocalName, cssFontSize, paragraphDirectionOptions, cssFontFamily, docxCharacterSpacingValue } from "./0~7043.js";
+import { paragraphTabStops, mergeDocxIgnorableExtensionsAtPairs, patchDocxBibliography, docxKerningThresholdValue, docxCharacterPositionValue, docxCharacterScaleValue, docxEmphasisMarkRunOptions, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, paragraphAlignment, paragraphSpacingOptions, xmlNamespaceUri, hasNonWhitespaceXmlText, patchDocxExplicitZeroCharacterSpacing, cloneXmlElement, cssColorToHex, DocxParagraphDefaultCollapsedPatchCollector, assertXmlRoot, xmlDeclaredPrefix, paragraphIndent, domDirection, DOCX_WORDPROCESSING_NAMESPACES, paragraphBidirectional, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, patchDocxParagraphDefaultCollapsed, xmlAttributeNamespace, dataBoolean, mergeDocxIgnorableExtensions, patchDocxExplicitZeroKerningThresholds, parseDocxColorSchemeMappingElement, paragraphPaginationOptions, DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, documentProofingLanguageDocxOptions, xmlAttributeLocalName, cssFontSize, paragraphDirectionOptions, cssFontFamily, docxCharacterSpacingValue } from "./0~7231.js";
 import { normalizeDocumentHref } from "./0~work-document-links.js";
 const WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 class DocxBookmarkPatchCollector {
@@ -2374,6 +2374,113 @@ function docxDocumentFieldRun(element, docx) {
     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 {
+    patches = [];
+    nextMarker = 1;
+    usedColors;
+    constructor(sourceHtml){
+        this.usedColors = work_docx_run_shading_export_sourceColors(sourceHtml);
+    }
+    marker(source) {
+        const shading = normalizeDocumentRunShading(source);
+        if (!shading) return null;
+        let marker = '';
+        do {
+            const value = 0xd00000 + this.nextMarker;
+            if (value > 0xdfffff) throw new Error('DOCX character shading 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,
+            shading
+        });
+        return marker;
+    }
+    hasMarker(value) {
+        const marker = value?.toUpperCase();
+        return Boolean(marker && this.patches.some((patch)=>patch.marker === marker));
+    }
+}
+function documentRunShadingDocxOptions(source, collector) {
+    const marker = collector.marker(source);
+    return marker ? {
+        shading: {
+            type: 'clear',
+            color: 'auto',
+            fill: marker
+        }
+    } : {};
+}
+async function patchDocxRunShading(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 ('shd' !== element.localName || element.namespaceURI !== work_docx_run_shading_export_WORD_NAMESPACE || element.parentElement?.localName !== 'rPr') continue;
+            const marker = work_docx_run_shading_export_wordAttribute(element, 'fill')?.toUpperCase();
+            const patch = marker ? byMarker.get(marker) : void 0;
+            if (marker && patch) {
+                replaceRunShadingAttributes(document, element, patch.shading);
+                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 shading marker(s).`);
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function setDocxRunShadingAttributes(document, element, source) {
+    const shading = normalizeDocumentRunShading(source);
+    if (!shading) return false;
+    work_docx_run_shading_export_setWordAttribute(document, element, 'val', shading.pattern);
+    setShadingColorAttributes(document, element, shading.color, 'color');
+    setShadingColorAttributes(document, element, shading.fill, 'fill');
+    return true;
+}
+function replaceRunShadingAttributes(document, element, shading) {
+    for (const attribute of Array.from(element.attributes))if ('xmlns' !== attribute.name && !attribute.name.startsWith('xmlns:')) element.removeAttributeNode(attribute);
+    element.replaceChildren();
+    setDocxRunShadingAttributes(document, element, shading);
+}
+function setShadingColorAttributes(document, element, color, kind) {
+    if (!color) return;
+    work_docx_run_shading_export_setWordAttribute(document, element, kind, 'auto' === color.value ? 'auto' : color.value.slice(1).toUpperCase());
+    if (!color.theme) return;
+    const themeName = 'color' === kind ? 'themeColor' : 'themeFill';
+    const tintName = 'color' === kind ? 'themeTint' : 'themeFillTint';
+    const shadeName = 'color' === kind ? 'themeShade' : 'themeFillShade';
+    work_docx_run_shading_export_setWordAttribute(document, element, themeName, color.theme.theme);
+    if (color.theme.tint) work_docx_run_shading_export_setWordAttribute(document, element, tintName, color.theme.tint);
+    if (color.theme.shade) work_docx_run_shading_export_setWordAttribute(document, element, shadeName, color.theme.shade);
+}
+function work_docx_run_shading_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_shading_export_wordAttribute(element, name) {
+    return element.getAttributeNS(element.namespaceURI ?? work_docx_run_shading_export_WORD_NAMESPACE, name) ?? element.getAttribute(`${element.prefix ?? 'w'}:${name}`);
+}
+function work_docx_run_shading_export_setWordAttribute(document, element, name, value) {
+    const namespace = element.namespaceURI ?? work_docx_run_shading_export_WORD_NAMESPACE;
+    const prefix = element.prefix ?? xmlNamespacePrefix(document.documentElement, namespace) ?? 'w';
+    element.setAttributeNS(namespace, `${prefix}:${name}`, value);
+}
 const MAX_RUN_FORMATTING_CHANGE_PATCHES = 65536;
 const RUN_FORMATTING_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes)\.xml$/i;
 class DocxRunFormattingChangePatchCollector {
@@ -2503,6 +2610,7 @@ function appendFormattingProperties(document, properties, namespace, prefix, ser
     appendTextCaseProperties(document, properties, namespace, prefix, byType.get('textStyle'));
     appendStrikeProperties(document, properties, namespace, prefix, byType.get('strike'));
     appendLegacyTextEffectsProperties(document, properties, namespace, prefix, byType.get('textStyle'));
+    appendNoProofProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendSnapToGridProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendHiddenTextProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendColorProperty(document, properties, namespace, prefix, byType.get('textStyle'));
@@ -2511,10 +2619,54 @@ function appendFormattingProperties(document, properties, namespace, prefix, ser
     appendKerningThresholdProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendCharacterPositionProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendFontSizeProperties(document, properties, namespace, prefix, byType.get('textStyle'));
-    appendHighlightProperty(document, properties, namespace, prefix, byType.get('highlight'));
+    appendHighlightProperty(document, properties, namespace, prefix, byType.get('highlight'), !parseDocumentRunShading(byType.get('textStyle')?.attrs?.runShading));
     appendUnderlineProperty(document, properties, namespace, prefix, byType.get('underline'));
+    appendRunBorderProperty(document, properties, namespace, prefix, byType.get('textStyle'));
+    appendRunShadingProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendVerticalAlignProperty(document, properties, namespace, prefix, byType);
     appendEmphasisMarkProperty(document, properties, namespace, prefix, byType.get('textStyle'));
+    appendProofingLanguagesProperty(document, properties, namespace, prefix, byType.get('textStyle'));
+}
+function appendNoProofProperty(document, properties, namespace, prefix, mark) {
+    const noProof = normalizeDocumentNoProof(mark?.attrs?.noProof);
+    if (null === noProof) return;
+    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 = 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);
+    properties.append(element);
+}
+function appendRunBorderProperty(document, properties, namespace, prefix, mark) {
+    const border = parseDocumentRunBorder(mark?.attrs?.runBorder);
+    if (!border) return;
+    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());
+        if (border.color.theme) {
+            work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'themeColor', border.color.theme.theme);
+            if (border.color.theme.tint) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'themeTint', border.color.theme.tint);
+            if (border.color.theme.shade) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'themeShade', border.color.theme.shade);
+        }
+    }
+    if (void 0 !== border.size) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'sz', String(border.size));
+    if (void 0 !== border.space) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'space', String(border.space));
+    if (void 0 !== border.shadow) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'shadow', border.shadow ? '1' : '0');
+    if (void 0 !== border.frame) work_docx_format_change_export_setWordAttribute(element, namespace, prefix, 'frame', border.frame ? '1' : '0');
+    properties.append(element);
+}
+function appendRunShadingProperty(document, properties, namespace, prefix, mark) {
+    const shading = parseDocumentRunShading(mark?.attrs?.runShading);
+    if (!shading) return;
+    const element = wordElement(document, namespace, prefix, 'shd');
+    if (!setDocxRunShadingAttributes(document, element, shading)) return;
+    properties.append(element);
 }
 function appendLegacyTextEffectsProperties(document, properties, namespace, prefix, mark) {
     const effects = {};
@@ -2684,7 +2836,10 @@ function appendFontSizeProperties(document, properties, namespace, prefix, mark)
     appendValuedProperty(document, properties, namespace, prefix, 'sz', String(halfPoints));
     appendValuedProperty(document, properties, namespace, prefix, 'szCs', String(halfPoints));
 }
-function appendHighlightProperty(document, properties, namespace, prefix, mark) {
+function appendHighlightProperty(document, properties, namespace, prefix, mark, allowFallbackShading) {
+    const nativeHighlight = normalizeDocumentHighlight(mark?.attrs?.nativeHighlight) ?? documentHighlightForCssColor(mark?.attrs?.color);
+    if (nativeHighlight) return void appendValuedProperty(document, properties, namespace, prefix, 'highlight', nativeHighlight);
+    if (!allowFallbackShading) return;
     const fill = normalizedHex(mark?.attrs?.color);
     const theme = themeReference(mark?.attrs?.themeFill);
     if (!fill && !theme) return;
@@ -3951,6 +4106,127 @@ function docxBorderStyle(style, docx) {
 function docxColor(color) {
     return color.replace(/^#/, '').toUpperCase();
 }
+const work_docx_table_of_contents_export_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const work_docx_table_of_contents_export_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
+class DocxTableOfContentsPatchCollector {
+    patches = [];
+    add(element) {
+        const value = documentTableOfContentsValueFromElement(element);
+        const patch = {
+            options: value.options,
+            entries: value.entries
+        };
+        this.patches.push(patch);
+        return patch;
+    }
+}
+function docxTableOfContents(element, docx, collector) {
+    const patch = collector.add(element);
+    const options = patch.options;
+    return new docx.TableOfContents('Table of Contents', {
+        hyperlink: options.hyperlinks,
+        headingStyleRange: `${options.minLevel}-${options.maxLevel}`,
+        pageNumbersEntryLevelsRange: options.showPageNumbers ? void 0 : `${options.minLevel}-${options.maxLevel}`,
+        entryAndPageNumberSeparator: options.showPageNumbers && !options.rightAlignPageNumbers ? ' ' : void 0,
+        useAppliedParagraphOutlineLevel: true,
+        hideTabAndPageNumbersInWebView: true,
+        cachedEntries: patch.entries.map((entry)=>({
+                title: entry.title,
+                level: entry.level,
+                page: options.showPageNumbers ? entry.pageNumber : void 0,
+                href: options.hyperlinks ? entry.targetId : void 0
+            }))
+    });
+}
+async function patchDocxTableOfContents(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 tables = descendants(document, 'sdt').filter((element)=>descendants(element, 'instrText').some((instruction)=>/^\s*TOC\b/i.test(instruction.textContent ?? '')));
+    if (tables.length !== patches.length) throw new Error(`Generated DOCX emitted ${tables.length} table(s) of contents for ${patches.length} source block(s).`);
+    for (const [index, table] of tables.entries()){
+        const patch = patches[index];
+        if (patch) patchTableOfContents(document, table, patch.options);
+    }
+    addTableOfContentsBookmarks(document, patches);
+    archive.file('word/document.xml', new XMLSerializer().serializeToString(document));
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function patchTableOfContents(document, table, options) {
+    for (const tabStop of descendants(table, 'tab')){
+        if (tabStop.parentElement?.localName !== 'tabs') continue;
+        const value = work_ooxml_package_attribute(tabStop, 'val');
+        if ('right' !== value) continue;
+        if (!options.showPageNumbers || !options.rightAlignPageNumbers) {
+            const parent = tabStop.parentElement;
+            tabStop.remove();
+            if (parent && !directChildren(parent, 'tab').length) parent.remove();
+            continue;
+        }
+        const leader = docxTableOfContentsLeader(options.leader);
+        if (leader) work_docx_table_of_contents_export_setWordAttribute(document, tabStop, 'leader', leader);
+        else removeWordAttribute(tabStop, 'leader');
+    }
+    if (options.showPageNumbers && options.rightAlignPageNumbers) return;
+    for (const tab of descendants(table, 'tab')){
+        if (tab.parentElement?.localName === 'tabs') continue;
+        if (!options.showPageNumbers) {
+            tab.remove();
+            continue;
+        }
+        const text = document.createElementNS(work_docx_table_of_contents_export_WORD_NAMESPACE, work_docx_table_of_contents_export_wordQualifiedName(document.documentElement, 't'));
+        text.setAttributeNS(work_docx_table_of_contents_export_XML_NAMESPACE, 'xml:space', 'preserve');
+        text.textContent = ' ';
+        tab.replaceWith(text);
+    }
+}
+function addTableOfContentsBookmarks(document, patches) {
+    const names = new Set(descendants(document, 'bookmarkStart').flatMap((bookmark)=>{
+        const name = work_ooxml_package_attribute(bookmark, 'name')?.trim();
+        return name ? [
+            name
+        ] : [];
+    }));
+    let nextId = Math.max(0, ...descendants(document, 'bookmarkStart').map((bookmark)=>Number(work_ooxml_package_attribute(bookmark, 'id') ?? 0))) + 1;
+    const targets = new Set(patches.flatMap((patch)=>patch.options.hyperlinks ? patch.entries.map((candidate)=>candidate.targetId) : []));
+    for (const target of targets){
+        if (names.has(target)) continue;
+        const paragraphId = /^heading-([0-9a-f]{8})$/i.exec(target)?.[1];
+        if (!paragraphId) continue;
+        const paragraph = descendants(document, 'p').find((candidate)=>work_ooxml_package_attribute(candidate, 'paraId')?.toLowerCase() === paragraphId.toLowerCase());
+        if (!paragraph) continue;
+        const start = document.createElementNS(work_docx_table_of_contents_export_WORD_NAMESPACE, work_docx_table_of_contents_export_wordQualifiedName(document.documentElement, 'bookmarkStart'));
+        const end = document.createElementNS(work_docx_table_of_contents_export_WORD_NAMESPACE, work_docx_table_of_contents_export_wordQualifiedName(document.documentElement, 'bookmarkEnd'));
+        work_docx_table_of_contents_export_setWordAttribute(document, start, 'id', String(nextId));
+        work_docx_table_of_contents_export_setWordAttribute(document, start, 'name', target);
+        work_docx_table_of_contents_export_setWordAttribute(document, end, 'id', String(nextId));
+        nextId += 1;
+        const properties = directChild(paragraph, 'pPr');
+        paragraph.insertBefore(start, properties?.nextSibling ?? paragraph.firstChild);
+        paragraph.append(end);
+        names.add(target);
+    }
+}
+function docxTableOfContentsLeader(value) {
+    if ('dash' === value) return 'hyphen';
+    if ('underline' === value) return 'underscore';
+    if ('dot' === value) return 'dot';
+    return null;
+}
+function work_docx_table_of_contents_export_setWordAttribute(document, element, localName, value) {
+    removeWordAttribute(element, localName);
+    element.setAttributeNS(work_docx_table_of_contents_export_WORD_NAMESPACE, work_docx_table_of_contents_export_wordQualifiedName(document.documentElement, localName), value);
+}
+function removeWordAttribute(element, localName) {
+    for (const candidate of Array.from(element.attributes))if (candidate.localName === localName && (candidate.namespaceURI === work_docx_table_of_contents_export_WORD_NAMESPACE || !candidate.namespaceURI)) element.removeAttributeNode(candidate);
+}
+function work_docx_table_of_contents_export_wordQualifiedName(root, localName) {
+    return `${xmlNamespacePrefix(root, work_docx_table_of_contents_export_WORD_NAMESPACE) ?? 'w'}:${localName}`;
+}
 const work_docx_table_sizing_export_TWIPS_PER_PIXEL = 15;
 function documentTableSizingDocxOptions(table, docx) {
     const geometry = documentTableGeometryFromElement(table);
@@ -7828,6 +8104,110 @@ function setWordFontAttribute(element, name, value) {
     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 = {
@@ -7865,8 +8245,13 @@ async function createDocxBlob(content, sourcePackage) {
         runFontPatches: new DocxRunFontsPatchCollector(JSON.stringify(normalizedContent)),
         hiddenTextPatches: new DocxHiddenTextPatchCollector(JSON.stringify(normalizedContent)),
         legacyTextEffectsPatches: new DocxLegacyTextEffectsPatchCollector(JSON.stringify(normalizedContent)),
+        runBorderPatches: new DocxRunBorderPatchCollector(JSON.stringify(normalizedContent)),
+        usedRunBorderMarkers: new Set(),
+        runShadingPatches: new DocxRunShadingPatchCollector(JSON.stringify(normalizedContent)),
+        usedRunShadingMarkers: new Set(),
         usedNativeTextEffectMarkers: new Set(),
         paragraphFormattingChangePatches: new DocxParagraphFormattingChangePatchCollector(),
+        tableOfContentsPatches: new DocxTableOfContentsPatchCollector(),
         hasExplicitZeroCharacterSpacing: false,
         hasExplicitZeroKerningThreshold: false
     };
@@ -7920,7 +8305,9 @@ async function createDocxBlob(content, sourcePackage) {
     const runFontsPatched = await patchDocxRunFonts(kerningPatched, noteContext.runFontPatches.patches);
     const hiddenTextPatched = await patchDocxHiddenText(runFontsPatched, noteContext.hiddenTextPatches.patches.filter((patch)=>noteContext.usedNativeTextEffectMarkers.has(patch.marker)));
     const legacyTextEffectsPatched = await patchDocxLegacyTextEffects(hiddenTextPatched, noteContext.legacyTextEffectsPatches.patches.filter((patch)=>noteContext.usedNativeTextEffectMarkers.has(patch.marker)));
-    const formattingChangesPatched = await patchDocxRunFormattingChanges(legacyTextEffectsPatched, noteContext.formattingChangePatches.patches);
+    const runBordersPatched = await patchDocxRunBorders(legacyTextEffectsPatched, noteContext.runBorderPatches.patches.filter((patch)=>noteContext.usedRunBorderMarkers.has(patch.marker)));
+    const runShadingPatched = await patchDocxRunShading(runBordersPatched, noteContext.runShadingPatches.patches.filter((patch)=>noteContext.usedRunShadingMarkers.has(patch.marker)));
+    const formattingChangesPatched = await patchDocxRunFormattingChanges(runShadingPatched, noteContext.formattingChangePatches.patches);
     const noteImageRelationshipsPatched = await patchDocxNoteImageRelationships(formattingChangesPatched);
     const commentMetadataPatched = await patchDocxCommentMetadata(noteImageRelationshipsPatched, commentThreads);
     const numberingPatched = await patchDocxNumberingRestartRules(commentMetadataPatched, noteContext.numberingRestartRules);
@@ -7935,7 +8322,8 @@ async function createDocxBlob(content, sourcePackage) {
     const bookmarkPatched = await patchDocxBookmarks(imageIdentityPatched, noteContext.bookmarkPatches.patches);
     const paragraphDefaultCollapsedPatched = await patchDocxParagraphDefaultCollapsed(bookmarkPatched, noteContext.paragraphDefaultCollapsedPatches.patches);
     const paragraphIdentityPatched = await patchDocxParagraphIdentities(paragraphDefaultCollapsedPatched, noteContext.paragraphIdentityPatches.patches);
-    const paragraphFormattingChangesPatched = await patchDocxParagraphFormattingChanges(paragraphIdentityPatched, noteContext.paragraphFormattingChangePatches.patches);
+    const tableOfContentsPatched = await patchDocxTableOfContents(paragraphIdentityPatched, noteContext.tableOfContentsPatches.patches);
+    const paragraphFormattingChangesPatched = await patchDocxParagraphFormattingChanges(tableOfContentsPatched, noteContext.paragraphFormattingChangePatches.patches);
     const equationPatched = await patchDocxEquations(paragraphFormattingChangesPatched, noteContext.equationPatches.patches);
     const patched = await patchDocxPageColor(equationPatched, normalizedContent.pageColor);
     const preserved = sourcePackage ? await preserveDocxSourcePackage(patched, sourcePackage, {
@@ -8001,6 +8389,14 @@ function markDocxNativeTextEffectStyleUsed(style, context) {
         break;
     }
 }
+function markDocxRunBorderUsed(border, context) {
+    const marker = border?.color?.toUpperCase();
+    if (context.runBorderPatches.hasMarker(marker)) context.usedRunBorderMarkers.add(marker);
+}
+function markDocxRunShadingUsed(shading, context) {
+    const marker = shading?.fill?.toUpperCase();
+    if (context.runShadingPatches.hasMarker(marker)) context.usedRunShadingMarkers.add(marker);
+}
 function work_docx_export_sectionProperties(layout, docx) {
     const landscape = 'landscape' === layout.orientation;
     const dimensions = documentPageGeometryForLayout(layout);
@@ -8098,6 +8494,9 @@ async function blockToFileChildren(element, docx, noteContext) {
     if (element.hasAttribute('data-document-bibliography')) return [
         docxBibliographyParagraph(element, docx, paragraphBidirectional(element))
     ];
+    if (element.hasAttribute('data-document-table-of-contents')) return [
+        docxTableOfContents(element, docx, noteContext.tableOfContentsPatches)
+    ];
     if (element.hasAttribute('data-document-caption')) return [
         docxCaptionParagraph(element, await paragraphRuns(element, docx, noteContext), docx, paragraphBidirectional(element))
     ];
@@ -8171,6 +8570,8 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         if (node.nodeType === Node.TEXT_NODE) {
             if (!node.textContent) return [];
             markDocxNativeTextEffectStyleUsed(inherited.style, noteContext);
+            markDocxRunBorderUsed(inherited.border, noteContext);
+            markDocxRunShadingUsed(inherited.shading, noteContext);
             if (revision?.kind === 'insertion') return [
                 new docx.InsertedTextRun({
                     ...inherited,
@@ -8228,19 +8629,32 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         const formattingChange = node.hasAttribute('data-document-change') && 'formatting' === node.dataset.changeKind ? noteContext.formattingChangePatches.register(node, docxRevisionId(node, noteContext)) : null;
         const commentBoundary = node.hasAttribute('data-document-comment') ? nextDocxCommentBoundary(node.dataset.commentId, noteContext) : null;
         const backgroundColor = cssColorToHex(node.style.backgroundColor);
+        const hasExplicitRunShading = 'span' === tag && node.hasAttribute(DOCUMENT_RUN_SHADING_ATTRIBUTE);
+        const explicitRunShading = hasExplicitRunShading ? parseDocumentRunShadingElement(node) : null;
+        if (hasExplicitRunShading && !explicitRunShading) throw new Error('Document contains invalid character shading.');
+        const hasHighlightSemantics = node.hasAttribute(DOCUMENT_HIGHLIGHT_ATTRIBUTE) || node.hasAttribute('data-color') || 'mark' === tag || Boolean(backgroundColor) && !hasExplicitRunShading;
+        const explicitHighlight = hasHighlightSemantics ? documentHighlightFromElement(node) : null;
         const direction = domDirection(node);
         const resolvedColor = cssColorToHex(node.style.color) ?? inherited.color;
         const themeColorMarker = noteContext.themePatches.marker('color', parseDocxThemeReference(node.dataset.officeThemeColor), resolvedColor ? `#${resolvedColor}` : null);
-        const resolvedShading = backgroundColor ? {
-            fill: backgroundColor
-        } : inherited.shading;
-        const themeFillMarker = noteContext.themePatches.marker('fill', parseDocxThemeReference(node.dataset.officeThemeFill), resolvedShading?.fill ? `#${resolvedShading.fill}` : null);
+        const runShading = explicitRunShading ? documentRunShadingDocxOptions(explicitRunShading, noteContext.runShadingPatches).shading : void 0;
+        const customHighlightFill = hasHighlightSemantics && !explicitHighlight ? backgroundColor : null;
+        const resolvedShading = runShading ?? (customHighlightFill ? {
+            fill: customHighlightFill
+        } : inherited.shading);
+        const themeFillMarker = !runShading && customHighlightFill ? noteContext.themePatches.marker('fill', parseDocxThemeReference(node.dataset.officeThemeFill), `#${customHighlightFill}`) : null;
         const explicitTextCase = normalizeDocumentTextCase(node.dataset.officeTextCase);
         const explicitCharacterSpacing = documentCharacterSpacingTwipsFromElement(node);
         const explicitCharacterScale = documentCharacterScalePercentFromElement(node);
         const explicitKerningThreshold = documentKerningThresholdHalfPointsFromElement(node);
         const explicitEmphasisMark = documentEmphasisMarkFromElement(node);
         const explicitHiddenText = documentHiddenTextFromElement(node);
+        const hasExplicitProofingLanguages = 'span' === tag && node.hasAttribute(DOCUMENT_PROOFING_LANGUAGES_ATTRIBUTE);
+        const explicitProofingLanguages = hasExplicitProofingLanguages ? documentProofingLanguagesFromElement(node) : null;
+        if (hasExplicitProofingLanguages && !explicitProofingLanguages) throw new Error('Document contains invalid proofing languages.');
+        const hasExplicitNoProof = 'span' === tag && node.hasAttribute(DOCUMENT_NO_PROOF_ATTRIBUTE);
+        const explicitNoProof = hasExplicitNoProof ? documentNoProofFromElement(node) : null;
+        if (hasExplicitNoProof && null === explicitNoProof) throw new Error('Document contains invalid proofing state.');
         const hasExplicitLegacyTextEffects = 'span' === tag && [
             DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE,
             DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE,
@@ -8250,6 +8664,9 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         const explicitLegacyTextEffects = hasExplicitLegacyTextEffects ? documentLegacyTextEffectsFromElement(node) : {};
         if (hasExplicitLegacyTextEffects && !explicitLegacyTextEffects) throw new Error('Document contains invalid legacy text effects.');
         const explicitCharacterPosition = documentCharacterPositionHalfPointsFromElement(node);
+        const hasExplicitRunBorder = 'span' === tag && (node.hasAttribute(DOCUMENT_RUN_BORDER_ATTRIBUTE) || Boolean(node.style.borderStyle));
+        const explicitRunBorder = hasExplicitRunBorder ? parseDocumentRunBorderElement(node) : null;
+        if (hasExplicitRunBorder && !explicitRunBorder) throw new Error('Document contains an invalid character border.');
         if (0 === explicitCharacterSpacing) noteContext.hasExplicitZeroCharacterSpacing = true;
         if (0 === explicitKerningThreshold) noteContext.hasExplicitZeroKerningThreshold = true;
         const characterSpacing = null === explicitCharacterSpacing ? inherited.characterSpacing : docxCharacterSpacingValue(explicitCharacterSpacing);
@@ -8274,6 +8691,9 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         const underline = docxUnderlineRunOptions(node, inherited.underline, noteContext.themePatches);
         const strike = docxStrikeRunOptions(node, inherited);
         const scriptFontMarker = noteContext.runFontPatches.marker(documentScriptFontsFromElement(node), documentScriptFontSlotFromElement(node), node.style.fontFamily);
+        const runBorder = explicitRunBorder ? documentRunBorderDocxOptions(explicitRunBorder, noteContext.runBorderPatches).border : inherited.border;
+        const language = hasExplicitProofingLanguages ? documentProofingLanguageDocxOptions(explicitProofingLanguages) : inherited.language;
+        const noProof = hasExplicitNoProof ? explicitNoProof ?? false : inherited.noProof;
         const style = {
             ...inherited,
             style: nativeTextEffectStyle,
@@ -8293,15 +8713,21 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
             kern,
             position,
             emphasisMark,
+            language,
+            noProof,
+            border: runBorder,
             shading: themeFillMarker ? {
                 fill: themeFillMarker
             } : resolvedShading,
+            highlight: hasHighlightSemantics ? explicitHighlight ?? (customHighlightFill ? 'none' : void 0) : inherited.highlight,
             snapToGrid: dataBoolean(node.dataset.officeWordSnapToGrid) ?? inherited.snapToGrid,
             rightToLeft: void 0 === direction ? inherited.rightToLeft : 'rtl' === direction,
             ...textCaseOptions
         };
         if ('br' === tag) {
             markDocxNativeTextEffectStyleUsed(style.style, noteContext);
+            markDocxRunBorderUsed(style.border, noteContext);
+            markDocxRunShadingUsed(style.shading, noteContext);
             return [
                 new docx.TextRun({
                     ...style,