@ai-matrx/print 0.8.4 → 0.8.6

package/dist/document.d.cts

@@ -21,7 +21,16 @@ interface MathSpan {
     tex: string;
     display: boolean;
 }
-/** Replace every math span with a private-use token; returns the spans. */
+/**
+ * Replace every math span with a private-use token; returns the spans.
+ *
+ * Print keeps NO fence, code-span or math detection of its own: the spans are
+ * the shared tokenizer's complete `math_block` / `math_inline` islands
+ * (`tokenizeSource` + `listIslands` from `@ai-matrx/content-ir/source` — the
+ * one fence-nesting rule and the one math pairing), so print, the renderer and
+ * the editor can never disagree about what is math. The delimiter decides the
+ * form: `$$`/`\[` display, `$`/`\(` inline.
+ */
 declare function extractMath(body: string): {
     text: string;
     spans: MathSpan[];

package/dist/document.d.ts

@@ -21,7 +21,16 @@ interface MathSpan {
     tex: string;
     display: boolean;
 }
-/** Replace every math span with a private-use token; returns the spans. */
+/**
+ * Replace every math span with a private-use token; returns the spans.
+ *
+ * Print keeps NO fence, code-span or math detection of its own: the spans are
+ * the shared tokenizer's complete `math_block` / `math_inline` islands
+ * (`tokenizeSource` + `listIslands` from `@ai-matrx/content-ir/source` — the
+ * one fence-nesting rule and the one math pairing), so print, the renderer and
+ * the editor can never disagree about what is math. The delimiter decides the
+ * form: `$$`/`\[` display, `$`/`\(` inline.
+ */
 declare function extractMath(body: string): {
     text: string;
     spans: MathSpan[];

package/dist/document.js

@@ -63,65 +63,54 @@ function visualOrder(input, rtl) {
   return out;
 }
 
+// src/document/layout.ts
+var plainInline = (nodes) => nodes.map((n) => "value" in n ? n.value : "label" in n ? n.label : "tex" in n ? n.tex : "children" in n ? plainInline(n.children) : "").join("");
+function contentColumnWidths(b, n, avail, measure, pad = 10) {
+  const min = new Array(n).fill(0);
+  const max = new Array(n).fill(0);
+  const rows = [[b.header, true], ...b.rows.map((r) => [r, false])];
+  for (const [r, head] of rows) {
+    for (let i = 0; i < n; i++) {
+      const t = plainInline(r[i] ?? []);
+      const longest = t.split(/\s+/).reduce((m, w) => Math.max(m, measure(w, head)), 0);
+      min[i] = Math.max(min[i], Math.min(longest, avail * 0.35) + pad);
+      max[i] = Math.max(max[i], measure(t, head) + pad);
+    }
+  }
+  const sumMax = max.reduce((a, x) => a + x, 0);
+  const sumMin = min.reduce((a, x) => a + x, 0);
+  if (sumMax <= avail) return max.map((m) => m + (avail - sumMax) / n);
+  if (sumMin >= avail) return min.map((m) => m / sumMin * avail);
+  const extra = avail - sumMin;
+  return min.map((m, i) => m + (max[i] - m) * (extra / (sumMax - sumMin)));
+}
+
 // src/document/math.ts
-import { pairDisplayMath, singleDollarMathEnd } from "@ai-matrx/content-ir/source";
+import { listIslands, tokenizeSource } from "@ai-matrx/content-ir/source";
 var MATH_OPEN = "\uE100";
 var MATH_CLOSE = "\uE101";
 var MATH_TOKEN_RE = /\uE100(\d+)\uE101/g;
-function codeRanges(text) {
-  const ranges = [];
-  for (const re of [/```[\s\S]*?(?:```|$)/g, /~~~[\s\S]*?(?:~~~|$)/g, /`[^`\n]*`/g]) {
-    let m;
-    while ((m = re.exec(text)) !== null) {
-      ranges.push([m.index, m.index + m[0].length]);
-      if (m[0].length === 0) re.lastIndex++;
-    }
-  }
-  return ranges.sort((a, b) => a[0] - b[0]);
-}
+var DELIMITERS = {
+  $$: { open: 2, close: 2, display: true },
+  "\\[": { open: 2, close: 2, display: true },
+  $: { open: 1, close: 1, display: false },
+  "\\(": { open: 2, close: 2, display: false }
+};
 function extractMath(body) {
   const spans = [];
   if (!/[$\\]/.test(body)) return { text: body, spans };
-  const code = codeRanges(body);
-  const inCode = (i2) => code.some(([a, b]) => i2 >= a && i2 < b);
-  const display = pairDisplayMath(body);
+  const islands = listIslands(tokenizeSource(body)).filter((isl) => isl.complete && (isl.islandType === "math_block" || isl.islandType === "math_inline")).sort((a, b) => a.start - b.start);
   let out = "";
-  let i = 0;
-  const token = (tex, isDisplay) => {
-    spans.push({ tex: tex.trim(), display: isDisplay });
-    return `${MATH_OPEN}${spans.length - 1}${MATH_CLOSE}`;
-  };
-  while (i < body.length) {
-    const ch = body[i];
-    if (ch === "$" && !inCode(i)) {
-      const close = display.get(i);
-      if (close !== void 0) {
-        out += token(body.slice(i + 2, close), true);
-        i = close + 2;
-        continue;
-      }
-      if (body[i + 1] !== "$" && body[i - 1] !== "$" && body[i - 1] !== "\\") {
-        const end = singleDollarMathEnd(body, i);
-        if (end > 0) {
-          out += token(body.slice(i + 1, end - 1), false);
-          i = end;
-          continue;
-        }
-      }
-    }
-    if (ch === "\\" && !inCode(i) && (body[i + 1] === "[" || body[i + 1] === "(")) {
-      const closer = body[i + 1] === "[" ? "\\]" : "\\)";
-      const end = body.indexOf(closer, i + 2);
-      if (end > i + 2 && end - i < 2e3 && (body[i + 1] === "[" || !body.slice(i, end).includes("\n\n"))) {
-        out += token(body.slice(i + 2, end), body[i + 1] === "[");
-        i = end + 2;
-        continue;
-      }
-    }
-    out += ch;
-    i++;
+  let at = 0;
+  for (const isl of islands) {
+    const d = DELIMITERS[String(isl.meta.delimiter ?? "")];
+    if (!d || isl.start < at) continue;
+    out += body.slice(at, isl.start);
+    spans.push({ tex: body.slice(isl.start + d.open, isl.end - d.close).trim(), display: d.display });
+    out += `${MATH_OPEN}${spans.length - 1}${MATH_CLOSE}`;
+    at = isl.end;
   }
-  return { text: out, spans };
+  return { text: out + body.slice(at), spans };
 }
 var mathKey = (tex, display) => `${display ? "D" : "I"}:${tex}`;
 var MATHJAX = /* @__PURE__ */ Symbol.for("ai-matrx.print.document.mathjax");
@@ -2881,6 +2870,8 @@ function block(b, c, o) {
     case "table": {
       const n = Math.max(b.header.length, ...b.rows.map((r) => r.length), 1);
       const keep = b.rows.length <= 20;
+      const cellPt = c.s.fontSize;
+      const colTw = contentColumnWidths(b, n, c.width, (t, bold) => t.length * cellPt * (bold ? 0.55 : 0.5), 10).map((w) => Math.round(w * TW));
       const alignOf = (i) => b.align[i] === "center" ? d.AlignmentType.CENTER : b.align[i] === "right" ? d.AlignmentType.RIGHT : d.AlignmentType.LEFT;
       const border = { style: d.BorderStyle.SINGLE, size: 4, color: "E5E7EB" };
       const none = { style: d.BorderStyle.NONE, size: 0, color: "FFFFFF" };
@@ -2890,6 +2881,7 @@ function block(b, c, o) {
         children: Array.from(
           { length: n },
           (_, i) => new d.TableCell({
+            width: { size: colTw[i] ?? 0, type: d.WidthType.DXA },
             ...head ? { shading: { type: d.ShadingType.CLEAR, fill: "F3F4F6", color: "auto" } } : {},
             margins: { top: 60, bottom: 60, left: 100, right: 100 },
             borders: { top: none, left: none, right: none, bottom: head ? { ...border, size: 10, color: HEX.heading } : border },
@@ -2908,7 +2900,9 @@ function block(b, c, o) {
       if (b.caption) out.push(captionParagraph(b.caption, c, true));
       out.push(
         new d.Table({
-          width: { size: 100, type: d.WidthType.PERCENTAGE },
+          width: { size: Math.round(c.width * TW), type: d.WidthType.DXA },
+          columnWidths: colTw,
+          layout: d.TableLayoutType.FIXED,
           rows: [row(b.header, true, b.rows.length === 0), ...b.rows.map((r, i) => row(r, false, i === b.rows.length - 1))]
         })
       );
@@ -4151,26 +4145,7 @@ function estimateLines(text, c, size = c.s.fontSize) {
 }
 function columnWidths(b, n, size, c) {
   const measure = (text, bold) => c.faces ? c.faces.measure(text, { bold, fontSize: size }) : text.length * size * 0.5;
-  const pad = 10;
-  const slack = 1;
-  const min = new Array(n).fill(0);
-  const max = new Array(n).fill(0);
-  const rows = [[b.header, true], ...b.rows.map((r) => [r, false])];
-  for (const [r, head] of rows) {
-    for (let i = 0; i < n; i++) {
-      const t = plain(r[i] ?? []);
-      const longest = t.split(/\s+/).reduce((m, w) => Math.max(m, measure(w, head)), 0);
-      min[i] = Math.max(min[i], Math.min(longest * slack, c.width * 0.35) + pad);
-      max[i] = Math.max(max[i], measure(t, head) * slack + pad);
-    }
-  }
-  const avail = c.width;
-  const sumMax = max.reduce((a, x) => a + x, 0);
-  const sumMin = min.reduce((a, x) => a + x, 0);
-  if (sumMax <= avail) return max.map((m) => m + (avail - sumMax) / n);
-  if (sumMin >= avail) return min.map((m) => m / sumMin * avail);
-  const extra = avail - sumMin;
-  return min.map((m, i) => m + (max[i] - m) * (extra / (sumMax - sumMin)));
+  return contentColumnWidths(b, n, c.width, measure);
 }
 var plain = (nodes) => nodes.map((n) => "value" in n ? n.value : "label" in n ? n.label : "children" in n ? plain(n.children) : "").join("");
 function taskItem(checked, content, c) {