odf.js 1.13.2 → 2.1.0

package/dist/typed/draw/shapes.cjs

@@ -4,6 +4,7 @@ const require_image_sniff = require("../../image/sniff.cjs");
 const require_typed_shared_units = require("../shared/units.cjs");
 const require_typed_shared_color = require("../shared/color.cjs");
 const require_xml_query = require("../../xml/query.cjs");
+const require_typed_shared_text = require("../shared/text.cjs");
 const require_typed_shared_geometry = require("../shared/geometry.cjs");
 const require_typed_shared_cascade = require("../shared/cascade.cjs");
 const require_typed_shared_paragraph = require("../shared/paragraph.cjs");
@@ -37,20 +38,31 @@ function readFrameInsets(frame, pkg) {
 	}
 	return insets;
 }
-function readDrawImageBlock(image, frameBox, pkg) {
+function readFrameAltText(frame) {
+	const title = require_xml_query.childrenWithTag(frame, "svg:title")[0];
+	const decodedTitle = title === void 0 ? void 0 : require_typed_shared_text.decodeOdfText(title);
+	if (decodedTitle !== void 0 && decodedTitle.length > 0) return decodedTitle;
+	const description = require_xml_query.childrenWithTag(frame, "svg:desc")[0];
+	const decodedDescription = description === void 0 ? void 0 : require_typed_shared_text.decodeOdfText(description);
+	return decodedDescription !== void 0 && decodedDescription.length > 0 ? decodedDescription : void 0;
+}
+function readDrawImageBlock(image, frame, frameBox, pkg) {
 	const href = require_xml_query.attrValue(image, "xlink:href");
 	const part = href === void 0 ? void 0 : pkg.parts[href];
 	if (part?.kind !== "binary") return;
 	const bytes = require_util_base64.base64ToBytes(part.base64);
 	const format = require_image_sniff.sniffImageFormat(bytes);
 	if (format === void 0) return;
-	return {
+	const block = {
 		kind: "image",
 		format,
 		base64: part.base64,
 		widthPt: frameBox.widthPt,
 		heightPt: frameBox.heightPt
 	};
+	const altText = readFrameAltText(frame);
+	if (altText !== void 0) block.altText = altText;
+	return block;
 }
 function readDrawFrameContent(frame, frameBox, pkg) {
 	const table = require_xml_query.childrenWithTag(frame, "table:table")[0];
@@ -59,7 +71,7 @@ function readDrawFrameContent(frame, frameBox, pkg) {
 	if (textBox !== void 0) return require_xml_query.elementsWithTag(textBox.children, "text:p").map((p) => require_typed_shared_paragraph.readOdfParagraph(p, pkg));
 	const image = require_xml_query.childrenWithTag(frame, "draw:image")[0];
 	if (image !== void 0) {
-		const block = readDrawImageBlock(image, frameBox, pkg);
+		const block = readDrawImageBlock(image, frame, frameBox, pkg);
 		return block === void 0 ? [] : [block];
 	}
 	return [];
@@ -80,16 +92,20 @@ function readOwnTransformFunctions(element) {
 	const value = require_xml_query.attrValue(element, "draw:transform");
 	return value === void 0 ? [] : require_typed_shared_transform.parseOdfTransform(value);
 }
-function walkDrawShapes(children, groupFunctions, pkg, out) {
+function walkDrawShapes(children, groupFunctions, pkg, out, indexState = { next: 0 }) {
 	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) out.push(shape);
+			if (shape !== void 0) out.push({
+				...shape,
+				paintOrder: zIndex
+			});
 		} else if (node.tag === "draw:g") {
 			const ownFunctions = readOwnTransformFunctions(node);
 			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
-			walkDrawShapes(node.children, nested, pkg, out);
+			walkDrawShapes(node.children, nested, pkg, out, indexState);
 		}
 	}
 }
@@ -97,7 +113,9 @@ function readOdfFillAndStroke(element, pkg) {
 	const styleName = require_xml_query.attrValue(element, "draw:style-name");
 	const { elements } = require_typed_shared_cascade.resolveStyleElementChain(styleName, "graphic", pkg);
 	let fill;
+	let fillRule;
 	let stroke;
+	let strokeStyle;
 	for (const styleElement of elements) {
 		const props = require_xml_query.childrenWithTag(styleElement, "style:graphic-properties")[0];
 		if (props === void 0) continue;
@@ -107,8 +125,15 @@ function readOdfFillAndStroke(element, pkg) {
 			const parsedFill = fillColorValue === void 0 ? void 0 : require_typed_shared_color.parseOdfColor(fillColorValue);
 			if (parsedFill !== void 0) fill = parsedFill;
 		}
-		if (require_xml_query.attrValue(props, "draw:stroke") === "none") stroke = void 0;
-		else {
+		const fillRuleValue = require_xml_query.attrValue(props, "svg:fill-rule");
+		if (fillRuleValue === "nonzero" || fillRuleValue === "evenodd") fillRule = fillRuleValue;
+		const strokeMode = require_xml_query.attrValue(props, "draw:stroke");
+		if (strokeMode === "none") {
+			stroke = void 0;
+			strokeStyle = void 0;
+		} else {
+			if (strokeMode === "dash") strokeStyle = "dashed";
+			else if (strokeMode === "solid") strokeStyle = "solid";
 			const strokeColorValue = require_xml_query.attrValue(props, "svg:stroke-color");
 			const strokeWidthValue = require_xml_query.attrValue(props, "svg:stroke-width");
 			const strokeColor = strokeColorValue === void 0 ? void 0 : require_typed_shared_color.parseOdfColor(strokeColorValue);
@@ -121,32 +146,38 @@ function readOdfFillAndStroke(element, pkg) {
 	}
 	return {
 		fill,
-		stroke
+		fillRule,
+		stroke: stroke === void 0 || strokeStyle === void 0 ? stroke : {
+			...stroke,
+			style: strokeStyle
+		}
 	};
 }
-function resolveVectorFrame(element, groupFunctions) {
+function resolveVectorGeometry(element, groupFunctions) {
 	const geometry = require_typed_shared_transform.resolveOdfShapeGeometry(element);
 	if (geometry === void 0) return;
-	return require_typed_shared_transform.composeOdfGroupTransform(groupFunctions, geometry).frame;
+	return require_typed_shared_transform.composeOdfGroupTransform(groupFunctions, geometry);
 }
 function readDrawRectVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
 }
 function readDrawEllipseVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "ellipse",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -166,8 +197,9 @@ function readDrawLineVector(element, groupFunctions, pkg) {
 	};
 }
 function readDrawPathVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
+	const frame = geometry.frame;
 	const viewBoxValue = require_xml_query.attrValue(element, "svg:viewBox");
 	const viewBox = viewBoxValue === void 0 ? void 0 : require_typed_shared_path.parseOdfViewBox(viewBoxValue);
 	if (viewBox === void 0) return;
@@ -183,12 +215,14 @@ function readDrawPathVector(element, groupFunctions, pkg) {
 	}
 	if (rawSubpaths.length === 0) return;
 	const subpaths = require_typed_shared_path.buildOdfSubpaths(rawSubpaths, viewBox, frame);
-	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	const { fill, fillRule, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "path",
 		frame,
+		rotationDeg: geometry.rotationDeg,
 		subpaths,
 		fill,
+		fillRule,
 		stroke
 	};
 }
@@ -201,12 +235,13 @@ function readCustomShapeVector(element, groupFunctions, pkg) {
 	const geometryElement = require_xml_query.childrenWithTag(element, "draw:enhanced-geometry")[0];
 	const type = geometryElement === void 0 ? void 0 : require_xml_query.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 geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: type === "ellipse" ? "ellipse" : "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -247,7 +282,10 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const shape = readDrawFrame(node, groupFunctions, pkg);
 			if (shape !== void 0) shapesOut.push({
-				value: shape,
+				value: {
+					...shape,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 		} else if (node.tag === "draw:g") {
@@ -258,41 +296,59 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const vector = readDrawRectVector(node, groupFunctions, pkg);
 			if (vector !== void 0) vectorsOut.push({
-				value: vector,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 			else {
 				const shape = readCustomShapeAsTextShape(node, groupFunctions, pkg);
 				if (shape !== void 0) shapesOut.push({
-					value: shape,
+					value: {
+						...shape,
+						paintOrder: zIndex
+					},
 					zIndex
 				});
 			}

package/dist/typed/draw/shapes.d.cts

@@ -4,7 +4,10 @@ import { OdfTransformFunction } from "../shared/transform.cjs";
 import { ContentShape, ContentVector } from "document-schema.js";
 //#region src/typed/draw/shapes.d.ts
 declare function readDrawFrame(frame: XmlElement, groupFunctions: readonly OdfTransformFunction[], pkg: Package): ContentShape | undefined;
-declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[]): void;
+declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[], indexState?: DocumentIndexState): void;
+interface DocumentIndexState {
+  next: number;
+}
 interface DrawPageContent {
   readonly shapes: ContentShape[];
   readonly vectors: ContentVector[];

package/dist/typed/draw/shapes.d.ts

@@ -4,7 +4,10 @@ import { OdfTransformFunction } from "../shared/transform.js";
 import { ContentShape, ContentVector } from "document-schema.js";
 //#region src/typed/draw/shapes.d.ts
 declare function readDrawFrame(frame: XmlElement, groupFunctions: readonly OdfTransformFunction[], pkg: Package): ContentShape | undefined;
-declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[]): void;
+declare function walkDrawShapes(children: readonly XmlNode[], groupFunctions: readonly OdfTransformFunction[], pkg: Package, out: ContentShape[], indexState?: DocumentIndexState): void;
+interface DocumentIndexState {
+  next: number;
+}
 interface DrawPageContent {
   readonly shapes: ContentShape[];
   readonly vectors: ContentVector[];

package/dist/typed/draw/shapes.js

@@ -3,6 +3,7 @@ import { sniffImageFormat } from "../../image/sniff.js";
 import { parseOdfLength } from "../shared/units.js";
 import { parseOdfColor } from "../shared/color.js";
 import { attrValue, childrenWithTag, elementsWithTag } from "../../xml/query.js";
+import { decodeOdfText } from "../shared/text.js";
 import { parseLinePoints } from "../shared/geometry.js";
 import { resolveStyleElementChain } from "../shared/cascade.js";
 import { readOdfParagraph } from "../shared/paragraph.js";
@@ -36,20 +37,31 @@ function readFrameInsets(frame, pkg) {
 	}
 	return insets;
 }
-function readDrawImageBlock(image, frameBox, pkg) {
+function readFrameAltText(frame) {
+	const title = childrenWithTag(frame, "svg:title")[0];
+	const decodedTitle = title === void 0 ? void 0 : decodeOdfText(title);
+	if (decodedTitle !== void 0 && decodedTitle.length > 0) return decodedTitle;
+	const description = childrenWithTag(frame, "svg:desc")[0];
+	const decodedDescription = description === void 0 ? void 0 : decodeOdfText(description);
+	return decodedDescription !== void 0 && decodedDescription.length > 0 ? decodedDescription : void 0;
+}
+function readDrawImageBlock(image, frame, frameBox, pkg) {
 	const href = attrValue(image, "xlink:href");
 	const part = href === void 0 ? void 0 : pkg.parts[href];
 	if (part?.kind !== "binary") return;
 	const bytes = base64ToBytes(part.base64);
 	const format = sniffImageFormat(bytes);
 	if (format === void 0) return;
-	return {
+	const block = {
 		kind: "image",
 		format,
 		base64: part.base64,
 		widthPt: frameBox.widthPt,
 		heightPt: frameBox.heightPt
 	};
+	const altText = readFrameAltText(frame);
+	if (altText !== void 0) block.altText = altText;
+	return block;
 }
 function readDrawFrameContent(frame, frameBox, pkg) {
 	const table = childrenWithTag(frame, "table:table")[0];
@@ -58,7 +70,7 @@ function readDrawFrameContent(frame, frameBox, pkg) {
 	if (textBox !== void 0) return elementsWithTag(textBox.children, "text:p").map((p) => readOdfParagraph(p, pkg));
 	const image = childrenWithTag(frame, "draw:image")[0];
 	if (image !== void 0) {
-		const block = readDrawImageBlock(image, frameBox, pkg);
+		const block = readDrawImageBlock(image, frame, frameBox, pkg);
 		return block === void 0 ? [] : [block];
 	}
 	return [];
@@ -79,16 +91,20 @@ function readOwnTransformFunctions(element) {
 	const value = attrValue(element, "draw:transform");
 	return value === void 0 ? [] : parseOdfTransform(value);
 }
-function walkDrawShapes(children, groupFunctions, pkg, out) {
+function walkDrawShapes(children, groupFunctions, pkg, out, indexState = { next: 0 }) {
 	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) out.push(shape);
+			if (shape !== void 0) out.push({
+				...shape,
+				paintOrder: zIndex
+			});
 		} else if (node.tag === "draw:g") {
 			const ownFunctions = readOwnTransformFunctions(node);
 			const nested = ownFunctions.length === 0 ? groupFunctions : [...ownFunctions, ...groupFunctions];
-			walkDrawShapes(node.children, nested, pkg, out);
+			walkDrawShapes(node.children, nested, pkg, out, indexState);
 		}
 	}
 }
@@ -96,7 +112,9 @@ function readOdfFillAndStroke(element, pkg) {
 	const styleName = attrValue(element, "draw:style-name");
 	const { elements } = resolveStyleElementChain(styleName, "graphic", pkg);
 	let fill;
+	let fillRule;
 	let stroke;
+	let strokeStyle;
 	for (const styleElement of elements) {
 		const props = childrenWithTag(styleElement, "style:graphic-properties")[0];
 		if (props === void 0) continue;
@@ -106,8 +124,15 @@ function readOdfFillAndStroke(element, pkg) {
 			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 fillRuleValue = attrValue(props, "svg:fill-rule");
+		if (fillRuleValue === "nonzero" || fillRuleValue === "evenodd") fillRule = fillRuleValue;
+		const strokeMode = attrValue(props, "draw:stroke");
+		if (strokeMode === "none") {
+			stroke = void 0;
+			strokeStyle = void 0;
+		} else {
+			if (strokeMode === "dash") strokeStyle = "dashed";
+			else if (strokeMode === "solid") strokeStyle = "solid";
 			const strokeColorValue = attrValue(props, "svg:stroke-color");
 			const strokeWidthValue = attrValue(props, "svg:stroke-width");
 			const strokeColor = strokeColorValue === void 0 ? void 0 : parseOdfColor(strokeColorValue);
@@ -120,32 +145,38 @@ function readOdfFillAndStroke(element, pkg) {
 	}
 	return {
 		fill,
-		stroke
+		fillRule,
+		stroke: stroke === void 0 || strokeStyle === void 0 ? stroke : {
+			...stroke,
+			style: strokeStyle
+		}
 	};
 }
-function resolveVectorFrame(element, groupFunctions) {
+function resolveVectorGeometry(element, groupFunctions) {
 	const geometry = resolveOdfShapeGeometry(element);
 	if (geometry === void 0) return;
-	return composeOdfGroupTransform(groupFunctions, geometry).frame;
+	return composeOdfGroupTransform(groupFunctions, geometry);
 }
 function readDrawRectVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
 }
 function readDrawEllipseVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "ellipse",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -165,8 +196,9 @@ function readDrawLineVector(element, groupFunctions, pkg) {
 	};
 }
 function readDrawPathVector(element, groupFunctions, pkg) {
-	const frame = resolveVectorFrame(element, groupFunctions);
-	if (frame === void 0) return;
+	const geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
+	const frame = geometry.frame;
 	const viewBoxValue = attrValue(element, "svg:viewBox");
 	const viewBox = viewBoxValue === void 0 ? void 0 : parseOdfViewBox(viewBoxValue);
 	if (viewBox === void 0) return;
@@ -182,12 +214,14 @@ function readDrawPathVector(element, groupFunctions, pkg) {
 	}
 	if (rawSubpaths.length === 0) return;
 	const subpaths = buildOdfSubpaths(rawSubpaths, viewBox, frame);
-	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
+	const { fill, fillRule, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: "path",
 		frame,
+		rotationDeg: geometry.rotationDeg,
 		subpaths,
 		fill,
+		fillRule,
 		stroke
 	};
 }
@@ -200,12 +234,13 @@ 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 geometry = resolveVectorGeometry(element, groupFunctions);
+	if (geometry === void 0) return;
 	const { fill, stroke } = readOdfFillAndStroke(element, pkg);
 	return {
 		kind: type === "ellipse" ? "ellipse" : "rect",
-		frame,
+		frame: geometry.frame,
+		rotationDeg: geometry.rotationDeg,
 		fill,
 		stroke
 	};
@@ -246,7 +281,10 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const shape = readDrawFrame(node, groupFunctions, pkg);
 			if (shape !== void 0) shapesOut.push({
-				value: shape,
+				value: {
+					...shape,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 		} else if (node.tag === "draw:g") {
@@ -257,41 +295,59 @@ function walkDrawPageContent(children, groupFunctions, pkg, indexState, shapesOu
 			const zIndex = paintOrderKey(node, indexState);
 			const vector = readDrawRectVector(node, groupFunctions, pkg);
 			if (vector !== void 0) vectorsOut.push({
-				value: vector,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				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,
+				value: {
+					...vector,
+					paintOrder: zIndex
+				},
 				zIndex
 			});
 			else {
 				const shape = readCustomShapeAsTextShape(node, groupFunctions, pkg);
 				if (shape !== void 0) shapesOut.push({
-					value: shape,
+					value: {
+						...shape,
+						paintOrder: zIndex
+					},
 					zIndex
 				});
 			}

package/dist/typed/formula/read.cjs

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_entities = require("../../xml/entities.cjs");
 const require_xml_query = require("../../xml/query.cjs");
 const require_typed_shared_metadata = require("../shared/metadata.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/typed/formula/read.ts
 const CONTENT_PART = "content.xml";
 const MATH_ROOT_TAGS = ["math", "math:math"];
@@ -44,5 +45,18 @@ function readOdfFormula(pkg) {
 		metadata
 	};
 }
+function readOdfFormulaDocument(pkg) {
+	const { mathml, starMath, metadata } = readOdfFormula(pkg);
+	return {
+		kind: "formula",
+		formatVersion: document_schema_js.CONTENT_FORMAT_VERSION,
+		metadata,
+		formula: starMath === void 0 ? { mathml } : {
+			mathml,
+			starMath
+		}
+	};
+}
 //#endregion
 exports.readOdfFormula = readOdfFormula;
+exports.readOdfFormulaDocument = readOdfFormulaDocument;

package/dist/typed/formula/read.d.cts

@@ -1,6 +1,6 @@
 import { d as XmlNode } from "../../node-CkBWRjNR.cjs";
 import { Package } from "../../model/package.cjs";
-import { LayoutMetadata } from "document-schema.js";
+import { ContentDocument, LayoutMetadata } from "document-schema.js";
 //#region src/typed/formula/read.d.ts
 interface OdfFormulaDocument {
   starMath?: string;
@@ -8,5 +8,6 @@ interface OdfFormulaDocument {
   metadata: LayoutMetadata;
 }
 declare function readOdfFormula(pkg: Package): OdfFormulaDocument;
+declare function readOdfFormulaDocument(pkg: Package): ContentDocument;
 //#endregion
-export { OdfFormulaDocument, readOdfFormula };
+export { OdfFormulaDocument, readOdfFormula, readOdfFormulaDocument };

package/dist/typed/formula/read.d.ts

@@ -1,6 +1,6 @@
 import { d as XmlNode } from "../../node-CkBWRjNR.js";
 import { Package } from "../../model/package.js";
-import { LayoutMetadata } from "document-schema.js";
+import { ContentDocument, LayoutMetadata } from "document-schema.js";
 //#region src/typed/formula/read.d.ts
 interface OdfFormulaDocument {
   starMath?: string;
@@ -8,5 +8,6 @@ interface OdfFormulaDocument {
   metadata: LayoutMetadata;
 }
 declare function readOdfFormula(pkg: Package): OdfFormulaDocument;
+declare function readOdfFormulaDocument(pkg: Package): ContentDocument;
 //#endregion
-export { OdfFormulaDocument, readOdfFormula };
+export { OdfFormulaDocument, readOdfFormula, readOdfFormulaDocument };

package/dist/typed/formula/read.js

@@ -1,6 +1,7 @@
 import { decodeXmlText } from "../../xml/entities.js";
 import { attrValue, elementsWithTag, rootElement } from "../../xml/query.js";
 import { readOdfMetadata } from "../shared/metadata.js";
+import { CONTENT_FORMAT_VERSION } from "document-schema.js";
 //#region src/typed/formula/read.ts
 const CONTENT_PART = "content.xml";
 const MATH_ROOT_TAGS = ["math", "math:math"];
@@ -43,5 +44,17 @@ function readOdfFormula(pkg) {
 		metadata
 	};
 }
+function readOdfFormulaDocument(pkg) {
+	const { mathml, starMath, metadata } = readOdfFormula(pkg);
+	return {
+		kind: "formula",
+		formatVersion: CONTENT_FORMAT_VERSION,
+		metadata,
+		formula: starMath === void 0 ? { mathml } : {
+			mathml,
+			starMath
+		}
+	};
+}
 //#endregion
-export { readOdfFormula };
+export { readOdfFormula, readOdfFormulaDocument };