wordinweb 0.1.5 → 0.1.7

package/dist/index.d.ts

@@ -1598,6 +1598,14 @@ interface TextMeasurer {
         ascent: number;
         descent: number;
     } | undefined;
+    /** Ink extents (actualBoundingBox*) of `text` in the RESOLVED paint face,
+     * px above/below the baseline. The radical join needs the √ glyph's real
+     * ink — which face paints it (real Cambria Math vs the STIX substitute)
+     * changes the extents, so a baked table can't cover both. */
+    inkBox?(text: string, font: FontSpec): {
+        ascent: number;
+        descent: number;
+    } | undefined;
 }
 
 interface LayoutOptions {

package/dist/index.js

@@ -5157,6 +5157,7 @@ var CanvasMeasurer = class {
     this.widthCache = /* @__PURE__ */ new Map();
     this.metricsCache = /* @__PURE__ */ new Map();
     this.paintBoxCache = /* @__PURE__ */ new Map();
+    this.inkBoxCache = /* @__PURE__ */ new Map();
     this.currentFont = "";
     if (typeof OffscreenCanvas !== "undefined") {
       const c = new OffscreenCanvas(1, 1);
@@ -5200,6 +5201,18 @@ var CanvasMeasurer = class {
     }
     return m ?? void 0;
   }
+  /** Glyph ink extents at 3x (like width()) from the resolved paint face. */
+  inkBox(text, font) {
+    const key = "ink " + fontKey(font) + " " + text;
+    let m = this.inkBoxCache.get(key);
+    if (m === void 0) {
+      this.setFont({ ...font, size: font.size * 3 });
+      const tm = this.ctx.measureText(text);
+      m = tm.actualBoundingBoxAscent !== void 0 && tm.actualBoundingBoxDescent !== void 0 ? { ascent: tm.actualBoundingBoxAscent / 3, descent: tm.actualBoundingBoxDescent / 3 } : null;
+      this.inkBoxCache.set(key, m);
+    }
+    return m ?? void 0;
+  }
   metrics(font) {
     const key = fontKey(font);
     let m = this.metricsCache.get(key);
@@ -5853,14 +5866,12 @@ function flow(nodes, size, dy, box, measurer, tight, display = false, breakDepth
           for (const r of degBox.rules) box.rules.push({ ...r, x1: box.width + r.x1, x2: box.width + r.x2, dy: degDy + r.dy });
           box.width += degBox.width + size * RAD_KERN_AFTER_DEG;
         }
-        let grow = Math.max(1, signInkH / (m.ascent + signDesc));
-        let signAnchor = -signDesc;
-        if (nestedGrown) {
-          const inkTopNat = size * RAD_VARIANTS[0].top / 2048;
-          const inkBotNat = size * RAD_VARIANTS[0].bot / 2048;
-          grow = (paintRuleTop + size * RAD_GROWN_FOOT) / (inkTopNat - inkBotNat);
-          signAnchor = (-size * RAD_GROWN_FOOT - inkBotNat * grow) / (1 - grow);
-        }
+        const signInk = measurer.inkBox?.("\u221A", font);
+        const inkTopNat = signInk ? signInk.ascent : size * RAD_VARIANTS[0].top / 2048;
+        const inkBotNat = signInk ? -signInk.descent : size * RAD_VARIANTS[0].bot / 2048;
+        const signFoot = nestedGrown ? size * RAD_GROWN_FOOT : signDesc;
+        const grow = (paintRuleTop + signFoot) / (inkTopNat - inkBotNat);
+        const signAnchor = grow === 1 ? 0 : (-signFoot - inkBotNat * grow) / (1 - grow);
         const topLevelDisplay = display && breakDepth === 0 && complexRad;
         const signW = measurer.width("\u221A", font);
         box.pieces.push({
@@ -15865,28 +15876,30 @@ function resizeTableColumn(doc, tblEl, boundary, deltaPx, renderedWidths) {
       setWidth(right, rw - d);
     }
   }
-  if (!hasSpans(tblEl)) {
-    for (const tr of rowsOf(tblEl)) {
-      const cells = cellsOf(tr);
-      cells.forEach((tc, i) => {
-        if (!cols[i]) return;
-        const w = prefixOf4(tc);
-        let tcPr = child(tc, "tcPr");
-        if (!tcPr) {
-          tcPr = { name: `${w}tcPr`, attrs: {}, children: [], text: "" };
-          tc.children.unshift(tcPr);
-        }
-        let tcW = child(tcPr, "tcW");
-        if (!tcW) {
-          tcW = { name: `${w}tcW`, attrs: { [`${w}type`]: "dxa" }, children: [], text: "" };
-          tcPr.children.unshift(tcW);
-        }
-        const typeKey = Object.keys(tcW.attrs).find((k) => localName(k) === "type");
-        if (!typeKey || tcW.attrs[typeKey] === "dxa") {
-          const wKey = Object.keys(tcW.attrs).find((k) => localName(k) === "w") ?? prefixOf4(tcW) + "w";
-          tcW.attrs[wKey] = String(widthOf2(cols[i]));
-        }
-      });
+  for (const tr of rowsOf(tblEl)) {
+    let col = 0;
+    for (const tc of cellsOf(tr)) {
+      const w = prefixOf4(tc);
+      let tcPr = child(tc, "tcPr");
+      if (!tcPr) {
+        tcPr = { name: `${w}tcPr`, attrs: {}, children: [], text: "" };
+        tc.children.unshift(tcPr);
+      }
+      const gs = child(tcPr, "gridSpan");
+      const gsKey = gs && Object.keys(gs.attrs).find((k) => localName(k) === "val");
+      const span = gs && gsKey ? Math.max(1, parseInt(gs.attrs[gsKey], 10) || 1) : 1;
+      const total = cols.slice(col, col + span).reduce((a, c) => a + widthOf2(c), 0);
+      col += span;
+      if (!total) continue;
+      let tcW = child(tcPr, "tcW");
+      if (!tcW) {
+        tcW = { name: `${w}tcW`, attrs: {}, children: [], text: "" };
+        tcPr.children.unshift(tcW);
+      }
+      const typeKey = Object.keys(tcW.attrs).find((k) => localName(k) === "type") ?? `${w}type`;
+      const wKey = Object.keys(tcW.attrs).find((k) => localName(k) === "w") ?? `${w}w`;
+      tcW.attrs[typeKey] = "dxa";
+      tcW.attrs[wKey] = String(total);
     }
   }
   doc.refresh();
@@ -16310,9 +16323,11 @@ function linearizeMath(nodes) {
       case "frac":
         out += group(n.num) + "/" + group(n.den);
         break;
-      case "rad":
-        out += "\u221A" + group(n.e);
+      case "rad": {
+        const deg = n.deg && n.deg.length ? linearizeMath(n.deg) : "";
+        out += deg ? "\u221A[" + deg + "]" + group(n.e) : "\u221A" + group(n.e);
         break;
+      }
       case "nary":
         out += n.chr + (n.sub.length ? "_" + group(n.sub) : "") + (n.sup.length ? "^" + group(n.sup) : "") + group(n.e);
         break;
@@ -16442,10 +16457,12 @@ function parseMathLinear(input) {
   const parseUnit = () => {
     const ch = input[i];
     if (ch === "{") return parseGroup();
-    if (ch === "\u221A") {
+    if (ch === "\u221A" || ch === "\u221B" || ch === "\u221C") {
       i++;
+      let deg = ch === "\u221B" ? [{ t: "run", text: "3" }] : ch === "\u221C" ? [{ t: "run", text: "4" }] : [];
+      if (ch === "\u221A" && input[i] === "[") deg = parseMathLinear(scanDelim("[", "]"));
       const e = input[i] === "{" ? parseGroup() : parseUnit();
-      return [{ t: "rad", e }];
+      return deg.length ? [{ t: "rad", e, deg }] : [{ t: "rad", e }];
     }
     if (NARY_CHRS.has(ch)) return parseNary();
     if (ch in DELIM_CLOSE) return parseDelim(ch);
@@ -16631,7 +16648,11 @@ function ommlToNodes(e) {
   }
   if (ln === "sSup") return [{ t: "sup", base: kids("e"), script: kids("sup") }];
   if (ln === "sSub") return [{ t: "sub", base: kids("e"), script: kids("sub") }];
-  if (ln === "rad") return [{ t: "rad", e: kids("e") }];
+  if (ln === "rad") {
+    const hide = chrAttr("radPr", "degHide", "0");
+    const deg = hide === "1" || hide === "true" || hide === "on" ? [] : kids("deg");
+    return deg.length ? [{ t: "rad", e: kids("e"), deg }] : [{ t: "rad", e: kids("e") }];
+  }
   if (ln === "t") return e.text ? [{ t: "run", text: e.text }] : [];
   const out = [];
   for (const c of e.children) {
@@ -16663,9 +16684,11 @@ function sameStructure(a, b) {
       case "frac":
         if (!sameStructure(x.num, y.num) || !sameStructure(x.den, y.den)) return false;
         break;
-      case "rad":
-        if (!sameStructure(x.e, y.e)) return false;
+      case "rad": {
+        const yy = y;
+        if (!sameStructure(x.e, yy.e) || !sameStructure(x.deg ?? [], yy.deg ?? [])) return false;
         break;
+      }
       case "nary": {
         const yy = y;
         if (x.chr !== yy.chr || !sameStructure(x.sub, yy.sub) || !sameStructure(x.sup, yy.sup) || !sameStructure(x.e, yy.e))
@@ -19676,7 +19699,7 @@ var _DocxEditor = class _DocxEditor {
     row.style.cssText = "display:flex;gap:6px;align-items:center;";
     const input = document.createElement("input");
     input.value = original;
-    input.title = "Linear math: x^2, x_i, {a+b}/{2}, \u221A{x}";
+    input.title = "Linear math: x^2, x_i, {a+b}/{2}, \u221A{x}, \u221A[n]{x}";
     input.style.cssText = "width:260px;border:1px solid #dadce0;border-radius:6px;padding:5px 8px;outline:none;font:14px 'Cambria Math','STIX Two Math',serif;transition:border-color .12s,background .12s;";
     const caption = document.createElement("div");
     caption.style.cssText = "font:11px system-ui,sans-serif;color:#5f6368;max-width:300px;";
@@ -19699,7 +19722,7 @@ var _DocxEditor = class _DocxEditor {
         }
       });
     } else {
-      caption.textContent = "Linear math: x^2, x_i, {a+b}/{2}, \u221A{x}. Enter to apply.";
+      caption.textContent = "Linear math: x^2, x_i, {a+b}/{2}, \u221A{x}, \u221A[n]{x}. Enter to apply.";
       const apply = document.createElement("button");
       apply.textContent = "Apply";
       apply.style.cssText = "border:1px solid #dadce0;border-radius:14px;padding:3px 12px;cursor:pointer;background:#1a73e8;color:#fff;";