reamkit 1.7.0 → 1.10.0

package/dist/esm/svg/svg-writer.js

@@ -1,5 +1,6 @@
 import { FEATURES } from "../core/ir/features.js";
 import { svgPathData } from "../core/vector.js";
+import { gradientSvgDef } from "../core/drawingml/shape-render.js";
 import { paintPlan } from "../layout/page-doc.js";
 import { toBase64 } from "../core/bytes.js";
 //#region src/svg/svg-writer.ts
@@ -12,10 +13,11 @@ function writeSvg(laid, opts = {}) {
 	const parts = [];
 	parts.push(`<svg xmlns="http://www.w3.org/2000/svg" width="${fmt(width)}" height="${fmt(height)}" viewBox="0 0 ${fmt(width)} ${fmt(height)}">`);
 	let yOffset = 0;
+	const idc = { n: 0 };
 	laid.pages.forEach((page, i) => {
 		parts.push(`<g transform="translate(0 ${fmt(yOffset)})" data-page="${i + 1}">`);
 		parts.push(`<rect x="0" y="0" width="${fmt(page.width)}" height="${fmt(page.height)}" fill="#ffffff" stroke="#cccccc"/>`);
-		emitPage(parts, page, laid, losses);
+		emitPage(parts, page, laid, losses, idc);
 		parts.push("</g>");
 		yOffset += page.height + gap;
 	});
@@ -36,7 +38,7 @@ var svgWriter = {
 	]),
 	write: (doc, opts) => writeSvg(doc, opts ?? {})
 };
-function emitPage(out, page, laid, losses) {
+function emitPage(out, page, laid, losses, idc) {
 	const plan = paintPlan(page.commands);
 	for (const f of plan.fills) out.push(`<rect x="${fmt(f.x)}" y="${fmt(f.y)}" width="${fmt(f.width)}" height="${fmt(f.height)}" fill="#${f.fillColorHex}"/>`);
 	for (const img of plan.images) {
@@ -71,7 +73,7 @@ function emitPage(out, page, laid, losses) {
 		];
 		out.push(`<line x1="${fmt(ax)}" y1="${fmt(ay)}" x2="${fmt(bx)}" y2="${fmt(by)}" stroke="#${b.borderColorHex}" stroke-width="${fmt(b.borderSizePt)}"/>`);
 	}
-	for (const sh of plan.shapes) emitShape(out, sh.shape);
+	for (const sh of plan.shapes) emitShape(out, sh.shape, idc);
 	for (const t of plan.lines) emitTextLine(out, t, losses);
 }
 function emitTextLine(out, item, losses) {
@@ -95,10 +97,15 @@ function emitTextLine(out, item, losses) {
 		x += tok.widthPt;
 	}
 }
-function emitShape(out, shape) {
+function emitShape(out, shape, idc) {
 	const [a, b, c, d, e, f] = shape.transform;
 	const transform = `matrix(${fmt(a)} ${fmt(b)} ${fmt(c)} ${fmt(d)} ${fmt(e)} ${fmt(f)})`;
-	const fill = shape.fillColorHex ? `#${shape.fillColorHex}` : "none";
+	let fill;
+	if (shape.fillGradient) {
+		const id = `grad${idc.n++}`;
+		out.push(gradientSvgDef(id, shape.fillGradient));
+		fill = `url(#${id})`;
+	} else fill = shape.fillColorHex ? `#${shape.fillColorHex}` : "none";
 	const stroke = shape.stroke ? ` stroke="#${shape.stroke.colorHex}" stroke-width="${fmt(shape.stroke.widthPt)}"` : "";
 	for (const path of shape.paths) {
 		const d2 = pathData(path.segments);

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

@@ -359,7 +359,14 @@ function geomXml(g) {
 	return `<a:prstGeom prst="${escapeAttr(g.preset ?? "rect")}"><a:avLst>${gds}</a:avLst></a:prstGeom>`;
 }
 function fillXml(f) {
-	return f.kind === "solid" && f.colorHex ? `<a:solidFill><a:srgbClr val="${f.colorHex}"/></a:solidFill>` : "<a:noFill/>";
+	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);
+	return "<a:noFill/>";
+}
+function gradFillXml(g) {
+	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>`;
+	}).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) {
 	const w = l.width !== void 0 ? ` w="${Math.round(l.width * EMU_PER_PT)}"` : "";

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

@@ -36,3 +36,7 @@ export declare function resolveMc(altContent: PoNode): ReadonlyArray<PoNode>;
 export declare function expandMcChildren(children: ReadonlyArray<PoNode>): Array<PoNode>;
 export declare function parseDrawing(drawing: PoNode, resolveColor: ColorResolver, parseBody?: ParseBody): DrawingContent | null;
 export declare function parseVmlPicture(node: PoNode): DrawingContent | null;
+export declare function parsePrstGeom(prst: PoNode): ShapeGeometry;
+export declare function parseCustGeom(cust: PoNode): ShapeGeometry;
+export declare function parseFill(spPr: PoNode, resolveColor: ColorResolver): ShapeFill;
+export declare function parseLine(spPr: PoNode, resolveColor: ColorResolver): ShapeLine | undefined;

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

@@ -353,10 +353,10 @@ function parseFill(spPr, resolveColor) {
 			} : { kind: "none" };
 		}
 		if (poIs(child, "a:gradFill")) {
-			const hex = colorFromGradient(child, resolveColor);
-			return hex ? {
-				kind: "solid",
-				colorHex: hex
+			const gradient = parseGradient(child, resolveColor);
+			return gradient ? {
+				kind: "gradient",
+				gradient
 			} : { kind: "none" };
 		}
 	}
@@ -404,13 +404,10 @@ function colorFromContainer(parent, resolveColor) {
 		if (hex) return hex;
 	}
 }
-function colorFromGradient(grad, resolveColor) {
+function parseGradient(grad, resolveColor) {
 	const gsLst = poChildren(grad).find((c) => poIs(c, "a:gsLst"));
 	if (!gsLst) return void 0;
-	let r = 0;
-	let g = 0;
-	let b = 0;
-	let n = 0;
+	const stops = [];
 	for (const gs of poChildren(gsLst)) {
 		if (!poIs(gs, "a:gs")) continue;
 		let hex;
@@ -419,15 +416,29 @@ function colorFromGradient(grad, resolveColor) {
 			if (hex) break;
 		}
 		if (!hex) continue;
-		const num = parseInt(hex, 16);
-		r += num >> 16 & 255;
-		g += num >> 8 & 255;
-		b += num & 255;
-		n++;
+		const pos = poIntAttr(gs, "pos");
+		const offset = pos !== void 0 ? clampUnit(pos / 1e5) : stops.length === 0 ? 0 : 1;
+		stops.push({
+			offset,
+			colorHex: hex
+		});
 	}
-	if (n === 0) return void 0;
-	const toHex = (x) => Math.round(x / n).toString(16).padStart(2, "0");
-	return (toHex(r) + toHex(g) + toHex(b)).toUpperCase();
+	if (stops.length === 0) return void 0;
+	stops.sort((a, b) => a.offset - b.offset);
+	if (poChildren(grad).some((c) => poIs(c, "a:path"))) return {
+		kind: "radial",
+		stops
+	};
+	const lin = poChildren(grad).find((c) => poIs(c, "a:lin"));
+	const ang = lin ? poIntAttr(lin, "ang") : void 0;
+	return {
+		kind: "linear",
+		angle: ang !== void 0 ? ang / 6e4 % 360 : 0,
+		stops
+	};
+}
+function clampUnit(x) {
+	return x < 0 ? 0 : x > 1 ? 1 : x;
 }
 //#endregion
-export { expandMcChildren, parseDrawing, parseVmlPicture };
+export { expandMcChildren, parseCustGeom, parseDrawing, parseFill, parseLine, parsePrstGeom, parseVmlPicture };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reamkit",
-  "version": "1.7.0",
-  "description": "Ream — convert DOCX, XLSX and PDF to PDF, SVG, HTML, DOCX and XLSX, built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
+  "version": "1.10.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>",
   "repository": {
@@ -38,6 +38,7 @@
   "keywords": [
     "docx",
     "xlsx",
+    "pptx",
     "pdf",
     "ooxml",
     "ecma-376",
@@ -46,6 +47,7 @@
     "office",
     "word",
     "excel",
+    "powerpoint",
     "converter"
   ],
   "scripts": {