reamkit 1.22.0 → 1.24.0

package/dist/esm/excel/xls/escher.js

@@ -1,3 +1,4 @@
+import { readEscherBlip } from "../../core/ole/escher-blip.js";
 //#region src/excel/xls/escher.ts
 var FBT_BSTORE_CONTAINER = 61441;
 var FBT_BSE = 61447;
@@ -6,6 +7,7 @@ var FBT_OPT = 61451;
 var FBT_CLIENT_ANCHOR = 61456;
 var PROP_PIB = 260;
 var MAX_DEPTH = 24;
+var BSE_HEADER_BYTES = 36;
 function* records(d) {
 	let off = 0;
 	while (off + 8 <= d.length) {
@@ -37,7 +39,11 @@ function parseBlipStore(msoDrawingGroup) {
 	const store = findContainer(msoDrawingGroup, FBT_BSTORE_CONTAINER, 0);
 	if (!store) return [];
 	const out = [];
-	for (const r of records(store)) if (r.type === FBT_BSE) out.push(findImageBytes(r.data));
+	for (const r of records(store)) {
+		if (r.type !== FBT_BSE) continue;
+		const nested = [...records(r.data.subarray(BSE_HEADER_BYTES))][0];
+		out.push(nested ? readEscherBlip(nested.type, nested.instance, nested.data) ?? findImageBytes(r.data) : findImageBytes(r.data));
+	}
 	return out;
 }
 function findContainer(d, type, depth) {
@@ -74,6 +80,9 @@ function collectPictures(d, out, depth) {
 }
 var FBT_SP = 61450;
 var FBT_CLIENT_TEXTBOX = 61453;
+var FBT_SPGR_CONTAINER = 61443;
+var FBT_SPGR = 61449;
+var FBT_CHILD_ANCHOR = 61455;
 var PROP_FILL_COLOR = 385;
 var PROP_LINE_COLOR = 448;
 /**
@@ -86,30 +95,84 @@ function parseSheetShapes(msoDrawing) {
 	collectShapes(msoDrawing, out, 0);
 	return out;
 }
-function collectShapes(d, out, depth) {
+function collectShapes(d, out, depth, group) {
 	if (depth > MAX_DEPTH) return;
-	for (const r of records(d)) if (r.type === FBT_SP_CONTAINER) {
-		let shapeType = 0;
-		let hasText = false;
-		let pib;
-		let anchor;
-		let fill;
-		let line;
-		for (const child of records(r.data)) if (child.type === FBT_SP) shapeType = child.instance;
-		else if (child.type === FBT_OPT) {
-			pib = optProperty(child.data, child.instance, PROP_PIB);
-			fill = optColor(child.data, child.instance, PROP_FILL_COLOR);
-			line = optColor(child.data, child.instance, PROP_LINE_COLOR);
-		} else if (child.type === FBT_CLIENT_ANCHOR) anchor = parseAnchor(child.data);
-		else if (child.type === FBT_CLIENT_TEXTBOX) hasText = true;
-		if (pib === void 0 && shapeType !== 0) out.push({
-			shapeType,
-			hasText,
-			...anchor ? { anchor } : {},
-			...fill ? { fillColorHex: fill } : {},
-			...line ? { lineColorHex: line } : {}
-		});
-	} else if (r.isContainer) collectShapes(r.data, out, depth + 1);
+	for (const r of records(d)) {
+		if (r.type === FBT_SPGR_CONTAINER) {
+			collectShapes(r.data, out, depth + 1, groupFrame(r.data) ?? group);
+			continue;
+		}
+		if (r.type === FBT_SP_CONTAINER) {
+			let shapeType = 0;
+			let hasText = false;
+			let pib;
+			let anchor;
+			let fill;
+			let line;
+			for (const child of records(r.data)) if (child.type === FBT_SP) shapeType = child.instance;
+			else if (child.type === FBT_OPT) {
+				pib = optProperty(child.data, child.instance, PROP_PIB);
+				fill = optColor(child.data, child.instance, PROP_FILL_COLOR);
+				line = optColor(child.data, child.instance, PROP_LINE_COLOR);
+			} else if (child.type === FBT_CLIENT_ANCHOR) anchor = parseAnchor(child.data);
+			else if (child.type === FBT_CHILD_ANCHOR && group) anchor = childAnchor(child.data, group);
+			else if (child.type === FBT_CLIENT_TEXTBOX) hasText = true;
+			if (pib === void 0 && shapeType !== 0) out.push({
+				shapeType,
+				hasText,
+				...anchor ? { anchor } : {},
+				...fill ? { fillColorHex: fill } : {},
+				...line ? { lineColorHex: line } : {}
+			});
+		} else if (r.isContainer) collectShapes(r.data, out, depth + 1, group);
+	}
+}
+function groupFrame(spgrData) {
+	const sp = [...records(spgrData)].find((r) => r.type === FBT_SP_CONTAINER);
+	if (!sp) return void 0;
+	let box;
+	let anchor;
+	for (const child of records(sp.data)) if (child.type === FBT_SPGR && child.data.length >= 16) {
+		const x = i32(child.data, 0);
+		const y = i32(child.data, 4);
+		box = {
+			x,
+			y,
+			w: i32(child.data, 8) - x,
+			h: i32(child.data, 12) - y
+		};
+	} else if (child.type === FBT_CLIENT_ANCHOR) anchor = parseAnchor(child.data);
+	if (!box || !anchor || box.w <= 0 || box.h <= 0) return void 0;
+	return {
+		anchor,
+		...box
+	};
+}
+function childAnchor(d, g) {
+	if (d.length < 16) return void 0;
+	const from = (v, lo, hi, min, size) => lo + (v - min) / size * (hi - lo);
+	const x1 = g.anchor.col1 + g.anchor.dx1 / 1024;
+	const x2 = g.anchor.col2 + g.anchor.dx2 / 1024;
+	const y1 = g.anchor.row1 + g.anchor.dy1 / 1024;
+	const y2 = g.anchor.row2 + g.anchor.dy2 / 1024;
+	const cell = (v) => {
+		const whole = Math.max(0, Math.min(65535, Math.floor(v)));
+		return [whole, Math.max(0, Math.min(1023, Math.round((v - whole) * 1024)))];
+	};
+	const [col1, dx1] = cell(from(i32(d, 0), x1, x2, g.x, g.w));
+	const [row1, dy1] = cell(from(i32(d, 4), y1, y2, g.y, g.h));
+	const [col2, dx2] = cell(from(i32(d, 8), x1, x2, g.x, g.w));
+	const [row2, dy2] = cell(from(i32(d, 12), y1, y2, g.y, g.h));
+	return {
+		col1,
+		dx1,
+		row1,
+		dy1,
+		col2,
+		dx2,
+		row2,
+		dy2
+	};
 }
 function optColor(d, count, wantId) {
 	const v = optProperty(d, count, wantId);
@@ -179,6 +242,9 @@ function matches(d, off, magic) {
 	for (let i = 0; i < magic.length; i++) if (d[off + i] !== magic[i]) return false;
 	return true;
 }
+function i32(d, off) {
+	return u32(d, off) | 0;
+}
 function u16(d, off) {
 	return (d[off] ?? 0) | (d[off + 1] ?? 0) << 8;
 }

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

@@ -653,7 +653,8 @@ var MIME_BY_FORMAT = {
 	png: "image/png",
 	jpeg2000: "image/jp2",
 	gif: "image/gif",
-	tiff: "image/tiff"
+	tiff: "image/tiff",
+	bmp: "image/bmp"
 };
 function dataUri(resource, store) {
 	if (resource === void 0) return void 0;

package/dist/esm/layout/page-doc.d.ts

@@ -17,6 +17,23 @@ export interface FontResource {
     /** Glyphs collected by the usage walk — the emit phase subsets to these. */
     readonly gids: ReadonlySet<number>;
 }
+/**
+ * The face a run asked for and the registry could not give — what the page has
+ * to draw itself. A font set carries only `regular` by contract, so a caller
+ * who supplies one file still asks for bold headings and italic quotes.
+ */
+export interface SyntheticFace {
+    /** No bold cut: the glyphs are stroked as well as filled. */
+    readonly bold?: true;
+    /** No italic cut: the glyphs are sheared. */
+    readonly italic?: true;
+    /**
+     * No condensed cut: the glyphs are set at this fraction of their advance
+     * (`Arial Narrow` is 82 % of Arial). Layout measures through it too — the
+     * squeeze decides where the line breaks, not just how it looks.
+     */
+    readonly widthScale?: number;
+}
 /** A run of text on a {@link Line}: the string plus its resolved font, size, width and link/tagging state. */
 export interface TextToken {
     readonly kind: 'text';
@@ -61,6 +78,8 @@ export interface TextToken {
     readonly highlight?: true;
     readonly resolvedRun: ResolvedRunProperties;
     readonly font: FontResource;
+    /** What the chosen face lacks and the emitter must fake (see {@link SyntheticFace}). */
+    readonly synthetic?: SyntheticFace;
     readonly fontSizePt: number;
     /**
      * §17.3.2.42 / §18.4.2 `vertAlign` — how far off the baseline this token
@@ -205,6 +224,19 @@ export interface MetafileDrawing {
         readonly y: number;
         readonly rotationDeg?: number;
     }>;
+    /**
+     * MS-EMF §2.3.1 — the bitmaps the picture blits into itself, each already a
+     * page resource of its own. `x`/`y` are the box's BOTTOM-left corner, in the
+     * same local frame as the shapes.
+     */
+    readonly images?: ReadonlyArray<{
+        readonly resourceName: string;
+        readonly x: number;
+        readonly y: number;
+        readonly width: number;
+        readonly height: number;
+        readonly rotationDeg?: number;
+    }>;
 }
 export interface ImageResource {
     readonly resourceName: string;
@@ -220,6 +252,13 @@ export interface ImageResource {
      * turns these into the same primitives a chart is made of.
      */
     readonly metafile?: MetaPicture;
+    /**
+     * The resource name of each bitmap `metafile` blits, in the order its
+     * primitives hold them. A metafile draws its own pictures, and each is an
+     * ordinary image resource — entered under a key of its own, so the emitters
+     * embed and name it without knowing where it came from.
+     */
+    readonly metafileImages?: ReadonlyArray<string>;
 }
 /**
  * The fields every {@link PageItem} shares (ir-design §6, frozen at stage 6.4):
@@ -287,6 +326,32 @@ export interface TextLineItem extends PageItemBase {
      * the plot's own tick labels. Absent ⇒ horizontal.
      */
     readonly rotationDeg?: number;
+    /**
+     * §20.1.9.10 `a:prstTxWarp` — the line is WordArt: each glyph is placed on
+     * its own, bent through the preset's curve and stretched onto the shape's
+     * box. Absent ⇒ the line is set flat, one text matrix for the whole of it.
+     */
+    readonly warp?: TextLineWarp;
+}
+/**
+ * What placing a warped line needs: the preset, the shape box the warped block
+ * is stretched onto, and the box the UN-warped block occupies — both in the
+ * page's top-left frame, so a glyph's position in the second maps straight into
+ * the first.
+ */
+export interface TextLineWarp {
+    readonly preset: string;
+    readonly adjust?: number;
+    readonly boxX: Pt;
+    readonly boxY: Pt;
+    readonly boxWidth: Pt;
+    readonly boxHeight: Pt;
+    /** The un-warped block's left edge and width (its widest line). */
+    readonly srcX: Pt;
+    readonly srcWidth: Pt;
+    /** The un-warped block's ink top and total ink height. */
+    readonly srcTop: Pt;
+    readonly srcHeight: Pt;
 }
 /** One edge of a table-cell frame; `(x, y)` is the cell box's top-left corner. */
 export interface BorderItem extends PageItemBase {
@@ -383,6 +448,15 @@ export interface PagePaintPlan {
      * per {@link PageItemBase.pictureId}. They paint where the shape pass does.
      */
     readonly pictures: ReadonlyArray<ReadonlyArray<PageItem>>;
+    /**
+     * §19.3.1 — the items of a page that STATES its own paint order, each run in
+     * the order it paints, the runs sorted by the order they were given. A slide
+     * is such a page: its shape tree is a z-order, and a picture standing after a
+     * rectangle in it is drawn over that rectangle. Split by kind instead — every
+     * image, then every shape — the six logos of 54542_cropped_bitmap.pptx were
+     * painted first and the six panels they sit on were painted over them.
+     */
+    readonly ordered: ReadonlyArray<ReadonlyArray<PageItem>>;
 }
 export declare function paintPlan(commands: ReadonlyArray<PageItem>): PagePaintPlan;
 export interface LaidOutDocument {

package/dist/esm/layout/page-doc.js

@@ -7,11 +7,23 @@ function paintPlan(commands) {
 	const lines = [];
 	const pictures = /* @__PURE__ */ new Map();
 	const behind = [];
+	const ordered = /* @__PURE__ */ new Map();
+	const orderOf = /* @__PURE__ */ new Map();
 	for (const c of commands) {
 		if (c.behind === true) {
 			behind.push(c);
 			continue;
 		}
+		if (c.z !== void 0 && c.type !== "line" && c.type !== "fill" && c.type !== "border") {
+			const key = c.pictureId !== void 0 ? `p${c.pictureId}` : `i${orderOf.size}`;
+			const run = ordered.get(key);
+			if (run) run.push(c);
+			else {
+				ordered.set(key, [c]);
+				orderOf.set(key, c.z);
+			}
+			continue;
+		}
 		if (c.pictureId !== void 0) {
 			const group = pictures.get(c.pictureId);
 			if (group) group.push(c);
@@ -44,7 +56,8 @@ function paintPlan(commands) {
 		borders,
 		shapes,
 		lines,
-		pictures: [...pictures.values()]
+		pictures: [...pictures.values()],
+		ordered: [...ordered.entries()].sort((a, b) => (orderOf.get(a[0]) ?? 0) - (orderOf.get(b[0]) ?? 0)).map(([, run]) => run)
 	};
 }
 function assertNeverPageItem(item) {

package/dist/esm/layout/styled-layout.d.ts

@@ -1,6 +1,6 @@
 import { BodyElement, Chart, Comment, DocumentInfo, Numbering, Section, SectionProperties, ShapeFill, StyleSheet } from '../core/document-model/index.js';
 import { FontRegistry } from '../core/font/index.js';
-import { FamilyKey } from '../core/fonts/index.js';
+import { SubstituteKey } from '../core/fonts/index.js';
 import { Hyphenator } from '../core/hyphenation/index.js';
 import { Pt, ResourceStore } from '../core/ir/index.js';
 import { LaidOutDocument, PageItem } from './page-doc.js';
@@ -53,7 +53,7 @@ export interface StyledRenderOptions {
      * run uses `registry`), byte-identical to before. `registry` remains the
      * guaranteed fallback for math/chart/default glyphs and any missing family.
      */
-    readonly registriesByFamily?: ReadonlyMap<FamilyKey, FontRegistry>;
+    readonly registriesByFamily?: ReadonlyMap<SubstituteKey, FontRegistry>;
     /**
      * The document's OWN embedded fonts (`word/fonts/*.odttf`, de-obfuscated),
      * keyed by normalized font name. A run whose `w:ascii` matches one renders with