@forevka/wordcanvas 0.7.1 → 0.7.3

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

@@ -8,13 +8,13 @@ import {
   createLayoutEngine,
   effectiveSection,
   resolveSections
-} from "./chunk-RNB336F3.js";
-import "./chunk-CDN6WU2P.js";
-import "./chunk-4ICCHZX4.js";
+} from "./chunk-ZLLSXOO2.js";
+import "./chunk-373K2XRY.js";
+import "./chunk-5RX3IHWE.js";
 import "./chunk-XSRSBST2.js";
 export {
   createLayoutEngine,
   effectiveSection,
   resolveSections
 };
-//# sourceMappingURL=engine-5FGDJD2H.js.map
+//# sourceMappingURL=engine-LLA6PCS5.js.map

package/dist-node/export.js

@@ -16,7 +16,7 @@ import {
   require_unicode_trie,
   resolveFont,
   tslib_es6_exports
-} from "./chunk-BRAPV465.js";
+} from "./chunk-HWQKGDS2.js";
 import {
   WML_NS,
   XML_DECL,
@@ -30,8 +30,9 @@ import {
   pxToEmu,
   pxToTwips,
   runPropsXml,
+  tableStyleXml,
   textEl
-} from "./chunk-4PDVRJF6.js";
+} from "./chunk-EMY2P524.js";
 import {
   pageOfBlockMap
 } from "./chunk-EGSAVPCC.js";
@@ -41,14 +42,16 @@ import {
 } from "./chunk-5PUCGN47.js";
 import {
   createLayoutEngine
-} from "./chunk-RNB336F3.js";
+} from "./chunk-ZLLSXOO2.js";
 import {
   detectTocHeadings,
   inRange,
   parseTocInstruction,
+  styleType,
   textOfRuns
-} from "./chunk-CDN6WU2P.js";
+} from "./chunk-373K2XRY.js";
 import {
+  COLUMN_SEPARATOR_COLOR,
   DEFAULT_GRID_COLOR,
   FOOTNOTE_RULE_COLOR,
   FOOTNOTE_RULE_WIDTH_FRACTION,
@@ -65,10 +68,11 @@ import {
   leaderDash,
   leaderWidth,
   normalizeLinkBlue,
+  pageBorderSegments,
   runPaint,
   strikeOffset,
   verticalShift
-} from "./chunk-4ICCHZX4.js";
+} from "./chunk-5RX3IHWE.js";
 import {
   __commonJS,
   __require,
@@ -24545,7 +24549,7 @@ function toBuffer(bytes) {
 var PT = 72 / 96;
 async function renderPdf(doc, opts = {}) {
   await installMeasureHost();
-  const { createLayoutEngine: createLayoutEngine2 } = await import("./engine-5FGDJD2H.js");
+  const { createLayoutEngine: createLayoutEngine2 } = await import("./engine-LLA6PCS5.js");
   const tree = createLayoutEngine2().layout(doc);
   const warnings = new WarningSink();
   const images = opts.images ?? {};
@@ -24600,8 +24604,23 @@ async function renderPdf(doc, opts = {}) {
     }
     pdf.save();
     pdf.scale(PT);
-    pdf.rect(0, 0, page.widthPx, page.heightPx).fill("#ffffff");
+    pdf.rect(0, 0, page.widthPx, page.heightPx).fill(page.pageColorHex ?? "#ffffff");
+    if (page.pageBorders) {
+      for (const s of pageBorderSegments(page.pageBorders, page.widthPx, page.heightPx, page.marginPx)) {
+        pdf.lineWidth(s.widthPx).strokeColor(s.color);
+        if (s.dash.length) pdf.dash(s.dash[0], { space: s.dash[1] ?? s.dash[0] });
+        else pdf.undash();
+        pdf.moveTo(s.x1, s.y1).lineTo(s.x2, s.y2).stroke();
+      }
+      pdf.undash();
+    }
     for (const block of page.blocks) paintBlock(ctx, block);
+    if (page.columnSeparatorsX) {
+      pdf.undash().lineWidth(1).strokeColor(COLUMN_SEPARATOR_COLOR);
+      for (const x of page.columnSeparatorsX) {
+        pdf.moveTo(x + 0.5, page.contentTopPx).lineTo(x + 0.5, page.contentBottomPx).stroke();
+      }
+    }
     if (page.footnoteRuleY !== void 0) {
       const cw = page.widthPx - page.marginPx.left - page.marginPx.right;
       pdf.undash().lineWidth(1).strokeColor(FOOTNOTE_RULE_COLOR);
@@ -24944,13 +24963,25 @@ function tableXml(table, ctx) {
     col = emitContinues(col, out);
     rowsXml.push(el("w:tr", void 0, out.join("")));
   }
+  const styleRef = table.styleId ? el("w:tblStyle", { "w:val": table.styleId }) : "";
+  const look = table.styleId && table.condOverrides ? tblLookXml(table.condOverrides) : "";
   const tblPr = el(
     "w:tblPr",
     void 0,
-    el("w:tblW", { "w:w": 0, "w:type": "auto" }) + el("w:tblLayout", { "w:type": "fixed" })
+    styleRef + el("w:tblW", { "w:w": 0, "w:type": "auto" }) + el("w:tblLayout", { "w:type": "fixed" }) + look
   );
   return el("w:tbl", void 0, tblPr + el("w:tblGrid", void 0, grid) + rowsXml.join(""));
 }
+function tblLookXml(o) {
+  return el("w:tblLook", {
+    "w:firstRow": o.firstRow ? "1" : "0",
+    "w:lastRow": o.lastRow ? "1" : "0",
+    "w:firstColumn": o.firstCol ? "1" : "0",
+    "w:lastColumn": o.lastCol ? "1" : "0",
+    "w:noHBand": o.bandRows ? "0" : "1",
+    "w:noVBand": o.bandCols ? "0" : "1"
+  });
+}
 function blockXml(block, ctx) {
   if (block.kind === "paragraph") return paragraphXml(block, ctx);
   if (block.kind === "table") return tableXml(block, ctx);
@@ -25077,6 +25108,20 @@ function imageParagraphXml(img, ctx) {
   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));
 }
+function pgBordersXml(b) {
+  const edge = (name, e) => {
+    if (!e || e.style === "none") return "";
+    const spacePt = Math.min(31, Math.max(0, Math.round((e.spacePx ?? 0) * (72 / 96))));
+    return el("w:" + name, {
+      "w:val": e.style,
+      "w:sz": pxToEighthPoints(e.widthPx),
+      "w:space": spacePt,
+      "w:color": e.color === "auto" ? "auto" : hexColor(e.color)
+    });
+  };
+  const inner = edge("top", b.top) + edge("left", b.left) + edge("bottom", b.bottom) + edge("right", b.right);
+  return el("w:pgBorders", { "w:offsetFrom": b.offsetFrom ?? "page" }, inner);
+}
 function sectPrXml(s, ctx, addBand, isBody) {
   const c = [];
   const band = (blocks, kind, type) => {
@@ -25092,7 +25137,12 @@ function sectPrXml(s, ctx, addBand, isBody) {
   band(s.footerEven, "footer", "even");
   if (s.headerFirst || s.footerFirst) c.push(el("w:titlePg"));
   if (s.pageWidthPx !== void 0 && s.pageHeightPx !== void 0) {
-    c.push(el("w:pgSz", { "w:w": pxToTwips(s.pageWidthPx), "w:h": pxToTwips(s.pageHeightPx) }));
+    const pgSz = {
+      "w:w": pxToTwips(s.pageWidthPx),
+      "w:h": pxToTwips(s.pageHeightPx)
+    };
+    if (s.pageWidthPx > s.pageHeightPx) pgSz["w:orient"] = "landscape";
+    c.push(el("w:pgSz", pgSz));
   }
   if (s.marginPx) {
     const m = s.marginPx;
@@ -25101,13 +25151,23 @@ function sectPrXml(s, ctx, addBand, isBody) {
       "w:right": pxToTwips(m.right),
       "w:bottom": pxToTwips(m.bottom),
       "w:left": pxToTwips(m.left),
-      "w:header": 720,
-      "w:footer": 720
+      "w:header": s.headerDistancePx !== void 0 ? pxToTwips(s.headerDistancePx) : 720,
+      "w:footer": s.footerDistancePx !== void 0 ? pxToTwips(s.footerDistancePx) : 720
     }));
   }
   if (s.columns && s.columns.count > 1) {
-    c.push(el("w:cols", { "w:num": s.columns.count, "w:space": pxToTwips(s.columns.gapPx) }));
+    const cols = s.columns;
+    const attrs = { "w:num": cols.count, "w:space": pxToTwips(cols.gapPx) };
+    if (cols.sep) attrs["w:sep"] = "1";
+    if (cols.cols && cols.cols.length === cols.count) {
+      attrs["w:equalWidth"] = "0";
+      const inner = cols.cols.map((col) => el("w:col", { "w:w": pxToTwips(col.widthPx), "w:space": pxToTwips(col.spaceAfterPx) })).join("");
+      c.push(el("w:cols", attrs, inner));
+    } else {
+      c.push(el("w:cols", attrs));
+    }
   }
+  if (s.pageBorders) c.push(pgBordersXml(s.pageBorders));
   if (s.pageNumberStart !== void 0) c.push(el("w:pgNumType", { "w:start": s.pageNumberStart }));
   if (!isBody) c.push(el("w:type", { "w:val": "nextPage" }));
   return el("w:sectPr", void 0, c.join(""));
@@ -25132,7 +25192,8 @@ function buildDocumentXml(blocks, section, ctx, addBand) {
     }
   }
   const body = parts.join("") + sectPrXml(section, ctx, addBand, true);
-  return XML_DECL + el("w:document", WML_NS, el("w:body", void 0, body));
+  const background = section.pageColorHex !== void 0 ? el("w:background", { "w:color": hexColor(section.pageColorHex) }) : "";
+  return XML_DECL + el("w:document", WML_NS, background + el("w:body", void 0, body));
 }
 
 // src/export/docx/contentTypes.ts
@@ -25240,20 +25301,22 @@ function numberingXml(lists, listIdMap) {
 }
 
 // src/export/docx/settingsXml.ts
-function settingsXml(evenAndOdd) {
-  const body = evenAndOdd ? el("w:evenAndOddHeadersAndFooters") : "";
+function settingsXml(evenAndOdd, displayBackgroundShape = false) {
+  const body = (displayBackgroundShape ? el("w:displayBackgroundShape") : "") + (evenAndOdd ? el("w:evenAndOddHeadersAndFooters") : "");
   return XML_DECL + el("w:settings", WML_NS, body);
 }
 
 // src/export/docx/stylesXml.ts
-function stylesXml(sheet) {
-  const styles = sheet.styles.map((s) => {
-    const attrs = { "w:type": "paragraph", "w:styleId": s.id };
-    if (s.id === sheet.defaultStyleId) attrs["w:default"] = "1";
-    const body = el("w:name", { "w:val": s.name }) + (s.basedOn ? el("w:basedOn", { "w:val": s.basedOn }) : "") + partialPPrXml(s.para) + partialRPrXml(s.char);
+function stylesXml(sheet, tableStyles) {
+  const named = (sheet?.styles ?? []).map((s) => {
+    const isChar = styleType(s) === "character";
+    const attrs = { "w:type": isChar ? "character" : "paragraph", "w:styleId": s.id };
+    if (!isChar && sheet && s.id === sheet.defaultStyleId) attrs["w:default"] = "1";
+    const body = el("w:name", { "w:val": s.name }) + (s.basedOn ? el("w:basedOn", { "w:val": s.basedOn }) : "") + (isChar ? "" : partialPPrXml(s.para)) + partialRPrXml(s.char);
     return el("w:style", attrs, body);
   }).join("");
-  return XML_DECL + el("w:styles", WML_NS, styles);
+  const tables = Object.values(tableStyles ?? {}).map(tableStyleXml).join("");
+  return XML_DECL + el("w:styles", WML_NS, named + tables);
 }
 
 // src/export/docx/writeDocx.ts
@@ -25343,8 +25406,10 @@ function writeDocx(doc, images = {}, tocPages) {
     return bodyRels.add(kind === "header" ? REL.header : REL.footer, file);
   };
   parts["word/document.xml"] = buildDocumentXml(doc.blocks, doc.section, bodyCtx, addBand);
-  if (doc.stylesheet && doc.stylesheet.styles.length > 0) {
-    parts["word/styles.xml"] = stylesXml(doc.stylesheet);
+  const hasNamed = !!doc.stylesheet && doc.stylesheet.styles.length > 0;
+  const hasTableStyles = !!doc.tableStyles && Object.keys(doc.tableStyles).length > 0;
+  if (hasNamed || hasTableStyles) {
+    parts["word/styles.xml"] = stylesXml(doc.stylesheet, doc.tableStyles);
     overrides.push(["/word/styles.xml", CT.styles]);
     bodyRels.add(REL.styles, "styles.xml");
   }
@@ -25359,7 +25424,7 @@ function writeDocx(doc, images = {}, tocPages) {
     bodyRels.add(REL.footnotes, "footnotes.xml");
   }
   const evenAndOdd = sectionsHaveEvenBands(doc);
-  parts["word/settings.xml"] = settingsXml(evenAndOdd);
+  parts["word/settings.xml"] = settingsXml(evenAndOdd, doc.section.pageColorHex !== void 0);
   overrides.push(["/word/settings.xml", CT.settings]);
   bodyRels.add(REL.settings, "settings.xml");
   for (const [path, bytes2] of bodyMedia.parts()) parts[`word/${path}`] = bytes2;