wordinweb 0.3.3 → 0.3.5

package/dist/{chunk-5SLXOYCF.js → chunk-QU3LB5BC.js}

@@ -6355,6 +6355,10 @@ function parseCell(tc, ctx) {
     if (tcW && attr(tcW, "type") === "dxa") {
       const w = intAttr(tcW, "w");
       if (w) props.width = twipsToPx(w);
+    } else if (tcW && attr(tcW, "type") === "pct") {
+      const raw = attr(tcW, "w");
+      const num = raw !== void 0 ? parseFloat(raw) : NaN;
+      if (Number.isFinite(num) && num > 0) props.widthPct = raw.trim().endsWith("%") ? num / 100 : num / 5e3;
     } else if (tcW && attr(tcW, "type") === "auto") {
       props.widthAuto = true;
     }
@@ -10556,7 +10560,11 @@ var WORD_FONT_METRICS = {
   // lineGap 99 / upem 2048 = 1.2734em (14.0pt at 11pt - phase23's sub-bullet
   // lists run 14.0pt/line among 13.5pt Calibri text).
   symbol: { asc: 1.005371, desc: 0.219727, gap: 0.04834 },
-  symbolmt: { asc: 1.005371, desc: 0.219727, gap: 0.04834 },
+  // A Symbol bullet LABEL (the engine's metrics face) sizes its line without
+  // the lineGap: Word runs an 11pt bullet at 13.5pt among 11pt Times New
+  // Roman (wild-termsheet-behinddoc) and a 10pt one at 12.25pt, both
+  // asc + desc; with the gap they would be 14.0pt and 12.75pt.
+  symbolmt: { asc: 1.005371, desc: 0.219727, gap: 0 },
   "pingfang sc": { asc: 2.27, desc: 0.7627, gap: 0 },
   "songti sc": { asc: 2.27, desc: 0.7627, gap: 0 },
   "heiti sc": { asc: 2.27, desc: 0.7627, gap: 0 },
@@ -10583,13 +10591,19 @@ function quantizeQuarterPt(px) {
   return Math.round(px / QUARTER_PT_PX) * QUARTER_PT_PX;
 }
 var FACE_SUFFIX = /\s+(bold italic|italic bold|bold|italic)$/i;
+var WORD_REPLACES = {
+  "liberation serif": "Times New Roman",
+  "liberation sans": "Arial",
+  "liberation mono": "Courier New"
+};
 function normalizeFamily(family, bold, italic) {
   if (family === "\u5B8B\u4F53") family = "SimSun";
+  const replaced = (f) => WORD_REPLACES[f.toLowerCase()] ?? f;
   const m = FACE_SUFFIX.exec(family);
-  if (!m) return { family, bold, italic };
+  if (!m) return { family: replaced(family), bold, italic };
   const suffix = m[1].toLowerCase();
   return {
-    family: family.slice(0, m.index).trim() || family,
+    family: replaced(family.slice(0, m.index).trim() || family),
     bold: bold || suffix.includes("bold"),
     italic: italic || suffix.includes("italic")
   };
@@ -18641,7 +18655,9 @@ var Engine = class {
     if (tbl.props.layout === "fixed") return base;
     const gridTotal = tbl.grid.reduce((a, b) => a + b, 0);
     const target = base.reduce((a, b) => a + b, 0);
-    const cellsDeclareWidths = tbl.rows.some((r) => r.cells.some((c) => c.props.width !== void 0));
+    const cellsDeclareWidths = tbl.rows.some(
+      (r) => r.cells.some((c) => c.props.width !== void 0 || c.props.widthPct !== void 0)
+    );
     const containsHyperlink = tbl.rows.some(
       (row) => row.cells.some(
         (cell) => cell.blocks.some(
@@ -19800,7 +19816,14 @@ var Engine = class {
       if (boundaryPara === void 0) continue;
       const above = keptTops.filter((t) => paraOfTop(part.keep, t) === boundaryPara);
       const below = restTops.filter((t) => paraOfTop(part.rest, t) === boundaryPara);
-      if (below.length !== 1 || above.length === 0) continue;
+      if (above.length === 0) continue;
+      if (above.length === 1 && below.length > 1) {
+        const moved2 = part.keep.filter((it) => topOf(it) >= above[0] - 0.01);
+        part.keep = part.keep.filter((it) => topOf(it) < above[0] - 0.01);
+        part.rest = [...moved2, ...part.rest];
+        continue;
+      }
+      if (below.length !== 1) continue;
       const moveTop = above.length >= 3 ? above[above.length - 1] : above[0];
       const moved = part.keep.filter((it) => topOf(it) >= moveTop - 0.01);
       part.keep = part.keep.filter((it) => topOf(it) < moveTop - 0.01);
@@ -21731,12 +21754,16 @@ function renderToDom(doc, layout, container, options = {}, prev) {
   }
   return handle;
 }
-function buildPrintHtml(root, pageWidthPx, pageHeightPx) {
-  const head = [`<base href="${document.location.href}">`];
-  for (const node of Array.from(document.head.querySelectorAll("style, link[rel=stylesheet]"))) {
-    head.push(node.outerHTML);
-  }
-  head.push(`<style>
+var pendingPaints = /* @__PURE__ */ new Set();
+function trackPaint(work) {
+  pendingPaints.add(work);
+  void work.finally(() => pendingPaints.delete(work));
+}
+async function paintsSettled() {
+  while (pendingPaints.size > 0) await Promise.allSettled([...pendingPaints]);
+}
+function printStylesheet(pageWidthPx, pageHeightPx) {
+  return `
     @page { size: ${pageWidthPx / 96}in ${pageHeightPx / 96}in; margin: 0; }
     html, body { margin: 0; padding: 0; }
     .dxw-pages { display: block !important; padding: 0 !important; gap: 0 !important; }
@@ -21746,7 +21773,14 @@ function buildPrintHtml(root, pageWidthPx, pageHeightPx) {
     }
     .dxw-page { box-shadow: none !important; margin: 0 !important; break-after: page; }
     .dxw-comment-card, .dxw-hf-marker { display: none !important; }
-  </style>`);
+  `;
+}
+function buildPrintHtml(root, pageWidthPx, pageHeightPx) {
+  const head = [`<base href="${document.location.href}">`];
+  for (const node of Array.from(document.head.querySelectorAll("style, link[rel=stylesheet]"))) {
+    head.push(node.outerHTML);
+  }
+  head.push(`<style>${printStylesheet(pageWidthPx, pageHeightPx)}</style>`);
   return `<!doctype html><html><head>${head.join("")}</head><body>${root.outerHTML}</body></html>`;
 }
 function printPages(root, pageWidthPx, pageHeightPx) {
@@ -22905,13 +22939,13 @@ function renderItem(doc, item2, urls, interactive) {
         if (cachedWmf) {
           decoded = cachedWmf;
         } else {
-          void import("./wmf-53LMIKNI.js").then(({ renderWmf }) => {
+          trackPaint(import("./wmf-53LMIKNI.js").then(({ renderWmf }) => {
             const url = renderWmf(bytes, item2.width, item2.height);
             if (url) {
               setDocDerivedSrc(doc, wmfKey, url);
               img.src = url;
             }
-          });
+          }));
         }
       } else if (ext === "emf") {
         const emfKey = `emf:${item2.part}`;
@@ -22920,12 +22954,12 @@ function renderItem(doc, item2, urls, interactive) {
           decoded = cachedEmf;
         } else {
           const buf = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
-          void import("emf-converter").then(({ convertEmfToDataUrl }) => convertEmfToDataUrl(buf)).then((url) => {
+          trackPaint(import("emf-converter").then(({ convertEmfToDataUrl }) => convertEmfToDataUrl(buf)).then((url) => {
             if (url) {
               setDocDerivedSrc(doc, emfKey, url);
               img.src = url;
             }
-          });
+          }));
         }
       }
       if (decoded) {
@@ -43203,6 +43237,7 @@ function lowestOccurrenceRegion(a, b, aLo, aHi, bLo, bHi) {
     sawCommon = true;
     if (candidates.length > MAX_CHAIN2) continue;
     sawUsable = true;
+    if (best !== void 0 && candidates.length > bestCost) continue;
     for (const i of candidates) {
       let aStart = i;
       let bStart = j;
@@ -43215,12 +43250,12 @@ function lowestOccurrenceRegion(a, b, aLo, aHi, bLo, bHi) {
         aEnd++;
       }
       const len = aEnd - aStart;
-      let cost = 0;
+      let cost = candidates.length;
       for (let k = aStart; k < aEnd; k++) {
-        cost = Math.max(cost, positions.get(a[k])?.length ?? 0);
+        cost = Math.min(cost, positions.get(a[k])?.length ?? cost);
       }
       const offset = Math.abs((aStart - aLo) / (aSpan || 1) - (bStart - bLo) / (bSpan || 1));
-      const better = cost < bestCost || cost === bestCost && best !== void 0 && len > best.len || cost === bestCost && best !== void 0 && len === best.len && offset < bestOffset;
+      const better = best !== void 0 && (len > best.len || cost < bestCost || len === best.len && cost === bestCost && offset < bestOffset);
       if (best === void 0 || better) {
         best = { aStart, bStart, len };
         bestCost = cost;
@@ -45318,6 +45353,21 @@ function setChartData(doc, drawing, input) {
   return true;
 }
 
+// ../core/src/render/print.ts
+async function renderForPrint(bytes, container) {
+  await document.fonts.ready;
+  const doc = DocxDocument.load(bytes);
+  const layout = layoutDocument(doc);
+  renderToDom(doc, layout, container, { zoom: 1, pageGap: 0, pageShadow: false, comments: false });
+  const first = layout.pages[0];
+  const style = document.createElement("style");
+  style.textContent = printStylesheet(first?.width ?? 816, first?.height ?? 1056);
+  document.head.append(style);
+  await paintsSettled();
+  await Promise.all(Array.from(container.querySelectorAll("img"), (img) => img.decode().catch(() => void 0)));
+  return { pageCount: layout.pages.length };
+}
+
 // ../core/src/render/fonts.ts
 var GENERIC = /* @__PURE__ */ new Set([
   "serif",
@@ -55746,6 +55796,7 @@ export {
   removeLink,
   insertChartAt,
   setChartData,
+  renderForPrint,
   compareWithFile,
   pickDocx,
   downloadDocx,
@@ -55764,4 +55815,4 @@ export {
 cfb/cfb.js:
   (*! crc32.js (C) 2014-present SheetJS -- http://sheetjs.com *)
 */
-//# sourceMappingURL=chunk-5SLXOYCF.js.map
+//# sourceMappingURL=chunk-QU3LB5BC.js.map