odf.js 1.5.0 → 1.7.0

package/dist/index.js

@@ -1420,6 +1420,25 @@ function cellReference(columnIndex, rowIndex) {
 	if (!Number.isInteger(rowIndex) || rowIndex < 0) throw new Error(`cellReference: rowIndex must be a non-negative integer, got ${rowIndex}`);
 	return `${columnIndexToLetters(columnIndex)}${rowIndex + 1}`;
 }
+function columnLettersToIndex(letters) {
+	if (!/^[A-Z]+$/.test(letters)) return;
+	let index = 0;
+	for (const char of letters) index = index * ALPHABET_SIZE + (char.charCodeAt(0) - ALPHABET_START_CODE + 1);
+	return index - 1;
+}
+function parseCellReference(reference) {
+	const match = /^([A-Z]+)(\d+)$/.exec(reference);
+	if (match === null) return;
+	const [, letters, digits] = match;
+	if (letters === void 0 || digits === void 0) return;
+	const column = columnLettersToIndex(letters);
+	const row = Number.parseInt(digits, 10) - 1;
+	if (column === void 0 || row < 0) return;
+	return {
+		column,
+		row
+	};
+}
 function validateRepeatCount(repeatCount, caller) {
 	if (!Number.isInteger(repeatCount) || repeatCount < 1) throw new Error(`${caller}: repeatCount must be a positive integer, got ${repeatCount}`);
 }
@@ -1494,6 +1513,28 @@ function parseBox(element) {
 		heightPt
 	};
 }
+function parseLinePoints(element) {
+	const x1Value = attrValue(element, "svg:x1");
+	const y1Value = attrValue(element, "svg:y1");
+	const x2Value = attrValue(element, "svg:x2");
+	const y2Value = attrValue(element, "svg:y2");
+	if (x1Value === void 0 || y1Value === void 0 || x2Value === void 0 || y2Value === void 0) return;
+	const x1Pt = parseOdfLength(x1Value);
+	const y1Pt = parseOdfLength(y1Value);
+	const x2Pt = parseOdfLength(x2Value);
+	const y2Pt = parseOdfLength(y2Value);
+	if (x1Pt === void 0 || y1Pt === void 0 || x2Pt === void 0 || y2Pt === void 0) return;
+	return {
+		from: {
+			xPt: x1Pt,
+			yPt: y1Pt
+		},
+		to: {
+			xPt: x2Pt,
+			yPt: y2Pt
+		}
+	};
+}
 //#endregion
 //#region src/typed/shared/cascade.ts
 const STYLE_PARTS = ["content.xml", "styles.xml"];
@@ -1679,7 +1720,7 @@ function readOdfParagraph(pElement, pkg) {
 }
 //#endregion
 //#region src/typed/shared/table.ts
-function readRepeatCount(element, attrName) {
+function readRepeatCount$1(element, attrName) {
 	const raw = attrValue(element, attrName);
 	if (raw === void 0) return 1;
 	const parsed = Number.parseInt(raw, 10);
@@ -1722,11 +1763,11 @@ function readTableRow(rowElement, pkg) {
 	for (const child of rowElement.children) {
 		if (child.type !== "element") continue;
 		if (child.tag === "table:covered-table-cell") {
-			const repeat = readRepeatCount(child, "table:number-columns-repeated");
+			const repeat = readRepeatCount$1(child, "table:number-columns-repeated");
 			for (let i = 0; i < repeat; i++) cells.push({ blocks: [] });
 		} else if (child.tag === "table:table-cell") {
 			const cell = readTableCell(child, pkg);
-			const repeat = readRepeatCount(child, "table:number-columns-repeated");
+			const repeat = readRepeatCount$1(child, "table:number-columns-repeated");
 			for (let i = 0; i < repeat; i++) cells.push(cell);
 		}
 	}
@@ -1739,13 +1780,13 @@ function readOdfTable(tableElement, pkg) {
 	const columnWidthsPt = [];
 	for (const column of childrenWithTag(tableElement, "table:table-column")) {
 		const widthPt = resolveColumnWidthPt(column, pkg);
-		const repeat = readRepeatCount(column, "table:number-columns-repeated");
+		const repeat = readRepeatCount$1(column, "table:number-columns-repeated");
 		for (let i = 0; i < repeat; i++) columnWidthsPt.push(widthPt);
 	}
 	const rows = [];
 	for (const rowElement of childrenWithTag(tableElement, "table:table-row")) {
 		const row = readTableRow(rowElement, pkg);
-		const repeat = readRepeatCount(rowElement, "table:number-rows-repeated");
+		const repeat = readRepeatCount$1(rowElement, "table:number-rows-repeated");
 		for (let i = 0; i < repeat; i++) rows.push(row);
 	}
 	return {
@@ -1858,6 +1899,294 @@ function composeOdfGroupTransform(groupFunctions, child) {
 	};
 }
 //#endregion
+//#region src/typed/shared/masterpage.ts
+const STYLES_PART$1 = "styles.xml";
+const AUTOMATIC_STYLE_PARTS$1 = ["content.xml", STYLES_PART$1];
+function findMasterPageElement(pkg, masterPageName) {
+	if (masterPageName === void 0) return;
+	const stylesPart = pkg.parts[STYLES_PART$1];
+	if (stylesPart?.kind !== "xml") return;
+	const root = rootElement(stylesPart.nodes);
+	const masterStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:master-styles");
+	if (masterStyles === void 0) return;
+	return childrenWithTag(masterStyles, "style:master-page").find((element) => attrValue(element, "style:name") === masterPageName);
+}
+function findPageLayoutElement$1(pkg, pageLayoutName) {
+	if (pageLayoutName === void 0) return;
+	for (const partPath of AUTOMATIC_STYLE_PARTS$1) {
+		const part = pkg.parts[partPath];
+		if (part?.kind !== "xml") continue;
+		const root = rootElement(part.nodes);
+		const automaticStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:automatic-styles");
+		if (automaticStyles === void 0) continue;
+		const found = childrenWithTag(automaticStyles, "style:page-layout").find((element) => attrValue(element, "style:name") === pageLayoutName);
+		if (found !== void 0) return found;
+	}
+}
+function resolvePageLayoutProperties(pkg, masterPageName) {
+	const masterPage = findMasterPageElement(pkg, masterPageName);
+	const pageLayout = findPageLayoutElement$1(pkg, masterPage === void 0 ? void 0 : attrValue(masterPage, "style:page-layout-name"));
+	return pageLayout === void 0 ? void 0 : childrenWithTag(pageLayout, "style:page-layout-properties")[0];
+}
+function resolveDrawPageSize(page, pkg) {
+	const properties = resolvePageLayoutProperties(pkg, attrValue(page, "draw:master-page-name"));
+	return properties === void 0 ? void 0 : parsePageSize(properties);
+}
+//#endregion
+//#region src/typed/shared/path.ts
+const VIEW_BOX_PATTERN = /^(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)$/;
+function parseOdfViewBox(value) {
+	const match = VIEW_BOX_PATTERN.exec(value.trim());
+	if (match === null) return;
+	const minX = Number(match[1]);
+	const minY = Number(match[2]);
+	const width = Number(match[3]);
+	const height = Number(match[4]);
+	if (width <= 0 || height <= 0) return;
+	return {
+		minX,
+		minY,
+		width,
+		height
+	};
+}
+function parseOdfPointsList(value) {
+	const points = [];
+	for (const pair of value.trim().split(/\s+/)) {
+		if (pair.length === 0) continue;
+		const [xRaw, yRaw] = pair.split(",");
+		if (xRaw === void 0 || yRaw === void 0) continue;
+		const x = Number(xRaw);
+		const y = Number(yRaw);
+		if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
+		points.push({
+			x,
+			y
+		});
+	}
+	return points;
+}
+function rawSubpathFromPoints(points, closed) {
+	const start = points[0];
+	if (start === void 0) return;
+	return {
+		start,
+		segments: points.slice(1).map((to) => ({
+			kind: "line",
+			to
+		})),
+		closed
+	};
+}
+const COMMAND_LETTERS = /* @__PURE__ */ new Set([
+	"M",
+	"m",
+	"L",
+	"l",
+	"H",
+	"h",
+	"V",
+	"v",
+	"C",
+	"c",
+	"S",
+	"s",
+	"Q",
+	"q",
+	"T",
+	"t",
+	"A",
+	"a",
+	"Z",
+	"z"
+]);
+function isCommandLetter(token) {
+	return COMMAND_LETTERS.has(token);
+}
+const PATH_TOKEN_PATTERN = /[MmLlHhVvCcSsQqTtAaZz]|-?(?:\d+\.\d+|\.\d+|\d+)(?:[eE][-+]?\d+)?/g;
+function tokenizePathData(d) {
+	return d.match(PATH_TOKEN_PATTERN) ?? [];
+}
+function parseOdfPathData(d) {
+	const tokens = tokenizePathData(d);
+	const subpaths = [];
+	let current = {
+		x: 0,
+		y: 0
+	};
+	let subpathStart = {
+		x: 0,
+		y: 0
+	};
+	let activeSubpath;
+	let command;
+	let firstMInCommand = true;
+	function startSubpath(point) {
+		activeSubpath = {
+			start: point,
+			segments: [],
+			closed: false
+		};
+		subpaths.push(activeSubpath);
+		subpathStart = point;
+		current = point;
+	}
+	function pushSegment(segment, to) {
+		if (activeSubpath !== void 0) activeSubpath.segments.push(segment);
+		current = to;
+	}
+	let i = 0;
+	while (i < tokens.length) {
+		const token = tokens[i];
+		if (token === void 0) break;
+		if (isCommandLetter(token)) {
+			if (token === "Z" || token === "z") {
+				if (activeSubpath !== void 0) {
+					activeSubpath.closed = true;
+					current = subpathStart;
+				}
+				command = void 0;
+				i += 1;
+				continue;
+			}
+			command = token;
+			firstMInCommand = true;
+			i += 1;
+			continue;
+		}
+		if (command === void 0) {
+			i += 1;
+			continue;
+		}
+		const upper = command.toUpperCase();
+		const relative = command !== upper;
+		if (upper === "M" || upper === "L") {
+			const xTok = tokens[i];
+			const yTok = tokens[i + 1];
+			i += 2;
+			if (xTok === void 0 || yTok === void 0) break;
+			const x = Number(xTok);
+			const y = Number(yTok);
+			if (!Number.isFinite(x) || !Number.isFinite(y)) continue;
+			const point = relative ? {
+				x: current.x + x,
+				y: current.y + y
+			} : {
+				x,
+				y
+			};
+			if (upper === "M" && firstMInCommand) {
+				startSubpath(point);
+				firstMInCommand = false;
+			} else pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "H") {
+			const xTok = tokens[i];
+			i += 1;
+			if (xTok === void 0) break;
+			const x = Number(xTok);
+			if (!Number.isFinite(x)) continue;
+			const point = relative ? {
+				x: current.x + x,
+				y: current.y
+			} : {
+				x,
+				y: current.y
+			};
+			pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "V") {
+			const yTok = tokens[i];
+			i += 1;
+			if (yTok === void 0) break;
+			const y = Number(yTok);
+			if (!Number.isFinite(y)) continue;
+			const point = relative ? {
+				x: current.x,
+				y: current.y + y
+			} : {
+				x: current.x,
+				y
+			};
+			pushSegment({
+				kind: "line",
+				to: point
+			}, point);
+		} else if (upper === "C") {
+			const rawArgs = tokens.slice(i, i + 6);
+			i += 6;
+			if (rawArgs.length < 6) break;
+			const x1 = Number(rawArgs[0]);
+			const y1 = Number(rawArgs[1]);
+			const x2 = Number(rawArgs[2]);
+			const y2 = Number(rawArgs[3]);
+			const x = Number(rawArgs[4]);
+			const y = Number(rawArgs[5]);
+			if (![
+				x1,
+				y1,
+				x2,
+				y2,
+				x,
+				y
+			].every(Number.isFinite)) continue;
+			const control1 = relative ? {
+				x: current.x + x1,
+				y: current.y + y1
+			} : {
+				x: x1,
+				y: y1
+			};
+			const control2 = relative ? {
+				x: current.x + x2,
+				y: current.y + y2
+			} : {
+				x: x2,
+				y: y2
+			};
+			const to = relative ? {
+				x: current.x + x,
+				y: current.y + y
+			} : {
+				x,
+				y
+			};
+			pushSegment({
+				kind: "cubic",
+				control1,
+				control2,
+				to
+			}, to);
+		} else i += 1;
+	}
+	return subpaths;
+}
+function scaleOdfRawPoint(point, viewBox, frame) {
+	return {
+		xPt: (point.x - viewBox.minX) * (frame.widthPt / viewBox.width),
+		yPt: (point.y - viewBox.minY) * (frame.heightPt / viewBox.height)
+	};
+}
+function buildOdfSubpaths(rawSubpaths, viewBox, frame) {
+	return rawSubpaths.map((raw) => ({
+		start: scaleOdfRawPoint(raw.start, viewBox, frame),
+		closed: raw.closed,
+		segments: raw.segments.map((segment) => segment.kind === "line" ? {
+			kind: "line",
+			to: scaleOdfRawPoint(segment.to, viewBox, frame)
+		} : {
+			kind: "cubic",
+			control1: scaleOdfRawPoint(segment.control1, viewBox, frame),
+			control2: scaleOdfRawPoint(segment.control2, viewBox, frame),
+			to: scaleOdfRawPoint(segment.to, viewBox, frame)
+		})
+	}));
+}
+//#endregion
 //#region src/typed/draw/shapes.ts
 const ZERO_INSETS = {
 	insetLeftPt: 0,
@@ -1939,37 +2268,224 @@ function walkDrawShapes(children, groupFunctions, pkg, out) {
 		}
 	}
 }
-//#endregion
-//#region src/typed/odp/read.ts
-const CONTENT_PART$1 = "content.xml";
-const STYLES_PART$1 = "styles.xml";
-const AUTOMATIC_STYLE_PARTS$1 = [CONTENT_PART$1, STYLES_PART$1];
-function findMasterPageElement(pkg, masterPageName) {
-	if (masterPageName === void 0) return;
-	const stylesPart = pkg.parts[STYLES_PART$1];
-	if (stylesPart?.kind !== "xml") return;
-	const root = rootElement(stylesPart.nodes);
-	const masterStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:master-styles");
-	if (masterStyles === void 0) return;
-	return childrenWithTag(masterStyles, "style:master-page").find((element) => attrValue(element, "style:name") === masterPageName);
+function readOdfFillAndStroke(element, pkg) {
+	const { elements } = resolveStyleElementChain(attrValue(element, "draw:style-name"), "graphic", pkg);
+	let fill;
+	let stroke;
+	for (const styleElement of elements) {
+		const props = childrenWithTag(styleElement, "style:graphic-properties")[0];
+		if (props === void 0) continue;
+		if (attrValue(props, "draw:fill") === "none") fill = void 0;
+		else {
+			const fillColorValue = attrValue(props, "draw:fill-color");
+			const parsedFill = fillColorValue === void 0 ? void 0 : parseOdfColor(fillColorValue);
+			if (parsedFill !== void 0) fill = parsedFill;
+		}
+		if (attrValue(props, "draw:stroke") === "none") stroke = void 0;
+		else {
+			const strokeColorValue = attrValue(props, "svg:stroke-color");
+			const strokeWidthValue = attrValue(props, "svg:stroke-width");
+			const strokeColor = strokeColorValue === void 0 ? void 0 : parseOdfColor(strokeColorValue);
+			const strokeWidthPt = strokeWidthValue === void 0 ? void 0 : parseOdfLength(strokeWidthValue);
+			if (strokeColor !== void 0 && strokeWidthPt !== void 0 && strokeWidthPt > 0) stroke = {
+				color: strokeColor,
+				widthPt: strokeWidthPt
+			};
+		}
+	}
+	return {
+		fill,
+		stroke
+	};
 }
-function findPageLayoutElement$1(pkg, pageLayoutName) {
-	if (pageLayoutName === void 0) return;
-	for (const partPath of AUTOMATIC_STYLE_PARTS$1) {
-		const part = pkg.parts[partPath];
-		if (part?.kind !== "xml") continue;
-		const root = rootElement(part.nodes);
-		const automaticStyles = root === void 0 ? void 0 : findChildElement(root.children, "office:automatic-styles");
-		if (automaticStyles === void 0) continue;
-		const found = childrenWithTag(automaticStyles, "style:page-layout").find((element) => attrValue(element, "style:name") === pageLayoutName);
-		if (found !== void 0) return found;
+function resolveVectorFrame(element, groupFunctions) {
+	const geometry = resolveOdfShapeGeometry(element);
+	if (geometry === void 0) return;
+	return composeOdfGroupTransform(groupFunctions, geometry).frame;
+}
+function readDrawRectVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "rect",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readDrawEllipseVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "ellipse",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readDrawLineVector(element, groupFunctions, pkg) {
+	const raw = parseLinePoints(element);
+	if (raw === void 0) return;
+	const from = groupFunctions.length === 0 ? raw.from : applyOdfTransform(groupFunctions, raw.from);
+	const to = groupFunctions.length === 0 ? raw.to : applyOdfTransform(groupFunctions, raw.to);
+	const { stroke } = readOdfFillAndStroke(element, pkg);
+	if (stroke === void 0) return;
+	return {
+		kind: "line",
+		from,
+		to,
+		stroke
+	};
+}
+function readDrawPathVector(element, groupFunctions, pkg) {
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const viewBoxValue = attrValue(element, "svg:viewBox");
+	const viewBox = viewBoxValue === void 0 ? void 0 : parseOdfViewBox(viewBoxValue);
+	if (viewBox === void 0) return;
+	let rawSubpaths;
+	if (element.tag === "draw:path") {
+		const d = attrValue(element, "svg:d");
+		rawSubpaths = d === void 0 ? [] : parseOdfPathData(d);
+	} else {
+		const pointsValue = attrValue(element, "draw:points");
+		const subpath = rawSubpathFromPoints(pointsValue === void 0 ? [] : parseOdfPointsList(pointsValue), element.tag === "draw:polygon");
+		rawSubpaths = subpath === void 0 ? [] : [subpath];
+	}
+	if (rawSubpaths.length === 0) return;
+	const subpaths = buildOdfSubpaths(rawSubpaths, viewBox, frame);
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: "path",
+		frame,
+		subpaths,
+		fill,
+		stroke
+	};
+}
+const RECOGNIZED_CUSTOM_SHAPE_PRESETS = /* @__PURE__ */ new Set([
+	"rectangle",
+	"round-rectangle",
+	"ellipse"
+]);
+function readCustomShapeVector(element, groupFunctions, pkg) {
+	const geometryElement = childrenWithTag(element, "draw:enhanced-geometry")[0];
+	const type = geometryElement === void 0 ? void 0 : attrValue(geometryElement, "draw:type");
+	if (type === void 0 || !RECOGNIZED_CUSTOM_SHAPE_PRESETS.has(type)) return;
+	const frame = resolveVectorFrame(element, groupFunctions);
+	if (frame === void 0) return;
+	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	return {
+		kind: type === "ellipse" ? "ellipse" : "rect",
+		frame,
+		fill,
+		stroke
+	};
+}
+function readCustomShapeAsTextShape(element, groupFunctions, pkg) {
+	const paragraphs = elementsWithTag(element.children, "text:p").map((p) => readOdfParagraph(p, pkg));
+	if (!paragraphs.some((paragraph) => paragraph.runs.some((run) => run.text.length > 0))) return;
+	const ownGeometry = resolveOdfShapeGeometry(element);
+	if (ownGeometry === void 0) return;
+	const geometry = composeOdfGroupTransform(groupFunctions, ownGeometry);
+	return {
+		name: attrValue(element, "draw:name"),
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
+		...readFrameInsets(element, pkg),
+		blocks: paragraphs
+	};
+}
+function nextDocumentIndex(state) {
+	const value = state.next;
+	state.next += 1;
+	return value;
+}
+function paintOrderKey(element, state) {
+	const documentIndex = nextDocumentIndex(state);
+	const raw = attrValue(element, "draw:z-index");
+	if (raw === void 0) return documentIndex;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed >= 0 ? parsed : documentIndex;
+}
+function byPaintOrder(items) {
+	return items.slice().sort((a, b) => a.zIndex - b.zIndex).map((item) => item.value);
+}
+function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOut, vectorsOut) {
+	for (const node of children) {
+		if (node.type !== "element") continue;
+		if (node.tag === "draw:frame") {
+			const zIndex = paintOrderKey(node, indexState);
+			const shape = readDrawFrame(node, groupFunctions, pkg);
+			if (shape !== void 0) shapesOut.push({
+				value: shape,
+				zIndex
+			});
+		} else if (node.tag === "draw:g") {
+			const ownFunctions = readOwnTransformFunctions(node);
+			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
+			walkDrawPageContent(node.children, nested, pkg, indexState, shapesOut, vectorsOut);
+		} else if (node.tag === "draw:rect") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawRectVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:ellipse" || node.tag === "draw:circle") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawEllipseVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:line") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawLineVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:path" || node.tag === "draw:polygon" || node.tag === "draw:polyline") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readDrawPathVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+		} else if (node.tag === "draw:custom-shape") {
+			const zIndex = paintOrderKey(node, indexState);
+			const vector = readCustomShapeVector(node, groupFunctions, pkg);
+			if (vector !== void 0) vectorsOut.push({
+				value: vector,
+				zIndex
+			});
+			else {
+				const shape = readCustomShapeAsTextShape(node, groupFunctions, pkg);
+				if (shape !== void 0) shapesOut.push({
+					value: shape,
+					zIndex
+				});
+			}
+		}
 	}
 }
+function readDrawPageContent(children, pkg) {
+	const shapesOut = [];
+	const vectorsOut = [];
+	walkDrawPageContent(children, [], pkg, { next: 0 }, shapesOut, vectorsOut);
+	return {
+		shapes: byPaintOrder(shapesOut),
+		vectors: byPaintOrder(vectorsOut)
+	};
+}
+//#endregion
+//#region src/typed/odp/read.ts
+const CONTENT_PART$3 = "content.xml";
 function readSlideSize(page, pkg) {
-	const masterPage = findMasterPageElement(pkg, attrValue(page, "draw:master-page-name"));
-	const pageLayout = findPageLayoutElement$1(pkg, masterPage === void 0 ? void 0 : attrValue(masterPage, "style:page-layout-name"));
-	const properties = pageLayout === void 0 ? void 0 : childrenWithTag(pageLayout, "style:page-layout-properties")[0];
-	return (properties === void 0 ? void 0 : parsePageSize(properties)) ?? SLIDE_SIZE_WIDESCREEN;
+	return resolveDrawPageSize(page, pkg) ?? SLIDE_SIZE_WIDESCREEN;
 }
 function readSlideNotes(page) {
 	const notes = childrenWithTag(page, "presentation:notes")[0];
@@ -1986,7 +2502,7 @@ function readSlide(page, pkg) {
 	};
 }
 function readOdp(pkg) {
-	const contentPart = pkg.parts[CONTENT_PART$1];
+	const contentPart = pkg.parts[CONTENT_PART$3];
 	const root = contentPart?.kind === "xml" ? rootElement(contentPart.nodes) : void 0;
 	const body = root === void 0 ? void 0 : findChildElement(root.children, "office:body");
 	const presentation = body === void 0 ? void 0 : findChildElement(body.children, "office:presentation");
@@ -1998,9 +2514,9 @@ function readOdp(pkg) {
 }
 //#endregion
 //#region src/typed/odt/read.ts
-const CONTENT_PART = "content.xml";
+const CONTENT_PART$2 = "content.xml";
 const STYLES_PART = "styles.xml";
-const AUTOMATIC_STYLE_PARTS = [CONTENT_PART, STYLES_PART];
+const AUTOMATIC_STYLE_PARTS = [CONTENT_PART$2, STYLES_PART];
 function readOutlineLevel(headingElement) {
 	const raw = attrValue(headingElement, "text:outline-level");
 	if (raw === void 0) return 1;
@@ -2043,18 +2559,18 @@ function readBlocks(nodes, pkg, listIdState) {
 	}
 	return blocks;
 }
-function parseKnownOdfLength(value) {
+function parseKnownOdfLength$1(value) {
 	const parsed = parseOdfLength(value);
 	if (parsed === void 0) throw new Error(`readOdt: internal error -- "${value}" is not a valid ODF length literal`);
 	return parsed;
 }
-const DEFAULT_PAGE_SIZE = PAGE_SIZE_A4;
-const DEFAULT_MARGIN_PT = parseKnownOdfLength("2cm");
-const DEFAULT_MARGINS = {
-	topPt: DEFAULT_MARGIN_PT,
-	rightPt: DEFAULT_MARGIN_PT,
-	bottomPt: DEFAULT_MARGIN_PT,
-	leftPt: DEFAULT_MARGIN_PT
+const DEFAULT_PAGE_SIZE$2 = PAGE_SIZE_A4;
+const DEFAULT_MARGIN_PT$1 = parseKnownOdfLength$1("2cm");
+const DEFAULT_MARGINS$1 = {
+	topPt: DEFAULT_MARGIN_PT$1,
+	rightPt: DEFAULT_MARGIN_PT$1,
+	bottomPt: DEFAULT_MARGIN_PT$1,
+	leftPt: DEFAULT_MARGIN_PT$1
 };
 function findPageLayoutElement(pkg, pageLayoutName) {
 	if (pageLayoutName === void 0) return;
@@ -2078,17 +2594,17 @@ function readFirstMasterPageGeometry(pkg) {
 	const pageSize = properties === void 0 ? void 0 : parsePageSize(properties);
 	const margins = properties === void 0 ? void 0 : parseMargins(properties);
 	return {
-		pageSize: pageSize ?? DEFAULT_PAGE_SIZE,
-		margins: margins ?? DEFAULT_MARGINS
+		pageSize: pageSize ?? DEFAULT_PAGE_SIZE$2,
+		margins: margins ?? DEFAULT_MARGINS$1
 	};
 }
 function readOdt(pkg) {
-	const contentPart = pkg.parts[CONTENT_PART];
-	if (contentPart?.kind !== "xml") throw new Error(`readOdt: package has no ${CONTENT_PART} part`);
+	const contentPart = pkg.parts[CONTENT_PART$2];
+	if (contentPart?.kind !== "xml") throw new Error(`readOdt: package has no ${CONTENT_PART$2} part`);
 	const contentRoot = rootElement(contentPart.nodes);
 	const body = contentRoot === void 0 ? void 0 : findChildElement(contentRoot.children, "office:body");
 	const textElement = body === void 0 ? void 0 : findChildElement(body.children, "office:text");
-	if (textElement === void 0) throw new Error(`readOdt: ${CONTENT_PART} has no office:body/office:text element`);
+	if (textElement === void 0) throw new Error(`readOdt: ${CONTENT_PART$2} has no office:body/office:text element`);
 	const metadata = readOdfMetadata(pkg);
 	const { pageSize, margins } = readFirstMasterPageGeometry(pkg);
 	return {
@@ -2101,4 +2617,335 @@ function readOdt(pkg) {
 	};
 }
 //#endregion
-export { AlignmentSchema, AttributeSchema, BinaryPartSchema, MANIFEST_PART, META_PART, MIMETYPE_PART, ManifestEntrySchema, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, PackageSchema, PartSchema, STYLE_FAMILIES, StylePropertiesSchema, StyleRegistry, TableCursor, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseLength, parseMargins, parseOdfColor, parseOdfLength, parseOdfTransform, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, readDrawFrame, readManifest, readMimetype, readOdfMetadata, readOdfParagraph, readOdfTable, readOdp, readOdt, resolveOdfShapeGeometry, resolveStyle, resolveStyleElementChain, rootElement, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };
+//#region src/typed/odg/read.ts
+const CONTENT_PART$1 = "content.xml";
+const DEFAULT_PAGE_SIZE$1 = PAGE_SIZE_A4;
+function readPage(page, pkg) {
+	const size = resolveDrawPageSize(page, pkg) ?? DEFAULT_PAGE_SIZE$1;
+	const { shapes, vectors } = readDrawPageContent(page.children, pkg);
+	return {
+		size,
+		shapes,
+		vectors
+	};
+}
+function readOdg(pkg) {
+	const contentPart = pkg.parts[CONTENT_PART$1];
+	const root = contentPart?.kind === "xml" ? rootElement(contentPart.nodes) : void 0;
+	const body = root === void 0 ? void 0 : findChildElement(root.children, "office:body");
+	const drawing = body === void 0 ? void 0 : findChildElement(body.children, "office:drawing");
+	const pages = drawing === void 0 ? [] : childrenWithTag(drawing, "draw:page");
+	return {
+		metadata: readOdfMetadata(pkg),
+		pages: pages.map((page) => readPage(page, pkg))
+	};
+}
+//#endregion
+//#region src/typed/ods/read.ts
+const CONTENT_PART = "content.xml";
+function parseKnownOdfLength(value) {
+	const parsed = parseOdfLength(value);
+	if (parsed === void 0) throw new Error(`readOds: internal error -- "${value}" is not a valid ODF length literal`);
+	return parsed;
+}
+const DEFAULT_PAGE_SIZE = PAGE_SIZE_A4;
+const DEFAULT_MARGIN_PT = parseKnownOdfLength("2cm");
+const DEFAULT_MARGINS = {
+	topPt: DEFAULT_MARGIN_PT,
+	rightPt: DEFAULT_MARGIN_PT,
+	bottomPt: DEFAULT_MARGIN_PT,
+	leftPt: DEFAULT_MARGIN_PT
+};
+function readRepeatCount(element, attrName) {
+	const raw = attrValue(element, attrName);
+	if (raw === void 0) return 1;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : 1;
+}
+function isHidden(element) {
+	return attrValue(element, "table:visibility") === "collapse";
+}
+function readColumnLayout(columnElement, pkg) {
+	const styleName = attrValue(columnElement, "table:style-name");
+	const styleElement = styleName === void 0 ? void 0 : findStyleElement(styleName, "table-column", pkg);
+	const properties = styleElement === void 0 ? void 0 : childrenWithTag(styleElement, "style:table-column-properties")[0];
+	const widthValue = properties === void 0 ? void 0 : attrValue(properties, "style:column-width");
+	return {
+		widthPt: widthValue === void 0 ? 0 : parseOdfLength(widthValue) ?? 0,
+		manualBreak: (properties === void 0 ? void 0 : attrValue(properties, "fo:break-before")) === "page"
+	};
+}
+function readRowLayout(rowElement, pkg) {
+	const styleName = attrValue(rowElement, "table:style-name");
+	const styleElement = styleName === void 0 ? void 0 : findStyleElement(styleName, "table-row", pkg);
+	const properties = styleElement === void 0 ? void 0 : childrenWithTag(styleElement, "style:table-row-properties")[0];
+	const heightValue = properties === void 0 ? void 0 : attrValue(properties, "style:row-height");
+	return {
+		heightPt: heightValue === void 0 ? 0 : parseOdfLength(heightValue) ?? 0,
+		manualBreak: (properties === void 0 ? void 0 : attrValue(properties, "fo:break-before")) === "page"
+	};
+}
+function readCellText(cellElement, pkg) {
+	const paragraphs = childrenWithTag(cellElement, "text:p");
+	const runs = [];
+	paragraphs.forEach((paragraph, index) => {
+		if (index > 0) runs.push({ text: "\n" });
+		runs.push(...readOdfParagraph(paragraph, pkg).runs);
+	});
+	return {
+		runs,
+		displayText: runs.map((run) => run.text).join("")
+	};
+}
+function readCellValue(cellElement, displayText) {
+	const valueType = attrValue(cellElement, "office:value-type");
+	const stringFallback = {
+		kind: "string",
+		value: displayText
+	};
+	switch (valueType) {
+		case "float": {
+			const value = parseRequiredNumber(attrValue(cellElement, "office:value"));
+			return value === void 0 ? stringFallback : {
+				kind: "number",
+				value
+			};
+		}
+		case "percentage": {
+			const value = parseRequiredNumber(attrValue(cellElement, "office:value"));
+			return value === void 0 ? stringFallback : {
+				kind: "percentage",
+				value
+			};
+		}
+		case "currency": {
+			const value = parseRequiredNumber(attrValue(cellElement, "office:value"));
+			if (value === void 0) return stringFallback;
+			const currency = attrValue(cellElement, "office:currency");
+			return currency === void 0 ? {
+				kind: "currency",
+				value
+			} : {
+				kind: "currency",
+				value,
+				currency
+			};
+		}
+		case "boolean": {
+			const raw = attrValue(cellElement, "office:boolean-value");
+			return raw === void 0 ? stringFallback : {
+				kind: "boolean",
+				value: raw === "true"
+			};
+		}
+		case "date": return {
+			kind: "date",
+			value: attrValue(cellElement, "office:date-value") ?? displayText
+		};
+		case "time": return {
+			kind: "time",
+			value: attrValue(cellElement, "office:time-value") ?? displayText
+		};
+		case "string": return {
+			kind: "string",
+			value: attrValue(cellElement, "office:string-value") ?? displayText
+		};
+		default: return { kind: "empty" };
+	}
+}
+function parseRequiredNumber(raw) {
+	if (raw === void 0) return;
+	const value = Number(raw);
+	return Number.isNaN(value) ? void 0 : value;
+}
+function parsePrintRanges(value) {
+	const first = value.split(" ").find((part) => part.length > 0);
+	if (first === void 0) return;
+	const separatorIndex = first.indexOf(":");
+	if (separatorIndex === -1) return;
+	const start = parseA1WithOptionalSheetPrefix(first.slice(0, separatorIndex));
+	const end = parseA1WithOptionalSheetPrefix(first.slice(separatorIndex + 1));
+	if (start === void 0 || end === void 0) return;
+	return {
+		startRow: start.row,
+		startColumn: start.column,
+		endRow: end.row,
+		endColumn: end.column
+	};
+}
+function parseA1WithOptionalSheetPrefix(cellPart) {
+	const dotIndex = cellPart.lastIndexOf(".");
+	return parseCellReference(dotIndex === -1 ? cellPart : cellPart.slice(dotIndex + 1));
+}
+function parseScalePercentage(value) {
+	const match = /^(\d+(?:\.\d+)?)%$/.exec(value);
+	if (match === null) return;
+	const numeric = match[1];
+	return numeric === void 0 ? void 0 : Number(numeric);
+}
+function parseNonNegativeInteger(value) {
+	if (value === void 0) return;
+	const parsed = Number.parseInt(value, 10);
+	return Number.isInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function readTable(tableElement, pkg) {
+	const columns = [];
+	const rows = [];
+	const cells = [];
+	const manualBreakRows = [];
+	const manualBreakColumns = [];
+	let repeatColumns;
+	let repeatRows;
+	let columnCursor = 0;
+	const cursor = new TableCursor();
+	function processColumn(columnElement) {
+		const startIndex = columnCursor;
+		const { widthPt, manualBreak } = readColumnLayout(columnElement, pkg);
+		columns.push({
+			index: startIndex,
+			widthPt,
+			hidden: isHidden(columnElement) ? true : void 0
+		});
+		if (manualBreak) manualBreakColumns.push(startIndex);
+		columnCursor += readRepeatCount(columnElement, "table:number-columns-repeated");
+	}
+	function processRowCells(rowElement) {
+		for (const child of rowElement.children) {
+			if (child.type !== "element") continue;
+			if (child.tag === "table:covered-table-cell") cursor.nextCell(readRepeatCount(child, "table:number-columns-repeated"));
+			else if (child.tag === "table:table-cell") {
+				const columnIndex = cursor.columnIndex;
+				const rowIndex = cursor.rowIndex;
+				cursor.nextCell(readRepeatCount(child, "table:number-columns-repeated"));
+				const formula = attrValue(child, "table:formula");
+				const { runs, displayText } = readCellText(child, pkg);
+				if (!(attrValue(child, "office:value-type") !== void 0) && formula === void 0 && displayText.length === 0) continue;
+				const value = readCellValue(child, displayText);
+				const colSpan = parseNonNegativeInteger(attrValue(child, "table:number-columns-spanned"));
+				const rowSpan = parseNonNegativeInteger(attrValue(child, "table:number-rows-spanned"));
+				const cell = {
+					row: rowIndex,
+					column: columnIndex,
+					value,
+					displayText
+				};
+				if (formula !== void 0) cell.formula = formula;
+				if (runs.length > 0) cell.runs = runs;
+				if (colSpan !== void 0) cell.colSpan = colSpan;
+				if (rowSpan !== void 0) cell.rowSpan = rowSpan;
+				cells.push(cell);
+			}
+		}
+	}
+	function processRow(rowElement) {
+		const startIndex = cursor.rowIndex;
+		processRowCells(rowElement);
+		const { heightPt, manualBreak } = readRowLayout(rowElement, pkg);
+		rows.push({
+			index: startIndex,
+			heightPt,
+			hidden: isHidden(rowElement) ? true : void 0
+		});
+		if (manualBreak) manualBreakRows.push(startIndex);
+		cursor.nextRow(readRepeatCount(rowElement, "table:number-rows-repeated"));
+	}
+	for (const child of tableElement.children) {
+		if (child.type !== "element") continue;
+		if (child.tag === "table:table-column") processColumn(child);
+		else if (child.tag === "table:table-header-columns") {
+			const startIndex = columnCursor;
+			for (const headerChild of child.children) if (headerChild.type === "element" && headerChild.tag === "table:table-column") processColumn(headerChild);
+			if (columnCursor > startIndex) repeatColumns = {
+				start: startIndex,
+				end: columnCursor - 1
+			};
+		} else if (child.tag === "table:table-row") processRow(child);
+		else if (child.tag === "table:table-header-rows") {
+			const startIndex = cursor.rowIndex;
+			for (const headerChild of child.children) if (headerChild.type === "element" && headerChild.tag === "table:table-row") processRow(headerChild);
+			if (cursor.rowIndex > startIndex) repeatRows = {
+				start: startIndex,
+				end: cursor.rowIndex - 1
+			};
+		}
+	}
+	return {
+		columns,
+		rows,
+		cells,
+		repeatColumns,
+		repeatRows,
+		manualBreakRows,
+		manualBreakColumns
+	};
+}
+function readPrintSettings(tableElement, pkg, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns) {
+	const tableStyleName = attrValue(tableElement, "table:style-name");
+	const tableStyleElement = tableStyleName === void 0 ? void 0 : findStyleElement(tableStyleName, "table", pkg);
+	const layoutProperties = resolvePageLayoutProperties(pkg, tableStyleElement === void 0 ? void 0 : attrValue(tableStyleElement, "style:master-page-name"));
+	const pageSize = layoutProperties === void 0 ? void 0 : parsePageSize(layoutProperties);
+	const margins = layoutProperties === void 0 ? void 0 : parseMargins(layoutProperties);
+	const printTokens = new Set((layoutProperties === void 0 ? void 0 : attrValue(layoutProperties, "style:print"))?.split(" ").filter((token) => token.length > 0));
+	const pageOrder = (layoutProperties === void 0 ? void 0 : attrValue(layoutProperties, "style:print-page-order")) === "ltr" ? "overThenDown" : "downThenOver";
+	const scaleToRaw = layoutProperties === void 0 ? void 0 : attrValue(layoutProperties, "style:scale-to");
+	const scale = scaleToRaw === void 0 ? void 0 : parseScalePercentage(scaleToRaw);
+	const scaleToXRaw = layoutProperties === void 0 ? void 0 : attrValue(layoutProperties, "style:scale-to-X");
+	const scaleToYRaw = layoutProperties === void 0 ? void 0 : attrValue(layoutProperties, "style:scale-to-Y");
+	const fitWidth = parseNonNegativeInteger(scaleToXRaw);
+	const fitHeight = parseNonNegativeInteger(scaleToYRaw);
+	const fitToPages = fitWidth === void 0 || fitHeight === void 0 ? void 0 : {
+		width: fitWidth,
+		height: fitHeight
+	};
+	const printRangesRaw = attrValue(tableElement, "table:print-ranges");
+	const printRange = printRangesRaw === void 0 ? void 0 : parsePrintRanges(printRangesRaw);
+	const manualBreaks = manualBreakRows.length > 0 || manualBreakColumns.length > 0 ? {
+		rows: manualBreakRows,
+		columns: manualBreakColumns
+	} : void 0;
+	const settings = {
+		pageSize: pageSize ?? DEFAULT_PAGE_SIZE,
+		margins: margins ?? DEFAULT_MARGINS,
+		gridlines: printTokens.has("grid"),
+		headers: printTokens.has("headers"),
+		pageOrder
+	};
+	if (printRange !== void 0) settings.printRange = printRange;
+	if (scale !== void 0) settings.scale = scale;
+	if (fitToPages !== void 0) settings.fitToPages = fitToPages;
+	if (repeatRows !== void 0) settings.repeatRows = repeatRows;
+	if (repeatColumns !== void 0) settings.repeatColumns = repeatColumns;
+	if (manualBreaks !== void 0) settings.manualBreaks = manualBreaks;
+	return settings;
+}
+function readSheet(tableElement, pkg) {
+	const name = attrValue(tableElement, "table:name");
+	if (name === void 0) return;
+	const { columns, rows, cells, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns } = readTable(tableElement, pkg);
+	return {
+		name,
+		cells,
+		columns,
+		rows,
+		images: [],
+		printSettings: readPrintSettings(tableElement, pkg, repeatColumns, repeatRows, manualBreakRows, manualBreakColumns)
+	};
+}
+function readOds(pkg) {
+	const contentPart = pkg.parts[CONTENT_PART];
+	const root = contentPart?.kind === "xml" ? rootElement(contentPart.nodes) : void 0;
+	const body = root === void 0 ? void 0 : findChildElement(root.children, "office:body");
+	const spreadsheet = body === void 0 ? void 0 : findChildElement(body.children, "office:spreadsheet");
+	const tables = spreadsheet === void 0 ? [] : childrenWithTag(spreadsheet, "table:table");
+	const sheets = [];
+	for (const table of tables) {
+		const sheet = readSheet(table, pkg);
+		if (sheet !== void 0) sheets.push(sheet);
+	}
+	return {
+		metadata: readOdfMetadata(pkg),
+		sheets
+	};
+}
+//#endregion
+export { AlignmentSchema, AttributeSchema, BinaryPartSchema, MANIFEST_PART, META_PART, MIMETYPE_PART, ManifestEntrySchema, ManifestProblemSchema, ManifestSchema, ODF_MEDIA_TYPES, ODF_NAMESPACES, PackageSchema, PartSchema, STYLE_FAMILIES, StylePropertiesSchema, StyleRegistry, TableCursor, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, applyOdfTransform, attrValue, base64ToBytes, buildManifest, buildOdfSubpaths, buildStylePropertyElements, buildXml, bytesToBase64, canonicalPropertiesString, cellReference, childrenWithTag, columnIndexToLetters, columnLettersToIndex, composeOdfGroupTransform, decodeOdfText, decodePackage, decodeXmlText, el, elementsWithTag, encodePackage, encodeXmlText, ensureSpan, findChildElement, findStyleElement, formatOdfColor, formatOdfLength, formatPercentageMultiplier, formatPt, getOdfSpaceCount, isStyleFamily, isXmlNode, measureOdfNodeLength, mediaTypeForExtension, netRotationDeg, packageCodec, paragraphPropertiesToAttributes, parseBox, parseCellReference, parseLength, parseLinePoints, parseMargins, parseOdfColor, parseOdfLength, parseOdfPathData, parseOdfPointsList, parseOdfTransform, parseOdfViewBox, parsePackage, parsePageSize, parseParagraphProperties, parseStyleElementProperties, parseTextProperties, parseXml, rawSubpathFromPoints, readDrawFrame, readDrawPageContent, readManifest, readMimetype, readOdfMetadata, readOdfParagraph, readOdfTable, readOdg, readOdp, readOds, readOdt, resolveDrawPageSize, resolveOdfShapeGeometry, resolvePageLayoutProperties, resolveStyle, resolveStyleElementChain, rootElement, scaleOdfRawPoint, serializePackage, setDocumentMediaType, sniffImageFormat, sumOdfNodeLength, syncManifest, textPropertiesToAttributes, txt, unzipPackage, validateManifest, walkDrawShapes, writeManifest, writeMimetype, xmlCodec, xmlnsAttributes, zipPackage };