reamkit 1.15.4 → 1.17.0

package/dist/esm/excel/xlsx-reader.js

@@ -1,9 +1,10 @@
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
+import { detectImageFormat } from "../core/images.js";
 import { bytesInclude, bytesIncludePartName } from "../core/bytes.js";
 import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
-import { parseTheme } from "../core/drawingml/theme-parser.js";
+import { parseTheme, parseThemeEffectStyles, parseThemeFillStyles, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
@@ -11,8 +12,8 @@ import "../core/opc/index.js";
 import { parseAreaRef } from "./defined-name-ref.js";
 import { parseSharedStrings } from "./shared-strings-parser.js";
 import { parseWorkbook } from "./workbook-parser.js";
-import { parseWorksheet } from "./worksheet-parser.js";
 import { EMPTY_XLSX_STYLES, parseXlsxStyles } from "./styles-parser.js";
+import { parseWorksheet } from "./worksheet-parser.js";
 import "./index.js";
 import { resolveCellText } from "./print-model.js";
 import { parseSheetDrawing } from "./sheet-drawing.js";
@@ -21,14 +22,20 @@ import { parsePivotTablePart } from "./pivot-table-parser.js";
 import { parseSlicerCachePart, parseSlicerPart } from "./slicer-parser.js";
 import { parseLegacyComments, parsePersons, parseThreadedComments } from "./comments-parser.js";
 import { parseFormControlProps } from "./form-control-parser.js";
+import { parseVmlDrawing } from "./vml-drawing.js";
+import { parsePrinterSettings } from "./printer-settings.js";
+import { parseRichValueText } from "./rich-value.js";
 import { activeXBinRelId, activeXType, activeXTypeFromPart, parseActiveX, parseActiveXBin } from "./activex-parser.js";
-import { parseSheetShapes } from "./sheet-shape-parser.js";
+import { parseDiagramFrames, parseDiagramShapes, parseSheetShapes } from "./sheet-shape-parser.js";
 import { projectSheetDoc } from "./sheet-to-flow.js";
 //#region src/excel/xlsx-reader.ts
 var WORKBOOK_PART = "xl/workbook.xml";
 var SHARED_STRINGS_PART = "xl/sharedStrings.xml";
 var STYLES_PART = "xl/styles.xml";
 var CORE_PROPS_PART = "docProps/core.xml";
+var METADATA_PART = "xl/metadata.xml";
+var RICH_VALUE_STRUCTURE_PART = "xl/richData/rdrichvaluestructure.xml";
+var RICH_VALUE_PART = "xl/richData/rdrichvalue.xml";
 var SLICER_REL_TAIL = "/slicer";
 var SLICER_CACHE_REL_TAIL = "/slicerCache";
 var THREADED_COMMENTS_REL_TAIL = "/threadedComment";
@@ -80,9 +87,11 @@ function readXlsxToSheetDoc(xlsx) {
 		texts: [],
 		runs: []
 	};
-	const stylesData = pkg.getPart(STYLES_PART);
-	const styles = stylesData ? parseXlsxStyles(stylesData) : EMPTY_XLSX_STYLES;
 	const workbookRels = pkg.getPartRelationships(WORKBOOK_PART);
+	const themePalette = buildThemePalette(pkg, workbookRels);
+	const richValueText = parseRichValueText(pkg.getPart(METADATA_PART), pkg.getPart(RICH_VALUE_STRUCTURE_PART), pkg.getPart(RICH_VALUE_PART));
+	const stylesData = pkg.getPart(STYLES_PART);
+	const styles = stylesData ? parseXlsxStyles(stylesData, themePalette) : EMPTY_XLSX_STYLES;
 	const persons = /* @__PURE__ */ new Map();
 	for (const rel of workbookRels) {
 		if (!rel.type.endsWith(PERSON_REL_TAIL)) continue;
@@ -93,7 +102,12 @@ function readXlsxToSheetDoc(xlsx) {
 	const resources = new ResourceStore();
 	const palette = buildThemePalette(pkg, workbookRels);
 	const resolveColor = makeColorResolver(palette);
+	const themeLineWidths = buildThemeLineWidths(pkg, workbookRels);
+	const themeFillStyles = buildThemeFillStyles(pkg, workbookRels);
+	const themeEffectStyles = buildThemeEffectStyles(pkg, workbookRels);
 	const sheetsOut = [];
+	let embeddedObjects = 0;
+	let metafilePictures = 0;
 	const tableIndex = /* @__PURE__ */ new Map();
 	const pendingSlicers = [];
 	for (let sheetIdx = 0; sheetIdx < sheets.length; sheetIdx++) {
@@ -102,7 +116,9 @@ function readXlsxToSheetDoc(xlsx) {
 		if (!sheetRel) continue;
 		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, sheetRel);
 		if (!resolved) continue;
-		const worksheet = parseWorksheet(resolved.data);
+		let worksheet = parseWorksheet(resolved.data, themePalette);
+		worksheet = withPrinterPageSetup(worksheet, pkg, resolved.path, pkg.getPartRelationships(resolved.path));
+		worksheet = withRichValues(worksheet, richValueText);
 		const charts = [];
 		const images = [];
 		let shapes;
@@ -121,22 +137,39 @@ function readXlsxToSheetDoc(xlsx) {
 					charts.push({
 						chartPartPath: ref.chartPartPath,
 						widthPt: ref.widthPt,
-						heightPt: ref.heightPt
+						heightPt: ref.heightPt,
+						xPt: ref.xPt,
+						yPt: ref.yPt
 					});
 				}
 				for (const pic of pictures) {
 					const bytes = pkg.getPart(pic.imagePartPath);
 					if (!bytes) continue;
+					if (detectImageFormat(bytes) === null) metafilePictures++;
 					images.push({
 						resourceId: resources.put(bytes),
 						widthPt: pic.widthPt,
-						heightPt: pic.heightPt
+						heightPt: pic.heightPt,
+						xPt: pic.xPt,
+						yPt: pic.yPt
 					});
 				}
 				if (bytesInclude(drawing.data, ":sp>") || bytesInclude(drawing.data, ":sp ")) {
-					const parsed = parseSheetShapes(drawing.data, worksheet, resolveColor);
+					const parsed = parseSheetShapes(drawing.data, worksheet, resolveColor, themeLineWidths, themeFillStyles, themeEffectStyles);
 					if (parsed.length > 0) shapes = parsed;
 				}
+				const frames = parseDiagramFrames(drawing.data, worksheet);
+				if (frames.length > 0) {
+					const dsp = pkg.getPartRelationships(drawing.path).filter((r) => r.type.endsWith("/diagramDrawing"));
+					const fromDiagrams = [];
+					frames.forEach((frame, i) => {
+						const rel = dsp[i];
+						const part = rel ? pkg.resolveRelatedPart(drawing.path, rel) : void 0;
+						if (!part) return;
+						fromDiagrams.push(...parseDiagramShapes(part.data, frame, resolveColor, themeLineWidths, themeFillStyles, themeEffectStyles));
+					});
+					if (fromDiagrams.length > 0) shapes = [...shapes ?? [], ...fromDiagrams];
+				}
 			}
 		}
 		let tables;
@@ -233,29 +266,40 @@ function readXlsxToSheetDoc(xlsx) {
 				...props
 			};
 		};
+		const legacyVml = readLegacyVml(pkg, resolved.path, wsRels, worksheet);
 		let formControls;
 		if (worksheet.formControls && worksheet.formControls.length > 0) {
 			const resolvedControls = [];
 			for (const fc of worksheet.formControls) {
+				if (fc.print === false) continue;
+				if (fc.shapeId !== void 0 && legacyVml.nonPrinting.has(fc.shapeId)) continue;
 				const rel = wsRels.find((r) => r.id === fc.relId);
 				const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
+				const box = fc.shapeId !== void 0 ? legacyVml.boxes.get(fc.shapeId) : void 0;
 				if (part && ACTIVEX_PART.test(part.path)) {
 					resolvedAx.push({
 						...activeXState(part),
 						type: activeXTypeFromPart(part.data),
-						...fc.name ? { name: fc.name } : {}
+						...fc.name ? { name: fc.name } : {},
+						...box ? { box } : {}
 					});
 					continue;
 				}
 				const props = part ? parseFormControlProps(part.data) : {};
 				resolvedControls.push({
 					...fc.name ? { name: fc.name } : {},
-					...props
+					...props,
+					...box ? { box } : {}
 				});
 			}
 			if (resolvedControls.length > 0) formControls = resolvedControls;
 		}
+		if (legacyVml.controls.length > 0) formControls = [...formControls ?? [], ...legacyVml.controls];
 		if (worksheet.oleObjects && worksheet.oleObjects.length > 0) for (const ole of worksheet.oleObjects) {
+			if (!/^Forms\./i.test(ole.progId ?? "")) {
+				embeddedObjects++;
+				continue;
+			}
 			const rel = wsRels.find((r) => r.id === ole.relId);
 			const part = rel ? pkg.resolveRelatedPart(resolved.path, rel) : void 0;
 			resolvedAx.push({
@@ -271,6 +315,7 @@ function readXlsxToSheetDoc(xlsx) {
 		} : worksheet;
 		sheetsOut.push({
 			name: sheet.name,
+			...sheet.hidden ? { hidden: true } : {},
 			grid,
 			...charts.length > 0 ? { charts } : {},
 			...images.length > 0 ? { images } : {},
@@ -299,6 +344,10 @@ function readXlsxToSheetDoc(xlsx) {
 			};
 		}
 	}
+	for (const [path, chart] of chartData) {
+		const resolved = withWorkbookData(chart, sheetsOut, styles, sharedStrings, date1904);
+		if (resolved !== chart) chartData.set(path, resolved);
+	}
 	const coreData = pkg.getPart(CORE_PROPS_PART);
 	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
 	return {
@@ -311,9 +360,167 @@ function readXlsxToSheetDoc(xlsx) {
 		date1904,
 		...chartData.size > 0 ? { chartData } : {},
 		resources,
+		themePalette,
+		...embeddedObjects > 0 ? { embeddedObjects } : {},
+		...metafilePictures > 0 ? { metafilePictures } : {},
 		...info ? { info } : {}
 	};
 }
+/**
+* Fill in the paper size and orientation a `<pageSetup>` leaves to its
+* `printerSettings` part.
+*
+* `<pageSetup>` naming no `paperSize` does not mean "the default": Excel
+* records the print dialog's choice in the DEVMODE of the related part, and
+* LibreOffice reads it. simple-monthly-budget.xlsx and 45540_classic_Header.xlsx
+* both print on Letter that way while we assumed A4 — the most visible
+* difference on every page of either. What the sheet states itself always wins.
+*/
+/**
+* Replace the legacy stand-in in every cell that points at a rich value we can
+* read. Spill.xlsx caches `#VALUE!` in three cells whose rich value says
+* `#SPILL!` — the error Excel shows and the one that explains the sheet, since
+* the file also records which cell three rows down does the blocking.
+*
+* @param worksheet The parsed worksheet.
+* @param richValueText `vm` index → text, from {@link parseRichValueText}.
+* @returns The worksheet, unchanged when nothing resolved (byte-identical path).
+*/
+/**
+* A chart with its uncached references resolved against the workbook.
+*
+* Only what is missing is filled in: a series that cached its values keeps
+* them, and a reference naming a sheet this workbook does not have resolves to
+* nothing rather than to zeros.
+*
+* @param chart         The parsed chart.
+* @param sheets        Every sheet in the workbook, by tab order.
+* @param styles        The style table (for a referenced cell's number format).
+* @param sharedStrings The shared-string table.
+* @param date1904      The workbook's date system.
+* @returns The chart, unchanged when nothing needed resolving.
+*/
+function withWorkbookData(chart, sheets, styles, sharedStrings, date1904) {
+	const cellsOf = (ref) => {
+		if (ref === void 0) return void 0;
+		const area = resolveChartRef(ref, sheets);
+		if (!area) return void 0;
+		const out = [];
+		for (let row = area.startRow; row <= area.endRow; row++) for (let col = area.startColumn; col <= area.endColumn; col++) {
+			const cell = area.grid.cells.find((c) => c.row === row && c.column === col);
+			out.push(cell ? resolveCellText(cell, sharedStrings, styles, date1904) : "");
+		}
+		return out;
+	};
+	let changed = false;
+	const series = chart.series.map((s) => {
+		if (s.values.length > 0 && s.name !== void 0) return s;
+		const values = s.values.length > 0 ? s.values : cellsOf(s.valuesRef)?.map((t) => Number(t) || 0);
+		const name = s.name ?? cellsOf(s.nameRef)?.find((t) => t.length > 0);
+		if (!values && name === void 0) return s;
+		changed = true;
+		return {
+			...s,
+			...values ? { values } : {},
+			...name !== void 0 ? { name } : {}
+		};
+	});
+	const categories = chart.categories.length > 0 ? chart.categories : cellsOf(chart.categoriesRef);
+	if (categories && categories.length > 0 && chart.categories.length === 0) changed = true;
+	if (!changed) return chart;
+	return {
+		...chart,
+		series,
+		...categories && categories.length > 0 ? { categories } : {}
+	};
+}
+/** `Sheet!A1:B2` → the sheet's grid and the 0-based rectangle it names. */
+function resolveChartRef(ref, sheets) {
+	const bang = ref.lastIndexOf("!");
+	if (bang < 0) return void 0;
+	const name = ref.slice(0, bang).replace(/^'|'$/g, "").replace(/''/g, "'");
+	const sheet = sheets.find((s) => s.name === name);
+	if (!sheet) return void 0;
+	const area = parseAreaRef(ref.slice(bang + 1).replace(/\$/g, ""));
+	return area ? {
+		grid: sheet.grid,
+		...area
+	} : void 0;
+}
+function withRichValues(worksheet, richValueText) {
+	if (richValueText.size === 0) return worksheet;
+	const resolves = (cell) => cell.valueMetadataIndex !== void 0 ? richValueText.get(cell.valueMetadataIndex) : void 0;
+	if (!worksheet.cells.some((cell) => resolves(cell) !== void 0)) return worksheet;
+	const cells = worksheet.cells.map((cell) => {
+		const text = resolves(cell);
+		return text === void 0 ? cell : {
+			...cell,
+			rawValue: text
+		};
+	});
+	return {
+		...worksheet,
+		cells
+	};
+}
+function withPrinterPageSetup(worksheet, pkg, sheetPath, wsRels) {
+	const setup = worksheet.pageSetup;
+	const relId = setup?.printerSettingsRelId;
+	if (!setup || relId === void 0) return worksheet;
+	const { printerSettingsRelId: _resolved, ...rest } = setup;
+	const rel = wsRels.find((r) => r.id === relId);
+	const part = rel ? pkg.resolveRelatedPart(sheetPath, rel) : void 0;
+	const printer = part ? parsePrinterSettings(part.data) : {};
+	return {
+		...worksheet,
+		pageSetup: {
+			...rest,
+			...rest.paperSize === void 0 && printer.paperSize !== void 0 ? { paperSize: printer.paperSize } : {},
+			...rest.orientation === void 0 && printer.orientation !== void 0 ? { orientation: printer.orientation } : {}
+		}
+	};
+}
+/**
+* The sheet's form controls that live only in its legacy VML drawing (§18.3.1.36).
+*
+* Shapes that back an ActiveX control are skipped — their `o:spid` is the
+* `shapeId` of a `<control>` element, which the caller has already resolved
+* through the activeX part. What is left is the Forms-toolbar kind, whose
+* caption and checked state exist nowhere else in the package.
+*/
+function readLegacyVml(pkg, sheetPath, wsRels, worksheet) {
+	const empty = {
+		controls: [],
+		boxes: /* @__PURE__ */ new Map(),
+		nonPrinting: /* @__PURE__ */ new Set()
+	};
+	const relId = worksheet.legacyDrawingRelId;
+	if (relId === void 0) return empty;
+	const rel = wsRels.find((r) => r.id === relId);
+	const part = rel ? pkg.resolveRelatedPart(sheetPath, rel) : void 0;
+	if (!part) return empty;
+	const activeXShapeIds = new Set((worksheet.formControls ?? []).map((fc) => fc.shapeId).filter((id) => id !== void 0));
+	const drawing = parseVmlDrawing(part.data);
+	const out = [];
+	for (const shape of drawing.controls) {
+		if (shape.shapeId !== void 0 && activeXShapeIds.has(shape.shapeId)) continue;
+		out.push({
+			objectType: shape.objectType,
+			...shape.caption ? {
+				name: shape.caption,
+				caption: shape.caption
+			} : {},
+			...shape.checked ? { checked: true } : {},
+			...shape.box ? { box: shape.box } : {},
+			...shape.fontSizePt !== void 0 ? { fontSizePt: shape.fontSizePt } : {}
+		});
+	}
+	return {
+		controls: out,
+		boxes: drawing.boxes,
+		nonPrinting: drawing.nonPrinting
+	};
+}
 function buildThemePalette(pkg, workbookRels) {
 	const palette = new Map(DEFAULT_THEME_PALETTE);
 	for (const rel of workbookRels) {
@@ -325,6 +532,30 @@ function buildThemePalette(pkg, workbookRels) {
 	}
 	return palette;
 }
+function buildThemeLineWidths(pkg, workbookRels) {
+	for (const rel of workbookRels) {
+		if (!isOoxmlRel(rel.type, "theme")) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (resolved) return parseThemeLineWidths(resolved.data);
+	}
+	return [];
+}
+function buildThemeEffectStyles(pkg, workbookRels) {
+	for (const rel of workbookRels) {
+		if (!isOoxmlRel(rel.type, "theme")) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (resolved) return parseThemeEffectStyles(resolved.data);
+	}
+	return [];
+}
+function buildThemeFillStyles(pkg, workbookRels) {
+	for (const rel of workbookRels) {
+		if (!isOoxmlRel(rel.type, "theme")) continue;
+		const resolved = pkg.resolveRelatedPart(WORKBOOK_PART, rel);
+		if (resolved) return parseThemeFillStyles(resolved.data);
+	}
+	return [];
+}
 function resolveTableStyle(t, palette) {
 	const m = t.styleName ? /TableStyle(Light|Medium|Dark)(\d+)/i.exec(t.styleName) : null;
 	if (!m) return t;

package/dist/esm/excel/xlsx-to-pdf.js

@@ -1,5 +1,6 @@
 import { fetchFontSet } from "../core/fonts/remote-fonts.js";
 import { FontRegistry } from "../core/font/font-registry.js";
+import { createFontMeasure } from "../core/font/measure.js";
 import { signPdf } from "../pdf/signature.js";
 import { renderStyledPdf, renderStyledPdfEncrypted } from "../pdf/styled-page-renderer.js";
 import "../pdf/index.js";
@@ -7,6 +8,11 @@ import { readXlsx } from "./xlsx-reader.js";
 import { flowRenderOptions } from "../core/converter/project.js";
 //#region src/excel/xlsx-to-pdf.ts
 /**
+* The point size Excel's column-width unit is quoted at — its default theme
+* font is 11 pt, and 8.43 of its digits are the documented 64 px column.
+*/
+var DEFAULT_WORKBOOK_FONT_PT = 11;
+/**
 * Convert a .xlsx to PDF in one shot.
 *
 * @deprecated Use `Ream.parse(bytes).convert('pdf', options)` — one parse,
@@ -45,7 +51,12 @@ function prepareXlsxStyledRender(xlsx, options) {
 	const fonts = options.fonts ?? (options.fontBytes ? { regular: options.fontBytes } : void 0);
 	if (!fonts) throw new Error("convertXlsxToPdfSync requires options.fonts or options.fontBytes");
 	const registry = FontRegistry.fromBytes(fonts);
-	const { doc: flow } = readXlsx(xlsx, options.now !== void 0 ? { now: options.now } : {});
+	const { parsed } = registry.resolveByStyle(false, false);
+	const digitWidthPt = createFontMeasure(parsed).textWidthPt("0", DEFAULT_WORKBOOK_FONT_PT);
+	const { doc: flow } = readXlsx(xlsx, {
+		...options.now !== void 0 ? { now: options.now } : {},
+		digitWidthPt
+	});
 	const { fontBytes: _ignoreA, fonts: _ignoreB, section: sectionOverride, info: callerInfo, embedSource, now: _ignoreNow, attachments: callerAttachments, signature: _ignoreSig, layoutProfile: _ignoreProfile, ...renderOptions } = options;
 	const section = sectionOverride ?? flow.section;
 	const info = flow.info || callerInfo ? {

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

@@ -106,7 +106,11 @@ function collectReferencedAnchors(body) {
 		for (const el of els) if (el.kind === "paragraph") {
 			for (const r of el.paragraph.runs) if (r.anchor !== void 0) out.add(r.anchor);
 		} else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
-		else if (el.kind === "shape" && el.shape.text) visit(el.shape.text.content);
+		else if (el.kind === "shape") visitShape(el.shape);
+	};
+	const visitShape = (shape) => {
+		if (shape.text) visit(shape.text.content);
+		for (const child of shape.children ?? []) visitShape(child.shape);
 	};
 	visit(body);
 	return out;
@@ -122,7 +126,11 @@ function collectNoteNumbers(flow) {
 			if (r.commentRef !== void 0 && !comments.has(r.commentRef)) comments.set(r.commentRef, comments.size + 1);
 		}
 		else if (el.kind === "table") for (const row of el.table.rows) for (const cell of row.cells) visit(cell.content);
-		else if (el.kind === "shape" && el.shape.text) visit(el.shape.text.content);
+		else if (el.kind === "shape") visitShape(el.shape);
+	};
+	const visitShape = (shape) => {
+		if (shape.text) visit(shape.text.content);
+		for (const child of shape.children ?? []) visitShape(child.shape);
 	};
 	visit(flow.body);
 	return {
@@ -265,9 +273,20 @@ function wedgeSvg(w) {
 	return `<path d="${svgPathData(b.build().segments, fmt)}" fill="#${w.fillHex}"${stroke}/>`;
 }
 function labelSvg(l, sceneH, anchor) {
-	return `<text x="${fmt(l.x)}" y="${fmt(sceneH - l.y)}" font-size="${fmt(l.sizePt)}" font-family="sans-serif" fill="#${l.colorHex}" text-anchor="${anchor}">${escapeText(l.text)}</text>`;
+	const rot = l.rotationDeg ? ` transform="rotate(${fmt(-l.rotationDeg)} ${fmt(l.x)} ${fmt(sceneH - l.y)})"` : "";
+	return `<text x="${fmt(l.x)}" y="${fmt(sceneH - l.y)}"${rot} font-size="${fmt(l.sizePt)}" font-family="sans-serif" fill="#${l.colorHex}" text-anchor="${anchor}">${escapeText(l.text)}</text>`;
+}
+/** `RRGGBB` as the `r,g,b` triple a CSS `rgba()` takes. */
+function hexToRgbCss(hex) {
+	const n = parseInt(hex, 16);
+	return `${String(n >> 16 & 255)},${String(n >> 8 & 255)},${String(n & 255)}`;
 }
 function emitShapeBlock(out, shape, ctx) {
+	const children = shape.children ?? [];
+	if (!(children.length > 0 && shape.fill.kind === "none" && shape.line === void 0 && (shape.text?.content.length ?? 0) === 0)) emitOneShape(out, shape, ctx);
+	for (const child of children) emitShapeBlock(out, child.shape, ctx);
+}
+function emitOneShape(out, shape, ctx) {
 	const w = shape.width;
 	const h = shape.height;
 	const paths = buildShapePaths(shape.geometry, w, h);
@@ -278,9 +297,11 @@ function emitShapeBlock(out, shape, ctx) {
 	const transform = ` transform="matrix(${flipTransform(buildShapeTransform(0, 0, w, h, t?.rotation60k ?? 0, t?.flipH ?? false, t?.flipV ?? false), h).map(fmt).join(" ")})"`;
 	const svg = [svgOpen(w, h, shape.altText)];
 	if (gradDef) svg.push(`<defs>${gradDef}</defs>`);
+	const shadow = shape.shadow;
+	const shadowFilter = shadow ? ` filter="drop-shadow(${fmt(shadow.dxPt)}px ${fmt(shadow.dyPt)}px ${fmt(shadow.blurPt / 2)}px rgba(${hexToRgbCss(shadow.colorHex)},${fmt(shadow.alpha)}))"` : "";
 	for (const path of paths) {
 		const rule = path.fillRule === "evenodd" ? " fill-rule=\"evenodd\"" : "";
-		svg.push(`<path d="${svgPathData(path.segments, fmt)}" fill="${fill}"${rule}${stroke}${transform}/>`);
+		svg.push(`<path d="${svgPathData(path.segments, fmt)}" fill="${fill}"${rule}${stroke}${transform}${shadowFilter}/>`);
 	}
 	svg.push("</svg>");
 	const figureCss = blockFigureCss(shape.paragraphProperties);
@@ -491,6 +512,7 @@ function emitCell(out, cell, table, ctx, pos) {
 	pushBorder(css, "left", c?.left ?? (pos.firstCol ? t?.left : t?.insideV));
 	pushBorder(css, "right", c?.right ?? (pos.lastCol ? t?.right : t?.insideV));
 	if (cell.properties.shading) css.push(`background-color:#${cell.properties.shading.colorHex}`);
+	if (cell.properties.noWrap) css.push("white-space:nowrap", "overflow:hidden");
 	if (cell.properties.dataBar) {
 		const db = cell.properties.dataBar;
 		const clamp = (n) => Math.max(0, Math.min(1, n));
@@ -611,7 +633,7 @@ function pieIconSvg(fill, color, empty) {
 function pushBorder(css, side, border) {
 	if (!border || border.style === "none") return;
 	const width = border.width ?? .5;
-	const style = border.style === "double" ? "double" : border.style === "dotted" ? "dotted" : border.style === "dashed" ? "dashed" : "solid";
+	const style = border.style === "double" ? "double" : border.style === "dotted" ? "dotted" : border.style === "dashed" || border.style === "dashSmallGap" ? "dashed" : "solid";
 	css.push(`border-${side}:${fmt(width)}pt ${style} #${border.colorHex ?? "000000"}`);
 }
 function emitImageBlock(out, image, ctx) {
@@ -629,7 +651,8 @@ function emitImageBlock(out, image, ctx) {
 var MIME_BY_FORMAT = {
 	jpeg: "image/jpeg",
 	png: "image/png",
-	jpeg2000: "image/jp2"
+	jpeg2000: "image/jp2",
+	gif: "image/gif"
 };
 function dataUri(resource, store) {
 	if (resource === void 0) return void 0;

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

@@ -1,7 +1,8 @@
+import { BorderStyle, ImageCrop, PictureOutline, ShapeShadow } from '../core/document-model/index.js';
 import { Pt, ResourceId, ResourceStore } from '../core/ir/index.js';
 import { FontMeasure, ParsedTtf } from '../core/font/index.js';
 import { ResolvedParagraphProperties, ResolvedRunProperties } from '../core/style-cascade/index.js';
-import { PathSegment, VectorShape } from '../core/vector.js';
+import { PathSegment, VectorPath, VectorShape } from '../core/vector.js';
 import { PreparedImage } from '../core/images.js';
 /** A font bound into a {@link LaidOutDocument}: the parsed face plus what layout/emit need from it. */
 export interface FontResource {
@@ -41,6 +42,17 @@ export interface TextToken {
      * element separate from the item body.
      */
     readonly listMarker?: true;
+    /**
+     * §17.3.3.1 — the token is the break of a `w:br w:type="column"`: what
+     * follows it belongs in the next column.
+     */
+    readonly columnBreak?: true;
+    /**
+     * §17.3.1.38 — the token IS a tab: its width is the distance to the stop it
+     * advances to, resolved once the line is known, and its text is whatever
+     * leader fills that gap.
+     */
+    readonly tab?: true;
     /**
      * The token falls inside a comment range (`commentRangeRefs`): the emitter
      * fills a soft highlight behind it (E-COMMENTS CM2c).
@@ -49,6 +61,12 @@ export interface TextToken {
     readonly resolvedRun: ResolvedRunProperties;
     readonly font: FontResource;
     readonly fontSizePt: number;
+    /**
+     * §17.3.2.42 / §18.4.2 `vertAlign` — how far off the baseline this token
+     * draws: positive for a superscript, negative for a subscript, absent on the
+     * baseline. The line's height is unchanged; only the glyphs move.
+     */
+    readonly risePt?: number;
     readonly widthPt: number;
     /**
      * UAX #9 embedding level of this token's characters (0 for pure-LTR docs).
@@ -62,6 +80,28 @@ export interface ImageToken {
     readonly imageResourceName: string;
     readonly widthPt: number;
     readonly heightPt: number;
+    /** §20.1.2.2.24 — the frame the picture is drawn with, when it has one. */
+    readonly outline?: PictureOutline;
+    /** §20.1.8.40 — the drop shadow under the picture, when it casts one. */
+    readonly shadow?: ShapeShadow;
+    /** §20.1.8.55 `a:srcRect` — the part of the source the frame shows. */
+    readonly crop?: ImageCrop;
+    /** §20.1.7.6 — degrees clockwise about the box's centre. */
+    readonly rotationDeg?: number;
+    /** §20.1.7.6 — the picture drawn mirrored in its box. */
+    readonly flipH?: boolean;
+    readonly flipV?: boolean;
+    /**
+     * §20.4.2.6 — where the picture itself sits inside the reserved box when the
+     * drawing asked for an effect extent: offsets from the box's left edge and
+     * from the baseline, plus the drawn size. Absent ⇒ the picture fills the box.
+     */
+    readonly drawBox?: {
+        readonly dxPt: number;
+        readonly dyPt: number;
+        readonly widthPt: number;
+        readonly heightPt: number;
+    };
     /** Constants kept to satisfy {@link Token} consumers — they never read these for images. */
     readonly isSpace: false;
     readonly bidiLevel: number;
@@ -114,6 +154,12 @@ export interface Line {
     readonly firstLine: boolean;
     readonly resolved: ResolvedParagraphProperties;
     isLastInParagraph: boolean;
+    /**
+     * ECMA-376 §17.15.1.35 — the line ends at a soft line break in a document
+     * that asked for `w:doNotExpandShiftReturn`, so justification leaves it at
+     * its natural width (as the paragraph's own last line is left).
+     */
+    readonly noJustify?: boolean;
     /**
      * Max ascent/descent contributed by math tokens (0 when none) — they straddle
      * the baseline, so the line height/descent must grow to fit them.
@@ -147,6 +193,11 @@ export interface ImageResource {
  * numbers — they are not page-frame coordinates.
  */
 export interface PageItemBase {
+    /**
+     * §20.4.2.3 — the float's `relativeHeight`. Items with one are sorted by it
+     * inside their layer before the page is written; the rest keep their order.
+     */
+    readonly z?: number;
     /**
      * Tagged PDF (§14.8): the logical structure node this item's content belongs
      * to. Set only on body content in tagged mode; undefined text in the line pass
@@ -167,6 +218,19 @@ export interface TextLineItem extends PageItemBase {
     readonly originX: Pt;
     /** Distance from the page TOP down to the text baseline. */
     readonly baselineY: Pt;
+    readonly clip?: {
+        readonly x: Pt;
+        readonly y: Pt;
+        readonly width: Pt;
+        readonly height: Pt;
+    };
+    /**
+     * Counter-clockwise rotation about `(originX, baselineY)`, in degrees. A
+     * value-axis title reads bottom-to-top in every reader (§21.2.2.216
+     * `c:title/c:tx/…/a:bodyPr@rot` = -5400000, i.e. 90°); drawn flat it sat over
+     * the plot's own tick labels. Absent ⇒ horizontal.
+     */
+    readonly rotationDeg?: number;
 }
 /** One edge of a table-cell frame; `(x, y)` is the cell box's top-left corner. */
 export interface BorderItem extends PageItemBase {
@@ -178,6 +242,12 @@ export interface BorderItem extends PageItemBase {
     readonly height: Pt;
     readonly borderSizePt: number;
     readonly borderColorHex: string;
+    /**
+     * §18.18.3 `ST_BorderStyle` — the rule's PATTERN, when it is not solid.
+     * `dashed`/`dotted` are line patterns, not weights, and dropping them here
+     * painted 57423.xlsx's dashed band as twelve continuous rules.
+     */
+    readonly borderStyle?: BorderStyle;
 }
 /** A filled rectangle (cell shading); `(x, y)` is its top-left corner. */
 export interface FillItem extends PageItemBase {
@@ -199,6 +269,22 @@ export interface ImageItem extends PageItemBase {
     readonly width: Pt;
     readonly height: Pt;
     readonly imageResourceName: string;
+    /** §20.1.8.55 `a:srcRect` — the part of the source the frame shows. */
+    readonly crop?: ImageCrop;
+    /** §20.1.7.6 — degrees clockwise about the box's centre. */
+    readonly rotationDeg?: number;
+    /** §20.1.7.6 — the picture drawn mirrored in its box. */
+    readonly flipH?: boolean;
+    readonly flipV?: boolean;
+    /**
+     * §20.1.8.14 — a picture FILL is the shape's outline painted with a picture,
+     * so it is clipped to that outline: the paths in the shape's local frame and
+     * the matrix that maps them onto the page.
+     */
+    readonly clip?: {
+        readonly paths: ReadonlyArray<VectorPath>;
+        readonly transform: readonly [number, number, number, number, number, number];
+    };
 }
 /**
  * DrawingML vector geometry. `shape.transform` maps the shape's local y-up frame