reamkit 1.29.0 → 1.30.0

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

@@ -17,6 +17,9 @@ var REL_NUMBERING = "http://schemas.openxmlformats.org/officeDocument/2006/relat
 var REL_HYPERLINK = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
 var REL_IMAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
 var NUMBERING_PART = "word/numbering.xml";
+var REL_FONT_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";
+var FONT_TABLE_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml";
+var FONT_TABLE_PART = "word/fontTable.xml";
 var REL_FOOTNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";
 var REL_ENDNOTES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";
 var FOOTNOTES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml";
@@ -127,7 +130,10 @@ function writeDocx(flow) {
 		drawingSeq: 0,
 		chartParts: [],
 		chartSeq: 0,
-		...flow.charts ? { charts: flow.charts } : {}
+		...flow.charts ? { charts: flow.charts } : {},
+		...flow.faceFamilies ? { faceFamilies: flow.faceFamilies } : {},
+		familiesUsed: /* @__PURE__ */ new Map(),
+		zRanks: zRanksOf(flow)
 	};
 	const docScope = newScope();
 	const extraParts = [];
@@ -179,6 +185,17 @@ function writeDocx(flow) {
 	}, state, losses, docScope, extraParts, extraPartRels);
 	const commentParaIds = emitComments(flow.comments, state, losses, docScope, extraParts, extraPartRels);
 	emitCommentsExtended(flow.comments, commentParaIds, docScope, extraParts);
+	const fontTablePart = state.familiesUsed.size > 0 ? {
+		path: FONT_TABLE_PART,
+		data: encoder.encode(fontTableXml(state.familiesUsed)),
+		contentType: FONT_TABLE_CONTENT_TYPE
+	} : void 0;
+	if (fontTablePart) docScope.rels.push({
+		id: `rId${++docScope.relSeq}`,
+		type: REL_FONT_TABLE,
+		target: "fontTable.xml",
+		targetMode: "Internal"
+	});
 	const partRelationships = [...docScope.rels.length > 0 ? [{
 		sourcePart: "word/document.xml",
 		relationships: docScope.rels
@@ -192,6 +209,7 @@ function writeDocx(flow) {
 					contentType: DOC_CONTENT_TYPE
 				},
 				...numberingPart ? [numberingPart] : [],
+				...fontTablePart ? [fontTablePart] : [],
 				...extraParts,
 				...state.chartParts,
 				...state.mediaParts
@@ -207,6 +225,47 @@ function writeDocx(flow) {
 		losses
 	};
 }
+function fontTableXml(families) {
+	return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:fonts xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main">${[...families.values()].map((f) => `<w:font w:name="${escapeAttr(f.family)}"><w:family w:val="${f.generic}"/><w:pitch w:val="${f.generic === "modern" ? "fixed" : "variable"}"/></w:font>`).join("")}</w:fonts>`;
+}
+/**
+* §20.4.2.3 `relativeHeight` — a float's z-order, written the way Word writes
+* it: a rank over every z-order the document states, counted up from Word's
+* own floor.
+*
+* The model's z-order is an ORDER, and may be any number. Written as it stood,
+* a PDF's first two marks got 0 and 1 — which Word, and LibreOffice after it,
+* read as "above everything": an "APPROVED" stamp's blue box came back over
+* its own lettering. A tagged reading counts up from minus a million, and a
+* negative number is not a value the attribute admits at all.
+*/
+function relativeHeight(zOrder, state) {
+	const at = (zOrder !== void 0 ? state.zRanks.get(zOrder) : void 0) ?? state.zRanks.size + ++state.drawingSeq;
+	const step = Math.max(1, Math.min(Z_STEP, Math.floor((Z_CEILING - Z_FLOOR) / Z_ROOM)));
+	return Math.min(Z_FLOOR + at * step, Z_CEILING);
+}
+/** Word's first float, and the highest value §20.4.2.3 lets a float take. */
+var Z_FLOOR = 251658240;
+var Z_CEILING = 503316479;
+/** …and the step Word counts up in, while there is room for it. */
+var Z_STEP = 1024;
+var Z_ROOM = 1 << 17;
+/** Every z-order the document's floats state, and each one's rank among them. */
+function zRanksOf(flow) {
+	const seen = /* @__PURE__ */ new Set();
+	const visit = (blocks) => {
+		for (const el of blocks) {
+			const z = el.kind === "image" ? el.image.float?.zOrder : el.kind === "shape" ? el.shape.float?.zOrder : el.kind === "chart" ? el.chart.float?.zOrder : void 0;
+			if (z !== void 0 && Number.isFinite(z)) seen.add(z);
+			if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
+		}
+	};
+	visit(flow.body);
+	for (const band of flow.headersFooters?.values() ?? []) visit(band);
+	for (const note of flow.footnotes?.values() ?? []) visit(note);
+	for (const note of flow.endnotes?.values() ?? []) visit(note);
+	return new Map([...seen].sort((a, b) => a - b).map((z, i) => [z, i]));
+}
 function emitNotes(notes, cfg, state, losses, docScope, extraParts, extraPartRels) {
 	if (!notes || notes.size === 0) return;
 	const scope = newScope();
@@ -388,14 +447,17 @@ var docxWriter = {
 */
 function emitBody(out, blocks, losses, state, scope, sectPrByClosingIndex) {
 	let carried = [];
+	let carrier;
 	const flush = () => {
-		if (carried.length > 0) out.push(`<w:p>${carried.join("")}</w:p>`);
+		if (carried.length > 0) out.push(`<w:p>${pPrWithSect(carrier ?? {})}${carried.join("")}</w:p>`);
 		carried = [];
+		carrier = void 0;
 	};
 	blocks.forEach((el, idx) => {
 		const closing = sectPrByClosingIndex.get(idx);
 		const anchored = closing === void 0 ? floatingDrawingRun(el, losses, state, scope) : void 0;
 		if (anchored !== void 0) {
+			carrier ??= el.kind === "image" ? el.image.paragraphProperties : el.kind === "shape" ? el.shape.paragraphProperties : void 0;
 			carried.push(anchored);
 			return;
 		}
@@ -411,7 +473,7 @@ function emitBody(out, blocks, losses, state, scope, sectPrByClosingIndex) {
 */
 function floatingDrawingRun(el, losses, state, scope) {
 	if (el.kind === "image" && el.image.float) {
-		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float);
+		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float, el.image);
 		if (drawing === "") {
 			losses.push({
 				severity: "dropped",
@@ -435,7 +497,7 @@ function emitBlock(out, el, losses, state, scope, closingSectPr) {
 		return;
 	}
 	if (el.kind === "image") {
-		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float);
+		const drawing = drawingXml(el.image.resource, el.image.width, el.image.height, el.image.altText, state, scope, el.image.float, el.image);
 		if (drawing) out.push(`<w:p>${pPrWithSect(el.image.paragraphProperties, closingSectPr)}<w:r>${drawing}</w:r></w:p>`);
 		else {
 			losses.push({
@@ -514,7 +576,7 @@ function drawingFrame(float, cx, cy, head, graphic, state, rotation60k) {
 	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))}"`;
-	const z = float.zOrder ?? ++state.drawingSeq;
+	const z = relativeHeight(float.zOrder, state);
 	const attrs = `${dist} simplePos="0" relativeHeight="${String(z)}" behindDoc="${float.behind ? "1" : "0"}" locked="0" layoutInCell="${float.inCell === false ? "0" : "1"}" allowOverlap="1"`;
 	const pos = (tag, p, fallback) => {
 		const from = p?.relativeFrom ?? fallback;
@@ -550,7 +612,7 @@ function effectExtentXml(cx, cy, rotation60k) {
 	const v = overhang(cy, cx * s + cy * c);
 	return h === 0 && v === 0 ? none : `<wp:effectExtent l="${String(h)}" t="${String(v)}" r="${String(h)}" b="${String(v)}"/>`;
 }
-function drawingXml(resource, widthPt, heightPt, altText, state, scope, float) {
+function drawingXml(resource, widthPt, heightPt, altText, state, scope, float, look) {
 	if (resource === void 0) return "";
 	const relId = mediaRelId(resource, state, scope);
 	if (relId === void 0) return "";
@@ -558,8 +620,15 @@ function drawingXml(resource, widthPt, heightPt, altText, state, scope, float) {
 	const cy = Math.round(heightPt * EMU_PER_PT);
 	const id = ++state.drawingSeq;
 	const descr = altText ? ` descr="${escapeAttr(altText)}"` : "";
-	const graphic = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="${id}" name="Image ${id}"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${relId}"/><a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${cx}" cy="${cy}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic>`;
-	return drawingFrame(float, cx, cy, `<wp:docPr id="${id}" name="Image ${id}"${descr}/>`, graphic, state);
+	const graphic = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"><pic:nvPicPr><pic:cNvPr id="${id}" name="Image ${id}"/><pic:cNvPicPr/></pic:nvPicPr><pic:blipFill><a:blip r:embed="${relId}">${look?.alpha !== void 0 && look.alpha < 1 ? `<a:alphaModFix amt="${String(Math.round(Math.max(0, look.alpha) * 1e5))}"/>` : ""}</a:blip>${srcRectXml(look?.crop)}<a:stretch><a:fillRect/></a:stretch></pic:blipFill><pic:spPr>${xfrmXml(look, cx, cy)}<a:prstGeom prst="rect"><a:avLst/></a:prstGeom></pic:spPr></pic:pic></a:graphicData></a:graphic>`;
+	return drawingFrame(float, cx, cy, `<wp:docPr id="${id}" name="Image ${id}"${descr}/>`, graphic, state, look?.rotation60k);
+}
+/** §20.1.8.55 `a:srcRect` — each edge cut away, in thousandths of a percent. */
+function srcRectXml(crop) {
+	if (!crop) return "";
+	const edge = (name, v) => v > 0 ? ` ${name}="${String(Math.round(v * 1e5))}"` : "";
+	const attrs = edge("l", crop.left) + edge("t", crop.top) + edge("r", crop.right) + edge("b", crop.bottom);
+	return attrs === "" ? "" : `<a:srcRect${attrs}/>`;
 }
 var WPS_URI = "http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
 function shapeDrawingXml(shape, losses, state, scope) {
@@ -624,13 +693,24 @@ function geomXml(g) {
 	return `<a:prstGeom prst="${escapeAttr(g.preset ?? "rect")}"><a:avLst>${gds}</a:avLst></a:prstGeom>`;
 }
 function fillXml(f) {
-	if (f.kind === "solid" && f.colorHex) return `<a:solidFill><a:srgbClr val="${f.colorHex}"/></a:solidFill>`;
-	if (f.kind === "gradient" && f.gradient) return gradFillXml(f.gradient);
+	if (f.kind === "solid" && f.colorHex) return `<a:solidFill>${srgbXml(f.colorHex, f.alpha)}</a:solidFill>`;
+	if (f.kind === "gradient" && f.gradient) return gradFillXml(f.gradient, f.alpha);
 	return "<a:noFill/>";
 }
-function gradFillXml(g) {
+/**
+* §20.1.2.3.19 `a:srgbClr`, with the §20.1.2.3.1 `a:alpha` of a fill that is
+* seen through. The model carried the opacity and the writer dropped it:
+* bug1755507.pdf lays a card on a shadow painted at a fifth of full strength,
+* and the shadow came back as a solid black slab around the card.
+*/
+function srgbXml(colorHex, alpha) {
+	if (alpha === void 0 || !(alpha < 1)) return `<a:srgbClr val="${colorHex}"/>`;
+	const val = Math.round(Math.max(0, alpha) * 1e5);
+	return `<a:srgbClr val="${colorHex}"><a:alpha val="${String(val)}"/></a:srgbClr>`;
+}
+function gradFillXml(g, alpha) {
 	return `<a:gradFill><a:gsLst>${g.stops.map((s) => {
-		return `<a:gs pos="${Math.round(Math.max(0, Math.min(1, s.offset)) * 1e5)}"><a:srgbClr val="${s.colorHex}"/></a:gs>`;
+		return `<a:gs pos="${Math.round(Math.max(0, Math.min(1, s.offset)) * 1e5)}">${srgbXml(s.colorHex, alpha)}</a:gs>`;
 	}).join("")}</a:gsLst>${g.kind === "radial" ? "<a:path path=\"circle\"/>" : `<a:lin ang="${Math.round(((g.angle ?? 0) % 360 + 360) % 360 * 6e4)}" scaled="1"/>`}</a:gradFill>`;
 }
 function lineXml(l) {
@@ -638,8 +718,13 @@ function lineXml(l) {
 	const cap = l.cap === "round" ? " cap=\"rnd\"" : l.cap === "square" ? " cap=\"sq\"" : l.cap === "flat" ? " cap=\"flat\"" : "";
 	const inner = [];
 	if (l.fill === "none") inner.push("<a:noFill/>");
-	else if (l.colorHex) inner.push(`<a:solidFill><a:srgbClr val="${l.colorHex}"/></a:solidFill>`);
-	if (l.dash) inner.push(`<a:prstDash val="${l.dash}"/>`);
+	else if (l.colorHex) inner.push(`<a:solidFill>${srgbXml(l.colorHex, l.alpha)}</a:solidFill>`);
+	const custom = l.customDash ?? [];
+	if (custom.length >= 2) {
+		const pairs = [];
+		for (let i = 0; i + 1 < custom.length; i += 2) pairs.push(`<a:ds d="${Math.round(custom[i] * 1e5)}" sp="${Math.round(custom[i + 1] * 1e5)}"/>`);
+		inner.push(`<a:custDash>${pairs.join("")}</a:custDash>`);
+	} else if (l.dash) inner.push(`<a:prstDash val="${l.dash}"/>`);
 	return `<a:ln${w}${cap}>${inner.join("")}</a:ln>`;
 }
 function txbxXml(text, losses, state, scope) {
@@ -704,6 +789,7 @@ function tblPrXml(p) {
 	if (p.alignment && p.alignment !== "left") out.push(`<w:jc w:val="${p.alignment}"/>`);
 	const borders = bordersXml("w:tblBorders", p.borders);
 	if (borders) out.push(borders);
+	if (p.layout === "fixed") out.push("<w:tblLayout w:type=\"fixed\"/>");
 	const margins = cellMarginsXml("w:tblCellMar", p.defaultCellMargins);
 	if (margins) out.push(margins);
 	return `<w:tblPr>${out.join("")}</w:tblPr>`;
@@ -747,9 +833,11 @@ var BORDER_SIDES = [
 ];
 function bordersXml(tag, borders) {
 	if (!borders) return "";
-	const sides = BORDER_SIDES.map(([key, el]) => {
+	const sides = BORDER_SIDES.map(([key, name]) => {
 		const b = borders[key];
 		if (!b) return "";
+		if (tag === "w:pBdr" && key === "insideV") return "";
+		const el = tag === "w:pBdr" && key === "insideH" ? "w:between" : name;
 		const sz = b.width !== void 0 ? ` w:sz="${Math.round(b.width * 8)}"` : "";
 		const color = b.colorHex !== void 0 ? ` w:color="${b.colorHex}"` : "";
 		return `<${el} w:val="${b.style}"${sz}${color}/>`;
@@ -809,10 +897,10 @@ function hyperlinkXml(run, inner, _state, scope) {
 }
 function runXml(run, state, scope) {
 	if (run.math !== void 0) return `<m:oMath xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">${omathXml(run.math)}</m:oMath>`;
-	const rPr = rPrXml(run.properties);
+	const rPr = rPrXml(run.properties, state);
 	if (run.inlineImage !== void 0) {
 		const img = run.inlineImage;
-		const drawing = drawingXml(img.resource, img.width, img.height, void 0, state, scope);
+		const drawing = drawingXml(img.resource, img.width, img.height, void 0, state, scope, void 0, img);
 		if (drawing) return `<w:r>${rPr}${drawing}</w:r>`;
 		if (run.text === "" && !run.pageBreak) return "";
 	}
@@ -822,22 +910,25 @@ function runXml(run, state, scope) {
 	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}`;
+		const piece = (inner) => `<w:r>${rPr}${inner}</w:r>`;
+		return piece("<w:fldChar w:fldCharType=\"begin\"/>") + piece(`<w:instrText xml:space="preserve"> ${run.field} </w:instrText>`) + piece("<w:fldChar w:fldCharType=\"separate\"/>") + piece(`<w:t xml:space="preserve">${escapeXml(run.text)}</w:t>`) + piece("<w:fldChar w:fldCharType=\"end\"/>") + brk;
 	}
 	if (run.text === "") return brk ? `<w:r>${rPr}${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) {
+function rPrXml(r, state) {
 	const out = [];
 	const states = (key) => r[key] !== void 0 && r[key] !== DEFAULT_RUN[key];
-	const fonts = rFontsXml(r.fontFamily);
+	const fonts = rFontsXml(r.fontFamily, state);
 	if (fonts) out.push(fonts);
-	if (states("bold")) out.push(toggle("w:b", r.bold));
-	if (states("italic")) out.push(toggle("w:i", r.italic));
+	if (states("bold")) out.push(toggle("w:b", r.bold), toggle("w:bCs", r.bold));
+	if (states("italic")) out.push(toggle("w:i", r.italic), toggle("w:iCs", 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("fontSizePt")) {
+		const half = Math.round(r.fontSizePt * 2);
+		out.push(`<w:sz w:val="${half}"/>`, `<w:szCs w:val="${half}"/>`);
+	}
 	if (states("underline")) out.push(underlineXml(r));
 	if (r.shadingColorHex !== void 0) out.push(runShdXml(r.shadingColorHex));
 	if (states("verticalAlign")) out.push(`<w:vertAlign w:val="${r.verticalAlign}"/>`);
@@ -854,15 +945,8 @@ function runShdXml(fill) {
 }
 function pPrBody(p) {
 	const out = [];
-	if (p.numbering) out.push(`<w:numPr><w:ilvl w:val="${p.numbering.ilvl}"/><w:numId w:val="${escapeAttr(p.numbering.numId)}"/></w:numPr>`);
-	if (p.outlineLevel !== void 0) out.push(`<w:outlineLvl w:val="${p.outlineLevel}"/>`);
 	if (p.pageBreakBefore) out.push("<w:pageBreakBefore/>");
-	if (p.bidi !== DEFAULT_PARA.bidi) out.push(toggle("w:bidi", p.bidi));
-	const ind = indXml(p);
-	if (ind) out.push(ind);
-	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}"/>`);
+	if (p.numbering) out.push(`<w:numPr><w:ilvl w:val="${p.numbering.ilvl}"/><w:numId w:val="${escapeAttr(p.numbering.numId)}"/></w:numPr>`);
 	const pBdr = bordersXml("w:pBdr", p.borders);
 	if (pBdr) out.push(pBdr);
 	const tabs = p.tabs ?? [];
@@ -874,6 +958,13 @@ function pPrBody(p) {
 		}).join("");
 		out.push(`<w:tabs>${stops}</w:tabs>`);
 	}
+	if (p.bidi !== void 0 && p.bidi !== DEFAULT_PARA.bidi) out.push(toggle("w:bidi", p.bidi));
+	const spacing = spacingXml(p);
+	if (spacing) out.push(spacing);
+	const ind = indXml(p);
+	if (ind) out.push(ind);
+	if (JC.has(p.alignment) && p.alignment !== DEFAULT_PARA.alignment) out.push(`<w:jc w:val="${p.alignment}"/>`);
+	if (p.outlineLevel !== void 0) out.push(`<w:outlineLvl w:val="${p.outlineLevel}"/>`);
 	return out.join("");
 }
 function pPrWithSect(p, closingSectPr) {
@@ -920,12 +1011,22 @@ function spacingXml(p) {
 	}
 	return attrs.length > 0 ? `<w:spacing ${attrs.join(" ")}/>` : "";
 }
-function rFontsXml(fonts) {
+function rFontsXml(fonts, state) {
+	if (fonts === void 0) return "";
 	const d = DEFAULT_RUN.fontFamily;
+	const family = (name) => {
+		const known = state?.faceFamilies?.get(name);
+		if (known === void 0) return name;
+		state?.familiesUsed.set(known.family, known);
+		return known.family;
+	};
 	const attrs = [];
-	if (fonts.ascii && fonts.ascii !== d.ascii) attrs.push(`w:ascii="${escapeAttr(fonts.ascii)}"`);
-	if (fonts.hAnsi && fonts.hAnsi !== d.hAnsi) attrs.push(`w:hAnsi="${escapeAttr(fonts.hAnsi)}"`);
-	if (fonts.cs && fonts.cs !== d.cs) attrs.push(`w:cs="${escapeAttr(fonts.cs)}"`);
+	if (fonts.ascii && fonts.ascii !== d.ascii) attrs.push(`w:ascii="${escapeAttr(family(fonts.ascii))}"`);
+	if (fonts.hAnsi && fonts.hAnsi !== d.hAnsi) attrs.push(`w:hAnsi="${escapeAttr(family(fonts.hAnsi))}"`);
+	const face = fonts.ascii !== void 0 && state?.faceFamilies?.has(fonts.ascii) === true ? family(fonts.ascii) : void 0;
+	if (face !== void 0 && fonts.eastAsia === void 0) attrs.push(`w:eastAsia="${escapeAttr(face)}"`);
+	if (fonts.cs && fonts.cs !== d.cs) attrs.push(`w:cs="${escapeAttr(family(fonts.cs))}"`);
+	else if (face !== void 0) attrs.push(`w:cs="${escapeAttr(face)}"`);
 	return attrs.length > 0 ? `<w:rFonts ${attrs.join(" ")}/>` : "";
 }
 function toggle(tag, on) {

package/dist/esm/word/drawing-parser.js

@@ -2128,13 +2128,17 @@ function parseLine(spPr, resolveColor) {
 	const cap = capRaw === "rnd" ? "round" : capRaw === "sq" ? "square" : capRaw === "flat" ? "flat" : void 0;
 	let noFill = false;
 	let colorHex;
+	let alpha;
 	let dash;
 	let customDash;
 	let headEnd;
 	let tailEnd;
 	for (const c of poChildren(ln)) if (poIs(c, "a:noFill")) noFill = true;
-	else if (poIs(c, "a:solidFill")) colorHex = colorFromContainer(c, resolveColor);
-	else if (poIs(c, "a:prstDash")) dash = normalizeDash(poAttr(c, "val"));
+	else if (poIs(c, "a:solidFill")) {
+		alpha = containerAlpha(c);
+		const hex = colorFromContainer(c, resolveColor);
+		colorHex = hex !== void 0 && alpha !== void 0 ? unblendWhite(hex, alpha) : hex;
+	} else if (poIs(c, "a:prstDash")) dash = normalizeDash(poAttr(c, "val"));
 	else if (poIs(c, "a:custDash")) customDash = parseCustDash(c);
 	else if (poIs(c, "a:headEnd")) headEnd = parseLineEnd(c);
 	else if (poIs(c, "a:tailEnd")) tailEnd = parseLineEnd(c);
@@ -2145,6 +2149,7 @@ function parseLine(spPr, resolveColor) {
 		...customDash && customDash.length > 0 ? { customDash } : {},
 		...cap ? { cap } : {},
 		...noFill ? { fill: "none" } : {},
+		...alpha !== void 0 && alpha < 1 ? { alpha } : {},
 		...headEnd ? { headEnd } : {},
 		...tailEnd ? { tailEnd } : {}
 	};

package/dist/esm/word/paragraph-properties.js

@@ -271,10 +271,12 @@ function parseParagraphBorders(node) {
 	const bottom = edge("w:bottom");
 	const left = edge("w:left", "w:start");
 	const right = edge("w:right", "w:end");
+	const between = edge("w:between");
 	if (top) out.top = top;
 	if (bottom) out.bottom = bottom;
 	if (left) out.left = left;
 	if (right) out.right = right;
+	if (between) out.insideH = between;
 	return Object.keys(out).length > 0 ? out : void 0;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.29.0",
+  "version": "1.30.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>",
@@ -63,8 +63,8 @@
     "typecheck": "tsc -p tsconfig.eslint.json --noEmit",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/**/*.ts\"",
-    "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/**/*.ts\"",
+    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/**/*.ts\" \"stand/**/*.ts\"",
+    "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\" \"scripts/**/*.ts\" \"stand/**/*.ts\"",
     "corpus:build": "tsx scripts/corpus/build-corpus.ts",
     "corpus:fetch": "tsx scripts/corpus/fetch-corpus.ts",
     "corpus:sandbox:build": "docker build -t docgen-losandbox:latest scripts/corpus/sandbox/",
@@ -77,6 +77,8 @@
     "corpus:visual": "tsx scripts/corpus/visual-diff.ts",
     "corpus:scout": "tsx scripts/corpus/scout.ts",
     "corpus:pixel": "tsx scripts/corpus/pixel-scout.ts",
+    "stand": "tsx stand/serve.ts",
+    "stand:build": "tsx stand/build.ts",
     "typecheck:dist": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {