reamkit 1.0.0 → 1.0.2

package/dist/esm/pdf/vector-graphics.d.ts

@@ -1,46 +1,4 @@
-export type PathSegment = {
-    readonly op: 'move';
-    readonly x: number;
-    readonly y: number;
-} | {
-    readonly op: 'line';
-    readonly x: number;
-    readonly y: number;
-} | {
-    readonly op: 'cubic';
-    readonly x1: number;
-    readonly y1: number;
-    readonly x2: number;
-    readonly y2: number;
-    readonly x: number;
-    readonly y: number;
-} | {
-    readonly op: 'close';
-};
-export interface VectorPath {
-    readonly segments: ReadonlyArray<PathSegment>;
-    readonly fillRule?: 'nonzero' | 'evenodd';
-}
-export interface StrokeStyle {
-    readonly colorHex: string;
-    readonly widthPt: number;
-    readonly cap?: 'butt' | 'round' | 'square';
-    readonly join?: 'miter' | 'round' | 'bevel';
-    readonly dash?: ReadonlyArray<number>;
-}
-export interface VectorShape {
-    readonly paths: ReadonlyArray<VectorPath>;
-    readonly fillColorHex?: string;
-    readonly stroke?: StrokeStyle;
-    readonly transform: readonly [number, number, number, number, number, number];
-}
-export declare class PathBuilder {
-    private readonly segments;
-    moveTo(x: number, y: number): this;
-    lineTo(x: number, y: number): this;
-    cubicTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): this;
-    append(segments: ReadonlyArray<PathSegment>): this;
-    close(): this;
-    build(fillRule?: 'nonzero' | 'evenodd'): VectorPath;
-}
+import { VectorShape } from '../core/vector.js';
+export type { PathSegment, StrokeStyle, VectorPath, VectorShape } from '../core/vector.js';
+export { PathBuilder } from '../core/vector.js';
 export declare function emitVectorShape(shape: VectorShape): Array<string>;

package/dist/esm/pdf/vector-graphics.js

@@ -1,49 +1,5 @@
+import "../core/vector.js";
 //#region src/pdf/vector-graphics.ts
-var PathBuilder = class {
-	segments = [];
-	moveTo(x, y) {
-		this.segments.push({
-			op: "move",
-			x,
-			y
-		});
-		return this;
-	}
-	lineTo(x, y) {
-		this.segments.push({
-			op: "line",
-			x,
-			y
-		});
-		return this;
-	}
-	cubicTo(x1, y1, x2, y2, x, y) {
-		this.segments.push({
-			op: "cubic",
-			x1,
-			y1,
-			x2,
-			y2,
-			x,
-			y
-		});
-		return this;
-	}
-	append(segments) {
-		for (const s of segments) this.segments.push(s);
-		return this;
-	}
-	close() {
-		this.segments.push({ op: "close" });
-		return this;
-	}
-	build(fillRule) {
-		return {
-			segments: this.segments.slice(),
-			...fillRule ? { fillRule } : {}
-		};
-	}
-};
 function emitVectorShape(shape) {
 	const out = [];
 	out.push("q");
@@ -100,4 +56,4 @@ function hexToRgb01(hex) {
 	];
 }
 //#endregion
-export { PathBuilder, emitVectorShape };
+export { emitVectorShape };

package/dist/esm/svg/svg-writer.d.ts

@@ -1,5 +1,5 @@
 import { DocumentWriter, WriteResult } from '../core/ir/adapters.js';
-import { LaidOutDocument } from '../pdf/styled-page-renderer.js';
+import { LaidOutDocument } from '../layout/page-doc.js';
 export interface SvgWriteOptions {
     /** Gap between stacked pages, in px/pt (default 12). */
     readonly pageGap?: number;

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

@@ -1,5 +1,5 @@
 import { FEATURES } from "../core/ir/features.js";
-import { paintPlan } from "../pdf/styled-page-renderer.js";
+import { paintPlan } from "../layout/page-doc.js";
 //#region src/svg/svg-writer.ts
 var PAGE_GAP = 12;
 function writeSvg(laid, opts = {}) {
@@ -35,18 +35,17 @@ var svgWriter = {
 	write: (doc, opts) => writeSvg(doc, opts ?? {})
 };
 function emitPage(out, page, laid, losses) {
-	const H = page.height;
 	const plan = paintPlan(page.commands);
-	for (const f of plan.fills) out.push(`<rect x="${fmt(f.x)}" y="${fmt(H - f.y - f.height)}" width="${fmt(f.width)}" height="${fmt(f.height)}" fill="#${f.fillColorHex}"/>`);
+	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) {
 		const href = imageHref(img.imageResourceName, laid);
 		if (!href) continue;
-		out.push(`<image x="${fmt(img.x)}" y="${fmt(H - img.y - img.height)}" width="${fmt(img.width)}" height="${fmt(img.height)}" href="${href}" preserveAspectRatio="none"/>`);
+		out.push(`<image x="${fmt(img.x)}" y="${fmt(img.y)}" width="${fmt(img.width)}" height="${fmt(img.height)}" href="${href}" preserveAspectRatio="none"/>`);
 	}
 	for (const b of plan.borders) {
 		const x2 = b.x + b.width;
-		const yTop = H - b.y - b.height;
-		const yBottom = H - b.y;
+		const yTop = b.y;
+		const yBottom = b.y + b.height;
 		const [ax, ay, bx, by] = b.side === "top" ? [
 			b.x,
 			yTop,
@@ -70,11 +69,11 @@ 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, H);
-	for (const t of plan.lines) emitTextLine(out, t, H, losses);
+	for (const sh of plan.shapes) emitShape(out, sh.shape);
+	for (const t of plan.lines) emitTextLine(out, t, losses);
 }
-function emitTextLine(out, item, pageHeight, losses) {
-	const y = pageHeight - item.baselineY;
+function emitTextLine(out, item, losses) {
+	const y = item.baselineY;
 	let x = item.originX;
 	for (const tok of item.line.tokens) {
 		if (tok.kind === "image") {
@@ -94,9 +93,9 @@ function emitTextLine(out, item, pageHeight, losses) {
 		x += tok.widthPt;
 	}
 }
-function emitShape(out, shape, pageHeight) {
+function emitShape(out, shape) {
 	const [a, b, c, d, e, f] = shape.transform;
-	const transform = `matrix(${fmt(a)} ${fmt(-b)} ${fmt(-c)} ${fmt(d)} ${fmt(e)} ${fmt(pageHeight - f)})`;
+	const transform = `matrix(${fmt(a)} ${fmt(b)} ${fmt(c)} ${fmt(d)} ${fmt(e)} ${fmt(f)})`;
 	const 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) {
@@ -107,9 +106,9 @@ function emitShape(out, shape, pageHeight) {
 }
 function pathData(segments) {
 	const parts = [];
-	for (const s of segments) if (s.op === "move") parts.push(`M ${fmt(s.x)} ${fmt(-s.y)}`);
-	else if (s.op === "line") parts.push(`L ${fmt(s.x)} ${fmt(-s.y)}`);
-	else if (s.op === "cubic") parts.push(`C ${fmt(s.x1)} ${fmt(-s.y1)} ${fmt(s.x2)} ${fmt(-s.y2)} ${fmt(s.x)} ${fmt(-s.y)}`);
+	for (const s of segments) if (s.op === "move") parts.push(`M ${fmt(s.x)} ${fmt(s.y)}`);
+	else if (s.op === "line") parts.push(`L ${fmt(s.x)} ${fmt(s.y)}`);
+	else if (s.op === "cubic") parts.push(`C ${fmt(s.x1)} ${fmt(s.y1)} ${fmt(s.x2)} ${fmt(s.y2)} ${fmt(s.x)} ${fmt(s.y)}`);
 	else parts.push("Z");
 	return parts.join(" ");
 }

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

@@ -1,6 +1,7 @@
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
-import { EMPTY_STYLE_SHEET } from "../core/style-cascade/resolver.js";
+import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numbering/apply.js";
+import { EMPTY_STYLE_SHEET, resolveBodyStyles, resolveHeadersFootersStyles } from "../core/style-cascade/resolver.js";
 import "../core/style-cascade/index.js";
 import { bytesInclude } from "../core/bytes.js";
 import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
@@ -66,11 +67,11 @@ function readDocx(docx) {
 	return {
 		doc: {
 			kind: "flow",
-			body,
+			body: resolveBodyStyles(applyNumbering(body, numbering), styles),
 			sections,
 			styles,
 			numbering,
-			headersFooters,
+			headersFooters: resolveHeadersFootersStyles(applyNumberingToHeadersFooters(headersFooters, numbering), styles),
 			charts,
 			resources,
 			...embeddedFonts.size > 0 ? { embeddedFonts } : {},

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "reamkit",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Ream — DOCX/XLSX to PDF (and SVG), built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
-  "author": "Alex Krassavin",
+  "author": "Alex Krassavin <info@reamkit.dev>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/alex-krassavin/reamkit.git"