@a3s-lab/office 0.28.0 → 0.30.0

package/dist/{0~5093.js → 0~7360.js}

@@ -1,6 +1,6 @@
-import { descendants, directChildren as work_ooxml_package_directChildren, xmlNamespacePrefix, directChild, attribute as work_ooxml_package_attribute, childPath } from "./5184.js";
-import { docxThemeFont, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, STRICT_WORDPROCESSING_NAMESPACE, docxCharacterSpacingTwipsFromProperties, parseBoundedDocxInteger, xmlAttributeLocalName, docxCharacterScalePercentFromProperties, resolveDocxEmphasisMark, docxCharacterPositionHalfPointsFromProperties, docxThemeColor, parseDocxParagraphDefaultCollapsed, resolveDocxKerningThresholdHalfPoints, resolveDocxThemeResolver as work_docx_theme_resolveDocxThemeResolver, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace, parseDocxTwipsMeasure } from "./0~7043.js";
-import { normalizeDocumentEmphasisMark, documentWordLineHeightFactor, normalizeDocumentPageBorders, normalizeDocumentParagraphBorder, documentCharacterPositionDomAttributes, DOCUMENT_PAGE_BORDER_EDGES, normalizeDocumentTabStops, documentTextCaseFromWordFlags, DOCUMENT_PARAGRAPH_SHADING_PATTERNS, documentStrikeDomAttributes, documentAutoLineHeight, documentScriptFontFallbackSlots, normalizeDocumentUnderlineColor, documentScriptFontsDomAttributes, documentKerningDomAttributes, documentCharacterScaleDomAttributes, documentParagraphShadingDomAttributes, serializeDocxThemeReference, documentParagraphBordersDomAttributes, normalizeDocumentScriptFontHint, serializeDocumentParagraphFormatting, normalizeDocumentPaperSource, documentEquationText, normalizeDocumentScriptFonts, documentLegacyTextEffectsDomAttributes, documentLegacyTextEffectsConflict, DOCUMENT_PARAGRAPH_BORDER_STYLES, normalizeDocumentParagraphBorders as work_document_paragraph_borders_normalizeDocumentParagraphBorders, DOCUMENT_PARAGRAPH_BORDER_EDGES, normalizeDocumentParagraphIndent, documentScriptFontFamily, normalizeDocumentEquation, normalizeDocumentThemeFont, documentCharacterSpacingDomAttributes, renderDocumentAutoLineHeight, documentUnderlineDomAttributes, normalizeDocumentUnderlineStyle, normalizeDocumentFontName, applyDocumentTextCaseStyle, documentHiddenTextDomAttributes, importedDocumentCharacterFormatting, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, createDocumentEquationElement, normalizeDocumentPageGeometry, serializeDocumentTabStops, documentEmphasisMarkDomAttributes, normalizeDocumentPageMargins, documentScriptFontSegments } from "./6282.js";
+import { documentRunBorderDomAttributes, normalizeDocumentRunBorder, normalizeDocumentParagraphBorder, serializeDocumentRunBorder, serializeDocumentRunShading, documentScriptFontFallbackSlots, attribute as work_ooxml_package_attribute, documentScriptFontsDomAttributes, documentHighlightFromDocxValue, documentTableOfContentsHtml, directChildren as work_ooxml_package_directChildren, documentParagraphShadingDomAttributes, serializeDocxThemeReference, documentParagraphBordersDomAttributes, normalizeDocumentScriptFontHint, normalizeDocumentScriptFonts, DOCUMENT_PARAGRAPH_BORDER_STYLES, normalizeDocumentParagraphBorders as work_document_paragraph_borders_normalizeDocumentParagraphBorders, DOCUMENT_PARAGRAPH_BORDER_EDGES, documentScriptFontFamily, normalizeDocumentThemeFont, normalizeDocumentParagraphId, documentHighlightDomAttributes, descendants, documentHighlightCssColor, xmlNamespacePrefix, normalizeDocumentFontName, documentProofingDomAttributes, work_document_paragraph_shading_DOCUMENT_PARAGRAPH_SHADING_PATTERNS, directChild, documentScriptFontSegments, childPath, parseDocumentTableOfContentsInstruction, documentRunShadingDomAttributes } from "./4121.js";
+import { docxThemeFont, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, resolveDocxProofing, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, STRICT_WORDPROCESSING_NAMESPACE, docxCharacterSpacingTwipsFromProperties, parseBoundedDocxInteger, xmlAttributeLocalName, docxCharacterScalePercentFromProperties, resolveDocxEmphasisMark, docxCharacterPositionHalfPointsFromProperties, docxThemeColor, parseDocxParagraphDefaultCollapsed, resolveDocxKerningThresholdHalfPoints, resolveDocxThemeResolver as work_docx_theme_resolveDocxThemeResolver, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace, parseDocxTwipsMeasure } from "./0~7231.js";
+import { normalizeDocumentEmphasisMark, normalizeDocumentPageBorders, documentCharacterPositionDomAttributes, DOCUMENT_PAGE_BORDER_EDGES, normalizeDocumentTabStops, documentTextCaseFromWordFlags, documentStrikeDomAttributes, documentAutoLineHeight, documentKerningDomAttributes, normalizeDocumentUnderlineColor, documentCharacterScaleDomAttributes, serializeDocumentParagraphFormatting, normalizeDocumentPaperSource, documentEquationText, documentLegacyTextEffectsDomAttributes, documentLegacyTextEffectsConflict, documentCharacterSpacingDomAttributes, normalizeDocumentParagraphIndent, normalizeDocumentEquation, renderDocumentAutoLineHeight, documentUnderlineDomAttributes, normalizeDocumentUnderlineStyle, applyDocumentTextCaseStyle, documentHiddenTextDomAttributes, importedDocumentCharacterFormatting, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, createDocumentEquationElement, normalizeDocumentPageGeometry, serializeDocumentTabStops, documentWordLineHeightFactor, documentEmphasisMarkDomAttributes, normalizeDocumentPageMargins } from "./6282.js";
 function docxCaptionSequenceKind(instruction) {
     const identifier = /^\s*SEQ\s+([^\s\\]+)/i.exec(instruction)?.[1]?.toLowerCase();
     if (!identifier) return null;
@@ -35,9 +35,9 @@ function docxFieldOccurrences(root) {
 function docxFieldOccurrenceIsInlineEditable(field) {
     return 'orphan' !== field.syntax && field.complete && !field.nested && !field.containsNested && field.sameParagraph && !field.inDeletion;
 }
-function hasInvalidDocxFieldStructure(root) {
+function hasInvalidDocxFieldStructure(root, ignore = ()=>false) {
     const parsed = parseDocxFields(root);
-    return parsed.hasUnmatchedEnd || parsed.hasUnclosedBegin || parsed.occurrences.some((field)=>'orphan' !== field.syntax && (!field.complete || field.nested || field.containsNested || !field.sameParagraph || field.inDeletion) || 'orphan' === field.syntax && field.inDeletion);
+    return parsed.hasUnmatchedEnd || parsed.hasUnclosedBegin || parsed.occurrences.some((field)=>!ignore(field) && ('orphan' !== field.syntax && (!field.complete || field.nested || field.containsNested || !field.sameParagraph || field.inDeletion) || 'orphan' === field.syntax && field.inDeletion));
 }
 function parseDocxFields(root) {
     const elements = Array.from(root.querySelectorAll('*'));
@@ -4073,6 +4073,147 @@ function nextEquationMarker(state) {
     state.occupiedText += marker;
     return marker;
 }
+const WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const work_docx_table_of_contents_import_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
+function markDocxTablesOfContents(document) {
+    const tables = [];
+    for (const element of descendants(document, 'sdt')){
+        if (!document.documentElement.contains(element)) continue;
+        const field = docxFieldOccurrences(element).find(supportedDocxTableOfContentsField);
+        if (!field) continue;
+        const parsed = parseDocumentTableOfContentsInstruction(field.instruction);
+        if (!parsed.supported) continue;
+        const tableIndex = tables.length + 1;
+        const marker = {
+            marker: `__A3S_WORK_TABLE_OF_CONTENTS_${tableIndex}__`,
+            id: `docx-table-of-contents-${tableIndex}`,
+            options: {
+                ...parsed.options,
+                leader: importedTableOfContentsLeader(element, parsed.options)
+            },
+            entries: importedTableOfContentsEntries(element, tableIndex)
+        };
+        element.replaceWith(markerParagraph(document, marker.marker));
+        tables.push(marker);
+    }
+    return {
+        tables
+    };
+}
+function applyImportedDocxTableOfContentsMarkers(document, markers) {
+    const headings = importedHtmlHeadings(document);
+    for (const table of markers.tables){
+        const usedHeadingIndexes = new Set();
+        const text = textNodes(document.body).find((node)=>node.data.includes(table.marker));
+        if (!text) continue;
+        const entries = table.entries.map((entry)=>{
+            const headingIndex = headings.findIndex((heading, index)=>!usedHeadingIndexes.has(index) && heading.level === entry.level && normalizedTitle(heading.title) === normalizedTitle(entry.title));
+            if (headingIndex < 0) return entry;
+            usedHeadingIndexes.add(headingIndex);
+            const heading = headings[headingIndex];
+            return heading ? {
+                ...entry,
+                targetId: heading.targetId
+            } : entry;
+        });
+        const fragment = document.createRange().createContextualFragment(documentTableOfContentsHtml({
+            id: table.id,
+            options: table.options,
+            entries
+        }));
+        const block = closestHtmlBlock(text.parentElement);
+        if (block) block.replaceWith(fragment);
+    }
+}
+function hasImportedDocxTableOfContentsMarkers(markers) {
+    return markers.tables.length > 0;
+}
+function supportedDocxTableOfContentsField(field) {
+    const parsed = parseDocumentTableOfContentsInstruction(field.instruction);
+    return parsed.supported && field.complete && !field.nested && !field.inDeletion && Boolean(work_docx_table_of_contents_import_closestAncestor(field.start, 'sdt'));
+}
+function importedTableOfContentsEntries(element, tableIndex) {
+    const paragraphs = descendants(element, 'p');
+    return paragraphs.flatMap((paragraph, index)=>{
+        const style = directChild(directChild(paragraph, 'pPr') ?? paragraph, 'pStyle');
+        const level = Number(/^TOC([1-9])$/i.exec(work_ooxml_package_attribute(style ?? paragraph, 'val') ?? '')?.[1]);
+        if (!level) return [];
+        const values = descendants(paragraph, 't').map((text)=>text.textContent ?? '').filter(Boolean);
+        const last = values.at(-1)?.trim() ?? '';
+        const hasPageNumber = /^\d{1,6}$/.test(last);
+        const title = (hasPageNumber ? values.slice(0, -1) : values).join('').replace(/\s+/g, ' ').trim();
+        if (!title) return [];
+        const hyperlink = descendants(paragraph, 'hyperlink').find((candidate)=>Boolean(work_ooxml_package_attribute(candidate, 'anchor')));
+        const anchor = work_ooxml_package_attribute(hyperlink ?? paragraph, 'anchor')?.trim();
+        const targetId = /^heading-[a-z0-9._:-]{1,128}$/i.test(anchor ?? '') ? anchor : `heading-import-${tableIndex}-${index + 1}`;
+        return [
+            {
+                targetId,
+                title,
+                level,
+                pageNumber: hasPageNumber ? Number(last) : 1
+            }
+        ];
+    });
+}
+function importedTableOfContentsLeader(element, options) {
+    if (!options.showPageNumbers || !options.rightAlignPageNumbers) return 'none';
+    const tab = descendants(element, 'tab').find((candidate)=>candidate.parentElement?.localName === 'tabs' && 'right' === work_ooxml_package_attribute(candidate, 'val'));
+    const leader = work_ooxml_package_attribute(tab ?? element, 'leader');
+    if ('hyphen' === leader) return 'dash';
+    if ('underscore' === leader) return 'underline';
+    if (!leader || 'none' === leader) return 'none';
+    return 'dot';
+}
+function markerParagraph(document, marker) {
+    const paragraph = document.createElementNS(WORD_NAMESPACE, 'w:p');
+    const run = document.createElementNS(WORD_NAMESPACE, 'w:r');
+    const text = document.createElementNS(WORD_NAMESPACE, 'w:t');
+    text.setAttributeNS(work_docx_table_of_contents_import_XML_NAMESPACE, 'xml:space', 'preserve');
+    text.textContent = marker;
+    run.append(text);
+    paragraph.append(run);
+    return paragraph;
+}
+function importedHtmlHeadings(document) {
+    return Array.from(document.body.querySelectorAll('h1,h2,h3,h4,h5,h6,p[data-office-outline-level]')).flatMap((heading, index)=>{
+        const headingLevel = /^H([1-6])$/.exec(heading.tagName)?.[1];
+        const outlineLevel = Number(heading.dataset.officeOutlineLevel);
+        const level = headingLevel ? Number(headingLevel) : Number.isInteger(outlineLevel) && outlineLevel >= 0 && outlineLevel <= 8 ? outlineLevel + 1 : null;
+        if (null === level) return [];
+        const identity = normalizeDocumentParagraphId(heading.dataset.officeParagraphId);
+        return [
+            {
+                title: heading.textContent ?? '',
+                level,
+                targetId: identity ? `heading-${identity.toLowerCase()}` : `heading-imported-${index + 1}`
+            }
+        ];
+    });
+}
+function textNodes(root) {
+    const walker = root.ownerDocument?.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+    const nodes = [];
+    if (!walker) return nodes;
+    while(walker.nextNode())nodes.push(walker.currentNode);
+    return nodes;
+}
+function closestHtmlBlock(element) {
+    let current = element;
+    while(current && current.parentElement?.tagName.toLowerCase() !== 'body')current = current.parentElement;
+    return current;
+}
+function work_docx_table_of_contents_import_closestAncestor(element, localName) {
+    let current = element;
+    while(current){
+        if (current.localName === localName) return current;
+        current = current.parentElement;
+    }
+    return null;
+}
+function normalizedTitle(value) {
+    return value.normalize('NFKC').replace(/\s+/g, ' ').trim().toLocaleLowerCase();
+}
 const ON_VALUES = new Set([
     '1',
     'on',
@@ -4530,7 +4671,7 @@ function onOffValue(value) {
 function work_docx_table_styles_wordAttribute(element, name) {
     return work_ooxml_package_attribute(element, name) ?? work_ooxml_package_attribute(element, `w:${name}`);
 }
-const WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
+const work_docx_paragraph_borders_import_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const work_docx_paragraph_borders_import_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
 const XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/';
 const PARAGRAPH_BORDER_MARKER_PATTERN = /__A3S_WORK_PARAGRAPH_BORDER_\d+__/g;
@@ -4622,7 +4763,7 @@ function applyImportedDocxParagraphBorderMarkers(document, markers) {
             marker,
             borders
         ]));
-    for (const node of textNodes(document.body))if (node.data.includes('__A3S_WORK_PARAGRAPH_BORDER_')) node.data = node.data.replace(PARAGRAPH_BORDER_MARKER_PATTERN, (marker)=>{
+    for (const node of work_docx_paragraph_borders_import_textNodes(document.body))if (node.data.includes('__A3S_WORK_PARAGRAPH_BORDER_')) node.data = node.data.replace(PARAGRAPH_BORDER_MARKER_PATTERN, (marker)=>{
         const borders = bordersByMarker.get(marker);
         const block = borders ? closestParagraphBlock(node.parentElement, node) : null;
         if (block && borders) applyParagraphBorders(block, borders);
@@ -4837,7 +4978,7 @@ function applyParagraphBorders(element, borders) {
     }
 }
 function insertParagraphMarker(document, paragraph, properties, marker) {
-    const namespace = paragraph.namespaceURI ?? WORD_NAMESPACE;
+    const namespace = paragraph.namespaceURI ?? work_docx_paragraph_borders_import_WORD_NAMESPACE;
     const prefix = paragraph.prefix ?? 'w';
     const run = document.createElementNS(namespace, `${prefix}:r`);
     const text = document.createElementNS(namespace, `${prefix}:t`);
@@ -4847,7 +4988,7 @@ function insertParagraphMarker(document, paragraph, properties, marker) {
     paragraph.insertBefore(run, properties.nextSibling);
 }
 function insertParagraphProperties(document, paragraph) {
-    const namespace = paragraph.namespaceURI ?? WORD_NAMESPACE;
+    const namespace = paragraph.namespaceURI ?? work_docx_paragraph_borders_import_WORD_NAMESPACE;
     const prefix = paragraph.prefix ?? 'w';
     const properties = document.createElementNS(namespace, `${prefix}:pPr`);
     paragraph.insertBefore(properties, paragraph.firstChild);
@@ -4899,7 +5040,7 @@ function isListItemBlock(node) {
         'ul'
     ].includes(node.tagName.toLowerCase());
 }
-function textNodes(root) {
+function work_docx_paragraph_borders_import_textNodes(root) {
     const document = root.ownerDocument;
     const walker = document?.createTreeWalker(root, NodeFilter.SHOW_TEXT);
     const nodes = [];
@@ -4907,6 +5048,57 @@ function textNodes(root) {
     while(walker.nextNode())nodes.push(walker.currentNode);
     return nodes;
 }
+function inspectDocxRunBorder(properties, themeSource) {
+    return inspectDocxRunBorderWithTheme(properties, work_docx_theme_resolveDocxThemeResolver(themeSource));
+}
+function resolveDocxRunBorder(propertySources, themeSource) {
+    const theme = work_docx_theme_resolveDocxThemeResolver(themeSource);
+    let border;
+    let invalidCount = 0;
+    let spoofedCount = 0;
+    for (const properties of propertySources){
+        const inspection = inspectDocxRunBorderWithTheme(properties, theme);
+        spoofedCount += inspection.spoofedCount;
+        if ('valid' === inspection.status) border = inspection.value;
+        else if ('invalid' === inspection.status) {
+            invalidCount += 1;
+            border = {
+                style: 'nil'
+            };
+        }
+    }
+    return {
+        border,
+        invalidCount,
+        spoofedCount
+    };
+}
+function inspectDocxRunBorderWithTheme(properties, theme) {
+    if (!properties) return {
+        status: 'absent',
+        spoofedCount: 0
+    };
+    const matches = work_ooxml_package_directChildren(properties, 'bdr');
+    if (!matches.length) return {
+        status: 'absent',
+        spoofedCount: 0
+    };
+    const native = matches.filter((element)=>element.namespaceURI === properties.namespaceURI);
+    const spoofedCount = matches.length - native.length;
+    if (1 !== matches.length || 1 !== native.length) return {
+        status: 'invalid',
+        spoofedCount
+    };
+    const parsed = normalizeDocumentRunBorder(parseDocxBorderElement(native[0], theme));
+    return parsed ? {
+        status: 'valid',
+        value: parsed,
+        spoofedCount
+    } : {
+        status: 'invalid',
+        spoofedCount
+    };
+}
 const work_docx_paragraph_shading_import_WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 const work_docx_paragraph_shading_import_XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace';
 const work_docx_paragraph_shading_import_XMLNS_NAMESPACE = 'http://www.w3.org/2000/xmlns/';
@@ -4989,7 +5181,7 @@ function hasImportedDocxParagraphShadingMarkers(markers) {
 function parseDocxParagraphShadingElement(element, themeSource) {
     const attributes = work_docx_paragraph_shading_import_wordLeafAttributes(element, SHADING_ATTRIBUTES);
     const pattern = attributes?.get('val')?.trim();
-    if (!attributes || !DOCUMENT_PARAGRAPH_SHADING_PATTERNS.has(pattern)) return null;
+    if (!attributes || !work_document_paragraph_shading_DOCUMENT_PARAGRAPH_SHADING_PATTERNS.has(pattern)) return null;
     const theme = work_docx_theme_resolveDocxThemeResolver(themeSource);
     const color = parseShadingColor(attributes, theme, {
         value: 'color',
@@ -5198,6 +5390,57 @@ function work_docx_paragraph_shading_import_textNodes(root) {
     while(walker.nextNode())nodes.push(walker.currentNode);
     return nodes;
 }
+function inspectDocxRunShading(properties, themeSource) {
+    return inspectDocxRunShadingWithTheme(properties, work_docx_theme_resolveDocxThemeResolver(themeSource));
+}
+function resolveDocxRunShading(propertySources, themeSource) {
+    const theme = work_docx_theme_resolveDocxThemeResolver(themeSource);
+    let shading;
+    let invalidCount = 0;
+    let spoofedCount = 0;
+    for (const properties of propertySources){
+        const inspection = inspectDocxRunShadingWithTheme(properties, theme);
+        spoofedCount += inspection.spoofedCount;
+        if ('valid' === inspection.status) shading = inspection.value;
+        else if ('invalid' === inspection.status) {
+            invalidCount += 1;
+            shading = {
+                pattern: 'nil'
+            };
+        }
+    }
+    return {
+        shading,
+        invalidCount,
+        spoofedCount
+    };
+}
+function inspectDocxRunShadingWithTheme(properties, theme) {
+    if (!properties) return {
+        status: 'absent',
+        spoofedCount: 0
+    };
+    const matches = work_ooxml_package_directChildren(properties, 'shd');
+    if (!matches.length) return {
+        status: 'absent',
+        spoofedCount: 0
+    };
+    const native = matches.filter((element)=>element.namespaceURI === properties.namespaceURI && DOCX_WORDPROCESSING_NAMESPACES.has(element.namespaceURI ?? ''));
+    const spoofedCount = matches.length - native.length;
+    if (1 !== matches.length || 1 !== native.length) return {
+        status: 'invalid',
+        spoofedCount
+    };
+    const parsed = parseDocxParagraphShadingElement(native[0], theme);
+    return parsed ? {
+        status: 'valid',
+        value: parsed,
+        spoofedCount
+    } : {
+        status: 'invalid',
+        spoofedCount
+    };
+}
 function importedDocxUnderline(element, theme) {
     const rawStyle = work_ooxml_package_attribute(element, 'val');
     const style = null === rawStyle ? 'single' : normalizeDocumentUnderlineStyle(rawStyle) ?? 'single';
@@ -6875,6 +7118,7 @@ const SUPPORTED_RUN_PROPERTY_CHANGE_CHILDREN = new Set([
     'shadow',
     'emboss',
     'imprint',
+    'noProof',
     'caps',
     'smallCaps',
     'vanish',
@@ -6892,7 +7136,9 @@ const SUPPORTED_RUN_PROPERTY_CHANGE_CHILDREN = new Set([
     'cs',
     'rtl',
     'em',
-    'vertAlign'
+    'lang',
+    'vertAlign',
+    'bdr'
 ]);
 function createImportedDocxRunFormattingMarkerState(documents) {
     return {
@@ -6974,6 +7220,7 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
     let complexFontSize;
     let color;
     let backgroundColor;
+    let highlightValue;
     let themeColor;
     let themeFill;
     let bold;
@@ -6997,6 +7244,9 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
     const emphasisMark = resolveDocxEmphasisMark(propertySources);
     const hiddenText = resolveDocxHiddenText(propertySources);
     const legacyTextEffects = resolveDocxLegacyTextEffects(propertySources);
+    const runBorder = resolveDocxRunBorder(propertySources, theme).border;
+    const runShading = resolveDocxRunShading(propertySources, theme).shading;
+    const proofing = resolveDocxProofing(propertySources);
     for (const properties of propertySources){
         bold = overriddenBoolean(bold, onOffProperty(properties, 'b'));
         complexBold = overriddenBoolean(complexBold, onOffProperty(properties, 'bCs'));
@@ -7045,23 +7295,10 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
         }
         const highlight = directChild(properties, 'highlight');
         if (highlight) {
-            const value = work_docx_run_formatting_import_wordAttribute(highlight, 'val')?.trim().toLowerCase();
+            const value = documentHighlightFromDocxValue(work_docx_run_formatting_import_wordAttribute(highlight, 'val'));
             if (value) {
-                backgroundColor = wordHighlightColor(value);
-                themeFill = void 0;
-            }
-        } else {
-            const shading = directChild(properties, 'shd');
-            const fill = shading ? work_docx_run_formatting_import_wordAttribute(shading, 'fill')?.trim() : void 0;
-            const themed = shading ? docxThemeColor(theme, work_docx_run_formatting_import_wordAttribute(shading, 'themeFill'), work_docx_run_formatting_import_wordAttribute(shading, 'themeFillTint'), work_docx_run_formatting_import_wordAttribute(shading, 'themeFillShade')) : void 0;
-            if (themed) {
-                backgroundColor = `#${themed}`;
-                themeFill = work_docx_run_formatting_import_themeReference(shading, 'themeFill', 'themeFillTint', 'themeFillShade', backgroundColor);
-            } else if (fill?.toLowerCase() === 'auto') {
-                backgroundColor = 'transparent';
-                themeFill = void 0;
-            } else if (fill && /^[0-9a-f]{6}$/i.test(fill)) {
-                backgroundColor = `#${fill.toLowerCase()}`;
+                highlightValue = value;
+                backgroundColor = documentHighlightCssColor(value) ?? 'transparent';
                 themeFill = void 0;
             }
         }
@@ -7146,6 +7383,9 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
         ...backgroundColor ? {
             backgroundColor
         } : {},
+        ...highlightValue ? {
+            highlight: highlightValue
+        } : {},
         ...themeColor ? {
             themeColor
         } : {},
@@ -7154,6 +7394,18 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
         } : {},
         ...textCase ? {
             textCase
+        } : {},
+        ...runBorder ? {
+            runBorder
+        } : {},
+        ...runShading ? {
+            runShading
+        } : {},
+        ...proofing.languages ? {
+            proofingLanguages: proofing.languages
+        } : {},
+        ...void 0 !== proofing.noProof ? {
+            noProof: proofing.noProof
         } : {}
     };
 }
@@ -7190,6 +7442,11 @@ function formattingMarkup(document, formatting) {
     if (void 0 !== formatting.emphasisMark) for (const [name, value] of Object.entries(documentEmphasisMarkDomAttributes(formatting.emphasisMark)))if ('style' === name) span.style.cssText += `; ${value}`;
     else span.setAttribute(name, value);
     if (void 0 !== formatting.hiddenText) for (const [name, value] of Object.entries(documentHiddenTextDomAttributes(formatting.hiddenText)))span.setAttribute(name, value);
+    if (formatting.runBorder) for (const [name, value] of Object.entries(documentRunBorderDomAttributes(formatting.runBorder)))if ('style' === name) span.style.cssText += `; ${value}`;
+    else span.setAttribute(name, value);
+    if (formatting.runShading) for (const [name, value] of Object.entries(documentRunShadingDomAttributes(formatting.runShading)))if ('style' === name) span.style.cssText += `; ${value}`;
+    else span.setAttribute(name, value);
+    if (void 0 !== formatting.proofingLanguages || void 0 !== formatting.noProof) for (const [name, value] of Object.entries(documentProofingDomAttributes(formatting.proofingLanguages, formatting.noProof, formatting.scriptFontSlot)))span.setAttribute(name, value);
     const legacyTextEffects = {
         ...void 0 !== formatting.legacyTextOutline ? {
             outline: formatting.legacyTextOutline
@@ -7215,7 +7472,9 @@ function formattingMarkup(document, formatting) {
     if (formatting.color) span.style.color = formatting.color;
     const themeColor = serializeDocxThemeReference(formatting.themeColor ?? null);
     if (themeColor) span.dataset.officeThemeColor = themeColor;
-    if (formatting.backgroundColor) span.style.backgroundColor = formatting.backgroundColor;
+    if (formatting.highlight) for (const [name, value] of Object.entries(documentHighlightDomAttributes(formatting.highlight)))if ('style' === name) span.style.cssText += `; ${value}`;
+    else span.setAttribute(name, value);
+    else if (formatting.backgroundColor) span.style.backgroundColor = formatting.backgroundColor;
     const themeFill = serializeDocxThemeReference(formatting.themeFill ?? null);
     if (themeFill) span.dataset.officeThemeFill = themeFill;
     if (formatting.textCase) applyDocumentTextCaseStyle(span, formatting.textCase);
@@ -7295,7 +7554,10 @@ function importedRunFormattingChange(runProperties, paragraphProperties, styles,
             legacyTextOutline: beforeFormatting.legacyTextOutline,
             legacyTextShadow: beforeFormatting.legacyTextShadow,
             legacyTextEmboss: beforeFormatting.legacyTextEmboss,
-            legacyTextImprint: beforeFormatting.legacyTextImprint
+            legacyTextImprint: beforeFormatting.legacyTextImprint,
+            runBorder: serializeDocumentRunBorder(beforeFormatting.runBorder),
+            runShading: serializeDocumentRunShading(beforeFormatting.runShading),
+            highlight: beforeFormatting.highlight
         })
     };
 }
@@ -7430,32 +7692,10 @@ function work_docx_run_formatting_import_numericAttribute(element, name) {
 function work_docx_run_formatting_import_wordAttribute(element, name) {
     return work_ooxml_package_attribute(element, name) ?? work_ooxml_package_attribute(element, `w:${name}`);
 }
-function wordHighlightColor(value) {
-    const colors = {
-        black: '#000000',
-        blue: '#0000ff',
-        cyan: '#00ffff',
-        darkblue: '#000080',
-        darkcyan: '#008080',
-        darkgray: '#808080',
-        darkgreen: '#008000',
-        darkmagenta: '#800080',
-        darkred: '#800000',
-        darkyellow: '#808000',
-        green: '#00ff00',
-        lightgray: '#c0c0c0',
-        magenta: '#ff00ff',
-        none: 'transparent',
-        red: '#ff0000',
-        white: '#ffffff',
-        yellow: '#ffff00'
-    };
-    return colors[value] ?? 'transparent';
-}
 function work_docx_run_formatting_import_formatNumber(value) {
     return Number(value.toFixed(2)).toString();
 }
 function formatLineHeightFactor(value) {
     return Number(value.toFixed(4)).toString();
 }
-export { applyImportedDocxEquationMarkers, applyImportedDocxParagraphAlignmentMarkers, applyImportedDocxParagraphBorderMarkers, applyImportedDocxParagraphDirectionMarkers, applyImportedDocxParagraphFormattingChangeMarkers, applyImportedDocxParagraphIndentMarkers, applyImportedDocxParagraphPaginationMarkers, applyImportedDocxParagraphShadingMarkers, applyImportedDocxParagraphSpacingMarkers, applyImportedDocxParagraphTabStopMarkers, applyImportedDocxRunFormattingMarkers, createDocxParagraphStyleResolver, createDocxTableStyleResolver, createImportedDocxRunFormattingMarkerState, docxCaptionBookmark, docxCaptionReferenceTarget, docxCaptionSequenceKind, docxEquationHtml, docxFieldInstructions, docxFieldOccurrenceIsInlineEditable, docxFieldOccurrences, docxFieldResultText, docxRunPropertySources, docxTableCellStyleLayers, docxTablePropertySources, docxTableRunPropertySources, hasImportedDocxParagraphAlignmentMarkers, hasImportedDocxParagraphBorderMarkers, hasImportedDocxParagraphDirectionMarkers, hasImportedDocxParagraphFormattingChangeMarkers, hasImportedDocxParagraphIndentMarkers, hasImportedDocxParagraphPaginationMarkers, hasImportedDocxParagraphShadingMarkers, hasImportedDocxParagraphSpacingMarkers, hasImportedDocxParagraphTabStopMarkers, hasImportedDocxRunFormattingMarkers, hasInvalidDocxFieldStructure, importedDocxStrike, importedDocxUnderline, inspectDocxEquation, inspectDocxHiddenText, inspectDocxLegacyTextEffects, inspectDocxPageBorders, inspectDocxPageMarginSettings, inspectDocxPageMargins, inspectDocxPageSize, inspectDocxPaperSource, inspectDocxRunFonts, isDocxEquationLikeRoot, isSupportedDocxEquationPlacement, isSupportedDocxParagraphFormattingChange, isSupportedDocxRunFormattingChange, markDocxPackageEquations, markDocxParagraphAlignments, markDocxParagraphBorders, markDocxParagraphDirections, markDocxParagraphFormattingChanges, markDocxParagraphIndents, markDocxParagraphPagination, markDocxParagraphShading, markDocxParagraphSpacing, markDocxParagraphTabStops, markDocxRunFormattingIntoState, parseDirectDocxParagraphShading, parseDocxPageBorders, parseDocxPageGeometry, parseDocxPageMargins, parseDocxPaperSource, resolveDocxHiddenText, resolveDocxLegacyTextEffects, resolveDocxParagraphBordersForParagraph, resolveDocxTableStyleResolver };
+export { applyImportedDocxEquationMarkers, applyImportedDocxParagraphAlignmentMarkers, applyImportedDocxParagraphBorderMarkers, applyImportedDocxParagraphDirectionMarkers, applyImportedDocxParagraphFormattingChangeMarkers, applyImportedDocxParagraphIndentMarkers, applyImportedDocxParagraphPaginationMarkers, applyImportedDocxParagraphShadingMarkers, applyImportedDocxParagraphSpacingMarkers, applyImportedDocxParagraphTabStopMarkers, applyImportedDocxRunFormattingMarkers, applyImportedDocxTableOfContentsMarkers, createDocxParagraphStyleResolver, createDocxTableStyleResolver, createImportedDocxRunFormattingMarkerState, docxCaptionBookmark, docxCaptionReferenceTarget, docxCaptionSequenceKind, docxEquationHtml, docxFieldInstructions, docxFieldOccurrenceIsInlineEditable, docxFieldOccurrences, docxFieldResultText, docxRunPropertySources, docxTableCellStyleLayers, docxTablePropertySources, docxTableRunPropertySources, hasImportedDocxParagraphAlignmentMarkers, hasImportedDocxParagraphBorderMarkers, hasImportedDocxParagraphDirectionMarkers, hasImportedDocxParagraphFormattingChangeMarkers, hasImportedDocxParagraphIndentMarkers, hasImportedDocxParagraphPaginationMarkers, hasImportedDocxParagraphShadingMarkers, hasImportedDocxParagraphSpacingMarkers, hasImportedDocxParagraphTabStopMarkers, hasImportedDocxRunFormattingMarkers, hasImportedDocxTableOfContentsMarkers, hasInvalidDocxFieldStructure, importedDocxStrike, importedDocxUnderline, inspectDocxEquation, inspectDocxHiddenText, inspectDocxLegacyTextEffects, inspectDocxPageBorders, inspectDocxPageMarginSettings, inspectDocxPageMargins, inspectDocxPageSize, inspectDocxPaperSource, inspectDocxRunBorder, inspectDocxRunFonts, inspectDocxRunShading, isDocxEquationLikeRoot, isSupportedDocxEquationPlacement, isSupportedDocxParagraphFormattingChange, isSupportedDocxRunFormattingChange, markDocxPackageEquations, markDocxParagraphAlignments, markDocxParagraphBorders, markDocxParagraphDirections, markDocxParagraphFormattingChanges, markDocxParagraphIndents, markDocxParagraphPagination, markDocxParagraphShading, markDocxParagraphSpacing, markDocxParagraphTabStops, markDocxRunFormattingIntoState, markDocxTablesOfContents, parseDirectDocxParagraphShading, parseDocxPageBorders, parseDocxPageGeometry, parseDocxPageMargins, parseDocxPaperSource, resolveDocxHiddenText, resolveDocxLegacyTextEffects, resolveDocxParagraphBordersForParagraph, resolveDocxRunBorder, resolveDocxRunShading, resolveDocxTableStyleResolver, supportedDocxTableOfContentsField };

package/dist/0~7614.js

@@ -1,5 +1,5 @@
 import jszip from "jszip";
-import { descendants, directChildren, directChild, xmlNamespacePrefix, attribute, firstDescendant, parseXml } from "./5184.js";
+import { descendants, directChildren, directChild, xmlNamespacePrefix, attribute, firstDescendant, parseXml } from "./4121.js";
 import { normalizePresentationChartDataLabelPosition, normalizePresentationChartDataLabels, normalizePresentationChartSeriesStyle } from "./0~work-presentation-charts.js";
 import { parseXlsxChartSeriesStyle, xlsxChartSeriesMarkerXml, parseXlsxTrendline, isSupportedXlsxChartLegend, isSupportedXlsxChartPlotLayout, isSupportedXlsxChartSeriesFormatting, parseXlsxChartPlotLayout, parseXlsxChartLegend, xlsxChartSeriesShapePropertiesXml, parseXlsxErrorBars } from "./4104.js";
 import { workSpreadsheetChartSupportsErrorBars, workSpreadsheetChartSupportsGrouping, normalizeWorkSpreadsheetChartSmoothLines, workSpreadsheetChartSupportsSeriesAnalysis, normalizeWorkSpreadsheetChartSeriesStyle, normalizeWorkSpreadsheetErrorBars, normalizeWorkSpreadsheetChartOverlap, workSpreadsheetChartUsesNumericXAxis, workSpreadsheetChartSupportsBarSpacing, normalizeWorkSpreadsheetChartLegendOverlay, normalizeWorkSpreadsheetChartGapWidth, normalizeWorkSpreadsheetChartGrouping, workSpreadsheetChartSupportsTrendlines, workSpreadsheetChartSupportsSmoothLines, normalizeWorkSpreadsheetTrendline } from "./8715.js";