@forevka/wordcanvas 0.7.1 → 0.7.2

package/dist-node/{chunk-RNB336F3.js → chunk-T3253N22.js}

@@ -9,12 +9,12 @@ import {
   formatListNumber,
   isHiddenParagraph,
   markerText
-} from "./chunk-CDN6WU2P.js";
+} from "./chunk-PIMVQULL.js";
 import {
   charStyleToFont,
   fontMetrics,
   measureTextWidth
-} from "./chunk-4ICCHZX4.js";
+} from "./chunk-U27EBKBG.js";
 
 // ../node_modules/@chenglou/pretext/dist/generated/bidi-data.js
 var latin1BidiTypes = [
@@ -4068,6 +4068,7 @@ function layoutTabbedSegment(p, segRuns, segStart, contentWidth, firstIndent) {
   const out = [];
   let curFrags = [];
   let curLeaders = [];
+  let curArrows = [];
   let curX = firstIndent;
   let maxH = 0;
   let maxA = 0;
@@ -4089,10 +4090,12 @@ function layoutTabbedSegment(p, segRuns, segStart, contentWidth, firstIndent) {
       // A tab-positioned line stays ragged (its manual x must not be re-justified);
       // pure wrapped continuation lines justify normally when the paragraph does.
       lastOfSegment: isLast || hasTab,
-      ...curLeaders.length > 0 ? { leaders: curLeaders } : {}
+      ...curLeaders.length > 0 ? { leaders: curLeaders } : {},
+      ...curArrows.length > 0 ? { tabArrows: curArrows } : {}
     });
     curFrags = [];
     curLeaders = [];
+    curArrows = [];
     curX = 0;
     maxH = 0;
     maxA = 0;
@@ -4112,6 +4115,7 @@ function layoutTabbedSegment(p, segRuns, segStart, contentWidth, firstIndent) {
       if ((stop.leader ?? "none") !== "none" && targetX > curX + 1 && baseStyle) {
         curLeaders.push({ x1: curX, x2: targetX, kind: stop.leader ?? "none", color: baseStyle.color, fontSizePx: baseStyle.fontSizePx });
       }
+      curArrows.push({ x1: curX, x2: Math.max(targetX, curX) });
       curX = targetX;
       hasTab = true;
     }
@@ -4164,10 +4168,13 @@ function paragraphLines(p, contentWidth, cache) {
   const lines = [];
   const raw = [];
   let first = true;
-  for (const seg of segments) {
+  const segLastLine = [];
+  for (let si = 0; si < segments.length; si++) {
+    const seg = segments[si];
     if (seg.runs.some((r) => r.text.includes("	"))) {
       raw.push(...layoutTabbedSegment(p, seg.runs, seg.startOffset, contentWidth, first ? p.style.indentFirstLinePx : 0));
       first = false;
+      segLastLine[si] = raw.length - 1;
       continue;
     }
     const runStarts = segRunOffsets(seg.runs, seg.startOffset);
@@ -4208,6 +4215,13 @@ function paragraphLines(p, contentWidth, cache) {
     } else {
       raw[raw.length - 1].lastOfSegment = true;
     }
+    segLastLine[si] = raw.length - 1;
+  }
+  for (let si = 0; si < segLastLine.length; si++) {
+    const idx = segLastLine[si];
+    if (idx === void 0) continue;
+    if (si === segments.length - 1) raw[idx].paragraphEnd = true;
+    else raw[idx].lineBreak = true;
   }
   let y = 0;
   for (const rl of raw) {
@@ -4222,6 +4236,11 @@ function paragraphLines(p, contentWidth, cache) {
     if (rl.leaders && rl.leaders.length > 0) {
       box.leaders = rl.leaders.map((l) => ({ ...l, x1: l.x1 + startX, x2: l.x2 + startX }));
     }
+    if (rl.tabArrows && rl.tabArrows.length > 0) {
+      box.tabArrows = rl.tabArrows.map((a) => ({ x1: a.x1 + startX, x2: a.x2 + startX }));
+    }
+    if (rl.paragraphEnd) box.paragraphEnd = true;
+    if (rl.lineBreak) box.lineBreak = true;
     lines.push(box);
     y += rl.height;
   }
@@ -4244,6 +4263,10 @@ function effectiveSection(base, patch) {
   if (headerDist !== void 0) out.headerDistancePx = headerDist;
   const footerDist = patch.footerDistancePx ?? base.footerDistancePx;
   if (footerDist !== void 0) out.footerDistancePx = footerDist;
+  const pageColorHex = patch.pageColorHex ?? base.pageColorHex;
+  if (pageColorHex !== void 0) out.pageColorHex = pageColorHex;
+  const pageBorders = patch.pageBorders ?? base.pageBorders;
+  if (pageBorders !== void 0) out.pageBorders = pageBorders;
   for (const key of BAND_KEYS) {
     const blocks = patch[key] ?? base[key];
     if (blocks) out[key] = blocks;
@@ -4321,8 +4344,9 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
   let contentBottom = 0;
   let contentWidth = 0;
   let colCount = 1;
-  let colGap = 0;
   let colWidth = 0;
+  let colBoxes = [];
+  let colSeparatorsX = [];
   const applySection = (props) => {
     sec = props;
     const box = contentBoxOf(sec);
@@ -4331,8 +4355,27 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
     contentBottom = box.bottom;
     contentWidth = sec.pageWidthPx - sec.marginPx.left - sec.marginPx.right;
     colCount = Math.max(1, sec.columns?.count ?? 1);
-    colGap = sec.columns?.gapPx ?? 24;
-    colWidth = colCount > 1 ? (contentWidth - (colCount - 1) * colGap) / colCount : contentWidth;
+    const gap = sec.columns?.gapPx ?? 24;
+    const cols = sec.columns?.cols;
+    if (colCount > 1 && cols && cols.length === colCount) {
+      let x = contentX;
+      colBoxes = cols.map((c, i) => {
+        const b = { x, width: c.widthPx };
+        x += c.widthPx + (i < colCount - 1 ? c.spaceAfterPx : 0);
+        return b;
+      });
+      colWidth = Math.min(...cols.map((c) => c.widthPx));
+    } else if (colCount > 1) {
+      colWidth = (contentWidth - (colCount - 1) * gap) / colCount;
+      colBoxes = Array.from({ length: colCount }, (_, i) => ({
+        x: contentX + i * (colWidth + gap),
+        width: colWidth
+      }));
+    } else {
+      colWidth = contentWidth;
+      colBoxes = [{ x: contentX, width: contentWidth }];
+    }
+    colSeparatorsX = sec.columns?.sep ? colBoxes.slice(0, -1).map((b, i) => (b.x + b.width + colBoxes[i + 1].x) / 2) : [];
   };
   applySection(sec);
   const lists = doc.lists ?? {};
@@ -4400,7 +4443,7 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
   const pageSections = [];
   const mkPage = () => {
     pageSections.push(sec);
-    return {
+    const p = {
       index: pageSections.length - 1,
       number: pageSections.length,
       // provisional; the post-pass sets the real value
@@ -4411,6 +4454,10 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       contentTopPx: contentTop,
       contentBottomPx: contentBottom
     };
+    if (sec.pageColorHex !== void 0) p.pageColorHex = sec.pageColorHex;
+    if (sec.pageBorders !== void 0) p.pageBorders = sec.pageBorders;
+    if (colSeparatorsX.length) p.columnSeparatorsX = colSeparatorsX.slice();
+    return p;
   };
   const pages = [mkPage()];
   let page = pages[0];
@@ -4450,7 +4497,7 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
   };
   let colIdx = 0;
   let colStartCount = 0;
-  const colX = () => contentX + colIdx * (colWidth + colGap);
+  const colX = () => colBoxes[colIdx]?.x ?? contentX;
   const colHasContent = () => page.blocks.length > colStartCount;
   const hardPage = () => {
     colIdx = 0;
@@ -4480,6 +4527,12 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       page.marginPx = sec.marginPx;
       page.contentTopPx = contentTop;
       page.contentBottomPx = contentBottom;
+      if (sec.pageColorHex !== void 0) page.pageColorHex = sec.pageColorHex;
+      else delete page.pageColorHex;
+      if (sec.pageBorders !== void 0) page.pageBorders = sec.pageBorders;
+      else delete page.pageBorders;
+      if (colSeparatorsX.length) page.columnSeparatorsX = colSeparatorsX.slice();
+      else delete page.columnSeparatorsX;
       pageSections[page.index] = sec;
       colIdx = 0;
       colStartCount = 0;
@@ -4929,10 +4982,13 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       }
     }
   }
-  for (const pg of pages) {
-    if (!pg.blocks.some((b) => b.image?.behind || b.image?.front)) continue;
+  const reorderAnchoredLayers = (blocks) => {
+    for (const b of blocks) {
+      if (b.table) for (const row of b.table.rows) for (const cell of row.cells) cell.blocks = reorderAnchoredLayers(cell.blocks);
+    }
+    if (!blocks.some((b) => b.image?.behind || b.image?.front)) return blocks;
     const layer = (b) => b.image?.behind ? 0 : b.image?.front ? 2 : 1;
-    pg.blocks = pg.blocks.map((b, i) => ({ b, i })).sort((p, q) => {
+    return blocks.map((b, i) => ({ b, i })).sort((p, q) => {
       const dl = layer(p.b) - layer(q.b);
       if (dl !== 0) return dl;
       if (layer(p.b) !== 1) {
@@ -4941,7 +4997,8 @@ function layoutDocument(doc, getLines, getPrepared, rawBand) {
       }
       return p.i - q.i;
     }).map((x) => x.b);
-  }
+  };
+  for (const pg of pages) pg.blocks = reorderAnchoredLayers(pg.blocks);
   const pageNumbers = [];
   {
     let n = 0;
@@ -5173,6 +5230,7 @@ function measureTable(t, contentWidth, getLines, listCtx) {
           return { kind: "para", block: b, lines };
         }
         if (b.kind === "image") {
+          if (b.anchor) return { kind: "image", block: b, width: b.widthPx, height: b.heightPx };
           const scale = Math.min(1, innerWidth / Math.max(1, b.widthPx));
           const w = b.widthPx * scale;
           const ih = b.heightPx * scale;
@@ -5243,6 +5301,26 @@ function placeTable(t, rows, colWidths, x, y, width, firstRowIndex, listCtx) {
           blocks.push(placedPara);
           py += totalLinesHeight(it.lines) + it.block.style.spaceAfterPx;
         } else if (it.kind === "image") {
+          const anchor = it.block.anchor;
+          if (anchor) {
+            const placedImage = {
+              src: it.block.src,
+              width: it.block.widthPx,
+              height: it.block.heightPx,
+              z: anchor.z ?? 0
+            };
+            if (anchor.behind) placedImage.behind = true;
+            else placedImage.front = true;
+            blocks.push({
+              blockId: it.block.id,
+              x: cx + mgn.left + anchor.offsetXPx,
+              y: ry + mgn.top + anchor.offsetYPx,
+              firstLineIndex: 0,
+              lines: [],
+              image: placedImage
+            });
+            continue;
+          }
           const innerH = cellHeight - mgn.top - mgn.bottom;
           if (mc.items.length === 1 && innerH > it.height + 8) {
             const scale = Math.max(innerWidth / it.block.widthPx, innerH / it.block.heightPx);
@@ -5311,4 +5389,4 @@ export {
   effectiveSection,
   resolveSections
 };
-//# sourceMappingURL=chunk-RNB336F3.js.map
+//# sourceMappingURL=chunk-T3253N22.js.map