reamkit 1.27.0 → 1.29.0

package/dist/esm/word/docx-writer.js

@@ -482,7 +482,7 @@ function chartBlockXml(chart, state, scope, losses) {
 	const cx = Math.round(chart.width * EMU_PER_PT);
 	const cy = Math.round(chart.height * EMU_PER_PT);
 	const id = ++state.drawingSeq;
-	return `<w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"><wp:extent cx="${cx}" cy="${cy}"/><wp:docPr id="${id}" name="Chart ${id}"${chart.altText ? ` descr="${escapeAttr(chart.altText)}"` : ""}/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="${relId}"/></a:graphicData></a:graphic></wp:inline></w:drawing>`;
+	return `<w:drawing><wp:inline xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" distT="0" distB="0" distL="0" distR="0"><wp:extent cx="${cx}" cy="${cy}"/><wp:docPr id="${id}" name="Chart ${id}"${chart.altText ? ` descr="${escapeAttr(chart.altText)}"` : ""}/><a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="${relId}"/></a:graphicData></a:graphic></wp:inline></w:drawing>`;
 }
 /**
 * §20.4.2.3 — the frame a drawing is placed by: `wp:anchor` where the block
@@ -510,7 +510,7 @@ function chartBlockXml(chart, state, scope, losses) {
 */
 function drawingFrame(float, cx, cy, head, graphic, state, rotation60k) {
 	const WP_NS = " xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\"";
-	if (!float) return `<w:drawing><wp:inline${WP_NS}><wp:extent cx="${cx}" cy="${cy}"/>${head}${graphic}</wp:inline></w:drawing>`;
+	if (!float) return `<w:drawing><wp:inline${WP_NS} distT="0" distB="0" distL="0" distR="0"><wp:extent cx="${cx}" cy="${cy}"/>${head}${graphic}</wp:inline></w:drawing>`;
 	const emu = (pt) => Number.isFinite(pt) ? Math.round((pt ?? 0) * EMU_PER_PT) : 0;
 	const d = float.wrapDist;
 	const dist = ` distT="${String(emu(d?.topPt))}" distB="${String(emu(d?.bottomPt))}" distL="${String(emu(d?.leftPt))}" distR="${String(emu(d?.rightPt))}"`;
@@ -821,22 +821,27 @@ function runXml(run, state, scope) {
 	if (run.noteNumber) return `<w:r>${rPr}<${scope.noteKind === "endnote" ? "w:endnoteRef" : "w:footnoteRef"}/></w:r>`;
 	if (run.commentRef !== void 0) return `<w:r>${rPr}<w:commentReference w:id="${escapeAttr(run.commentRef)}"/></w:r>`;
 	const brk = run.pageBreak ? "<w:br w:type=\"page\"/>" : "";
+	if (run.field !== void 0 && run.text !== "") {
+		const inner = `<w:r>${rPr}<w:t xml:space="preserve">${escapeXml(run.text)}</w:t></w:r>`;
+		return `<w:fldSimple w:instr=" ${run.field} ">${inner}</w:fldSimple>${brk}`;
+	}
 	if (run.text === "") return brk ? `<w:r>${rPr}${brk}</w:r>` : "";
-	return `<w:r>${rPr}<w:t xml:space="preserve">${escapeXml(run.text)}</w:t>${brk}</w:r>`;
+	return `<w:r>${rPr}${run.text.split("	").map((piece) => piece === "" ? "" : `<w:t xml:space="preserve">${escapeXml(piece)}</w:t>`).join("<w:tab/>")}${brk}</w:r>`;
 }
 function rPrXml(r) {
 	const out = [];
+	const states = (key) => r[key] !== void 0 && r[key] !== DEFAULT_RUN[key];
 	const fonts = rFontsXml(r.fontFamily);
 	if (fonts) out.push(fonts);
-	if (r.bold !== DEFAULT_RUN.bold) out.push(toggle("w:b", r.bold));
-	if (r.italic !== DEFAULT_RUN.italic) out.push(toggle("w:i", r.italic));
-	if (r.strike !== DEFAULT_RUN.strike) out.push(toggle("w:strike", r.strike));
-	if (r.colorHex !== DEFAULT_RUN.colorHex) out.push(`<w:color w:val="${r.colorHex}"/>`);
-	if (r.fontSizePt !== DEFAULT_RUN.fontSizePt) out.push(`<w:sz w:val="${Math.round(r.fontSizePt * 2)}"/>`);
-	if (r.underline !== DEFAULT_RUN.underline) out.push(underlineXml(r));
+	if (states("bold")) out.push(toggle("w:b", r.bold));
+	if (states("italic")) out.push(toggle("w:i", r.italic));
+	if (states("strike")) out.push(toggle("w:strike", r.strike));
+	if (states("colorHex")) out.push(`<w:color w:val="${r.colorHex}"/>`);
+	if (states("fontSizePt")) out.push(`<w:sz w:val="${Math.round(r.fontSizePt * 2)}"/>`);
+	if (states("underline")) out.push(underlineXml(r));
 	if (r.shadingColorHex !== void 0) out.push(runShdXml(r.shadingColorHex));
-	if (r.verticalAlign !== DEFAULT_RUN.verticalAlign) out.push(`<w:vertAlign w:val="${r.verticalAlign}"/>`);
-	if (r.rtl !== DEFAULT_RUN.rtl) out.push(toggle("w:rtl", r.rtl));
+	if (states("verticalAlign")) out.push(`<w:vertAlign w:val="${r.verticalAlign}"/>`);
+	if (states("rtl")) out.push(toggle("w:rtl", r.rtl));
 	if (r.lang !== void 0) out.push(`<w:lang w:val="${escapeAttr(r.lang)}"/>`);
 	return out.length > 0 ? `<w:rPr>${out.join("")}</w:rPr>` : "";
 }
@@ -858,6 +863,17 @@ function pPrBody(p) {
 	const spacing = spacingXml(p);
 	if (spacing) out.push(spacing);
 	if (JC.has(p.alignment) && p.alignment !== DEFAULT_PARA.alignment) out.push(`<w:jc w:val="${p.alignment}"/>`);
+	const pBdr = bordersXml("w:pBdr", p.borders);
+	if (pBdr) out.push(pBdr);
+	const tabs = p.tabs ?? [];
+	if (tabs.length > 0) {
+		const stops = tabs.map((t) => {
+			const pos = twips(t.positionPt);
+			const leader = t.leader !== void 0 ? ` w:leader="${escapeAttr(t.leader)}"` : "";
+			return `<w:tab w:val="${escapeAttr(t.alignment ?? "left")}" w:pos="${String(pos)}"${leader}/>`;
+		}).join("");
+		out.push(`<w:tabs>${stops}</w:tabs>`);
+	}
 	return out.join("");
 }
 function pPrWithSect(p, closingSectPr) {
@@ -976,6 +992,7 @@ function sectPrXml(s, hf) {
 	const parts = [];
 	for (const h of hf.headers) parts.push(`<w:headerReference w:type="${h.type}" r:id="${h.relId}"/>`);
 	for (const f of hf.footers) parts.push(`<w:footerReference w:type="${f.type}" r:id="${f.relId}"/>`);
+	if (s.sectionStart !== void 0 && s.sectionStart !== "nextPage") parts.push(`<w:type w:val="${s.sectionStart}"/>`);
 	if (s.pageSize) {
 		const orient = s.pageSize.orientation === "landscape" ? " w:orient=\"landscape\"" : "";
 		parts.push(`<w:pgSz w:w="${twips(s.pageSize.width)}" w:h="${twips(s.pageSize.height)}"${orient}/>`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.27.0",
+  "version": "1.29.0",
   "description": "Ream — convert DOCX, XLSX, PPTX and PDF to PDF, SVG, HTML, DOCX and XLSX, built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
   "author": "Alex Krassavin <info@reamkit.dev>",