reamkit 1.22.0 → 1.23.0

package/dist/esm/excel/xls/biff-reader.js

@@ -1,5 +1,6 @@
 import { pt } from "../../core/ir/units.js";
 import { ResourceStore } from "../../core/ir/resources.js";
+import { makeColWidthPt, makeRowHeightPt } from "../sheet-drawing.js";
 import { openCfb } from "../../core/ole/cfb.js";
 import { parseBiffChart } from "./biff-chart.js";
 import { buildBiffPalette, parseBiffStyles } from "./biff-styles.js";
@@ -333,7 +334,8 @@ function readSheet(wb, view, start, blips, resources, sharedStrings, chartData,
 		...pane ? { pane } : {}
 	};
 	const drawing = gatherDrawing(records, REC.MSODRAWING);
-	const images = drawing.length > 0 && blips.length > 0 ? buildImages(drawing, blips, resources) : [];
+	const place = anchorPlacer(grid);
+	const images = drawing.length > 0 && blips.length > 0 ? buildImages(drawing, blips, resources, place) : [];
 	const charts = [];
 	for (let i = 0; i < records.length; i++) {
 		if (records[i].type !== REC.BOF || readU16(records[i].data, 2) !== 32) continue;
@@ -361,7 +363,7 @@ function readSheet(wb, view, start, blips, resources, sharedStrings, chartData,
 		grid,
 		images,
 		charts,
-		shapes: drawing.length > 0 ? buildShapes(parseSheetShapes(drawing), gatherTxoTexts(records)) : [],
+		shapes: drawing.length > 0 ? buildShapes(parseSheetShapes(drawing), gatherTxoTexts(records), place) : [],
 		hyperlinks,
 		comments: parseComments(records)
 	};
@@ -1174,13 +1176,24 @@ function parseComments(records) {
 	}
 	return out;
 }
-function buildShapes(escherShapes, txoTexts) {
+function buildShapes(escherShapes, txoTexts, place) {
 	const out = [];
 	let textIdx = 0;
 	for (const s of escherShapes) {
 		const text = s.hasText ? txoTexts[textIdx++] ?? "" : "";
-		const { widthPt, heightPt } = anchorSize(s.anchor);
+		const { xPt, yPt, widthPt, heightPt } = place(s.anchor);
 		out.push({
+			float: {
+				wrap: "none",
+				posH: {
+					relativeFrom: "margin",
+					offsetPt: pt(xPt)
+				},
+				posV: {
+					relativeFrom: "margin",
+					offsetPt: pt(yPt)
+				}
+			},
 			width: pt(widthPt),
 			height: pt(heightPt),
 			geometry: {
@@ -1222,34 +1235,56 @@ function shapePreset(type) {
 		default: return "rect";
 	}
 }
-function buildImages(drawing, blips, resources) {
+function buildImages(drawing, blips, resources, place) {
 	const out = [];
 	for (const pic of parseSheetPictures(drawing)) {
 		const bytes = blips[pic.blipIndex - 1];
 		if (!bytes) continue;
-		const { widthPt, heightPt } = anchorSize(pic.anchor);
+		const { xPt, yPt, widthPt, heightPt } = place(pic.anchor);
 		out.push({
 			resourceId: resources.put(bytes),
 			widthPt,
-			heightPt
+			heightPt,
+			xPt,
+			yPt
 		});
 	}
 	return out;
 }
-function anchorSize(anchor) {
-	if (!anchor) return {
-		widthPt: 96,
-		heightPt: 72
+function anchorPlacer(grid) {
+	const colPt = makeColWidthPt(grid);
+	const rowPt = makeRowHeightPt(grid);
+	const before = (track) => {
+		const sums = [0];
+		return (index) => {
+			const n = Math.min(Math.max(Math.trunc(index), 0), MAX_ANCHOR_TRACKS);
+			while (sums.length <= n) sums.push(sums[sums.length - 1] + track(sums.length - 1));
+			return sums[n];
+		};
 	};
-	const DEFAULT_COL_PT = 48;
-	const DEFAULT_ROW_PT = 15;
-	const cols = anchor.col2 + anchor.dx2 / 1024 - (anchor.col1 + anchor.dx1 / 1024);
-	const rows = anchor.row2 + anchor.dy2 / 1024 - (anchor.row1 + anchor.dy1 / 1024);
-	return {
-		widthPt: Math.max(8, cols * DEFAULT_COL_PT),
-		heightPt: Math.max(8, rows * DEFAULT_ROW_PT)
+	const beforeCol = before(colPt);
+	const beforeRow = before(rowPt);
+	const at = (index, off, start, track) => start(index) + off / 1024 * track(index);
+	return (anchor) => {
+		if (!anchor) return {
+			xPt: 0,
+			yPt: 0,
+			widthPt: 96,
+			heightPt: 72
+		};
+		const x1 = at(anchor.col1, anchor.dx1, beforeCol, colPt);
+		const x2 = at(anchor.col2, anchor.dx2, beforeCol, colPt);
+		const y1 = at(anchor.row1, anchor.dy1, beforeRow, rowPt);
+		const y2 = at(anchor.row2, anchor.dy2, beforeRow, rowPt);
+		return {
+			xPt: x1,
+			yPt: y1,
+			widthPt: Math.max(1, x2 - x1),
+			heightPt: Math.max(1, y2 - y1)
+		};
 	};
 }
+var MAX_ANCHOR_TRACKS = 65536;
 function numCell(row, column, style, rawValue) {
 	return {
 		column,

package/dist/esm/excel/xls/biff-styles.d.ts

@@ -4,8 +4,11 @@ interface BiffRec {
     readonly data: Uint8Array;
 }
 /**
- * Build a palette-index → `"FFRRGGBB"` (8-hex ARGB, like the xlsx `rgb` attr)
- * resolver from the default 56-colour palette plus any `PALETTE` override.
+ * Build a palette-index → `"RRGGBB"` resolver from the default 56-colour palette
+ * plus any `PALETTE` override. Six hex digits, not the eight an xlsx `rgb`
+ * attribute carries: by the time styles are parsed the alpha is gone, and a
+ * colour that kept it was read from its first six characters — silver `C0C0C0`
+ * reaching the page as the pink `FFC0C0`.
  * `0x7FFF` / 64 / 65 are automatic or system colours → `undefined` (the renderer
  * default). Exported so the conditional-format reader (XLS-13) resolves its dxf
  * colours the same way.

package/dist/esm/excel/xls/biff-styles.js

@@ -116,8 +116,11 @@ var PALETTE56 = [
 	"333333"
 ];
 /**
-* Build a palette-index → `"FFRRGGBB"` (8-hex ARGB, like the xlsx `rgb` attr)
-* resolver from the default 56-colour palette plus any `PALETTE` override.
+* Build a palette-index → `"RRGGBB"` resolver from the default 56-colour palette
+* plus any `PALETTE` override. Six hex digits, not the eight an xlsx `rgb`
+* attribute carries: by the time styles are parsed the alpha is gone, and a
+* colour that kept it was read from its first six characters — silver `C0C0C0`
+* reaching the page as the pink `FFC0C0`.
 * `0x7FFF` / 64 / 65 are automatic or system colours → `undefined` (the renderer
 * default). Exported so the conditional-format reader (XLS-13) resolves its dxf
 * colours the same way.
@@ -130,8 +133,7 @@ function buildBiffPalette(records) {
 	for (const rec of records) if (rec.type === REC_PALETTE) applyPalette(rec.data, palette);
 	return (icv) => {
 		if (icv === 32767 || icv === 64 || icv === 65) return void 0;
-		const rgb = palette[icv];
-		return rgb ? `FF${rgb}` : void 0;
+		return palette[icv];
 	};
 }
 /**
@@ -252,11 +254,11 @@ function parseXf(d, color, internFill, internBorder) {
 	if (right) border.right = right;
 	if (top) border.top = top;
 	if (bottom) border.bottom = bottom;
-	const patternType = FILL_PATTERNS[brd3 >> 26 & 63];
+	const patternType = FILL_PATTERNS[brd3 >> 10 & 63];
 	let fill;
 	if (patternType && patternType !== "none") {
-		const fg = color(brd3 & 127);
-		const bg = color(brd3 >> 7 & 127);
+		const fg = color(brd3 >> 16 & 127);
+		const bg = color(brd3 >> 23 & 127);
 		fill = {
 			patternType,
 			...fg ? { fgColorHex: fg } : {},

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/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):

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