@forevka/wordcanvas 0.7.0 → 0.7.1

package/dist-node/{engine-FRCX7PXF.js → engine-5FGDJD2H.js}

@@ -8,8 +8,8 @@ import {
   createLayoutEngine,
   effectiveSection,
   resolveSections
-} from "./chunk-IJLL6IFJ.js";
-import "./chunk-XDUDPPJW.js";
+} from "./chunk-RNB336F3.js";
+import "./chunk-CDN6WU2P.js";
 import "./chunk-4ICCHZX4.js";
 import "./chunk-XSRSBST2.js";
 export {
@@ -17,4 +17,4 @@ export {
   effectiveSection,
   resolveSections
 };
-//# sourceMappingURL=engine-FRCX7PXF.js.map
+//# sourceMappingURL=engine-5FGDJD2H.js.map

package/dist-node/export.js

@@ -34,20 +34,20 @@ import {
 } from "./chunk-4PDVRJF6.js";
 import {
   pageOfBlockMap
-} from "./chunk-TBSXA2I4.js";
+} from "./chunk-EGSAVPCC.js";
 import {
   strToU8,
   zipSync
 } from "./chunk-5PUCGN47.js";
 import {
   createLayoutEngine
-} from "./chunk-IJLL6IFJ.js";
+} from "./chunk-RNB336F3.js";
 import {
   detectTocHeadings,
   inRange,
   parseTocInstruction,
   textOfRuns
-} from "./chunk-XDUDPPJW.js";
+} from "./chunk-CDN6WU2P.js";
 import {
   DEFAULT_GRID_COLOR,
   FOOTNOTE_RULE_COLOR,
@@ -24545,7 +24545,7 @@ function toBuffer(bytes) {
 var PT = 72 / 96;
 async function renderPdf(doc, opts = {}) {
   await installMeasureHost();
-  const { createLayoutEngine: createLayoutEngine2 } = await import("./engine-FRCX7PXF.js");
+  const { createLayoutEngine: createLayoutEngine2 } = await import("./engine-5FGDJD2H.js");
   const tree = createLayoutEngine2().layout(doc);
   const warnings = new WarningSink();
   const images = opts.images ?? {};
@@ -24751,9 +24751,33 @@ function runsXml(runs, ctx) {
     const sdtId = runs[i].style.sdtId;
     if (sdtId) {
       let j = i;
-      let inner = "";
-      while (j < runs.length && runs[j].style.sdtId === sdtId) inner += singleRun(runs[j++], ctx);
-      out += el("w:sdt", void 0, sdtPrXml(ctx.sdts[sdtId]) + el("w:sdtContent", void 0, inner));
+      const seg = [];
+      while (j < runs.length && runs[j].style.sdtId === sdtId) seg.push(runs[j++]);
+      out += el("w:sdt", void 0, sdtPrXml(ctx.sdts[sdtId]) + el("w:sdtContent", void 0, fieldRunsXml(seg, ctx)));
+      i = j;
+    } else {
+      let j = i;
+      const seg = [];
+      while (j < runs.length && !runs[j].style.sdtId) seg.push(runs[j++]);
+      out += fieldRunsXml(seg, ctx);
+      i = j;
+    }
+  }
+  return out;
+}
+function fieldRunsXml(runs, ctx) {
+  let out = "";
+  let i = 0;
+  while (i < runs.length) {
+    const fid = runs[i].style.fieldId;
+    const def = fid ? ctx.fields?.[fid] : void 0;
+    if (fid && def && def.kind === "builtin") {
+      let j = i;
+      const seg = [];
+      while (j < runs.length && runs[j].style.fieldId === fid) seg.push(runs[j++]);
+      const isToken = def.spec?.type === "PAGE" || def.spec?.type === "NUMPAGES";
+      const result = seg.map((r) => el("w:r", void 0, runPropsXml(r.style) + (isToken ? "" : runContent(r.text)))).join("");
+      out += fldRun("begin") + instrRun(def.instruction) + fldRun("separate") + result + fldRun("end");
       i = j;
     } else {
       out += singleRun(runs[i], ctx);
@@ -24820,10 +24844,24 @@ function paragraphXml(p, ctx) {
   const flush = (upto) => {
     while (mi < sorted.length && sorted[mi].offset <= upto) body += bookmarkEl(sorted[mi++]);
   };
-  for (const run of runs) {
+  let ri = 0;
+  while (ri < runs.length) {
     flush(cum);
-    body += singleRun(run, ctx);
-    cum += run.text.length;
+    const fid = runs[ri].style.fieldId;
+    const def = fid ? ctx.fields?.[fid] : void 0;
+    if (fid && def && def.kind === "builtin") {
+      const seg = [];
+      while (ri < runs.length && runs[ri].style.fieldId === fid) {
+        seg.push(runs[ri]);
+        cum += runs[ri].text.length;
+        ri++;
+      }
+      body += fieldRunsXml(seg, ctx);
+    } else {
+      body += singleRun(runs[ri], ctx);
+      cum += runs[ri].text.length;
+      ri++;
+    }
   }
   flush(cum);
   while (mi < sorted.length) body += bookmarkEl(sorted[mi++]);
@@ -24984,35 +25022,58 @@ function imageParagraphXml(img, ctx) {
   const relId = ctx.rels.add(REL.image, target);
   const cx = pxToEmu(img.widthPx);
   const cy = pxToEmu(img.heightPx);
-  const drawing = el(
-    "w:drawing",
+  const graphic = el(
+    "a:graphic",
     void 0,
     el(
-      "wp:inline",
-      { distT: 0, distB: 0, distL: 0, distR: 0 },
-      el("wp:extent", { cx, cy }) + el("wp:docPr", { id: ctx.nextId(), name: "image" }) + el(
-        "a:graphic",
+      "a:graphicData",
+      { uri: "http://schemas.openxmlformats.org/drawingml/2006/picture" },
+      el(
+        "pic:pic",
         void 0,
         el(
-          "a:graphicData",
-          { uri: "http://schemas.openxmlformats.org/drawingml/2006/picture" },
-          el(
-            "pic:pic",
-            void 0,
-            el(
-              "pic:nvPicPr",
-              void 0,
-              el("pic:cNvPr", { id: 0, name: "image" }) + el("pic:cNvPicPr")
-            ) + el("pic:blipFill", void 0, el("a:blip", { "r:embed": relId }) + el("a:stretch", void 0, el("a:fillRect"))) + el(
-              "pic:spPr",
-              void 0,
-              el("a:xfrm", void 0, el("a:off", { x: 0, y: 0 }) + el("a:ext", { cx, cy })) + el("a:prstGeom", { prst: "rect" }, el("a:avLst"))
-            )
-          )
+          "pic:nvPicPr",
+          void 0,
+          el("pic:cNvPr", { id: 0, name: "image" }) + el("pic:cNvPicPr")
+        ) + el("pic:blipFill", void 0, el("a:blip", { "r:embed": relId }) + el("a:stretch", void 0, el("a:fillRect"))) + el(
+          "pic:spPr",
+          void 0,
+          el("a:xfrm", void 0, el("a:off", { x: 0, y: 0 }) + el("a:ext", { cx, cy })) + el("a:prstGeom", { prst: "rect" }, el("a:avLst"))
         )
       )
     )
   );
+  if (img.anchor) {
+    const a = img.anchor;
+    const anchor = el(
+      "wp:anchor",
+      {
+        distT: 0,
+        distB: 0,
+        distL: 0,
+        distR: 0,
+        simplePos: 0,
+        // relativeHeight is an unsigned int in OOXML; clamp the (possibly
+        // negative, from repeated "send to back") z into the valid range.
+        relativeHeight: Math.max(0, Math.round(a.z ?? 0)),
+        behindDoc: a.behind ? 1 : 0,
+        locked: 0,
+        layoutInCell: 1,
+        allowOverlap: 1
+      },
+      el("wp:simplePos", { x: 0, y: 0 }) + el("wp:positionH", { relativeFrom: a.relFromH }, el("wp:posOffset", void 0, String(pxToEmu(a.offsetXPx)))) + el("wp:positionV", { relativeFrom: a.relFromV }, el("wp:posOffset", void 0, String(pxToEmu(a.offsetYPx)))) + el("wp:extent", { cx, cy }) + el("wp:wrapNone") + el("wp:docPr", { id: ctx.nextId(), name: "image" }) + graphic
+    );
+    return el("w:p", void 0, el("w:r", void 0, el("w:drawing", void 0, anchor)));
+  }
+  const drawing = el(
+    "w:drawing",
+    void 0,
+    el(
+      "wp:inline",
+      { distT: 0, distB: 0, distL: 0, distR: 0 },
+      el("wp:extent", { cx, cy }) + el("wp:docPr", { id: ctx.nextId(), name: "image" }) + graphic
+    )
+  );
   const align = img.align === "center" ? "center" : img.align === "right" ? "right" : "left";
   return el("w:p", void 0, el("w:pPr", void 0, el("w:jc", { "w:val": align })) + el("w:r", void 0, drawing));
 }