@a3s-lab/office 0.37.5 → 0.38.0

package/README.md

@@ -309,9 +309,14 @@ and [CLI reference](./docs/latest/en/cli-reference.md).
 
 ## Current release
 
-Version `0.37.5` keeps the release surface focused on local, testable
+Version `0.38.0` keeps the release surface focused on local, testable
 workflows:
 
+- Writer's shared advanced Font dialog now edits the complete bounded Office
+  2010 OpenType typography set: 16 ligature combinations, numeral form and
+  spacing, style sets 1-20, and contextual alternates. Mixed selections,
+  tracked formatting, Undo, body/page-chrome stories, exact DOCX reopen, and
+  malformed-input diagnostics share one model with structured equations.
 - Spreadsheet XLSX import/export now retains the workbook's native 1900 or
   1904 date system, exact typed date serials, dynamic date filters, and
   epoch-correct current-date authoring across controlled and collaborative

package/dist/{0~4808.js → 0~5024.js}

@@ -1,6 +1,6 @@
 import jszip from "jszip";
 import { normalizeDocumentIndexEntryDraft, serializeUtf8Xml, directChildren, xmlNamespacePrefix, normalizeDocumentLanguageTag, parseXml, firstDescendant, decodeXmlBytes, directChild, descendants, normalizeDocumentProofingLanguages, attribute as work_ooxml_package_attribute, normalizeDocumentIndexOptions } from "./4121.js";
-import { normalizeDocumentEmphasisMark, normalizeDocumentCharacterScalePercent, documentCitationStyle, normalizeDocumentKerningThresholdHalfPoints, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentCharacterSpacingTwips, normalizeDocumentTabStops, createDocumentBibliography, documentCitationStyleDetails } from "./4174.js";
+import { normalizeDocumentEmphasisMark, normalizeDocumentCharacterScalePercent, documentCitationStyle, normalizeDocumentKerningThresholdHalfPoints, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentCharacterSpacingTwips, normalizeDocumentOpenTypeNumberSpacing, createDocumentBibliography, normalizeDocumentOpenTypeNumberForm, normalizeDocumentOpenTypeLigatures, normalizeDocumentTabStops, documentCitationStyleDetails, normalizeDocumentOpenTypeStylisticSets } from "./4174.js";
 const BIBLIOGRAPHY_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/bibliography';
 const CUSTOM_XML_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/customXml';
 const OFFICE_RELATIONSHIPS_NAMESPACE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships';
@@ -1151,6 +1151,154 @@ function work_docx_kerning_setWordValue(element, value) {
     if (existing) existing.value = value;
     else element.setAttributeNS(namespace, `${prefix}:val`, value);
 }
+const DOCX_WORD_2010_NAMESPACE = 'http://schemas.microsoft.com/office/word/2010/wordml';
+const OPEN_TYPE_PROPERTY_NAMES = [
+    'ligatures',
+    'numForm',
+    'numSpacing',
+    'stylisticSets',
+    'cntxtAlts'
+];
+const OPEN_TYPE_PROPERTY_NAME_SET = new Set(OPEN_TYPE_PROPERTY_NAMES);
+const MAX_STYLISTIC_SET_ENTRIES = 4096;
+function resolveDocxOpenTypeFeatures(propertySources) {
+    const features = {};
+    let invalidCount = 0;
+    let spoofedCount = 0;
+    for (const properties of propertySources){
+        const candidates = new Map();
+        for (const child of directChildren(properties)){
+            if (!OPEN_TYPE_PROPERTY_NAME_SET.has(child.localName)) continue;
+            if (child.namespaceURI !== DOCX_WORD_2010_NAMESPACE) {
+                spoofedCount += 1;
+                continue;
+            }
+            const name = child.localName;
+            const values = candidates.get(name) ?? [];
+            values.push(child);
+            candidates.set(name, values);
+        }
+        for (const name of OPEN_TYPE_PROPERTY_NAMES){
+            const values = candidates.get(name) ?? [];
+            if (!values.length) continue;
+            if (1 !== values.length || !values[0]) {
+                invalidCount += 1;
+                continue;
+            }
+            const parsed = parseProperty(name, values[0]);
+            if (null === parsed) {
+                invalidCount += 1;
+                continue;
+            }
+            if ('ligatures' === parsed.name) features.ligatures = parsed.value;
+            else if ('numForm' === parsed.name) features.numberForm = parsed.value;
+            else if ('numSpacing' === parsed.name) features.numberSpacing = parsed.value;
+            else if ('stylisticSets' === parsed.name) features.stylisticSets = parsed.value;
+            else features.contextualAlternates = parsed.value;
+        }
+    }
+    return {
+        features: invalidCount || spoofedCount || !Object.keys(features).length ? null : features,
+        invalidCount,
+        spoofedCount
+    };
+}
+function parseProperty(name, element) {
+    if ('ligatures' === name) {
+        const attributes = word2010LeafAttributes(element, new Set([
+            'val'
+        ]));
+        const value = attributes?.size === 1 ? normalizeDocumentOpenTypeLigatures(attributes.get('val')) : null;
+        return null === value ? null : {
+            name,
+            value
+        };
+    }
+    if ('numForm' === name) {
+        const attributes = word2010LeafAttributes(element, new Set([
+            'val'
+        ]));
+        const value = attributes?.size === 1 ? normalizeDocumentOpenTypeNumberForm(attributes.get('val')) : null;
+        return null === value ? null : {
+            name,
+            value
+        };
+    }
+    if ('numSpacing' === name) {
+        const attributes = word2010LeafAttributes(element, new Set([
+            'val'
+        ]));
+        const value = attributes?.size === 1 ? normalizeDocumentOpenTypeNumberSpacing(attributes.get('val')) : null;
+        return null === value ? null : {
+            name,
+            value
+        };
+    }
+    if ('cntxtAlts' === name) {
+        const attributes = word2010LeafAttributes(element, new Set([
+            'val'
+        ]));
+        if (!attributes) return null;
+        const value = attributes.has('val') ? strictOnOff(attributes.get('val')) : true;
+        return null === value ? null : {
+            name,
+            value
+        };
+    }
+    const value = parseStylisticSets(element);
+    return null === value ? null : {
+        name,
+        value
+    };
+}
+function parseStylisticSets(element) {
+    const attributes = word2010Attributes(element, new Set());
+    if (!attributes || attributes.size || hasNonWhitespaceText(element)) return null;
+    const children = directChildren(element);
+    if (children.length > MAX_STYLISTIC_SET_ENTRIES) return null;
+    const raw = [];
+    for (const child of children){
+        if ('styleSet' !== child.localName || child.namespaceURI !== DOCX_WORD_2010_NAMESPACE) return null;
+        const childAttributes = word2010LeafAttributes(child, new Set([
+            'id',
+            'val'
+        ]));
+        if (!childAttributes?.has('id')) return null;
+        const id = boundedInteger(childAttributes.get('id'), 1, 20);
+        const enabled = childAttributes.has('val') ? strictOnOff(childAttributes.get('val')) : true;
+        if (null === id || null === enabled) return null;
+        if (enabled) raw.push(id);
+    }
+    return normalizeDocumentOpenTypeStylisticSets(raw);
+}
+function word2010LeafAttributes(element, allowed) {
+    if (directChildren(element).length || hasNonWhitespaceText(element)) return null;
+    return word2010Attributes(element, allowed);
+}
+function word2010Attributes(element, allowed) {
+    const result = new Map();
+    for (const attribute of Array.from(element.attributes)){
+        if (attribute.namespaceURI === XMLNS_NAMESPACE) continue;
+        const name = xmlAttributeLocalName(attribute);
+        if (!allowed.has(name) || xmlAttributeNamespace(element, attribute) !== DOCX_WORD_2010_NAMESPACE || result.has(name)) return null;
+        result.set(name, attribute.value);
+    }
+    return result;
+}
+function hasNonWhitespaceText(element) {
+    return Array.from(element.childNodes).some((node)=>1 !== node.nodeType && (node.textContent ?? '').trim());
+}
+function strictOnOff(value) {
+    if ('1' === value || 'true' === value) return true;
+    if ('0' === value || 'false' === value) return false;
+    return null;
+}
+function boundedInteger(value, minimum, maximum) {
+    const source = value?.trim() ?? '';
+    if (!/^[+-]?\d+$/.test(source)) return null;
+    const number = Number(source);
+    return Number.isSafeInteger(number) && number >= minimum && number <= maximum ? number : null;
+}
 function docxEmphasisMarkFromProperties(properties) {
     const inspection = inspectDocxEmphasisMark(properties);
     return 'valid' === inspection.status ? inspection.value : void 0;
@@ -1924,4 +2072,4 @@ 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 ?? '');
 }
-export { DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, DOCX_WORDPROCESSING_NAMESPACES, DocxParagraphDefaultCollapsedPatchCollector, STRICT_WORDPROCESSING_NAMESPACE, XMLNS_NAMESPACE, XML_NAMESPACE, assertXmlRoot, cloneXmlElement, createDocxThemeResolver, cssColorToHex, cssFontFamily, cssFontSize, dataBoolean, documentIndexEntryInstruction, documentIndexInstruction, documentProofingLanguageDocxOptions, docxCharacterPositionHalfPointsFromProperties, docxCharacterPositionValue, docxCharacterScalePercentFromProperties, docxCharacterScaleValue, docxCharacterSpacingTwipsFromProperties, docxCharacterSpacingValue, docxEmphasisMarkRunOptions, docxKerningThresholdValue, docxThemeColor, docxThemeFont, domDirection, hasNonWhitespaceXmlText, inspectDocxEmphasisMark, inspectDocxKerningThresholdHalfPoints, inspectDocxNoProof, inspectDocxProofingLanguages, mergeDocxIgnorableExtensions, mergeDocxIgnorableExtensionsAtPairs, paragraphAlignment, paragraphBidirectional, paragraphDirectionOptions, paragraphIndent, paragraphPaginationOptions, paragraphSpacingOptions, paragraphTabStops, parseBoundedDocxInteger, parseDocumentIndexEntryInstruction, parseDocumentIndexInstruction, parseDocxColorSchemeMappingElement, parseDocxParagraphDefaultCollapsed, parseDocxTwipsMeasure, patchDocxBibliography, patchDocxExplicitZeroCharacterSpacing, patchDocxExplicitZeroKerningThresholds, patchDocxParagraphDefaultCollapsed, readDocxBibliography, resolveDocxEmphasisMark, resolveDocxKerningThresholdHalfPoints, resolveDocxProofing, resolveDocxThemeResolver, xmlAttributeLocalName, xmlAttributeNamespace, xmlDeclaredPrefix, xmlNamespaceUri };
+export { DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, DOCX_WORDPROCESSING_NAMESPACES, DOCX_WORD_2010_NAMESPACE, DocxParagraphDefaultCollapsedPatchCollector, STRICT_WORDPROCESSING_NAMESPACE, XMLNS_NAMESPACE, XML_NAMESPACE, assertXmlRoot, cloneXmlElement, createDocxThemeResolver, cssColorToHex, cssFontFamily, cssFontSize, dataBoolean, documentIndexEntryInstruction, documentIndexInstruction, documentProofingLanguageDocxOptions, docxCharacterPositionHalfPointsFromProperties, docxCharacterPositionValue, docxCharacterScalePercentFromProperties, docxCharacterScaleValue, docxCharacterSpacingTwipsFromProperties, docxCharacterSpacingValue, docxEmphasisMarkRunOptions, docxKerningThresholdValue, docxThemeColor, docxThemeFont, domDirection, hasNonWhitespaceXmlText, inspectDocxEmphasisMark, inspectDocxKerningThresholdHalfPoints, inspectDocxNoProof, inspectDocxProofingLanguages, mergeDocxIgnorableExtensions, mergeDocxIgnorableExtensionsAtPairs, paragraphAlignment, paragraphBidirectional, paragraphDirectionOptions, paragraphIndent, paragraphPaginationOptions, paragraphSpacingOptions, paragraphTabStops, parseBoundedDocxInteger, parseDocumentIndexEntryInstruction, parseDocumentIndexInstruction, parseDocxColorSchemeMappingElement, parseDocxParagraphDefaultCollapsed, parseDocxTwipsMeasure, patchDocxBibliography, patchDocxExplicitZeroCharacterSpacing, patchDocxExplicitZeroKerningThresholds, patchDocxParagraphDefaultCollapsed, readDocxBibliography, resolveDocxEmphasisMark, resolveDocxKerningThresholdHalfPoints, resolveDocxOpenTypeFeatures, resolveDocxProofing, resolveDocxThemeResolver, xmlAttributeLocalName, xmlAttributeNamespace, xmlDeclaredPrefix, xmlNamespaceUri };

package/dist/0~7240.js

@@ -1,6 +1,6 @@
 import { documentRunBorderDomAttributes, normalizeDocumentRunBorder, normalizeDocumentParagraphBorder, serializeDocumentRunBorder, serializeDocumentRunShading, documentIndexEntryHtml, attribute as work_ooxml_package_attribute, documentScriptFontFallbackSlots, 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, documentIndexHtml, 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, parseDocumentIndexEntryInstruction, resolveDocxProofing, parseDocumentIndexInstruction, 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~4808.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 "./4174.js";
+import { docxThemeFont, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, parseDocumentIndexEntryInstruction, resolveDocxProofing, parseDocumentIndexInstruction, DOCX_WORD_2010_NAMESPACE, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, STRICT_WORDPROCESSING_NAMESPACE, docxCharacterSpacingTwipsFromProperties, parseBoundedDocxInteger, xmlAttributeLocalName, resolveDocxOpenTypeFeatures, docxCharacterScalePercentFromProperties, resolveDocxEmphasisMark, docxCharacterPositionHalfPointsFromProperties, docxThemeColor, parseDocxParagraphDefaultCollapsed, resolveDocxKerningThresholdHalfPoints, resolveDocxThemeResolver as work_docx_theme_resolveDocxThemeResolver, DOCX_WORDPROCESSING_NAMESPACES, xmlAttributeNamespace, parseDocxTwipsMeasure } from "./0~5024.js";
+import { normalizeDocumentEmphasisMark, normalizeDocumentPageBorders, documentCharacterPositionDomAttributes, DOCUMENT_PAGE_BORDER_EDGES, normalizeDocumentTabStops, documentTextCaseFromWordFlags, documentStrikeDomAttributes, documentAutoLineHeight, documentKerningDomAttributes, normalizeDocumentUnderlineColor, documentCharacterScaleDomAttributes, serializeDocumentParagraphFormatting, normalizeDocumentPaperSource, documentEquationText, documentLegacyTextEffectsDomAttributes, documentLegacyTextEffectsConflict, documentCharacterSpacingDomAttributes, normalizeDocumentParagraphIndent, normalizeDocumentEquation, documentOpenTypeDomAttributes, renderDocumentAutoLineHeight, documentUnderlineDomAttributes, normalizeDocumentUnderlineStyle, applyDocumentTextCaseStyle, documentHiddenTextDomAttributes, importedDocumentCharacterFormatting, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, createDocumentEquationElement, normalizeDocumentPageGeometry, serializeDocumentTabStops, documentWordLineHeightFactor, documentEmphasisMarkDomAttributes, normalizeDocumentPageMargins } from "./4174.js";
 function docxCaptionSequenceKind(instruction) {
     const identifier = /^\s*SEQ\s+([^\s\\]+)/i.exec(instruction)?.[1]?.toLowerCase();
     if (!identifier) return null;
@@ -7369,6 +7369,13 @@ const SUPPORTED_RUN_PROPERTY_CHANGE_CHILDREN = new Set([
     'vertAlign',
     'bdr'
 ]);
+const SUPPORTED_OPEN_TYPE_PROPERTY_CHANGE_CHILDREN = new Set([
+    'ligatures',
+    'numForm',
+    'numSpacing',
+    'stylisticSets',
+    'cntxtAlts'
+]);
 function createImportedDocxRunFormattingMarkerState(documents) {
     return {
         markers: {
@@ -7476,6 +7483,7 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
     const runBorder = resolveDocxRunBorder(propertySources, theme).border;
     const runShading = resolveDocxRunShading(propertySources, theme).shading;
     const proofing = resolveDocxProofing(propertySources);
+    const openTypeFeatures = resolveDocxOpenTypeFeatures(propertySources).features;
     for (const properties of propertySources){
         bold = overriddenBoolean(bold, onOffProperty(properties, 'b'));
         complexBold = overriddenBoolean(complexBold, onOffProperty(properties, 'bCs'));
@@ -7635,6 +7643,9 @@ function resolvedRunFormatting(propertySources, theme, runText, requestedFontSlo
         } : {},
         ...void 0 !== proofing.noProof ? {
             noProof: proofing.noProof
+        } : {},
+        ...openTypeFeatures ? {
+            openTypeFeatures
         } : {}
     };
 }
@@ -7660,6 +7671,8 @@ function formattingMarkup(document, formatting) {
     if (formatting.fontFamily) span.style.fontFamily = formatting.fontFamily;
     if (formatting.scriptFonts) for (const [name, value] of Object.entries(documentScriptFontsDomAttributes(formatting.scriptFonts, formatting.scriptFontSlot)))if ('style' === name) span.style.cssText += `; ${value}`;
     else span.setAttribute(name, value);
+    if (formatting.openTypeFeatures) for (const [name, value] of Object.entries(documentOpenTypeDomAttributes(formatting.openTypeFeatures)))if ('style' === name) span.style.cssText += `; ${value}`;
+    else span.setAttribute(name, value);
     if (void 0 !== formatting.characterSpacingTwips) for (const [name, value] of Object.entries(documentCharacterSpacingDomAttributes(formatting.characterSpacingTwips)))if ('style' === name) span.style.cssText += `; ${value}`;
     else span.setAttribute(name, value);
     if (void 0 !== formatting.characterScalePercent) for (const [name, value] of Object.entries(documentCharacterScaleDomAttributes(formatting.characterScalePercent)))if ('style' === name) span.style.cssText += `; ${value}`;
@@ -7805,8 +7818,17 @@ function supportedRunFormattingChangeElement(change) {
     const source = properties[0];
     const names = new Set();
     for (const child of Array.from(source.children)){
-        if (!DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '') || !SUPPORTED_RUN_PROPERTY_CHANGE_CHILDREN.has(child.localName) || names.has(child.localName)) return null;
-        names.add(child.localName);
+        const supportedWordProperty = DOCX_WORDPROCESSING_NAMESPACES.has(child.namespaceURI ?? '') && SUPPORTED_RUN_PROPERTY_CHANGE_CHILDREN.has(child.localName);
+        const supportedOpenTypeProperty = child.namespaceURI === DOCX_WORD_2010_NAMESPACE && SUPPORTED_OPEN_TYPE_PROPERTY_CHANGE_CHILDREN.has(child.localName);
+        const key = `${child.namespaceURI ?? ''}|${child.localName}`;
+        if (!supportedWordProperty && !supportedOpenTypeProperty || names.has(key)) return null;
+        names.add(key);
+    }
+    if (Array.from(source.children).some((child)=>child.namespaceURI === DOCX_WORD_2010_NAMESPACE)) {
+        const openType = resolveDocxOpenTypeFeatures([
+            source
+        ]);
+        if (!openType.features || openType.invalidCount || openType.spoofedCount) return null;
     }
     const id = work_ooxml_package_attribute(change, 'id')?.trim() ?? '';
     const author = work_ooxml_package_attribute(change, 'author')?.trim() ?? '';