@a3s-lab/office 0.2.1 → 0.2.2

package/README.md

@@ -307,10 +307,13 @@ interaction model.
   gaps, centered fixed table, row heights, borders, fills, and cell margins
   stay within the checked one-pixel layout-landmark budget while preserving
   the original OOXML line multiples for DOCX export.
-  Separate 30-row common-font, 36-row CJK-font, and 18-row document-grid
-  matrices now gate text-band positions against WPS. The browser keeps the
-  measured per-font automatic-line advance, while DOCX round trips retain the
-  section `docGrid` type and line pitch and each run's `snapToGrid` override.
+  Separate 30-row common-font, 36-row CJK-font, 18-row document-grid, and
+  30-row multilingual-script matrices now gate text-band positions against
+  WPS. DOCX import selects the Word `ascii`, `hAnsi`, `eastAsia`, or `cs` font
+  slot from the run script, including complex-script bold, italic, size, and
+  RTL overrides. The browser keeps the measured per-font automatic-line
+  advance, while DOCX round trips retain the section `docGrid` type and line
+  pitch and each run's `snapToGrid` override.
   _DOCX import/export; PDF export._
 - **Markdown** — GFM source, visual editing, synchronized and resizable split
   preview, source-native undo/redo with typing coalescing and selection restore,

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

@@ -2297,7 +2297,7 @@ function markDocxRunFormatting(document, styleSource, themeSource, tableStyleSou
         if (!paragraph) continue;
         const paragraphProperties = directChild(paragraph, 'pPr');
         const runProperties = directChild(run, 'rPr');
-        const formatting = resolvedRunFormatting(docxRunPropertySources(paragraphProperties, runProperties, styles, docxTableRunPropertySources(run, tableStyles)), theme);
+        const formatting = resolvedRunFormatting(docxRunPropertySources(paragraphProperties, runProperties, styles, docxTableRunPropertySources(run, tableStyles)), theme, runText);
         if (!Object.keys(formatting).length) continue;
         const index = runs.length + 1;
         const startMarker = `__A3S_WORK_RUN_START_${index}__`;
@@ -2325,25 +2325,36 @@ function applyImportedDocxRunFormattingMarkers(document, markers) {
 function hasImportedDocxRunFormattingMarkers(markers) {
     return markers.runs.length > 0;
 }
-function resolvedRunFormatting(propertySources, theme) {
+function resolvedRunFormatting(propertySources, theme, runText) {
     const fonts = {};
     let fontSize;
+    let complexFontSize;
     let color;
     let backgroundColor;
     let bold;
+    let complexBold;
     let italic;
+    let complexItalic;
     let underline;
     let strike;
     let snapToGrid;
+    let complexScriptFormatting;
+    let rightToLeft;
+    let fontHint;
     for (const properties of propertySources){
         bold = overriddenBoolean(bold, onOffProperty(properties, 'b'));
+        complexBold = overriddenBoolean(complexBold, onOffProperty(properties, 'bCs'));
         italic = overriddenBoolean(italic, onOffProperty(properties, 'i'));
+        complexItalic = overriddenBoolean(complexItalic, onOffProperty(properties, 'iCs'));
         underline = overriddenBoolean(underline, underlineProperty(properties));
         strike = overriddenBoolean(strike, onOffProperty(properties, 'strike'));
         strike = overriddenBoolean(strike, onOffProperty(properties, 'dstrike'));
         snapToGrid = overriddenBoolean(snapToGrid, onOffProperty(properties, 'snapToGrid'));
+        complexScriptFormatting = overriddenBoolean(complexScriptFormatting, onOffProperty(properties, 'cs'));
+        rightToLeft = overriddenBoolean(rightToLeft, onOffProperty(properties, 'rtl'));
         const runFonts = directChild(properties, 'rFonts');
         if (runFonts) {
+            fontHint = resolvedFontHint(runFonts) ?? fontHint;
             assignFont(fonts, 'ascii', resolvedFont(runFonts, 'ascii', 'asciiTheme', theme));
             assignFont(fonts, 'hAnsi', resolvedFont(runFonts, 'hAnsi', 'hAnsiTheme', theme));
             assignFont(fonts, 'eastAsia', resolvedFont(runFonts, 'eastAsia', 'eastAsiaTheme', theme));
@@ -2351,6 +2362,8 @@ function resolvedRunFormatting(propertySources, theme) {
         }
         const size = work_docx_run_formatting_import_numericAttribute(directChild(properties, 'sz'), 'val');
         if (void 0 !== size && size > 0) fontSize = Math.min(512, size / 2);
+        const complexSize = work_docx_run_formatting_import_numericAttribute(directChild(properties, 'szCs'), 'val');
+        if (void 0 !== complexSize && complexSize > 0) complexFontSize = Math.min(512, complexSize / 2);
         const colorElement = directChild(properties, 'color');
         if (colorElement) {
             const value = work_docx_run_formatting_import_wordAttribute(colorElement, 'val')?.trim();
@@ -2372,25 +2385,25 @@ function resolvedRunFormatting(propertySources, theme) {
             else if (fill && /^[0-9a-f]{6}$/i.test(fill)) backgroundColor = `#${fill.toLowerCase()}`;
         }
     }
-    let fontFamily = uniqueFonts([
-        fonts.eastAsia,
-        fonts.hAnsi,
-        fonts.ascii,
-        fonts.complex
-    ]);
-    if (!fontFamily) fontFamily = uniqueFonts([
-        docxThemeFont(theme, 'minorEastAsia'),
-        docxThemeFont(theme, 'minorHAnsi'),
-        docxThemeFont(theme, 'minorAscii'),
-        docxThemeFont(theme, 'minorBidi')
-    ]);
+    const fontSlot = true === complexScriptFormatting || true === rightToLeft ? 'complex' : docxFontSlotForText(runText, fontHint);
+    const usesComplexFormatting = 'complex' === fontSlot;
+    const resolvedBold = usesComplexFormatting ? complexBold ?? bold : bold;
+    const resolvedItalic = usesComplexFormatting ? complexItalic ?? italic : italic;
+    const resolvedFontSize = usesComplexFormatting ? complexFontSize ?? fontSize : fontSize;
+    let fontFamily = uniqueFonts(orderedFonts(fonts, fontSlot));
+    if (!fontFamily) fontFamily = uniqueFonts(orderedFonts({
+        ascii: docxThemeFont(theme, 'minorAscii'),
+        hAnsi: docxThemeFont(theme, 'minorHAnsi'),
+        eastAsia: docxThemeFont(theme, 'minorEastAsia'),
+        complex: docxThemeFont(theme, 'minorBidi')
+    }, fontSlot));
     const hasRunPropertySource = propertySources.length > 0;
     return {
-        ...void 0 !== bold || hasRunPropertySource ? {
-            bold: bold ?? false
+        ...void 0 !== resolvedBold || hasRunPropertySource ? {
+            bold: resolvedBold ?? false
         } : {},
-        ...void 0 !== italic || hasRunPropertySource ? {
-            italic: italic ?? false
+        ...void 0 !== resolvedItalic || hasRunPropertySource ? {
+            italic: resolvedItalic ?? false
         } : {},
         ...void 0 !== underline || hasRunPropertySource ? {
             underline: underline ?? false
@@ -2402,8 +2415,8 @@ function resolvedRunFormatting(propertySources, theme) {
             fontFamily,
             wordLineHeightFactor: documentWordLineHeightFactor(fontFamily)
         } : {},
-        ...void 0 !== fontSize ? {
-            fontSize
+        ...void 0 !== resolvedFontSize ? {
+            fontSize: resolvedFontSize
         } : {},
         ...void 0 !== snapToGrid ? {
             wordSnapToGrid: snapToGrid
@@ -2495,6 +2508,61 @@ function assignFont(fonts, key, value) {
     const normalized = value?.trim();
     if (normalized) fonts[key] = normalized;
 }
+function resolvedFontHint(element) {
+    const hint = work_docx_run_formatting_import_wordAttribute(element, 'hint')?.trim().toLowerCase();
+    if ('eastasia' === hint) return 'eastAsia';
+    if ('cs' === hint) return 'complex';
+    if ('default' === hint) return 'ascii';
+}
+function orderedFonts(fonts, preferred) {
+    const order = {
+        ascii: [
+            'ascii',
+            'hAnsi',
+            'eastAsia',
+            'complex'
+        ],
+        hAnsi: [
+            'hAnsi',
+            'ascii',
+            'eastAsia',
+            'complex'
+        ],
+        eastAsia: [
+            'eastAsia',
+            'hAnsi',
+            'ascii',
+            'complex'
+        ],
+        complex: [
+            'complex',
+            'hAnsi',
+            'ascii',
+            'eastAsia'
+        ]
+    };
+    return order[preferred].map((slot)=>fonts[slot]);
+}
+function docxFontSlotForText(text, hint) {
+    for (const character of text){
+        const codePoint = character.codePointAt(0);
+        if (!(void 0 === codePoint || isNeutralCodePoint(codePoint))) {
+            if (isComplexScriptCodePoint(codePoint)) return 'complex';
+            if (isEastAsianCodePoint(codePoint)) return 'eastAsia';
+            return codePoint <= 0x7f ? 'ascii' : 'hAnsi';
+        }
+    }
+    return hint ?? 'ascii';
+}
+function isNeutralCodePoint(codePoint) {
+    return codePoint <= 0x20 || codePoint <= 0x7f && !(codePoint >= 0x41 && codePoint <= 0x5a || codePoint >= 0x61 && codePoint <= 0x7a) || codePoint >= 0x300 && codePoint <= 0x36f || codePoint >= 0x2000 && codePoint <= 0x206f;
+}
+function isComplexScriptCodePoint(codePoint) {
+    return codePoint >= 0x0590 && codePoint <= 0x08ff || codePoint >= 0xfb1d && codePoint <= 0xfdff || codePoint >= 0xfe70 && codePoint <= 0xfeff || codePoint >= 0x1ee00 && codePoint <= 0x1eeff;
+}
+function isEastAsianCodePoint(codePoint) {
+    return codePoint >= 0x1100 && codePoint <= 0x11ff || codePoint >= 0x2e80 && codePoint <= 0xa4cf || codePoint >= 0xac00 && codePoint <= 0xd7af || codePoint >= 0xf900 && codePoint <= 0xfaff || codePoint >= 0xfe10 && codePoint <= 0xfe6f || codePoint >= 0xff00 && codePoint <= 0xffef || codePoint >= 0x20000 && codePoint <= 0x323af;
+}
 function resolvedFont(element, explicitName, themeName, theme) {
     const explicit = work_docx_run_formatting_import_wordAttribute(element, explicitName);
     if (explicit?.trim()) return explicit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a3s-lab/office",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Open-source browser editors for documents, Markdown, spreadsheets, presentations, and PDFs.",
   "keywords": [
     "office",