reamkit 1.2.0 → 1.3.0

package/README.md

@@ -168,8 +168,9 @@ repeated titles, page breaks), DrawingML shapes and charts, OMML math,
 Type0+CIDFontType2 embedding with subsetting, Knuth-Plass line breaking,
 Liang hyphenation, OpenType ligatures/kerning + Arabic cursive joining,
 BiDi (UAX #9), hyperlinks (PDF link annotations + HTML anchors,
-scheme-allowlisted), tagged PDF, PDF/A-1/2/3 (a/b/u), digital signatures
-(PKCS#7/ECDSA/PAdES/RFC 3161), SVG page preview, flowed HTML export.
+scheme-allowlisted), tagged PDF, PDF/A-1/2/3 (a/b/u), PDF/UA-1, AES-256
+encryption, digital signatures (PKCS#7/ECDSA/PAdES/RFC 3161), SVG page
+preview, flowed HTML export. Reads OOXML Transitional and Strict.
 
 See `handoff.md` for the full feature matrix and known limitations.
 

package/dist/esm/core/converter/ream.js

@@ -3,7 +3,7 @@ import { FontRegistry } from "../font/font-registry.js";
 import { ConversionLossError } from "../ir/loss.js";
 import { layoutStyledDocument } from "../../layout/styled-layout.js";
 import { signPdf } from "../../pdf/signature.js";
-import { renderStyledPdf } from "../../pdf/styled-page-renderer.js";
+import { renderStyledPdf, renderStyledPdfEncrypted } from "../../pdf/styled-page-renderer.js";
 import "../../pdf/index.js";
 import { flowRenderOptions } from "./project.js";
 import { writeHtml } from "../../html/html-writer.js";
@@ -73,7 +73,7 @@ var Ream = class Ream {
 			relationship: "Source",
 			description: "Source document"
 		});
-		let pdf = renderStyledPdf(this.flow.body, {
+		const styled = {
 			registry,
 			...registriesByFamily ? { registriesByFamily } : {},
 			...flowRenderOptions(this.flow),
@@ -81,7 +81,8 @@ var Ream = class Ream {
 			...attachments.length > 0 ? { attachments } : {},
 			...signature ? { signaturePlaceholder: signature } : {},
 			...renderOptions
-		});
+		};
+		let pdf = styled.encrypt ? await renderStyledPdfEncrypted(this.flow.body, styled) : renderStyledPdf(this.flow.body, styled);
 		if (signature) pdf = await signPdf(pdf, signature);
 		this.enforceStrict(options, losses);
 		return {

package/dist/esm/core/document-model/types.d.ts

@@ -132,6 +132,7 @@ export interface Run {
     readonly footnoteRef?: string;
     readonly endnoteRef?: string;
     readonly noteNumber?: true;
+    readonly listMarker?: true;
     readonly inlineImage?: InlineImage;
     readonly math?: MathNode;
     readonly pageBreak?: boolean;
@@ -382,6 +383,7 @@ export interface Chart {
     readonly showValues?: boolean;
     readonly catAxisTitle?: string;
     readonly valAxisTitle?: string;
+    readonly seriesColorCycle?: ReadonlyArray<string>;
 }
 export interface ChartBlock {
     readonly float?: FloatAnchor;

package/dist/esm/core/drawingml/chart-geometry.d.ts

@@ -48,7 +48,7 @@ export type MeasureText = (text: string, sizePt: number) => number;
 export declare const CHART_LABEL_PT = 9;
 export declare const CHART_TITLE_PT = 13;
 export declare const SERIES_COLORS: string[];
-export declare const seriesColor: (s: ChartSeries, i: number) => string;
+export declare const seriesColor: (s: ChartSeries, i: number, cycle?: ReadonlyArray<string>) => string;
 export interface Scale {
     readonly min: number;
     readonly max: number;

package/dist/esm/core/drawingml/chart-geometry.js

@@ -10,7 +10,7 @@ var SERIES_COLORS = [
 	"5B9BD5",
 	"70AD47"
 ];
-var seriesColor = (s, i) => s.colorHex ?? SERIES_COLORS[i % SERIES_COLORS.length];
+var seriesColor = (s, i, cycle) => s.colorHex ?? (cycle && cycle.length > 0 ? cycle[i % cycle.length] : SERIES_COLORS[i % SERIES_COLORS.length]);
 function niceNum(range, round) {
 	const exp = Math.floor(Math.log10(range));
 	const f = range / 10 ** exp;
@@ -40,6 +40,68 @@ var ticks = (s) => {
 	for (let v = s.min; v <= s.max + 1e-9; v += s.step) out.push(Math.abs(v) < 1e-9 ? 0 : v);
 	return out;
 };
+function pushChartTitle(labels, chart, wPt, hPt) {
+	if (!chart.title) return;
+	labels.push({
+		text: chart.title,
+		x: wPt / 2,
+		y: hPt - 4 - 13,
+		sizePt: 13,
+		colorHex: TITLE_COLOR,
+		align: "center"
+	});
+}
+function buildLegendBlock(chart, wPt, hPt, measure) {
+	return layoutLegend(chart.series.map((s, i) => ({
+		name: s.name ?? "",
+		colorHex: seriesColor(s, i, chart.seriesColorCycle)
+	})).filter((e) => e.name !== ""), chart.hasLegend, chart.legendPos ?? "b", wPt, hPt, measure);
+}
+function pushGridTicks(polylines, labels, tickVals, fmt, axis, at, x0, y0, plotW, plotH) {
+	for (const v of tickVals) if (axis === "x") {
+		const gx = at(v);
+		polylines.push({
+			points: [[gx, y0], [gx, y0 + plotH]],
+			strokeHex: GRID_COLOR,
+			widthPt: .75
+		});
+		labels.push({
+			text: fmt(v),
+			x: gx,
+			y: y0 - 9,
+			sizePt: 9,
+			colorHex: LABEL_COLOR,
+			align: "center"
+		});
+	} else {
+		const gy = at(v);
+		polylines.push({
+			points: [[x0, gy], [x0 + plotW, gy]],
+			strokeHex: GRID_COLOR,
+			widthPt: .75
+		});
+		labels.push({
+			text: fmt(v),
+			x: x0 - 3,
+			y: gy - 9 / 3,
+			sizePt: 9,
+			colorHex: LABEL_COLOR,
+			align: "right"
+		});
+	}
+}
+function pushAxisLines(polylines, x0, y0, plotW, plotH) {
+	polylines.push({
+		points: [[x0, y0], [x0, y0 + plotH]],
+		strokeHex: AXIS_COLOR,
+		widthPt: 1
+	});
+	polylines.push({
+		points: [[x0, y0], [x0 + plotW, y0]],
+		strokeHex: AXIS_COLOR,
+		widthPt: 1
+	});
+}
 function buildFrame(chart, wPt, hPt, measure, horizontal, opts = {}) {
 	const rects = [];
 	const polylines = [];
@@ -53,10 +115,7 @@ function buildFrame(chart, wPt, hPt, measure, horizontal, opts = {}) {
 	let top = 4;
 	if (chart.title) top += 13 * 1.6;
 	if (chart.valAxisTitle) top += 9 * 1.4;
-	const legend = layoutLegend(chart.series.map((s, i) => ({
-		name: s.name ?? "",
-		colorHex: seriesColor(s, i)
-	})).filter((e) => e.name !== ""), chart.hasLegend, chart.legendPos ?? "b", wPt, hPt, measure);
+	const legend = buildLegendBlock(chart, wPt, hPt, measure);
 	const plotRight = wPt - 4 - legend.rightWidth;
 	const tickLabelW = Math.max(0, ...tickVals.map((v) => measure(fmtVal(v), 9))) + 4;
 	const catLabelH = 9 * 1.6;
@@ -67,14 +126,7 @@ function buildFrame(chart, wPt, hPt, measure, horizontal, opts = {}) {
 	const plotH = Math.max(1, hPt - top - y0);
 	const valueOffset = (v) => (v - scale.min) / (scale.max - scale.min) * (horizontal ? plotW : plotH);
 	const zeroOffset = valueOffset(0);
-	if (chart.title) labels.push({
-		text: chart.title,
-		x: wPt / 2,
-		y: hPt - 4 - 13,
-		sizePt: 13,
-		colorHex: TITLE_COLOR,
-		align: "center"
-	});
+	pushChartTitle(labels, chart, wPt, hPt);
 	if (chart.valAxisTitle) labels.push({
 		text: chart.valAxisTitle,
 		x: x0,
@@ -91,40 +143,8 @@ function buildFrame(chart, wPt, hPt, measure, horizontal, opts = {}) {
 		colorHex: LABEL_COLOR,
 		align: "center"
 	});
-	for (const v of tickVals) {
-		const off = valueOffset(v);
-		if (horizontal) {
-			const gx = x0 + off;
-			polylines.push({
-				points: [[gx, y0], [gx, y0 + plotH]],
-				strokeHex: GRID_COLOR,
-				widthPt: .75
-			});
-			labels.push({
-				text: fmtVal(v),
-				x: gx,
-				y: y0 - 9,
-				sizePt: 9,
-				colorHex: LABEL_COLOR,
-				align: "center"
-			});
-		} else {
-			const gy = y0 + off;
-			polylines.push({
-				points: [[x0, gy], [x0 + plotW, gy]],
-				strokeHex: GRID_COLOR,
-				widthPt: .75
-			});
-			labels.push({
-				text: fmtVal(v),
-				x: x0 - 3,
-				y: gy - 9 / 3,
-				sizePt: 9,
-				colorHex: LABEL_COLOR,
-				align: "right"
-			});
-		}
-	}
+	if (horizontal) pushGridTicks(polylines, labels, tickVals, fmtVal, "x", (v) => x0 + valueOffset(v), x0, y0, plotW, plotH);
+	else pushGridTicks(polylines, labels, tickVals, fmtVal, "y", (v) => y0 + valueOffset(v), x0, y0, plotW, plotH);
 	const slot = (horizontal ? plotH : plotW) / nCats;
 	for (let c = 0; c < nCats; c++) {
 		const cat = chart.categories[c] ?? "";
@@ -147,16 +167,7 @@ function buildFrame(chart, wPt, hPt, measure, horizontal, opts = {}) {
 			align: "center"
 		});
 	}
-	polylines.push({
-		points: [[x0, y0], [x0, y0 + plotH]],
-		strokeHex: AXIS_COLOR,
-		widthPt: 1
-	});
-	polylines.push({
-		points: [[x0, y0], [x0 + plotW, y0]],
-		strokeHex: AXIS_COLOR,
-		widthPt: 1
-	});
+	pushAxisLines(polylines, x0, y0, plotW, plotH);
 	legend.emit(rects, labels);
 	return {
 		x0,
@@ -232,7 +243,7 @@ function buildBarScene(chart, wPt, hPt, measure) {
 				const o1 = f.valueOffset(top);
 				const lo = Math.min(o0, o1);
 				const span = Math.abs(o1 - o0);
-				const color = pointColor(series, c) ?? seriesColor(series, s);
+				const color = pointColor(series, c) ?? seriesColor(series, s, chart.seriesColorCycle);
 				if (horizontal) f.rects.push({
 					x: f.x0 + lo,
 					y: along,
@@ -271,7 +282,7 @@ function buildBarScene(chart, wPt, hPt, measure) {
 		for (let s = 0; s < chart.series.length; s++) {
 			const series = chart.series[s];
 			const len = f.valueOffset(series.values[c] ?? 0) - f.zeroOffset;
-			const color = pointColor(series, c) ?? seriesColor(series, s);
+			const color = pointColor(series, c) ?? seriesColor(series, s, chart.seriesColorCycle);
 			const along = slotStart + s * barW;
 			if (horizontal) {
 				const bx = f.x0 + f.zeroOffset + Math.min(0, len);
@@ -356,7 +367,7 @@ function buildAreaScene(chart, wPt, hPt, measure) {
 				const denom = percent ? chart.series.reduce((a, ss) => a + Math.abs(ss.values[c] ?? 0), 0) || 1 : 1;
 				return b + (series.values[c] ?? 0) / denom;
 			});
-			polygons.push(areaBand(top, base, f, xAt, seriesColor(series, s)));
+			polygons.push(areaBand(top, base, f, xAt, seriesColor(series, s, chart.seriesColorCycle)));
 			for (let c = 0; c < nCats; c++) cum[c] = top[c];
 		}
 	} else {
@@ -364,7 +375,7 @@ function buildAreaScene(chart, wPt, hPt, measure) {
 		for (let s = chart.series.length - 1; s >= 0; s--) {
 			const series = chart.series[s];
 			const top = Array.from({ length: nCats }, (_, c) => series.values[c] ?? 0);
-			polygons.push(areaBand(top, base, f, xAt, seriesColor(series, s)));
+			polygons.push(areaBand(top, base, f, xAt, seriesColor(series, s, chart.seriesColorCycle)));
 		}
 	}
 	return {
@@ -397,69 +408,20 @@ function buildScatterScene(chart, wPt, hPt, measure) {
 	const yTicks = ticks(yScale);
 	let top = 4;
 	if (chart.title) top += 13 * 1.6;
-	const legend = layoutLegend(chart.series.map((s, i) => ({
-		name: s.name ?? "",
-		colorHex: seriesColor(s, i)
-	})).filter((e) => e.name !== ""), chart.hasLegend, chart.legendPos ?? "b", wPt, hPt, measure);
+	const legend = buildLegendBlock(chart, wPt, hPt, measure);
 	const x0 = 4 + (Math.max(0, ...yTicks.map((v) => measure(formatTick(v, yScale.step), 9))) + 4);
 	const y0 = 4 + legend.bottomHeight + 9 * 1.6;
 	const plotW = Math.max(1, wPt - 4 - legend.rightWidth - x0);
 	const plotH = Math.max(1, hPt - top - y0);
 	const xAt = (v) => x0 + (v - xScale.min) / (xScale.max - xScale.min) * plotW;
 	const yAt = (v) => y0 + (v - yScale.min) / (yScale.max - yScale.min) * plotH;
-	if (chart.title) labels.push({
-		text: chart.title,
-		x: wPt / 2,
-		y: hPt - 4 - 13,
-		sizePt: 13,
-		colorHex: TITLE_COLOR,
-		align: "center"
-	});
-	for (const v of yTicks) {
-		const gy = yAt(v);
-		polylines.push({
-			points: [[x0, gy], [x0 + plotW, gy]],
-			strokeHex: GRID_COLOR,
-			widthPt: .75
-		});
-		labels.push({
-			text: formatTick(v, yScale.step),
-			x: x0 - 3,
-			y: gy - 9 / 3,
-			sizePt: 9,
-			colorHex: LABEL_COLOR,
-			align: "right"
-		});
-	}
-	for (const v of xTicks) {
-		const gx = xAt(v);
-		polylines.push({
-			points: [[gx, y0], [gx, y0 + plotH]],
-			strokeHex: GRID_COLOR,
-			widthPt: .75
-		});
-		labels.push({
-			text: formatTick(v, xScale.step),
-			x: gx,
-			y: y0 - 9,
-			sizePt: 9,
-			colorHex: LABEL_COLOR,
-			align: "center"
-		});
-	}
-	polylines.push({
-		points: [[x0, y0], [x0, y0 + plotH]],
-		strokeHex: AXIS_COLOR,
-		widthPt: 1
-	});
-	polylines.push({
-		points: [[x0, y0], [x0 + plotW, y0]],
-		strokeHex: AXIS_COLOR,
-		widthPt: 1
-	});
+	pushChartTitle(labels, chart, wPt, hPt);
+	pushGridTicks(polylines, labels, yTicks, (v) => formatTick(v, yScale.step), "y", yAt, x0, y0, plotW, plotH);
+	pushGridTicks(polylines, labels, xTicks, (v) => formatTick(v, xScale.step), "x", xAt, x0, y0, plotW, plotH);
+	pushAxisLines(polylines, x0, y0, plotW, plotH);
 	for (let s = 0; s < chart.series.length; s++) {
 		const series = chart.series[s];
-		const color = seriesColor(series, s);
+		const color = seriesColor(series, s, chart.seriesColorCycle);
 		for (let i = 0; i < series.values.length; i++) {
 			const px = xAt(series.xValues?.[i] ?? i);
 			const py = yAt(series.values[i] ?? 0);
@@ -485,7 +447,7 @@ function buildLineScene(chart, wPt, hPt, measure) {
 	const f = buildFrame(chart, wPt, hPt, measure, false, { dataRange: allVals.length > 0 ? [Math.min(...allVals), Math.max(...allVals)] : [0, 1] });
 	for (let s = 0; s < chart.series.length; s++) {
 		const series = chart.series[s];
-		const color = seriesColor(series, s);
+		const color = seriesColor(series, s, chart.seriesColorCycle);
 		const pts = [];
 		for (let c = 0; c < f.nCats; c++) {
 			const x = f.x0 + c * f.slot + f.slot / 2;

package/dist/esm/core/drawingml/chart-parser.d.ts

@@ -1,3 +1,6 @@
 import { Chart } from '../document-model/index.js';
+import { OpcPackage } from '../opc/index.js';
 import { ColorResolver } from './colors.js';
 export declare function parseChart(chartXml: Uint8Array, resolveColor: ColorResolver): Chart | null;
+export declare function parseChartColorStyle(colorsXml: Uint8Array, resolveColor: ColorResolver): Array<string>;
+export declare function withChartColorStyle(chart: Chart, pkg: OpcPackage, chartPartPath: string, resolveColor: ColorResolver): Chart;

package/dist/esm/core/drawingml/chart-parser.js

@@ -191,5 +191,32 @@ function isLegendPos(v) {
 function isGrouping(v) {
 	return v === "clustered" || v === "stacked" || v === "percentStacked" || v === "standard";
 }
+function parseChartColorStyle(colorsXml, resolveColor) {
+	const root = parser.parse(new TextDecoder().decode(colorsXml)).find((n) => {
+		const tag = Object.keys(n).find((k) => k !== ":@" && k !== "#text");
+		return tag !== void 0 && tag.endsWith("colorStyle");
+	});
+	if (!root) return [];
+	const out = [];
+	for (const child of poChildren(root)) {
+		const hex = resolveColorNode(child, resolveColor);
+		if (hex !== void 0) out.push(hex);
+	}
+	return out;
+}
+function withChartColorStyle(chart, pkg, chartPartPath, resolveColor) {
+	for (const rel of pkg.getPartRelationships(chartPartPath)) {
+		if (rel.type !== REL_CHART_COLOR_STYLE) continue;
+		const resolved = pkg.resolveRelatedPart(chartPartPath, rel);
+		if (!resolved) continue;
+		const cycle = parseChartColorStyle(resolved.data, resolveColor);
+		if (cycle.length > 0) return {
+			...chart,
+			seriesColorCycle: cycle
+		};
+	}
+	return chart;
+}
+var REL_CHART_COLOR_STYLE = "http://schemas.microsoft.com/office/2011/relationships/chartColorStyle";
 //#endregion
-export { parseChart };
+export { parseChart, withChartColorStyle };

package/dist/esm/core/numbering/apply.js

@@ -12,7 +12,8 @@ function applyNumbering(body, numbering) {
 		const level = (instance ? numbering.abstractNums.get(instance.abstractNumId) : void 0)?.levels.get(ref.ilvl);
 		const markerRun = {
 			text: `${marker}\t`,
-			properties: level?.runProperties ?? {}
+			properties: level?.runProperties ?? {},
+			listMarker: true
 		};
 		const newProps = mergeIndentFromLevel(p.properties, level?.paragraphProperties);
 		return {

package/dist/esm/core/opc/index.d.ts

@@ -3,3 +3,4 @@ export type { Relationship } from './relationships.js';
 export { REL_OFFICE_DOCUMENT, REL_CORE_PROPERTIES, REL_EXTENDED_PROPERTIES, } from './relationship-types.js';
 export { parseCoreProperties } from './core-properties.js';
 export type { CoreProperties } from './core-properties.js';
+export { isOoxmlRel } from './relationship-types.js';

package/dist/esm/core/opc/package.js

@@ -1,5 +1,5 @@
 import { parseRelationships } from "./relationships.js";
-import "./relationship-types.js";
+import { isOoxmlRel } from "./relationship-types.js";
 import { unzipSync } from "fflate";
 //#region src/core/opc/package.ts
 var ROOT_RELS_PATH = "_rels/.rels";
@@ -11,6 +11,7 @@ var OpcPackage = class OpcPackage {
 	}
 	relsCache = /* @__PURE__ */ new Map();
 	static open(buffer, options = {}) {
+		if (buffer.length >= 4 && buffer[0] === 208 && buffer[1] === 207 && buffer[2] === 17 && buffer[3] === 224) throw new Error("OLE compound file: a password-protected (encrypted) OOXML document or a legacy binary .doc/.xls — re-save as an unencrypted .docx/.xlsx");
 		const maxArchive = options.maxArchiveBytes ?? 128 * MIB;
 		const maxEntry = options.maxEntryBytes ?? 256 * MIB;
 		const maxTotal = options.maxTotalBytes ?? 512 * MIB;
@@ -77,7 +78,7 @@ var OpcPackage = class OpcPackage {
 		};
 	}
 	getMainDocumentPath() {
-		const candidates = this.rootRelationships.filter((r) => r.type === "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" && r.targetMode === "Internal");
+		const candidates = this.rootRelationships.filter((r) => isOoxmlRel(r.type, "officeDocument") && r.targetMode === "Internal");
 		if (candidates.length === 0) throw new Error("OPC package has no officeDocument relationship");
 		if (candidates.length > 1) throw new Error(`OPC package has multiple officeDocument relationships (${candidates.length})`);
 		return resolveTarget("/", candidates[0].target);

package/dist/esm/core/opc/relationship-types.d.ts

@@ -1,3 +1,4 @@
 export declare const REL_OFFICE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
 export declare const REL_CORE_PROPERTIES = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
 export declare const REL_EXTENDED_PROPERTIES = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
+export declare function isOoxmlRel(type: string, name: string): boolean;

package/dist/esm/core/opc/relationship-types.js

@@ -1,4 +1,7 @@
 //#region src/core/opc/relationship-types.ts
-var REL_OFFICE_DOCUMENT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";
+var OOXML_REL_BASES = ["http://schemas.openxmlformats.org/officeDocument/2006/relationships/", "http://purl.oclc.org/ooxml/officeDocument/relationships/"];
+function isOoxmlRel(type, name) {
+	return OOXML_REL_BASES.some((base) => type === base + name);
+}
 //#endregion
-export { REL_OFFICE_DOCUMENT };
+export { isOoxmlRel };

package/dist/esm/excel/print-model.d.ts

@@ -1,5 +1,8 @@
 import { BodyElement, SectionProperties } from '../core/document-model/index.js';
 import { CellRange, DefinedName, ParsedWorksheet, XlsxStyles } from './index.js';
+export declare const TWIPS_PER_EXCEL_CHAR = 105;
+export declare const DEFAULT_COL_TWIPS = 960;
+export declare const DEFAULT_ROW_TWIPS = 300;
 export declare function sectionFromWorksheet(worksheet: ParsedWorksheet): SectionProperties | undefined;
 export declare function resolvePrintArea(definedNames: ReadonlyArray<DefinedName>, sheetIdx: number): CellRange | undefined;
 export declare function resolvePrintTitleRows(definedNames: ReadonlyArray<DefinedName>, sheetIdx: number): {

package/dist/esm/excel/print-model.js

@@ -2,10 +2,6 @@ import { eighthPtToPt, halfPtToPt, twipsToPt } from "../core/ir/units.js";
 import { parseAreaRef, parseTitleRowRange } from "./defined-name-ref.js";
 import { applyNumberFormat } from "./number-format.js";
 import "./index.js";
-//#region src/excel/print-model.ts
-var TWIPS_PER_EXCEL_CHAR = 105;
-var DEFAULT_COL_TWIPS = 960;
-var DEFAULT_ROW_TWIPS = 300;
 var TWIPS_PER_POINT = 20;
 var TWIPS_PER_INCH = 1440;
 var PAPER_SIZES_TWIPS = new Map([
@@ -154,9 +150,9 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 		const cEnd = Math.min(m.endColumn, colWindowEnd);
 		for (let r = Math.max(m.startRow, rowStart); r <= rEnd; r++) for (let c = Math.max(m.startColumn, colStart); c <= cEnd; c++) if (!(r === m.startRow && c === m.startColumn)) insideMerge.add(key(r, c));
 	}
-	const columnWidths = new Array(colCount).fill(DEFAULT_COL_TWIPS);
+	const columnWidths = new Array(colCount).fill(960);
 	for (const col of worksheet.columns) {
-		const twips = Math.round(col.widthChars * TWIPS_PER_EXCEL_CHAR);
+		const twips = Math.round(col.widthChars * 105);
 		for (let abs = col.min - 1; abs <= col.max - 1; abs++) {
 			const i = abs - colStart;
 			if (i >= 0 && i < colCount) columnWidths[i] = twips;
@@ -164,7 +160,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 	}
 	const totalGridTwips = columnWidths.reduce((sum, w) => sum + w, 0);
 	let totalGridHeightTwips = 0;
-	for (let r = 0; r < rowCount; r++) totalGridHeightTwips += rowHeightMap.get(r)?.heightTwips ?? DEFAULT_ROW_TWIPS;
+	for (let r = 0; r < rowCount; r++) totalGridHeightTwips += rowHeightMap.get(r)?.heightTwips ?? 300;
 	const printScale = computePrintScale(worksheet, totalGridTwips, sheetContentWidthTwips(worksheet), totalGridHeightTwips, sheetContentHeightTwips(worksheet));
 	const scaled = printScale < .999;
 	const breakRows = new Set(worksheet.rowBreaks ?? []);
@@ -217,7 +213,7 @@ function worksheetToBody(worksheet, sharedStrings, styles, date1904, print) {
 					cc++;
 				}
 				if (cc < colCount) {
-					const charsFit = Math.max(1, Math.round(availTwips / TWIPS_PER_EXCEL_CHAR));
+					const charsFit = Math.max(1, Math.round(availTwips / 105));
 					if (text.length > charsFit) text = text.slice(0, charsFit);
 				}
 			}

package/dist/esm/excel/sheet-drawing.d.ts

@@ -0,0 +1,9 @@
+import { OpcPackage } from '../core/opc/index.js';
+import { ParsedWorksheet } from './worksheet-parser.js';
+export interface SheetChartRef {
+    readonly chartPartPath: string;
+    readonly widthPt: number;
+    readonly heightPt: number;
+    readonly anchorRow: number;
+}
+export declare function parseSheetDrawing(drawingXml: Uint8Array, drawingPartPath: string, pkg: OpcPackage, worksheet: ParsedWorksheet): Array<SheetChartRef>;

package/dist/esm/excel/sheet-drawing.js

@@ -0,0 +1,113 @@
+import { emuToPt } from "../core/ir/units.js";
+import "./print-model.js";
+import { XMLParser } from "fast-xml-parser";
+//#region src/excel/sheet-drawing.ts
+var CHART_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
+var parser = new XMLParser({
+	ignoreAttributes: false,
+	attributeNamePrefix: "@_",
+	removeNSPrefix: true,
+	parseTagValue: false
+});
+var TWIPS_PER_PT = 20;
+function parseSheetDrawing(drawingXml, drawingPartPath, pkg, worksheet) {
+	const root = parser.parse(new TextDecoder().decode(drawingXml))["wsDr"];
+	if (!root || typeof root !== "object") return [];
+	const rootObj = root;
+	const colWidthPt = makeColWidthPt(worksheet);
+	const rowHeightPt = makeRowHeightPt(worksheet);
+	const rels = pkg.getPartRelationships(drawingPartPath);
+	const out = [];
+	for (const kind of [
+		"twoCellAnchor",
+		"oneCellAnchor",
+		"absoluteAnchor"
+	]) for (const anchor of asArray(rootObj[kind])) {
+		if (!anchor || typeof anchor !== "object") continue;
+		const a = anchor;
+		const chartRelId = chartRelIdOf(a);
+		if (!chartRelId) continue;
+		const rel = rels.find((r) => r.id === chartRelId);
+		const resolved = rel ? pkg.resolveRelatedPart(drawingPartPath, rel) : void 0;
+		if (!resolved) continue;
+		const from = cellMarker(a["from"]);
+		let widthPt = 0;
+		let heightPt = 0;
+		if (kind === "twoCellAnchor") {
+			const to = cellMarker(a["to"]);
+			if (!from || !to) continue;
+			widthPt = spanPt(from.col, from.colOffPt, to.col, to.colOffPt, colWidthPt);
+			heightPt = spanPt(from.row, from.rowOffPt, to.row, to.rowOffPt, rowHeightPt);
+		} else {
+			const ext = a["ext"];
+			if (!ext || typeof ext !== "object") continue;
+			const e = ext;
+			widthPt = emuToPt(num(e["@_cx"]) ?? 0);
+			heightPt = emuToPt(num(e["@_cy"]) ?? 0);
+		}
+		if (widthPt <= 0 || heightPt <= 0) continue;
+		out.push({
+			chartPartPath: resolved.path,
+			widthPt,
+			heightPt,
+			anchorRow: from?.row ?? 0
+		});
+	}
+	return out.sort((x, y) => x.anchorRow - y.anchorRow);
+}
+function chartRelIdOf(anchor) {
+	const frame = anchor["graphicFrame"];
+	if (!frame || typeof frame !== "object") return void 0;
+	const graphic = frame["graphic"];
+	if (!graphic || typeof graphic !== "object") return void 0;
+	const data = graphic["graphicData"];
+	if (!data || typeof data !== "object") return void 0;
+	const d = data;
+	if (d["@_uri"] !== CHART_URI) return void 0;
+	const chart = d["chart"];
+	if (!chart || typeof chart !== "object") return void 0;
+	const id = chart["@_id"];
+	return typeof id === "string" && id !== "" ? id : void 0;
+}
+function cellMarker(node) {
+	if (!node || typeof node !== "object") return void 0;
+	const m = node;
+	const col = num(m["col"]);
+	const row = num(m["row"]);
+	if (col === void 0 || row === void 0) return void 0;
+	return {
+		col,
+		row,
+		colOffPt: emuToPt(num(m["colOff"]) ?? 0),
+		rowOffPt: emuToPt(num(m["rowOff"]) ?? 0)
+	};
+}
+function spanPt(from, fromOffPt, to, toOffPt, trackPt) {
+	let span = 0;
+	for (let i = from; i < to; i++) span += trackPt(i);
+	return span - fromOffPt + toOffPt;
+}
+function makeColWidthPt(ws) {
+	return (col) => {
+		for (const c of ws.columns) if (col >= c.min - 1 && col <= c.max - 1) return c.widthChars * 105 / TWIPS_PER_PT;
+		return 960 / TWIPS_PER_PT;
+	};
+}
+function makeRowHeightPt(ws) {
+	return (row) => {
+		for (const r of ws.rowHeights) if (r.row === row) return r.heightPt;
+		return 300 / TWIPS_PER_PT;
+	};
+}
+function num(v) {
+	if (typeof v === "number" && Number.isFinite(v)) return v;
+	if (typeof v === "string" && v !== "") {
+		const n = Number(v);
+		if (Number.isFinite(n)) return n;
+	}
+}
+function asArray(v) {
+	return Array.isArray(v) ? v : v !== void 0 ? [v] : [];
+}
+//#endregion
+export { parseSheetDrawing };

package/dist/esm/excel/worksheet-parser.d.ts

@@ -56,5 +56,6 @@ export interface ParsedWorksheet {
     readonly printOptions?: XlsxPrintOptions;
     readonly rowBreaks?: ReadonlyArray<number>;
     readonly colBreaks?: ReadonlyArray<number>;
+    readonly drawingRelId?: string;
 }
 export declare function parseWorksheet(data: Uint8Array): ParsedWorksheet;

package/dist/esm/excel/worksheet-parser.js

@@ -32,13 +32,16 @@ function parseWorksheet(data) {
 	const printOptions = parsePrintOptions(wsObj);
 	const rowBreaks = parseBreaks(wsObj, "rowBreaks");
 	const colBreaks = parseBreaks(wsObj, "colBreaks");
+	const drawingNode = wsObj["drawing"];
+	const drawingRelId = drawingNode && typeof drawingNode === "object" ? strAttr(drawingNode, "id") : void 0;
 	const printModel = {
 		...pageMargins ? { pageMargins } : {},
 		...pageSetup ? { pageSetup } : {},
 		...fitToPage ? { fitToPage } : {},
 		...printOptions ? { printOptions } : {},
 		...rowBreaks.length > 0 ? { rowBreaks } : {},
-		...colBreaks.length > 0 ? { colBreaks } : {}
+		...colBreaks.length > 0 ? { colBreaks } : {},
+		...drawingRelId !== void 0 ? { drawingRelId } : {}
 	};
 	const sheetData = wsObj["sheetData"];
 	if (!sheetData || typeof sheetData !== "object") return {