@a3s-lab/office 0.37.4 → 0.38.0

package/dist/0~spreadsheet-editor.js

@@ -4516,19 +4516,21 @@ function spreadsheetSortColumnLabel(column) {
         }
     ]).replace(/\d+$/, '');
 }
-function reconcileSpreadsheetFiltersAfterFortune(sheets, sourceSheets, operations = []) {
+function reconcileSpreadsheetFiltersAfterFortune(sheets, sourceSheets, operations = [], context = {
+    now: new Date()
+}) {
     const coordinates = spreadsheetCellOperationCoordinates(operations);
     return sheets.map((sheet, index)=>{
         const source = spreadsheet_filter_reconciliation_sourceSheet(sheet, sourceSheets, index);
         if (!source || !spreadsheetSheetHasCriteria(source) || !spreadsheetFilterReconciliationIsBounded(source) || !spreadsheetFilterRangesWereEdited(source, operations, coordinates)) return sheet;
-        const previousTableOwnedRows = spreadsheetTableFilterOwnedRows(source);
+        const previousTableOwnedRows = spreadsheetTableFilterOwnedRows(source, context);
         const manuallyHiddenRows = workSpreadsheetAutoFilterManuallyHiddenRows(source);
         for (const row of previousTableOwnedRows)manuallyHiddenRows.delete(row);
         let next = sheet;
-        if (normalizedWorkSpreadsheetAutoFilterRange(sheet.filter_select) && workSpreadsheetAutoFilterCriteriaEntries(source).length) next = workSpreadsheetSheetWithReappliedAutoFilterCriteria(sheet, source, manuallyHiddenRows);
+        if (normalizedWorkSpreadsheetAutoFilterRange(sheet.filter_select) && workSpreadsheetAutoFilterCriteriaEntries(source).length) next = workSpreadsheetSheetWithReappliedAutoFilterCriteria(sheet, source, manuallyHiddenRows, context);
         const hiddenRows = new Set(manuallyHiddenRows);
         for (const row of workSpreadsheetAutoFilterOwnedRows(next))hiddenRows.add(row);
-        for (const row of spreadsheetTableFilterOwnedRows(next))hiddenRows.add(row);
+        for (const row of spreadsheetTableFilterOwnedRows(next, context))hiddenRows.add(row);
         const rowhidden = Object.fromEntries([
             ...hiddenRows
         ].sort(compareSpreadsheetRowKeys).map((row)=>[
@@ -4544,26 +4546,28 @@ function reconcileSpreadsheetFiltersAfterFortune(sheets, sourceSheets, operation
         };
     });
 }
-function reconcileSpreadsheetFiltersAfterSort(sheet, source, range, sourceIndexes) {
+function reconcileSpreadsheetFiltersAfterSort(sheet, source, range, sourceIndexes, context = {
+    now: new Date()
+}) {
     if (!spreadsheetFilterReconciliationIsBounded(source) || !spreadsheetSortSourceIndexesAreValid(range, sourceIndexes)) return null;
     const reconciled = reconcileSpreadsheetFiltersAfterFortune([
         sheet
     ], [
         source
-    ])[0];
+    ], [], context)[0];
     if (!reconciled) return null;
     let filter = reconciled.filter;
     const autoFilter = normalizedWorkSpreadsheetAutoFilterRange(source.filter_select);
     if (autoFilter && autoFilter.row[0] === range.row[0] && autoFilter.row[1] === range.row[1] && autoFilter.column[0] === range.column[0] && autoFilter.column[1] === range.column[1]) filter = spreadsheetFilterWithRemappedOpaqueEntries(reconciled, source, range, sourceIndexes);
     const manuallyHiddenRows = workSpreadsheetAutoFilterManuallyHiddenRows(source);
-    for (const row of spreadsheetTableFilterOwnedRows(source))manuallyHiddenRows.delete(row);
+    for (const row of spreadsheetTableFilterOwnedRows(source, context))manuallyHiddenRows.delete(row);
     const withFilter = {
         ...reconciled,
         filter
     };
     const hiddenRows = new Set(manuallyHiddenRows);
     for (const row of workSpreadsheetAutoFilterOwnedRows(withFilter))hiddenRows.add(row);
-    for (const row of spreadsheetTableFilterOwnedRows(withFilter))hiddenRows.add(row);
+    for (const row of spreadsheetTableFilterOwnedRows(withFilter, context))hiddenRows.add(row);
     const rowhidden = Object.fromEntries([
         ...hiddenRows
     ].sort(compareSpreadsheetRowKeys).map((row)=>[
@@ -4645,13 +4649,13 @@ function spreadsheetFilterRanges(sheet) {
     }
     return ranges;
 }
-function spreadsheetTableFilterOwnedRows(sheet) {
+function spreadsheetTableFilterOwnedRows(sheet, context) {
     const hidden = new Set();
     for (const table of sheet.tables ?? []){
         const range = spreadsheetTableFilterRange(table);
         if (range) for (const filter of table.filters){
             const column = range.column[0] + filter.column;
-            const rowhidden = workSpreadsheetFilterHiddenRows(sheet, range, column, filter.criteria);
+            const rowhidden = workSpreadsheetFilterHiddenRows(sheet, range, column, filter.criteria, context);
             for (const row of Object.keys(rowhidden ?? {}))hidden.add(row);
         }
     }
@@ -5348,8 +5352,12 @@ function recordSpreadsheetProjectionMeasure(start, end, detail) {
         });
     } catch  {}
 }
-function spreadsheetSheetsFromFortune(sheets, sourceSheets, operations = []) {
+function spreadsheetSheetsFromFortune(sheets, sourceSheets, operations = [], dateSystem = '1900') {
     const startedAt = spreadsheetProjectionNow();
+    const filterContext = {
+        dateSystem,
+        now: new Date()
+    };
     const incremental = projectSpreadsheetSheetsFromFortuneOperations(sheets, sourceSheets, operations);
     if (incremental) {
         recordSpreadsheetControlledProjectionMeasure(startedAt, spreadsheetProjectionNow(), {
@@ -5357,7 +5365,7 @@ function spreadsheetSheetsFromFortune(sheets, sourceSheets, operations = []) {
             incremental: true,
             operationCount: operations.length
         });
-        return reconcileSpreadsheetFiltersAfterFortune(reconcileSpreadsheetTablesAfterFortune(incremental.sheets, sourceSheets, operations), sourceSheets, operations);
+        return reconcileSpreadsheetFiltersAfterFortune(reconcileSpreadsheetTablesAfterFortune(incremental.sheets, sourceSheets, operations), sourceSheets, operations, filterContext);
     }
     const operationCoordinatesBySheet = spreadsheetCellOperationCoordinates(operations);
     const projected = sheets.map((sheet, index)=>{
@@ -5399,7 +5407,7 @@ function spreadsheetSheetsFromFortune(sheets, sourceSheets, operations = []) {
         incremental: false,
         operationCount: operations.length
     });
-    return reconcileSpreadsheetFiltersAfterFortune(reconcileSpreadsheetTablesAfterFortune(projected, sourceSheets, operations), sourceSheets, operations);
+    return reconcileSpreadsheetFiltersAfterFortune(reconcileSpreadsheetTablesAfterFortune(projected, sourceSheets, operations), sourceSheets, operations, filterContext);
 }
 function recordSpreadsheetControlledProjectionMeasure(start, end, detail) {
     try {
@@ -5929,18 +5937,18 @@ function toggleSpreadsheetAutoFilter(content, sheetId, selection) {
 function spreadsheetAutoFilterCriteria(sheet, column) {
     return workSpreadsheetAutoFilterCriteria(sheet, column);
 }
-function spreadsheetAutoFilterColumnIsNumeric(sheet, range, column) {
-    return spreadsheetAutoFilterColumnProfile(sheet, range, column).numeric;
+function spreadsheetAutoFilterColumnIsNumeric(sheet, range, column, dateSystem = '1900') {
+    return spreadsheetAutoFilterColumnProfile(sheet, range, column, dateSystem).numeric;
 }
-function spreadsheetAutoFilterColumnIsDate(sheet, range, column) {
-    return spreadsheetAutoFilterColumnProfile(sheet, range, column).date;
+function spreadsheetAutoFilterColumnIsDate(sheet, range, column, dateSystem = '1900') {
+    return spreadsheetAutoFilterColumnProfile(sheet, range, column, dateSystem).date;
 }
-function spreadsheetAutoFilterColumnProfile(sheet, range, column) {
+function spreadsheetAutoFilterColumnProfile(sheet, range, column, dateSystem) {
     if (!Number.isSafeInteger(column) || column < range.column[0] || column > range.column[1]) return {
         date: false,
         numeric: false
     };
-    const key = `${range.row[0]}:${range.row[1]}:${column}`;
+    const key = `${dateSystem}:${range.row[0]}:${range.row[1]}:${column}`;
     const cached = spreadsheetAutoFilterColumnProfileCache.get(sheet)?.get(key);
     if (cached) return cached;
     const cellAt = spreadsheetSheetCellReader(sheet);
@@ -5949,7 +5957,7 @@ function spreadsheetAutoFilterColumnProfile(sheet, range, column) {
         const cell = cellAt(row, column);
         const value = cell?.v ?? cell?.m;
         if (null == value || '' === value) continue;
-        const valueKind = workSpreadsheetCellIsDate(cell) ? 'date' : 'number' == typeof value && Number.isFinite(value) ? 'numeric' : null;
+        const valueKind = workSpreadsheetCellIsDate(cell, dateSystem) ? 'date' : 'number' == typeof value && Number.isFinite(value) ? 'numeric' : null;
         if (!valueKind || null !== columnKind && columnKind !== valueKind) {
             columnKind = null;
             break;
@@ -5969,7 +5977,10 @@ function applySpreadsheetAutoFilterCriteria(content, sheetId, column, criteria,
     const sheetIndex = content.sheets.findIndex((sheet)=>sheet.id === sheetId);
     const sheet = content.sheets[sheetIndex];
     if (!sheet) return null;
-    const nextSheet = workSpreadsheetSheetWithAutoFilterCriteria(sheet, column, criteria, context);
+    const nextSheet = workSpreadsheetSheetWithAutoFilterCriteria(sheet, column, criteria, {
+        dateSystem: content.dateSystem,
+        now: context?.now ?? new Date()
+    });
     if (!nextSheet) return null;
     const sheets = [
         ...content.sheets
@@ -8529,13 +8540,15 @@ function clampSpreadsheetDataValidationFocus(value, range) {
 const MILLISECONDS_PER_DAY = 86400000;
 const MINUTES_PER_DAY = 1440;
 const EXCEL_1900_EPOCH_UTC = Date.UTC(1899, 11, 30);
-function spreadsheetDateTimeEntry(kind, now) {
+const EXCEL_1904_EPOCH_UTC = Date.UTC(1904, 0, 1);
+function spreadsheetDateTimeEntry(kind, now, dateSystem = '1900') {
     if (!Number.isFinite(now.getTime())) return null;
     if ('date' === kind) {
         const year = now.getFullYear();
         const month = now.getMonth();
         const day = now.getDate();
-        const value = (Date.UTC(year, month, day) - EXCEL_1900_EPOCH_UTC) / MILLISECONDS_PER_DAY;
+        const epoch = '1904' === dateSystem ? EXCEL_1904_EPOCH_UTC : EXCEL_1900_EPOCH_UTC;
+        const value = (Date.UTC(year, month, day) - epoch) / MILLISECONDS_PER_DAY;
         if (!Number.isFinite(value)) return null;
         return {
             format: {
@@ -8576,7 +8589,7 @@ function createSpreadsheetDateTimeExtension() {
 function insertCurrentSpreadsheetDateTime(context, kind) {
     if (!isSpreadsheetDateTimeKind(kind)) return false;
     const target = spreadsheetDateTimeTarget(context);
-    const entry = spreadsheetDateTimeEntry(kind, new Date());
+    const entry = spreadsheetDateTimeEntry(kind, new Date(), context.content.dateSystem);
     if (!target || !entry || !context.workbook) return false;
     try {
         context.workbook.batchCallApis([
@@ -10369,7 +10382,10 @@ function applySpreadsheetSort(context, request) {
         if (!result.ok) return false;
         if (owned && spreadsheetSortRequiresFilterReconciliation(sheet, owned)) {
             const sorted = spreadsheetSheetWithSortedRange(sheet, validation.request.range, result.rows);
-            const reconciled = reconcileSpreadsheetFiltersAfterSort(sorted, sheet, validation.request.range, result.sourceIndexes);
+            const reconciled = reconcileSpreadsheetFiltersAfterSort(sorted, sheet, validation.request.range, result.sourceIndexes, {
+                dateSystem: context.content.dateSystem,
+                now: new Date()
+            });
             if (!reconciled) return false;
             context.onChange({
                 ...context.content,
@@ -23509,7 +23525,7 @@ const SPREADSHEET_AUTO_FILTER_MENU_ITEMS = [
     '|',
     'filter-by-value'
 ];
-function enhanceSpreadsheetAutoFilterSurface(container, sheet, invoker) {
+function enhanceSpreadsheetAutoFilterSurface(container, sheet, invoker, dateSystem = '1900') {
     const range = sheet?.filter_select;
     const startRow = range?.row?.[0];
     const startColumn = range?.column?.[0];
@@ -23556,14 +23572,14 @@ function enhanceSpreadsheetAutoFilterSurface(container, sheet, invoker) {
             action.setAttribute('aria-haspopup', 'dialog');
         }
     }
-    synchronizeSpreadsheetAutoFilterRankAction(menu, sheet, trigger);
+    synchronizeSpreadsheetAutoFilterRankAction(menu, sheet, trigger, dateSystem);
     return menu;
 }
-function synchronizeSpreadsheetAutoFilterRankAction(menu, sheet, trigger) {
+function synchronizeSpreadsheetAutoFilterRankAction(menu, sheet, trigger, dateSystem) {
     const existing = menu.querySelector('[data-a3s-auto-filter-rank]');
     const range = normalizedWorkSpreadsheetAutoFilterRange(sheet?.filter_select);
     const column = Number(trigger?.dataset.filterColumn);
-    const numeric = Boolean(sheet && range && Number.isSafeInteger(column) && spreadsheetAutoFilterColumnIsNumeric(sheet, range, column));
+    const numeric = Boolean(sheet && range && Number.isSafeInteger(column) && spreadsheetAutoFilterColumnIsNumeric(sheet, range, column, dateSystem));
     if (!numeric) return void existing?.remove();
     if (existing) {
         existing.dataset.filterColumn = String(column);
@@ -24291,7 +24307,7 @@ function useSpreadsheetAutoFilter({ canvasRef, commandsRef, content, editable, m
         const column = spreadsheetAutoFilterHeaderColumn(activeSheet, currentSpreadsheetAutoFilterSelection(selectionRef.current, workbookRef.current));
         const startColumn = activeSheet?.filter_select?.column?.[0];
         if (!container || null === column || !Number.isFinite(startColumn)) return false;
-        enhanceSpreadsheetAutoFilterSurface(container, activeSheet, keyboardInvokerRef.current);
+        enhanceSpreadsheetAutoFilterSurface(container, activeSheet, keyboardInvokerRef.current, contentRef.current.dateSystem);
         const triggers = [
             ...container.querySelectorAll('.luckysheet-filter-options')
         ];
@@ -24300,7 +24316,7 @@ function useSpreadsheetAutoFilter({ canvasRef, commandsRef, content, editable, m
         keyboardInvokerRef.current = trigger;
         restoreInvokerFocusRef.current = true;
         trigger.click();
-        enhanceSpreadsheetAutoFilterSurface(container, activeSheet, trigger);
+        enhanceSpreadsheetAutoFilterSurface(container, activeSheet, trigger, contentRef.current.dateSystem);
         focusSpreadsheetAutoFilterMenu(container);
         return true;
     }, [
@@ -24328,11 +24344,11 @@ function useSpreadsheetAutoFilter({ canvasRef, commandsRef, content, editable, m
             column,
             columnLabel: spreadsheetAutoFilterColumnLabel(activeSheet, range.row[0], column),
             criteria,
-            date: spreadsheetAutoFilterColumnIsDate(activeSheet, range, column),
+            date: spreadsheetAutoFilterColumnIsDate(activeSheet, range, column, contentRef.current.dateSystem),
             filterRange: range,
             hasActiveFilter: Object.hasOwn(activeSheet.filter ?? {}, key),
             invoker,
-            numeric: spreadsheetAutoFilterColumnIsNumeric(activeSheet, range, column),
+            numeric: spreadsheetAutoFilterColumnIsNumeric(activeSheet, range, column, contentRef.current.dateSystem),
             sheetId: activeSheet.id ?? sheetIdRef.current,
             sheetName: activeSheet.name
         };
@@ -24354,7 +24370,7 @@ function useSpreadsheetAutoFilter({ canvasRef, commandsRef, content, editable, m
         if (!container || !editable) return;
         const enhance = ()=>{
             const activeSheet = contentRef.current.sheets.find((candidate)=>candidate.id === sheetIdRef.current);
-            const menu = enhanceSpreadsheetAutoFilterSurface(container, activeSheet, keyboardInvokerRef.current);
+            const menu = enhanceSpreadsheetAutoFilterSurface(container, activeSheet, keyboardInvokerRef.current, contentRef.current.dateSystem);
             const menuOpen = Boolean(menu);
             if (menuWasOpenRef.current && !menuOpen && restoreInvokerFocusRef.current) {
                 const invoker = keyboardInvokerRef.current;
@@ -24389,7 +24405,7 @@ function useSpreadsheetAutoFilter({ canvasRef, commandsRef, content, editable, m
                 keyboardInvokerRef.current = trigger;
                 restoreInvokerFocusRef.current = true;
                 trigger.click();
-                enhanceSpreadsheetAutoFilterSurface(container, contentRef.current.sheets.find((candidate)=>candidate.id === sheetIdRef.current), trigger);
+                enhanceSpreadsheetAutoFilterSurface(container, contentRef.current.sheets.find((candidate)=>candidate.id === sheetIdRef.current), trigger, contentRef.current.dateSystem);
                 focusSpreadsheetAutoFilterMenu(container);
                 return;
             }
@@ -30136,7 +30152,7 @@ function SpreadsheetEditorSurface({ autoFocus = true, content, collaborationHist
         if (ignoreChangeDuringExternalSync(matchesRenderedWorkbook)) return;
         const hasPendingResultPatches = calculation.hasPendingResultPatches();
         if (previewRef.current || matchesRenderedWorkbook && !hasPendingResultPatches) return;
-        const controlledSheets = spreadsheetSheetsFromFortune(sheets, contentRef.current.sheets, operations);
+        const controlledSheets = spreadsheetSheetsFromFortune(sheets, contentRef.current.sheets, operations, contentRef.current.dateSystem);
         const withCharts = reconcileSpreadsheetChartPreviews(contentRef.current, controlledSheets);
         const next = reconcileSpreadsheetPivots(contentRef.current, withCharts.sheets);
         const isHistoryNoop = sameSpreadsheetHistoryContent(contentRef.current, next);

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, 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 "./4174.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, serializeDocumentOpenTypeFeatures, normalizeDocumentImageIdentity, normalizeDocumentStrikeStyle, normalizeTableColor, normalizeDocumentOpenTypeFeatures, documentCitationTags, docxDocumentFieldKind, documentTableBordersFromElement, documentSections, wrapsBesideImage, normalizeDocumentCharacterPositionHalfPoints, normalizeDocumentKerningThresholdHalfPoints, defaultDocumentImageWrapContour, parseDocumentOpenTypeFeatures, normalizeDocumentPaperSource, DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE, documentEquationFromElement, documentLegacyTextEffectsFromElement, parseDocumentCharacterFormatting, documentUnderlineFormattingFromElement, DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE, normalizeDocumentEquation, parseDocumentParagraphFormatting, documentOpenTypeFeaturesFromElement, normalizeDocumentBookmarkNativeId, documentTableRowIdentityFromElement, DOCUMENT_PAGE_MARGIN_KEYS, uniqueDocumentImageIdentity, documentHiddenTextFromElement, collectDocumentNotes, documentImageLayoutFromElement, documentPageHorizontalMarginTwips, DOCUMENT_OPEN_TYPE_ATTRIBUTE, documentPageGeometryForLayout, DOCUMENT_LEGACY_TEXT_EFFECT_NAMES, documentCharacterScalePercentFromElement, normalizeDocumentPageMargins, normalizeDocumentLegacyTextEffect, documentNoteKind } from "./4174.js";
 import { normalizeDocumentRunBorder, parseDocumentScriptFonts, normalizeDocumentIndexesHtml, parseXml, parseDocumentRunShading, applyDocumentParagraphIdentityToElement, DOCUMENT_RUN_SHADING_ATTRIBUTE, documentScriptFontSlotFromElement, DOCUMENT_HIGHLIGHT_ATTRIBUTE, parseDocxThemeReference, serializeDocumentScriptFonts, attribute as work_ooxml_package_attribute, createDocumentParagraphIdentityRegistry, uniqueDocumentParagraphIdentity, DOCUMENT_NO_PROOF_ATTRIBUTE, documentHighlightForCssColor, directChildren, documentTableOfContentsValueFromElement, DOCUMENT_PROOFING_LANGUAGES_ATTRIBUTE, DocxThemePatchCollector, normalizeDocumentScriptFonts, normalizeDocumentParagraphIdentity, normalizeDocumentHighlight, normalizeDocumentParagraphBorders, serializeUtf8Xml, DOCUMENT_PARAGRAPH_BORDER_EDGES, parseDocumentRunBorder, normalizeDocumentNoProof, decodeXmlBytes, documentParagraphIdentityFromElement, normalizeDocumentParagraphId, documentIndexValueFromElement, descendants, resolvePartTarget, documentProofingLanguagesFromElement, documentScriptFontFamily, parseDocumentRunShadingElement, parseDocumentProofingLanguages, documentHighlightFromElement, parseDocumentParagraphBordersElement, DOCUMENT_RUN_BORDER_ATTRIBUTE, parseDocumentRunBorderElement, xmlNamespacePrefix, documentScriptFontSlotFromHint, documentNoProofFromElement, documentScriptFontsFromElement, normalizeDocumentRunShading, documentIndexEntryFromElement, directChild, normalizeDocumentScriptFontSlot, patchDocxThemeReferences, parseDocumentParagraphShadingElement, documentFontNameFromCssFamily } from "./4121.js";
 import { assignDocxNoteIds, patchDocxPageColor, normalizeDocxCommentId, assignDocxCommentThreads } from "./0~4980.js";
-import { paragraphTabStops, mergeDocxIgnorableExtensionsAtPairs, patchDocxBibliography, docxKerningThresholdValue, docxCharacterPositionValue, documentIndexInstruction, docxCharacterScaleValue, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, paragraphAlignment, xmlNamespaceUri, paragraphSpacingOptions, docxEmphasisMarkRunOptions, documentIndexEntryInstruction, hasNonWhitespaceXmlText, patchDocxExplicitZeroCharacterSpacing, cloneXmlElement, cssColorToHex, xmlDeclaredPrefix, assertXmlRoot, DOCX_WORDPROCESSING_NAMESPACES, paragraphIndent, domDirection, xmlAttributeNamespace, paragraphBidirectional, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, mergeDocxIgnorableExtensions, DocxParagraphDefaultCollapsedPatchCollector, dataBoolean, patchDocxParagraphDefaultCollapsed, patchDocxExplicitZeroKerningThresholds, parseDocxColorSchemeMappingElement, paragraphPaginationOptions, DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, documentProofingLanguageDocxOptions, xmlAttributeLocalName, cssFontSize, paragraphDirectionOptions, cssFontFamily, docxCharacterSpacingValue } from "./0~4808.js";
+import { paragraphTabStops, mergeDocxIgnorableExtensionsAtPairs, DOCX_WORD_2010_NAMESPACE, docxKerningThresholdValue, patchDocxBibliography, documentIndexInstruction, docxCharacterScaleValue, XMLNS_NAMESPACE as work_docx_settings_xml_XMLNS_NAMESPACE, paragraphAlignment, xmlNamespaceUri, paragraphSpacingOptions, docxCharacterPositionValue, documentIndexEntryInstruction, docxEmphasisMarkRunOptions, hasNonWhitespaceXmlText, patchDocxExplicitZeroCharacterSpacing, cloneXmlElement, cssColorToHex, xmlDeclaredPrefix, assertXmlRoot, DOCX_WORDPROCESSING_NAMESPACES, paragraphIndent, domDirection, xmlAttributeNamespace, paragraphBidirectional, XML_NAMESPACE as work_docx_settings_xml_XML_NAMESPACE, mergeDocxIgnorableExtensions, DocxParagraphDefaultCollapsedPatchCollector, dataBoolean, patchDocxParagraphDefaultCollapsed, patchDocxExplicitZeroKerningThresholds, parseDocxColorSchemeMappingElement, paragraphPaginationOptions, DOCX_COLOR_SCHEME_MAPPING_ATTRIBUTES, documentProofingLanguageDocxOptions, xmlAttributeLocalName, cssFontSize, paragraphDirectionOptions, cssFontFamily, docxCharacterSpacingValue } from "./0~5024.js";
 import { normalizeDocumentHref } from "./0~work-document-links.js";
 const WORD_NAMESPACE = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
 class DocxBookmarkPatchCollector {
@@ -2660,6 +2660,174 @@ function work_docx_run_shading_export_setWordAttribute(document, element, name,
     const prefix = element.prefix ?? xmlNamespacePrefix(document.documentElement, namespace) ?? 'w';
     element.setAttributeNS(namespace, `${prefix}:${name}`, value);
 }
+const work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE = 'http://schemas.openxmlformats.org/markup-compatibility/2006';
+const OPEN_TYPE_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes|comments)\.xml$/i;
+const OPEN_TYPE_PROPERTY_ORDER = [
+    'ligatures',
+    'numForm',
+    'numSpacing',
+    'stylisticSets',
+    'cntxtAlts'
+];
+class DocxOpenTypePatchCollector {
+    patches = [];
+    nextMarker = 1;
+    occupied;
+    patchesByMarker = new Map();
+    markersByFeaturesAndStyle = new Map();
+    constructor(source){
+        this.occupied = source;
+    }
+    marker(value, inheritedStyle) {
+        const features = normalizeDocumentOpenTypeFeatures(value);
+        if (!features) throw new Error('Document contains invalid OpenType typography.');
+        const style = this.originalStyle(inheritedStyle);
+        const serialized = serializeDocumentOpenTypeFeatures(features);
+        if (!serialized) throw new Error('Document contains invalid OpenType typography.');
+        const key = JSON.stringify([
+            serialized,
+            style ?? null
+        ]);
+        const existing = this.markersByFeaturesAndStyle.get(key);
+        if (existing) return existing;
+        let marker = '';
+        do {
+            marker = `A3SOfficeOpenType${String(this.nextMarker).padStart(8, '0')}`;
+            this.nextMarker += 1;
+        }while (this.occupied.includes(marker) || this.patches.some((patch)=>patch.marker === marker))
+        const patch = {
+            marker,
+            features,
+            ...style ? {
+                style
+            } : {}
+        };
+        this.patches.push(patch);
+        this.patchesByMarker.set(marker, patch);
+        this.markersByFeaturesAndStyle.set(key, marker);
+        return marker;
+    }
+    lookup(marker) {
+        return marker ? this.patchesByMarker.get(marker) : void 0;
+    }
+    originalStyle(style) {
+        let current = style;
+        const seen = new Set();
+        while(current && !seen.has(current)){
+            seen.add(current);
+            const patch = this.patchesByMarker.get(current);
+            if (!patch) break;
+            current = patch.style;
+        }
+        return current;
+    }
+}
+async function patchDocxOpenTypeFeatures(buffer, patches) {
+    if (!patches.length) return buffer;
+    const byMarker = validatedPatches(patches);
+    const archive = await jszip.loadAsync(buffer);
+    const applied = new Set();
+    for (const entry of Object.values(archive.files)){
+        if (entry.dir || !OPEN_TYPE_PART_PATTERN.test(entry.name)) continue;
+        const document = parseXml(decodeXmlBytes(await entry.async('uint8array'), `generated DOCX ${entry.name}`), `generated DOCX ${entry.name}`);
+        let changed = false;
+        for (const properties of descendants(document, 'rPr')){
+            if (!DOCX_WORDPROCESSING_NAMESPACES.has(properties.namespaceURI ?? '')) continue;
+            const markerStyles = directChildren(properties, 'rStyle').filter((style)=>{
+                if (!DOCX_WORDPROCESSING_NAMESPACES.has(style.namespaceURI ?? '')) return false;
+                const marker = work_docx_opentype_export_wordValue(style);
+                return null !== marker && byMarker.has(marker);
+            });
+            if (!markerStyles.length) continue;
+            if (1 !== markerStyles.length) throw new Error('Generated DOCX OpenType marker is duplicated in one run.');
+            const marker = work_docx_opentype_export_wordValue(markerStyles[0]);
+            const patch = marker ? byMarker.get(marker) : void 0;
+            if (marker && patch) {
+                if (directChildren(properties).some((child)=>child.namespaceURI === DOCX_WORD_2010_NAMESPACE && OPEN_TYPE_PROPERTY_ORDER.includes(child.localName))) throw new Error('Generated DOCX OpenType marker unexpectedly has a native value.');
+                if (patch.style) work_docx_opentype_export_setWordValue(markerStyles[0], patch.style);
+                else markerStyles[0].remove();
+                appendDocxOpenTypeProperties(document, properties, patch.features);
+                applied.add(marker);
+                changed = true;
+            }
+        }
+        if (changed) archive.file(entry.name, serializeUtf8Xml(document));
+    }
+    const missing = patches.filter((patch)=>!applied.has(patch.marker));
+    if (missing.length) throw new Error(`DOCX OpenType markers were not emitted: ${missing.map((patch)=>patch.marker).join(', ')}.`);
+    return archive.generateAsync({
+        type: 'arraybuffer'
+    });
+}
+function validatedPatches(patches) {
+    const result = new Map();
+    for (const patch of patches){
+        const features = normalizeDocumentOpenTypeFeatures(patch.features);
+        if (!patch.marker || !features || result.has(patch.marker)) throw new Error('Document contains invalid OpenType patches.');
+        result.set(patch.marker, {
+            ...patch,
+            features
+        });
+    }
+    return result;
+}
+function appendDocxOpenTypeProperties(document, properties, source) {
+    const features = normalizeDocumentOpenTypeFeatures(source);
+    if (!features) throw new Error('Document contains invalid OpenType typography.');
+    const prefix = work_docx_opentype_export_ensureWord2010Prefix(document.documentElement);
+    if (void 0 !== features.ligatures) properties.append(valuedElement(document, prefix, 'ligatures', features.ligatures));
+    if (void 0 !== features.numberForm) properties.append(valuedElement(document, prefix, 'numForm', features.numberForm));
+    if (void 0 !== features.numberSpacing) properties.append(valuedElement(document, prefix, 'numSpacing', features.numberSpacing));
+    if (void 0 !== features.stylisticSets) {
+        const stylisticSets = word2010Element(document, prefix, 'stylisticSets');
+        for (const id of features.stylisticSets)stylisticSets.append(valuedElement(document, prefix, 'styleSet', String(id), 'id'));
+        properties.append(stylisticSets);
+    }
+    if (void 0 !== features.contextualAlternates) properties.append(valuedElement(document, prefix, 'cntxtAlts', features.contextualAlternates ? '1' : '0'));
+}
+function valuedElement(document, prefix, name, value, attribute = 'val') {
+    const element = word2010Element(document, prefix, name);
+    element.setAttributeNS(DOCX_WORD_2010_NAMESPACE, `${prefix}:${attribute}`, value);
+    return element;
+}
+function word2010Element(document, prefix, name) {
+    return document.createElementNS(DOCX_WORD_2010_NAMESPACE, `${prefix}:${name}`);
+}
+function work_docx_opentype_export_ensureWord2010Prefix(root) {
+    const existing = Array.from(root.attributes).find((attribute)=>attribute.namespaceURI === work_docx_settings_xml_XMLNS_NAMESPACE && attribute.value === DOCX_WORD_2010_NAMESPACE);
+    const prefix = existing?.localName ?? availablePrefix(root, 'w14');
+    if (!existing) root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${prefix}`, DOCX_WORD_2010_NAMESPACE);
+    ensureIgnorable(root, prefix);
+    return prefix;
+}
+function availablePrefix(root, preferred) {
+    let index = 0;
+    while(true){
+        const prefix = index ? `${preferred}${index}` : preferred;
+        const occupied = Array.from(root.attributes).some((attribute)=>attribute.namespaceURI === work_docx_settings_xml_XMLNS_NAMESPACE && attribute.localName === prefix);
+        if (!occupied) return prefix;
+        index += 1;
+    }
+}
+function ensureIgnorable(root, word2010Prefix) {
+    const existingPrefix = Array.from(root.attributes).find((attribute)=>attribute.namespaceURI === work_docx_settings_xml_XMLNS_NAMESPACE && attribute.value === work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE)?.localName;
+    const prefix = existingPrefix ?? availablePrefix(root, 'mc');
+    if (!existingPrefix) root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${prefix}`, work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE);
+    const value = root.getAttributeNS(work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE, 'Ignorable');
+    const tokens = value?.trim().split(/\s+/).filter(Boolean) ?? [];
+    if (!tokens.includes(word2010Prefix)) tokens.push(word2010Prefix);
+    root.setAttributeNS(work_docx_opentype_export_MARKUP_COMPATIBILITY_NAMESPACE, `${prefix}:Ignorable`, tokens.join(' '));
+}
+function work_docx_opentype_export_wordValue(element) {
+    const values = Array.from(element.attributes).filter((attribute)=>'val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? ''));
+    return 1 === values.length ? values[0].value : null;
+}
+function work_docx_opentype_export_setWordValue(element, value) {
+    const namespace = element.namespaceURI ?? '';
+    const prefix = element.prefix || 'w';
+    for (const attribute of Array.from(element.attributes))if ('val' === xmlAttributeLocalName(attribute) && DOCX_WORDPROCESSING_NAMESPACES.has(xmlAttributeNamespace(element, attribute) ?? '')) element.removeAttributeNode(attribute);
+    element.setAttributeNS(namespace, `${prefix}:val`, value);
+}
 const MAX_RUN_FORMATTING_CHANGE_PATCHES = 65536;
 const RUN_FORMATTING_PART_PATTERN = /^word\/(?:document|header\d*|footer\d*|footnotes|endnotes)\.xml$/i;
 class DocxRunFormattingChangePatchCollector {
@@ -2805,6 +2973,11 @@ function appendFormattingProperties(document, properties, namespace, prefix, ser
     appendVerticalAlignProperty(document, properties, namespace, prefix, byType);
     appendEmphasisMarkProperty(document, properties, namespace, prefix, byType.get('textStyle'));
     appendProofingLanguagesProperty(document, properties, namespace, prefix, byType.get('textStyle'));
+    appendOpenTypeProperties(document, properties, byType.get('textStyle'));
+}
+function appendOpenTypeProperties(document, properties, mark) {
+    const features = parseDocumentOpenTypeFeatures(mark?.attrs?.openTypeFeatures);
+    if (features) appendDocxOpenTypeProperties(document, properties, features);
 }
 function appendNoProofProperty(document, properties, namespace, prefix, mark) {
     const noProof = normalizeDocumentNoProof(mark?.attrs?.noProof);
@@ -5271,12 +5444,12 @@ function work_docx_note_comment_hyperlink_relationships_removeNamespacedAttribut
 function setNamespacedAttribute(element, root, namespace, preferredPrefix, localName, value) {
     let prefix = xmlDeclaredPrefix(element, namespace) ?? xmlDeclaredPrefix(root, namespace);
     if (!prefix) {
-        prefix = availablePrefix(root, preferredPrefix);
+        prefix = work_docx_note_comment_hyperlink_relationships_availablePrefix(root, preferredPrefix);
         root.setAttributeNS(work_docx_settings_xml_XMLNS_NAMESPACE, `xmlns:${prefix}`, namespace);
     }
     element.setAttributeNS(namespace, `${prefix}:${localName}`, value);
 }
-function availablePrefix(root, preferred) {
+function work_docx_note_comment_hyperlink_relationships_availablePrefix(root, preferred) {
     if (!xmlNamespaceUri(root, preferred)) return preferred;
     let index = 1;
     while(xmlNamespaceUri(root, `${preferred}${index}`))index += 1;
@@ -8424,11 +8597,13 @@ async function createDocxBlob(content, sourcePackage) {
         runFontPatches: new DocxRunFontsPatchCollector(JSON.stringify(normalizedContent)),
         hiddenTextPatches: new DocxHiddenTextPatchCollector(JSON.stringify(normalizedContent)),
         legacyTextEffectsPatches: new DocxLegacyTextEffectsPatchCollector(JSON.stringify(normalizedContent)),
+        openTypePatches: new DocxOpenTypePatchCollector(JSON.stringify(normalizedContent)),
         runBorderPatches: new DocxRunBorderPatchCollector(JSON.stringify(normalizedContent)),
         usedRunBorderMarkers: new Set(),
         runShadingPatches: new DocxRunShadingPatchCollector(JSON.stringify(normalizedContent)),
         usedRunShadingMarkers: new Set(),
         usedNativeTextEffectMarkers: new Set(),
+        usedOpenTypeMarkers: new Set(),
         paragraphFormattingChangePatches: new DocxParagraphFormattingChangePatchCollector(),
         tableOfContentsPatches: new DocxTableOfContentsPatchCollector(),
         indexPatches: new DocxIndexPatchCollector(),
@@ -8483,7 +8658,8 @@ async function createDocxBlob(content, sourcePackage) {
     const characterSpacingPatched = noteContext.hasExplicitZeroCharacterSpacing ? await patchDocxExplicitZeroCharacterSpacing(await packed.arrayBuffer()) : await packed.arrayBuffer();
     const kerningPatched = noteContext.hasExplicitZeroKerningThreshold ? await patchDocxExplicitZeroKerningThresholds(characterSpacingPatched) : characterSpacingPatched;
     const runFontsPatched = await patchDocxRunFonts(kerningPatched, noteContext.runFontPatches.patches);
-    const hiddenTextPatched = await patchDocxHiddenText(runFontsPatched, noteContext.hiddenTextPatches.patches.filter((patch)=>noteContext.usedNativeTextEffectMarkers.has(patch.marker)));
+    const openTypePatched = await patchDocxOpenTypeFeatures(runFontsPatched, noteContext.openTypePatches.patches.filter((patch)=>noteContext.usedOpenTypeMarkers.has(patch.marker)));
+    const hiddenTextPatched = await patchDocxHiddenText(openTypePatched, 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 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)));
@@ -8516,13 +8692,20 @@ async function createDocxBlob(content, sourcePackage) {
         type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
     });
 }
-function docxNativeTextEffectState(style, context) {
+function docxRunStyleState(style, context) {
     let current = style;
     let hiddenText;
+    let openTypeFeatures;
     const legacyTextEffects = {};
     const seen = new Set();
     while(current && !seen.has(current)){
         seen.add(current);
+        const openTypePatch = context.openTypePatches.lookup(current);
+        if (openTypePatch) {
+            openTypeFeatures ??= openTypePatch.features;
+            current = openTypePatch.style;
+            continue;
+        }
         const hiddenPatch = context.hiddenTextPatches.lookup(current);
         if (hiddenPatch) {
             hiddenText ??= hiddenPatch.value;
@@ -8547,14 +8730,23 @@ function docxNativeTextEffectState(style, context) {
         ...void 0 !== hiddenText ? {
             hiddenText
         } : {},
+        ...openTypeFeatures ? {
+            openTypeFeatures
+        } : {},
         legacyTextEffects
     };
 }
-function markDocxNativeTextEffectStyleUsed(style, context) {
+function markDocxRunStyleMarkersUsed(style, context) {
     let current = style;
     const seen = new Set();
     while(current && !seen.has(current)){
         seen.add(current);
+        const openTypePatch = context.openTypePatches.lookup(current);
+        if (openTypePatch) {
+            context.usedOpenTypeMarkers.add(current);
+            current = openTypePatch.style;
+            continue;
+        }
         const hiddenPatch = context.hiddenTextPatches.lookup(current);
         if (hiddenPatch) {
             context.usedNativeTextEffectMarkers.add(current);
@@ -8751,7 +8943,7 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
     const visit = async (node, inherited = {}, revision)=>{
         if (node.nodeType === Node.TEXT_NODE) {
             if (!node.textContent) return [];
-            markDocxNativeTextEffectStyleUsed(inherited.style, noteContext);
+            markDocxRunStyleMarkersUsed(inherited.style, noteContext);
             markDocxRunBorderUsed(inherited.border, noteContext);
             markDocxRunShadingUsed(inherited.shading, noteContext);
             if (revision?.kind === 'insertion') return [
@@ -8843,6 +9035,9 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         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 hasExplicitOpenType = 'span' === tag && node.hasAttribute(DOCUMENT_OPEN_TYPE_ATTRIBUTE);
+        const explicitOpenType = hasExplicitOpenType ? documentOpenTypeFeaturesFromElement(node) : null;
+        if (hasExplicitOpenType && !explicitOpenType) throw new Error('Document contains invalid OpenType typography.');
         const hasExplicitLegacyTextEffects = 'span' === tag && [
             DOCUMENT_LEGACY_TEXT_OUTLINE_ATTRIBUTE,
             DOCUMENT_LEGACY_TEXT_SHADOW_ATTRIBUTE,
@@ -8863,18 +9058,20 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         const position = null === explicitCharacterPosition ? inherited.position : docxCharacterPositionValue(explicitCharacterPosition);
         const emphasisMark = null === explicitEmphasisMark ? inherited.emphasisMark : docxEmphasisMarkRunOptions(explicitEmphasisMark);
         const textCaseOptions = docxTextCaseRunOptions(explicitTextCase, inherited);
-        const inheritedNativeTextEffects = docxNativeTextEffectState(inherited.style, noteContext);
+        const inheritedRunStyle = docxRunStyleState(inherited.style, noteContext);
         const legacyTextEffects = {
-            ...inheritedNativeTextEffects.legacyTextEffects,
+            ...inheritedRunStyle.legacyTextEffects,
             ...explicitLegacyTextEffects ?? {}
         };
         if (documentLegacyTextEffectsConflict(legacyTextEffects)) throw new Error('Document contains conflicting legacy text effects.');
-        const hiddenText = null === explicitHiddenText ? inheritedNativeTextEffects.hiddenText : explicitHiddenText;
-        let nativeTextEffectStyle = inherited.style;
-        if (hasExplicitLegacyTextEffects || null !== explicitHiddenText) {
-            nativeTextEffectStyle = inheritedNativeTextEffects.baseStyle;
-            if (Object.keys(legacyTextEffects).length) nativeTextEffectStyle = noteContext.legacyTextEffectsPatches.marker(legacyTextEffects, nativeTextEffectStyle);
-            if (void 0 !== hiddenText) nativeTextEffectStyle = noteContext.hiddenTextPatches.marker(hiddenText, nativeTextEffectStyle);
+        const hiddenText = null === explicitHiddenText ? inheritedRunStyle.hiddenText : explicitHiddenText;
+        const openTypeFeatures = hasExplicitOpenType ? explicitOpenType ?? void 0 : inheritedRunStyle.openTypeFeatures;
+        let runStyle = inherited.style;
+        if (hasExplicitLegacyTextEffects || null !== explicitHiddenText || hasExplicitOpenType) {
+            runStyle = inheritedRunStyle.baseStyle;
+            if (Object.keys(legacyTextEffects).length) runStyle = noteContext.legacyTextEffectsPatches.marker(legacyTextEffects, runStyle);
+            if (void 0 !== hiddenText) runStyle = noteContext.hiddenTextPatches.marker(hiddenText, runStyle);
+            if (openTypeFeatures) runStyle = noteContext.openTypePatches.marker(openTypeFeatures, runStyle);
         }
         const underline = docxUnderlineRunOptions(node, inherited.underline, noteContext.themePatches);
         const strike = docxStrikeRunOptions(node, inherited);
@@ -8884,7 +9081,7 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
         const noProof = hasExplicitNoProof ? explicitNoProof ?? false : inherited.noProof;
         const style = {
             ...inherited,
-            style: nativeTextEffectStyle,
+            style: runStyle,
             bold: inherited.bold || 'strong' === tag || 'b' === tag,
             italics: inherited.italics || 'em' === tag || 'i' === tag,
             underline,
@@ -8913,7 +9110,7 @@ async function work_docx_export_inlineRuns(root, docx, noteContext) {
             ...textCaseOptions
         };
         if ('br' === tag) {
-            markDocxNativeTextEffectStyleUsed(style.style, noteContext);
+            markDocxRunStyleMarkersUsed(style.style, noteContext);
             markDocxRunBorderUsed(style.border, noteContext);
             markDocxRunShadingUsed(style.shading, noteContext);
             return [