reamkit 1.23.0 → 1.25.0

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

@@ -50,6 +50,10 @@ var RASTER_MEDIA = {
 	gif: {
 		ext: "gif",
 		contentType: "image/gif"
+	},
+	bmp: {
+		ext: "bmp",
+		contentType: "image/bmp"
 	}
 };
 function mediaInfo(bytes) {
@@ -523,6 +527,16 @@ function tableXml(table, losses, state, scope) {
 	const rows = table.rows.map((row) => rowXml(row, losses, state, scope)).join("");
 	return `<w:tbl>${tblPrXml(table.properties)}<w:tblGrid>${grid}</w:tblGrid>${rows}</w:tbl>`;
 }
+/**
+* §17.4.60 — `w:tblPr`. CT_Tbl declares it `minOccurs="1"`: a table states its
+* properties even when it has none to state, and Word refuses to open a file
+* whose `w:tbl` opens straight into its grid. Nothing else in the wild writes
+* one without it — 5432 tables across the LibreOffice, Word and POI corpora,
+* every one of them with a `w:tblPr` — and it went unnoticed here because a
+* table read from a real document always carries SOMETHING (a width, a border,
+* an alignment). One reconstructed from a PDF's glyph positions carries none of
+* it, so `Ream.parse(pdf).convert('docx')` wrote a document Word turned away.
+*/
 function tblPrXml(p) {
 	const out = [];
 	if (p.widthType !== void 0) {
@@ -534,7 +548,7 @@ function tblPrXml(p) {
 	if (borders) out.push(borders);
 	const margins = cellMarginsXml("w:tblCellMar", p.defaultCellMargins);
 	if (margins) out.push(margins);
-	return out.length > 0 ? `<w:tblPr>${out.join("")}</w:tblPr>` : "";
+	return `<w:tblPr>${out.join("")}</w:tblPr>`;
 }
 function rowXml(row, losses, state, scope) {
 	const trPr = [];

package/dist/esm/word/drawing-parser.d.ts

@@ -157,6 +157,26 @@ export declare function parseVmlPicture(node: PoNode, parseBody?: ParseBody): Dr
  * @returns The fill.
  */
 export declare function vmlFill(shape: PoNode, shapeType?: PoNode, resolveImage?: (id: string) => ResourceId | undefined): ShapeFill;
+/**
+ * §20.1.8.55 `a:srcRect` — the picture's own edges, cut away before it is
+ * fitted to its frame. Each is a percentage in thousandths (ST_Percentage), so
+ * `l="14711"` drops the left 14.711%.
+ *
+ * @param node The `a:srcRect` element, or `undefined` when the fill declares none.
+ * @returns The crop, or `undefined` when nothing is cut away.
+ */
+export declare function parseSrcRect(node: PoNode | undefined): ImageCrop | undefined;
+/**
+ * The fill with the direction the SHAPE states, where it states one and no
+ * colours: §20.1.8.33's `a:gradFill` holding only an `a:lin` says "sweep the
+ * gallery style's run of colours this way". 63200.pptx's ellipse asks for the
+ * diagonal where the theme's slot sweeps straight down.
+ *
+ * @param fill The fill resolved from the style (or anywhere else).
+ * @param spPr The shape's own properties.
+ * @returns The fill, turned; unchanged when the shape states no bare direction.
+ */
+export declare function withStatedDirection(fill: ShapeFill, spPr: PoNode | undefined): ShapeFill;
 /**
  * Whether an `spPr` states a fill AT ALL — including `a:noFill`, which is a
  * shape saying it has none rather than saying nothing. A placeholder that says

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

@@ -1042,7 +1042,11 @@ function vmlTextBox(shape, parseBody) {
 	const content = box ? poFindDescendant(box, "w:txbxContent") : void 0;
 	if (!content) return void 0;
 	const blocks = parseBody(poChildren(content));
-	return blocks.length > 0 ? { content: blocks } : void 0;
+	if (blocks.length === 0) return void 0;
+	return {
+		content: blocks,
+		upright: true
+	};
 }
 /**
 * The `@style` of a positioned VML shape as a float anchor: `position:absolute`
@@ -1532,6 +1536,34 @@ var FILL_TAGS = new Set([
 	"a:pattFill",
 	"a:grpFill"
 ]);
+function emptyGradient(node) {
+	return poIs(node, "a:gradFill") && !poChildren(node).some((c) => poIs(c, "a:gsLst"));
+}
+/**
+* The fill with the direction the SHAPE states, where it states one and no
+* colours: §20.1.8.33's `a:gradFill` holding only an `a:lin` says "sweep the
+* gallery style's run of colours this way". 63200.pptx's ellipse asks for the
+* diagonal where the theme's slot sweeps straight down.
+*
+* @param fill The fill resolved from the style (or anywhere else).
+* @param spPr The shape's own properties.
+* @returns The fill, turned; unchanged when the shape states no bare direction.
+*/
+function withStatedDirection(fill, spPr) {
+	const gradient = fill.kind === "gradient" ? fill.gradient : void 0;
+	if (gradient === void 0 || gradient.kind !== "linear" || spPr === void 0) return fill;
+	const grad = poChildren(spPr).find((c) => emptyGradient(c));
+	const lin = grad ? poChildren(grad).find((c) => poIs(c, "a:lin")) : void 0;
+	const ang = lin ? poIntAttr(lin, "ang") : void 0;
+	if (ang === void 0) return fill;
+	return {
+		...fill,
+		gradient: {
+			...gradient,
+			angle: ang / 6e4 % 360
+		}
+	};
+}
 /**
 * Whether an `spPr` states a fill AT ALL — including `a:noFill`, which is a
 * shape saying it has none rather than saying nothing. A placeholder that says
@@ -1541,7 +1573,7 @@ var FILL_TAGS = new Set([
 * @returns Whether a fill element is present.
 */
 function statesFill(spPr) {
-	return spPr !== void 0 && poChildren(spPr).some((c) => FILL_TAGS.has(poTag(c) ?? ""));
+	return spPr !== void 0 && poChildren(spPr).some((c) => FILL_TAGS.has(poTag(c) ?? "") && !emptyGradient(c));
 }
 function styleRefFill(style, resolveColor, themeStyles) {
 	const ref = poChildren(style).find((c) => poIs(c, "a:fillRef"));
@@ -1625,11 +1657,13 @@ function parseTextBox(wsp, parseBody) {
 	const anchor = a === "ctr" ? "ctr" : a === "b" ? "b" : a === "t" ? "t" : void 0;
 	const v = bodyPr ? poAttr(bodyPr, "vert") : void 0;
 	const vertical = v === "vert270" ? "vert270" : v !== void 0 && v !== "horz" ? "vert" : void 0;
+	const upright = bodyPr !== void 0 && poAttr(bodyPr, "upright") === "1";
 	const autoFit = bodyPr !== void 0 && poChildren(bodyPr).some((c) => poIs(c, "a:spAutoFit"));
 	return {
 		content,
 		...chain ? { chain } : {},
 		...vertical ? { vertical } : {},
+		...upright ? { upright } : {},
 		...autoFit ? { autoFit: true } : {},
 		...lIns !== void 0 ? { insetLeft: emuToPt(lIns) } : {},
 		...tIns !== void 0 ? { insetTop: emuToPt(tIns) } : {},
@@ -1819,7 +1853,8 @@ function fillFromNode(child, resolveColor, resolveImage) {
 		const rect = fillRectBox(child);
 		const duotone = blip ? duotoneOf(blip, resolveColor) : void 0;
 		const tile = poChildren(child).find((c) => poIs(c, "a:tile"));
-		const tiled = tile !== void 0;
+		const stretched = poChildren(child).some((c) => poIs(c, "a:stretch"));
+		const tiled = tile !== void 0 || !stretched;
 		const tileScale = tile ? tileScaleOf(tile) : void 0;
 		const fixed = blip ? poChildren(blip).find((c) => poIs(c, "a:alphaModFix")) : void 0;
 		const amt = fixed ? poIntAttr(fixed, "amt") : void 0;
@@ -1981,6 +2016,10 @@ function nodeAlpha(color) {
 * @returns The pair, or `undefined` when the blip states no duotone.
 */
 function duotoneOf(blip, resolveColor) {
+	if (poChildren(blip).some((c) => poIs(c, "a:grayscl"))) return {
+		shadowHex: "000000",
+		highlightHex: "FFFFFF"
+	};
 	const duotone = poChildren(blip).find((c) => poIs(c, "a:duotone"));
 	if (!duotone) return void 0;
 	const [shadowHex, highlightHex] = poChildren(duotone).map((c) => resolveColorNode(c, resolveColor)).filter((hex) => hex !== void 0);
@@ -2286,7 +2325,7 @@ function parseGradient(grad, resolveColor) {
 		return {
 			kind: "radial",
 			stops,
-			...poAttr(path, "path") === "rect" ? { sweep: "rect" } : {},
+			...poAttr(path, "path") === "rect" || poAttr(path, "path") === "shape" ? { sweep: "rect" } : {},
 			...center ? { center } : {}
 		};
 	}
@@ -2302,4 +2341,4 @@ function clampUnit(x) {
 	return x < 0 ? 0 : x > 1 ? 1 : x;
 }
 //#endregion
-export { colorChangeOf, expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseVmlPicture, parseXfrm, shadowFromOuterShdw, statesFill, styleRefFill, styleRefFontColor, styleRefLine, vmlFill };
+export { colorChangeOf, expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseShadow, parseSrcRect, parseVmlPicture, parseXfrm, shadowFromOuterShdw, statesFill, styleRefFill, styleRefFontColor, styleRefLine, vmlFill, withStatedDirection };

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

@@ -353,6 +353,9 @@ function parseCellProperties(tcPr) {
 	}
 	const vAlign = poVal(poFirstChild(tcPr, "w:vAlign"));
 	if (vAlign === "center" || vAlign === "bottom" || vAlign === "top") out.verticalAlign = vAlign;
+	const dir = poVal(poFirstChild(tcPr, "w:textDirection"));
+	if (dir === "btLr" || dir === "tbLr") out.textDirection = "vert270";
+	else if (dir === "tbRl") out.textDirection = "vert";
 	if (poFirstChild(tcPr, "w:hideMark")) out.hideMark = true;
 	return {
 		properties: out,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.23.0",
+  "version": "1.25.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>",