js.documents 1.60.3 → 1.62.0

package/dist/edit/odg/vector.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
+const require_edit_geometry = require("../geometry.cjs");
 const require_edit_odg_style = require("./style.cjs");
 const require_edit_odg_svg_path = require("./svg-path.cjs");
 let ooxml_js = require("ooxml.js");
@@ -49,14 +50,18 @@ var OdgBoxVector = class {
 		return (0, ooxml_js.attr)(this.live(), "draw:name");
 	}
 	get frame() {
-		return (0, odf_js.parseBox)(this.live());
+		return (0, odf_js.resolveOdfShapeGeometry)(this.live())?.frame;
 	}
 	set frame(value) {
-		const node = this.live();
-		require_xml_edit.setAttr(node, "svg:x", (0, odf_js.formatOdfLength)(value.xPt));
-		require_xml_edit.setAttr(node, "svg:y", (0, odf_js.formatOdfLength)(value.yPt));
-		require_xml_edit.setAttr(node, "svg:width", (0, odf_js.formatOdfLength)(value.widthPt));
-		require_xml_edit.setAttr(node, "svg:height", (0, odf_js.formatOdfLength)(value.heightPt));
+		require_edit_geometry.applyOdfGeometry(this.live(), value, this.rotationDeg);
+	}
+	get rotationDeg() {
+		return (0, odf_js.resolveOdfShapeGeometry)(this.live())?.rotationDeg;
+	}
+	set rotationDeg(value) {
+		const currentFrame = this.frame;
+		if (currentFrame === void 0) throw new Error("cannot set rotationDeg on a vector with no resolvable frame (missing svg:width/svg:height)");
+		require_edit_geometry.applyOdfGeometry(this.live(), currentFrame, value);
 	}
 	get fill() {
 		return require_edit_odg_style.readGraphicFill(this.pkg, this.live());
@@ -162,14 +167,18 @@ var OdgPathVector = class {
 		return (0, ooxml_js.attr)(this.live(), "draw:name");
 	}
 	get frame() {
-		return (0, odf_js.parseBox)(this.live());
+		return (0, odf_js.resolveOdfShapeGeometry)(this.live())?.frame;
 	}
 	set frame(value) {
-		const node = this.live();
-		require_xml_edit.setAttr(node, "svg:x", (0, odf_js.formatOdfLength)(value.xPt));
-		require_xml_edit.setAttr(node, "svg:y", (0, odf_js.formatOdfLength)(value.yPt));
-		require_xml_edit.setAttr(node, "svg:width", (0, odf_js.formatOdfLength)(value.widthPt));
-		require_xml_edit.setAttr(node, "svg:height", (0, odf_js.formatOdfLength)(value.heightPt));
+		require_edit_geometry.applyOdfGeometry(this.live(), value, this.rotationDeg);
+	}
+	get rotationDeg() {
+		return (0, odf_js.resolveOdfShapeGeometry)(this.live())?.rotationDeg;
+	}
+	set rotationDeg(value) {
+		const currentFrame = this.frame;
+		if (currentFrame === void 0) throw new Error("cannot set rotationDeg on a vector with no resolvable frame (missing svg:width/svg:height)");
+		require_edit_geometry.applyOdfGeometry(this.live(), currentFrame, value);
 	}
 	get fill() {
 		return require_edit_odg_style.readGraphicFill(this.pkg, this.live());
@@ -187,7 +196,7 @@ var OdgPathVector = class {
 		const node = this.live();
 		const viewBoxValue = (0, ooxml_js.attr)(node, "svg:viewBox");
 		const dValue = (0, ooxml_js.attr)(node, "svg:d");
-		const frame = (0, odf_js.parseBox)(node);
+		const frame = (0, odf_js.resolveOdfShapeGeometry)(node)?.frame;
 		if (viewBoxValue === void 0 || dValue === void 0 || frame === void 0) return [];
 		const viewBox = (0, odf_js.parseOdfViewBox)(viewBoxValue);
 		if (viewBox === void 0) return [];

package/dist/edit/odg/vector.d.cts

@@ -1,2 +1,2 @@
-import { a as OdgLineVector, c as buildEllipseElement, d as buildRectElement, i as OdgBoxVectorKind, l as buildLineElement, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit, u as buildPathElement } from "../../vector-ClohqsOe.cjs";
+import { a as OdgLineVector, c as buildEllipseElement, d as buildRectElement, i as OdgBoxVectorKind, l as buildLineElement, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit, u as buildPathElement } from "../../vector-Puuqu_IT.cjs";
 export { BoxVectorInit, LineVectorInit, OdgBoxVector, OdgBoxVectorKind, OdgLineVector, OdgPathVector, PathVectorInit, buildEllipseElement, buildLineElement, buildPathElement, buildRectElement };

package/dist/edit/odg/vector.d.ts

@@ -1,2 +1,2 @@
-import { a as OdgLineVector, c as buildEllipseElement, d as buildRectElement, i as OdgBoxVectorKind, l as buildLineElement, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit, u as buildPathElement } from "../../vector-ClohqsOe.js";
+import { a as OdgLineVector, c as buildEllipseElement, d as buildRectElement, i as OdgBoxVectorKind, l as buildLineElement, n as LineVectorInit, o as OdgPathVector, r as OdgBoxVector, s as PathVectorInit, t as BoxVectorInit, u as buildPathElement } from "../../vector-Puuqu_IT.js";
 export { BoxVectorInit, LineVectorInit, OdgBoxVector, OdgBoxVectorKind, OdgLineVector, OdgPathVector, PathVectorInit, buildEllipseElement, buildLineElement, buildPathElement, buildRectElement };

package/dist/edit/odg/vector.js

@@ -1,9 +1,10 @@
 import { el } from "../../xml/fragment.js";
 import { removeChild, setAttr } from "../../xml/edit.js";
+import { applyOdfGeometry } from "../geometry.js";
 import { buildGraphicStyle, readGraphicFill, readGraphicStroke, setGraphicFill, setGraphicStroke } from "./style.js";
 import { buildSvgPathData, buildSvgViewBox } from "./svg-path.js";
 import { attr } from "ooxml.js";
-import { buildOdfSubpaths, formatOdfLength, parseBox, parseLinePoints, parseOdfPathData, parseOdfViewBox } from "odf.js";
+import { buildOdfSubpaths, formatOdfLength, parseLinePoints, parseOdfPathData, parseOdfViewBox, resolveOdfShapeGeometry } from "odf.js";
 //#region src/edit/odg/vector.ts
 function directTextP() {
 	return el("text:p");
@@ -48,14 +49,18 @@ var OdgBoxVector = class {
 		return attr(this.live(), "draw:name");
 	}
 	get frame() {
-		return parseBox(this.live());
+		return resolveOdfShapeGeometry(this.live())?.frame;
 	}
 	set frame(value) {
-		const node = this.live();
-		setAttr(node, "svg:x", formatOdfLength(value.xPt));
-		setAttr(node, "svg:y", formatOdfLength(value.yPt));
-		setAttr(node, "svg:width", formatOdfLength(value.widthPt));
-		setAttr(node, "svg:height", formatOdfLength(value.heightPt));
+		applyOdfGeometry(this.live(), value, this.rotationDeg);
+	}
+	get rotationDeg() {
+		return resolveOdfShapeGeometry(this.live())?.rotationDeg;
+	}
+	set rotationDeg(value) {
+		const currentFrame = this.frame;
+		if (currentFrame === void 0) throw new Error("cannot set rotationDeg on a vector with no resolvable frame (missing svg:width/svg:height)");
+		applyOdfGeometry(this.live(), currentFrame, value);
 	}
 	get fill() {
 		return readGraphicFill(this.pkg, this.live());
@@ -161,14 +166,18 @@ var OdgPathVector = class {
 		return attr(this.live(), "draw:name");
 	}
 	get frame() {
-		return parseBox(this.live());
+		return resolveOdfShapeGeometry(this.live())?.frame;
 	}
 	set frame(value) {
-		const node = this.live();
-		setAttr(node, "svg:x", formatOdfLength(value.xPt));
-		setAttr(node, "svg:y", formatOdfLength(value.yPt));
-		setAttr(node, "svg:width", formatOdfLength(value.widthPt));
-		setAttr(node, "svg:height", formatOdfLength(value.heightPt));
+		applyOdfGeometry(this.live(), value, this.rotationDeg);
+	}
+	get rotationDeg() {
+		return resolveOdfShapeGeometry(this.live())?.rotationDeg;
+	}
+	set rotationDeg(value) {
+		const currentFrame = this.frame;
+		if (currentFrame === void 0) throw new Error("cannot set rotationDeg on a vector with no resolvable frame (missing svg:width/svg:height)");
+		applyOdfGeometry(this.live(), currentFrame, value);
 	}
 	get fill() {
 		return readGraphicFill(this.pkg, this.live());
@@ -186,7 +195,7 @@ var OdgPathVector = class {
 		const node = this.live();
 		const viewBoxValue = attr(node, "svg:viewBox");
 		const dValue = attr(node, "svg:d");
-		const frame = parseBox(node);
+		const frame = resolveOdfShapeGeometry(node)?.frame;
 		if (viewBoxValue === void 0 || dValue === void 0 || frame === void 0) return [];
 		const viewBox = parseOdfViewBox(viewBoxValue);
 		if (viewBox === void 0) return [];

package/dist/edit/odp/content.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_embedded_drawing = require("../../model/embedded-drawing.cjs");
 const require_edit_odt_content = require("../odt/content.cjs");
 const require_edit_odp_editor = require("./editor.cjs");
 let odf_js = require("odf.js");
@@ -17,6 +18,7 @@ function buildOdpPackage(content) {
 }
 function appendShape(slide, shape) {
 	const [onlyBlock] = shape.blocks;
+	if (shape.blocks.length === 1 && onlyBlock?.kind === "embeddedObject" && require_model_embedded_drawing.drawingOfBlock(onlyBlock) !== void 0) return;
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "image") {
 		const imageShape = slide.addImage({
 			frame: shape.frame,
@@ -27,6 +29,19 @@ function appendShape(slide, shape) {
 		if (shape.rotationDeg !== void 0) imageShape.rotationDeg = shape.rotationDeg;
 		return;
 	}
+	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
+		const { shape: tableFrame, table } = slide.addTable({
+			frame: shape.frame,
+			table: {
+				rows: onlyBlock.rows.length,
+				columns: onlyBlock.columnWidthsPt.length,
+				columnWidthsPt: onlyBlock.columnWidthsPt
+			}
+		});
+		if (shape.rotationDeg !== void 0) tableFrame.rotationDeg = shape.rotationDeg;
+		require_edit_odt_content.populateOdtTable(table, onlyBlock);
+		return;
+	}
 	const textShape = slide.addTextBox({
 		frame: shape.frame,
 		text: ""

package/dist/edit/odp/content.js

@@ -1,4 +1,5 @@
-import { populateParagraph } from "../odt/content.js";
+import { drawingOfBlock } from "../../model/embedded-drawing.js";
+import { populateOdtTable, populateParagraph } from "../odt/content.js";
 import { createOdp } from "./editor.js";
 import { base64ToBytes } from "odf.js";
 //#region src/edit/odp/content.ts
@@ -16,6 +17,7 @@ function buildOdpPackage(content) {
 }
 function appendShape(slide, shape) {
 	const [onlyBlock] = shape.blocks;
+	if (shape.blocks.length === 1 && onlyBlock?.kind === "embeddedObject" && drawingOfBlock(onlyBlock) !== void 0) return;
 	if (shape.blocks.length === 1 && onlyBlock?.kind === "image") {
 		const imageShape = slide.addImage({
 			frame: shape.frame,
@@ -26,6 +28,19 @@ function appendShape(slide, shape) {
 		if (shape.rotationDeg !== void 0) imageShape.rotationDeg = shape.rotationDeg;
 		return;
 	}
+	if (shape.blocks.length === 1 && onlyBlock?.kind === "table") {
+		const { shape: tableFrame, table } = slide.addTable({
+			frame: shape.frame,
+			table: {
+				rows: onlyBlock.rows.length,
+				columns: onlyBlock.columnWidthsPt.length,
+				columnWidthsPt: onlyBlock.columnWidthsPt
+			}
+		});
+		if (shape.rotationDeg !== void 0) tableFrame.rotationDeg = shape.rotationDeg;
+		populateOdtTable(table, onlyBlock);
+		return;
+	}
 	const textShape = slide.addTextBox({
 		frame: shape.frame,
 		text: ""

package/dist/edit/odp/editor.d.cts

@@ -1,4 +1,4 @@
-import { s as PageSize } from "../../geometry-DvwdrIij.cjs";
+import { s as PageSize } from "../../geometry-DaJr8yQW.cjs";
 import { OdpSlide } from "./slide.cjs";
 import { Package } from "odf.js";
 //#region src/edit/odp/editor.d.ts

package/dist/edit/odp/editor.d.ts

@@ -1,4 +1,4 @@
-import { s as PageSize } from "../../geometry-DvwdrIij.js";
+import { s as PageSize } from "../../geometry-DaJr8yQW.js";
 import { OdpSlide } from "./slide.js";
 import { Package } from "odf.js";
 //#region src/edit/odp/editor.d.ts

package/dist/edit/odp/image.d.cts

@@ -1,2 +1,2 @@
-import { n as MediaContext, r as insertImageFrameMedia, t as ImageInit } from "../../image-DWX6cNOD.cjs";
+import { n as MediaContext, r as insertImageFrameMedia, t as ImageInit } from "../../image-M5SezZVI.cjs";
 export { ImageInit, MediaContext, insertImageFrameMedia };

package/dist/edit/odp/image.d.ts

@@ -1,2 +1,2 @@
-import { n as MediaContext, r as insertImageFrameMedia, t as ImageInit } from "../../image-CeqwL-Qs.js";
+import { n as MediaContext, r as insertImageFrameMedia, t as ImageInit } from "../../image-DHcA9kaK.js";
 export { ImageInit, MediaContext, insertImageFrameMedia };

package/dist/edit/odp/shape.cjs

@@ -3,30 +3,13 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_edit_odt_paragraph = require("../odt/paragraph.cjs");
 const require_edit_odt_list = require("../odt/list.cjs");
+const require_edit_geometry = require("../geometry.cjs");
 let ooxml_js = require("ooxml.js");
 let odf_js = require("odf.js");
 //#region src/edit/odp/shape.ts
 function directChild(parent, tag) {
 	for (const child of parent.children) if (child.type === "element" && child.tag === tag) return child;
 }
-function buildTransformAttr(frame, rotationDeg) {
-	const angleRad = -rotationDeg * Math.PI / 180;
-	const localCenter = {
-		xPt: frame.widthPt / 2,
-		yPt: frame.heightPt / 2
-	};
-	const rotatedCenter = (0, odf_js.applyOdfTransform)([{
-		kind: "rotate",
-		angleRad
-	}], localCenter);
-	const desiredCenter = {
-		xPt: frame.xPt + frame.widthPt / 2,
-		yPt: frame.yPt + frame.heightPt / 2
-	};
-	const txPt = desiredCenter.xPt - rotatedCenter.xPt;
-	const tyPt = desiredCenter.yPt - rotatedCenter.yPt;
-	return `rotate(${angleRad}) translate(${(0, odf_js.formatOdfLength)(txPt)} ${(0, odf_js.formatOdfLength)(tyPt)})`;
-}
 var OdpShape = class {
 	container;
 	node;
@@ -59,18 +42,7 @@ var OdpShape = class {
 		this.applyGeometry(currentFrame, value);
 	}
 	applyGeometry(frame, rotationDeg) {
-		const node = this.live();
-		require_xml_edit.setAttr(node, "svg:width", (0, odf_js.formatOdfLength)(frame.widthPt));
-		require_xml_edit.setAttr(node, "svg:height", (0, odf_js.formatOdfLength)(frame.heightPt));
-		if (rotationDeg === void 0 || rotationDeg === 0) {
-			require_xml_edit.removeAttr(node, "draw:transform");
-			require_xml_edit.setAttr(node, "svg:x", (0, odf_js.formatOdfLength)(frame.xPt));
-			require_xml_edit.setAttr(node, "svg:y", (0, odf_js.formatOdfLength)(frame.yPt));
-		} else {
-			require_xml_edit.removeAttr(node, "svg:x");
-			require_xml_edit.removeAttr(node, "svg:y");
-			require_xml_edit.setAttr(node, "draw:transform", buildTransformAttr(frame, rotationDeg));
-		}
+		require_edit_geometry.applyOdfGeometry(this.live(), frame, rotationDeg);
 	}
 	textBox(create) {
 		const node = this.live();
@@ -127,7 +99,16 @@ function buildImageFrame(partPath, frame) {
 		"svg:height": (0, odf_js.formatOdfLength)(frame.heightPt)
 	}, [require_xml_fragment.el("draw:image", { "xlink:href": partPath })]);
 }
+function buildTableFrame(frame, tableElement) {
+	return require_xml_fragment.el("draw:frame", {
+		"svg:x": (0, odf_js.formatOdfLength)(frame.xPt),
+		"svg:y": (0, odf_js.formatOdfLength)(frame.yPt),
+		"svg:width": (0, odf_js.formatOdfLength)(frame.widthPt),
+		"svg:height": (0, odf_js.formatOdfLength)(frame.heightPt)
+	}, [tableElement]);
+}
 //#endregion
 exports.OdpShape = OdpShape;
 exports.buildImageFrame = buildImageFrame;
+exports.buildTableFrame = buildTableFrame;
 exports.buildTextBoxFrame = buildTextBoxFrame;

package/dist/edit/odp/shape.d.cts

@@ -1,2 +1,2 @@
-import { n as buildImageFrame, r as buildTextBoxFrame, t as OdpShape } from "../../shape-CN2ycxOo.cjs";
-export { OdpShape, buildImageFrame, buildTextBoxFrame };
+import { i as buildTextBoxFrame, n as buildImageFrame, r as buildTableFrame, t as OdpShape } from "../../shape-CXZ6fejV.cjs";
+export { OdpShape, buildImageFrame, buildTableFrame, buildTextBoxFrame };

package/dist/edit/odp/shape.d.ts

@@ -1,2 +1,2 @@
-import { n as buildImageFrame, r as buildTextBoxFrame, t as OdpShape } from "../../shape-BfN3m52m.js";
-export { OdpShape, buildImageFrame, buildTextBoxFrame };
+import { i as buildTextBoxFrame, n as buildImageFrame, r as buildTableFrame, t as OdpShape } from "../../shape-CVXedeL7.js";
+export { OdpShape, buildImageFrame, buildTableFrame, buildTextBoxFrame };

package/dist/edit/odp/shape.js

@@ -1,31 +1,14 @@
 import { el } from "../../xml/fragment.js";
-import { removeAttr, removeChild, setAttr } from "../../xml/edit.js";
+import { removeChild } from "../../xml/edit.js";
 import { OdtParagraph, buildParagraph } from "../odt/paragraph.js";
 import { OdtList, buildList } from "../odt/list.js";
+import { applyOdfGeometry } from "../geometry.js";
 import { attr } from "ooxml.js";
-import { applyOdfTransform, formatOdfLength, resolveOdfShapeGeometry } from "odf.js";
+import { formatOdfLength, resolveOdfShapeGeometry } from "odf.js";
 //#region src/edit/odp/shape.ts
 function directChild(parent, tag) {
 	for (const child of parent.children) if (child.type === "element" && child.tag === tag) return child;
 }
-function buildTransformAttr(frame, rotationDeg) {
-	const angleRad = -rotationDeg * Math.PI / 180;
-	const localCenter = {
-		xPt: frame.widthPt / 2,
-		yPt: frame.heightPt / 2
-	};
-	const rotatedCenter = applyOdfTransform([{
-		kind: "rotate",
-		angleRad
-	}], localCenter);
-	const desiredCenter = {
-		xPt: frame.xPt + frame.widthPt / 2,
-		yPt: frame.yPt + frame.heightPt / 2
-	};
-	const txPt = desiredCenter.xPt - rotatedCenter.xPt;
-	const tyPt = desiredCenter.yPt - rotatedCenter.yPt;
-	return `rotate(${angleRad}) translate(${formatOdfLength(txPt)} ${formatOdfLength(tyPt)})`;
-}
 var OdpShape = class {
 	container;
 	node;
@@ -58,18 +41,7 @@ var OdpShape = class {
 		this.applyGeometry(currentFrame, value);
 	}
 	applyGeometry(frame, rotationDeg) {
-		const node = this.live();
-		setAttr(node, "svg:width", formatOdfLength(frame.widthPt));
-		setAttr(node, "svg:height", formatOdfLength(frame.heightPt));
-		if (rotationDeg === void 0 || rotationDeg === 0) {
-			removeAttr(node, "draw:transform");
-			setAttr(node, "svg:x", formatOdfLength(frame.xPt));
-			setAttr(node, "svg:y", formatOdfLength(frame.yPt));
-		} else {
-			removeAttr(node, "svg:x");
-			removeAttr(node, "svg:y");
-			setAttr(node, "draw:transform", buildTransformAttr(frame, rotationDeg));
-		}
+		applyOdfGeometry(this.live(), frame, rotationDeg);
 	}
 	textBox(create) {
 		const node = this.live();
@@ -126,5 +98,13 @@ function buildImageFrame(partPath, frame) {
 		"svg:height": formatOdfLength(frame.heightPt)
 	}, [el("draw:image", { "xlink:href": partPath })]);
 }
+function buildTableFrame(frame, tableElement) {
+	return el("draw:frame", {
+		"svg:x": formatOdfLength(frame.xPt),
+		"svg:y": formatOdfLength(frame.yPt),
+		"svg:width": formatOdfLength(frame.widthPt),
+		"svg:height": formatOdfLength(frame.heightPt)
+	}, [tableElement]);
+}
 //#endregion
-export { OdpShape, buildImageFrame, buildTextBoxFrame };
+export { OdpShape, buildImageFrame, buildTableFrame, buildTextBoxFrame };

package/dist/edit/odp/slide.cjs

@@ -3,6 +3,7 @@ const require_xml_fragment = require("../../xml/fragment.cjs");
 const require_xml_edit = require("../../xml/edit.cjs");
 const require_xml_odf_text = require("../../xml/odf-text.cjs");
 const require_edit_odt_paragraph = require("../odt/paragraph.cjs");
+const require_edit_odt_table = require("../odt/table.cjs");
 const require_edit_odp_shape = require("./shape.cjs");
 const require_edit_odp_image = require("./image.cjs");
 let ooxml_js = require("ooxml.js");
@@ -59,6 +60,16 @@ var OdpSlide = class {
 		node.children.push(frameElement);
 		return new require_edit_odp_shape.OdpShape(node.children, frameElement, this.context.pkg);
 	}
+	addTable(init) {
+		const node = this.live();
+		const tableElement = require_edit_odt_table.buildTable(this.context.pkg, init.table);
+		const frameElement = require_edit_odp_shape.buildTableFrame(init.frame, tableElement);
+		node.children.push(frameElement);
+		return {
+			shape: new require_edit_odp_shape.OdpShape(node.children, frameElement, this.context.pkg),
+			table: new require_edit_odt_table.OdtTable(frameElement.children, tableElement, this.context.pkg)
+		};
+	}
 	get notes() {
 		const notesElement = directChild(this.live(), "presentation:notes");
 		if (notesElement === void 0) return "";

package/dist/edit/odp/slide.d.cts

@@ -1,6 +1,7 @@
-import { t as Box } from "../../geometry-DvwdrIij.cjs";
-import { t as ImageInit } from "../../image-DWX6cNOD.cjs";
-import { t as OdpShape } from "../../shape-CN2ycxOo.cjs";
+import { t as Box } from "../../geometry-DaJr8yQW.cjs";
+import { t as ImageInit } from "../../image-M5SezZVI.cjs";
+import { t as OdpShape } from "../../shape-CXZ6fejV.cjs";
+import { i as TableInit, t as OdtTable } from "../../table-DjYcNOFm.cjs";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts
 interface TextBoxInit {
@@ -10,9 +11,17 @@ interface TextBoxInit {
 interface SlideImageInit extends ImageInit {
   readonly frame: Box;
 }
+interface SlideTableInit {
+  readonly frame: Box;
+  readonly table: TableInit;
+}
 interface SlideContext {
   readonly pkg: Package;
 }
+interface OdpTableShape {
+  readonly shape: OdpShape;
+  readonly table: OdtTable;
+}
 declare class OdpSlide {
   private readonly container;
   private readonly node;
@@ -23,9 +32,10 @@ declare class OdpSlide {
   shapes(): OdpShape[];
   addTextBox(init: TextBoxInit): OdpShape;
   addImage(init: SlideImageInit): OdpShape;
+  addTable(init: SlideTableInit): OdpTableShape;
   get notes(): string;
   set notes(value: string);
   remove(): void;
 }
 //#endregion
-export { OdpSlide, SlideContext, SlideImageInit, TextBoxInit };
+export { OdpSlide, OdpTableShape, SlideContext, SlideImageInit, SlideTableInit, TextBoxInit };

package/dist/edit/odp/slide.d.ts

@@ -1,6 +1,7 @@
-import { t as Box } from "../../geometry-DvwdrIij.js";
-import { t as ImageInit } from "../../image-CeqwL-Qs.js";
-import { t as OdpShape } from "../../shape-BfN3m52m.js";
+import { t as Box } from "../../geometry-DaJr8yQW.js";
+import { t as ImageInit } from "../../image-DHcA9kaK.js";
+import { t as OdpShape } from "../../shape-CVXedeL7.js";
+import { i as TableInit, t as OdtTable } from "../../table-DqfqMkVq.js";
 import { Package, XmlElement, XmlNode } from "odf.js";
 //#region src/edit/odp/slide.d.ts
 interface TextBoxInit {
@@ -10,9 +11,17 @@ interface TextBoxInit {
 interface SlideImageInit extends ImageInit {
   readonly frame: Box;
 }
+interface SlideTableInit {
+  readonly frame: Box;
+  readonly table: TableInit;
+}
 interface SlideContext {
   readonly pkg: Package;
 }
+interface OdpTableShape {
+  readonly shape: OdpShape;
+  readonly table: OdtTable;
+}
 declare class OdpSlide {
   private readonly container;
   private readonly node;
@@ -23,9 +32,10 @@ declare class OdpSlide {
   shapes(): OdpShape[];
   addTextBox(init: TextBoxInit): OdpShape;
   addImage(init: SlideImageInit): OdpShape;
+  addTable(init: SlideTableInit): OdpTableShape;
   get notes(): string;
   set notes(value: string);
   remove(): void;
 }
 //#endregion
-export { OdpSlide, SlideContext, SlideImageInit, TextBoxInit };
+export { OdpSlide, OdpTableShape, SlideContext, SlideImageInit, SlideTableInit, TextBoxInit };

package/dist/edit/odp/slide.js

@@ -2,7 +2,8 @@ import { el } from "../../xml/fragment.js";
 import { removeChild } from "../../xml/edit.js";
 import { decodeOdfText as decodeOdfText$1 } from "../../xml/odf-text.js";
 import { buildParagraph } from "../odt/paragraph.js";
-import { OdpShape, buildTextBoxFrame } from "./shape.js";
+import { OdtTable, buildTable } from "../odt/table.js";
+import { OdpShape, buildTableFrame, buildTextBoxFrame } from "./shape.js";
 import { insertImageFrameMedia } from "./image.js";
 import { elementsWithTag } from "ooxml.js";
 import { formatOdfLength } from "odf.js";
@@ -58,6 +59,16 @@ var OdpSlide = class {
 		node.children.push(frameElement);
 		return new OdpShape(node.children, frameElement, this.context.pkg);
 	}
+	addTable(init) {
+		const node = this.live();
+		const tableElement = buildTable(this.context.pkg, init.table);
+		const frameElement = buildTableFrame(init.frame, tableElement);
+		node.children.push(frameElement);
+		return {
+			shape: new OdpShape(node.children, frameElement, this.context.pkg),
+			table: new OdtTable(frameElement.children, tableElement, this.context.pkg)
+		};
+	}
 	get notes() {
 		const notesElement = directChild(this.live(), "presentation:notes");
 		if (notesElement === void 0) return "";

package/dist/edit/odt/content.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_model_formula = require("../../model/formula.cjs");
 const require_edit_odt_editor = require("./editor.cjs");
 //#region src/edit/odt/content.ts
 function buildOdtPackage(content) {
@@ -75,27 +76,56 @@ function populateParagraph(paragraph, block) {
 		if (run.color !== void 0) odtRun.color = run.color;
 	}
 }
+function populateCellBlocks(cell, blocks) {
+	const [firstBlock, ...restBlocks] = blocks;
+	const firstParagraph = cell.paragraphs()[0];
+	if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
+	else if (firstBlock !== void 0) appendCellBlock(cell, firstBlock);
+	for (const remaining of restBlocks) appendCellBlock(cell, remaining);
+}
+function populateOdtTable(table, block) {
+	const verticalMerges = /* @__PURE__ */ new Map();
+	block.rows.forEach((row) => {
+		const tableRow = table.appendEmptyRow();
+		let colIndex = 0;
+		let horizontalCoverRemaining = 0;
+		row.cells.forEach((cell) => {
+			if (horizontalCoverRemaining > 0) {
+				tableRow.appendCoveredCell();
+				horizontalCoverRemaining -= 1;
+				colIndex += 1;
+				return;
+			}
+			const verticalRemaining = verticalMerges.get(colIndex);
+			if (verticalRemaining !== void 0 && verticalRemaining > 0) {
+				tableRow.appendCoveredCell();
+				verticalMerges.set(colIndex, verticalRemaining - 1);
+				colIndex += 1;
+				return;
+			}
+			const tableCell = tableRow.appendCell();
+			const span = cell.colSpan ?? 1;
+			if (span > 1) {
+				tableCell.colSpan = span;
+				horizontalCoverRemaining = span - 1;
+			}
+			if (cell.rowSpan !== void 0 && cell.rowSpan > 1) {
+				tableCell.rowSpan = cell.rowSpan;
+				for (let c = 0; c < span; c++) verticalMerges.set(colIndex + c, cell.rowSpan - 1);
+			}
+			populateCellBlocks(tableCell, cell.blocks);
+			colIndex += 1;
+		});
+	});
+}
 function appendTable(body, block) {
 	const columns = block.columnWidthsPt.length;
 	if (block.rows.length === 0 || columns === 0) return;
-	const table = body.appendTable({
-		rows: block.rows.length,
+	populateOdtTable(body.appendTable({
+		rows: 0,
 		columns,
 		columnWidthsPt: block.columnWidthsPt
-	});
-	block.rows.forEach((row, rowIndex) => {
-		const tableRow = table.rows()[rowIndex];
-		if (tableRow === void 0) return;
-		row.cells.forEach((cell, cellIndex) => {
-			const tableCell = tableRow.cells()[cellIndex];
-			if (tableCell === void 0) return;
-			const [firstBlock, ...restBlocks] = cell.blocks;
-			const firstParagraph = tableCell.paragraphs()[0];
-			if (firstBlock?.kind === "paragraph" && firstParagraph !== void 0) populateParagraph(firstParagraph, firstBlock);
-			else if (firstBlock !== void 0) appendCellBlock(tableCell, firstBlock);
-			for (const remaining of restBlocks) appendCellBlock(tableCell, remaining);
-		});
-	});
+	}), block);
 }
 function appendCellBlock(cell, block) {
 	if (block.kind === "paragraph") populateParagraph(cell.appendParagraph(), block);
@@ -104,7 +134,17 @@ function appendBlock(body, block) {
 	if (block.kind === "paragraph") populateParagraph(body.appendParagraph(), block);
 	else if (block.kind === "pageBreak") body.appendPageBreak();
 	else if (block.kind === "table") appendTable(body, block);
+	else if (block.kind === "embeddedObject") appendEmbeddedObject(body, block);
+}
+function appendEmbeddedObject(body, block) {
+	const formula = require_model_formula.formulaOfBlock(block);
+	if (formula === void 0) return;
+	populateParagraph(body.appendParagraph(), {
+		kind: "paragraph",
+		runs: [{ text: require_model_formula.formulaPlaceholderText(formula) }]
+	});
 }
 //#endregion
 exports.buildOdtPackage = buildOdtPackage;
+exports.populateOdtTable = populateOdtTable;
 exports.populateParagraph = populateParagraph;

package/dist/edit/odt/content.d.cts

@@ -1,8 +1,10 @@
 import { t as OdtParagraph } from "../../paragraph-BXbXKPy3.cjs";
-import { ContentDocument, ContentParagraph } from "document-schema.js";
+import { t as OdtTable } from "../../table-DjYcNOFm.cjs";
+import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts
 declare function buildOdtPackage(content: ContentDocument): Package;
 declare function populateParagraph(paragraph: OdtParagraph, block: ContentParagraph): void;
+declare function populateOdtTable(table: OdtTable, block: ContentTable): void;
 //#endregion
-export { buildOdtPackage, populateParagraph };
+export { buildOdtPackage, populateOdtTable, populateParagraph };

package/dist/edit/odt/content.d.ts

@@ -1,8 +1,10 @@
 import { t as OdtParagraph } from "../../paragraph-CoUi_88j.js";
-import { ContentDocument, ContentParagraph } from "document-schema.js";
+import { t as OdtTable } from "../../table-DqfqMkVq.js";
+import { ContentDocument, ContentParagraph, ContentTable } from "document-schema.js";
 import { Package } from "odf.js";
 //#region src/edit/odt/content.d.ts
 declare function buildOdtPackage(content: ContentDocument): Package;
 declare function populateParagraph(paragraph: OdtParagraph, block: ContentParagraph): void;
+declare function populateOdtTable(table: OdtTable, block: ContentTable): void;
 //#endregion
-export { buildOdtPackage, populateParagraph };
+export { buildOdtPackage, populateOdtTable, populateParagraph };