ppt-codec 1.5.0 → 1.7.0

package/dist/drawing/shapes-write.js

@@ -1,10 +1,38 @@
-import { OfficeArtClientAnchor, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSpContainer, OfficeArtSpgrContainer, RT_Drawing, RT_TextCharsAtom, RT_TextHeaderAtom } from "../record/types.js";
+import { PptUnsupportedContentError } from "../errors.js";
+import { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSpContainer, OfficeArtSpgrContainer, OfficeArtTertiaryFOPT, RT_Drawing, RT_TextCharsAtom, RT_TextHeaderAtom } from "../record/types.js";
 import { characterCountOf } from "../text/atoms.js";
-import { pointsToMasterUnits } from "../units.js";
+import { pointsToEmu, pointsToMasterUnits } from "../units.js";
 import { buildTextBody } from "../content-write.js";
+import { PptDiagnosticCodes } from "../diagnostics.js";
 import { concatBytes, i32le, u32le, utf16le, writeAtom, writeContainer } from "../record/write.js";
+import { isBlipFormat } from "./blips.js";
+import { degreesToFixedPoint, writeIMsoArray, writeShapePropertyTable } from "./properties.js";
+import { DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT } from "../read.js";
 import { writeStyleTextPropAtom } from "../text/style-write.js";
 //#region src/drawing/shapes-write.ts
+function insetProperties(shape, isPicture) {
+	const defaultLeftRight = isPicture ? 0 : DEFAULT_INSET_LEFT_RIGHT_PT;
+	const defaultTopBottom = isPicture ? 0 : DEFAULT_INSET_TOP_BOTTOM_PT;
+	const entries = [];
+	if (shape.insetLeftPt !== defaultLeftRight) entries.push({
+		opid: 129,
+		op: pointsToEmu(shape.insetLeftPt)
+	});
+	if (shape.insetTopPt !== defaultTopBottom) entries.push({
+		opid: 130,
+		op: pointsToEmu(shape.insetTopPt)
+	});
+	if (shape.insetRightPt !== defaultLeftRight) entries.push({
+		opid: 131,
+		op: pointsToEmu(shape.insetRightPt)
+	});
+	if (shape.insetBottomPt !== defaultTopBottom) entries.push({
+		opid: 132,
+		op: pointsToEmu(shape.insetBottomPt)
+	});
+	return entries;
+}
+const FSP_CHILD = 2;
 const PATRIARCH_SPID = 1;
 const FIRST_CONTENT_SPID = 2;
 function writeFsp(spid, flags) {
@@ -20,9 +48,23 @@ function writeClientAnchor(xPt, yPt, widthPt, heightPt) {
 function writeTextCharsAtom(text) {
 	return writeAtom(RT_TextCharsAtom, utf16le(text));
 }
-function writeClientTextbox(shape, fontIndexOf) {
-	if (!shape.blocks.some((block) => block.kind === "paragraph")) return;
-	const { text, style } = buildTextBody(shape.blocks, fontIndexOf);
+function writeShapeProperties(shape, pib) {
+	const entries = [];
+	if (shape.rotationDeg !== void 0) entries.push({
+		opid: 4,
+		op: degreesToFixedPoint(shape.rotationDeg)
+	});
+	if (pib !== void 0) entries.push({
+		opid: 260,
+		op: pib,
+		fBid: true
+	});
+	entries.push(...insetProperties(shape, pib !== void 0));
+	return entries.length === 0 ? void 0 : writeShapePropertyTable(OfficeArtFOPT, entries);
+}
+function writeClientTextbox(textBlocks, fontIndexOf) {
+	if (textBlocks.length === 0) return;
+	const { text, style } = buildTextBody(textBlocks, fontIndexOf);
 	const totalParagraphCount = style.paragraphRuns.reduce((sum, run) => sum + run.count, 0);
 	if (totalParagraphCount !== characterCountOf(text)) throw new Error(`internal error: built ${totalParagraphCount} characters of paragraph runs for a ${characterCountOf(text)}-character text body`);
 	return writeContainer(OfficeArtClientTextbox, [
@@ -31,9 +73,12 @@ function writeClientTextbox(shape, fontIndexOf) {
 		writeStyleTextPropAtom(style)
 	]);
 }
-function writeShape(spid, shape, fontIndexOf, clientData) {
-	const clientTextbox = writeClientTextbox(shape, fontIndexOf);
-	const children = [writeFsp(spid, 0), writeClientAnchor(shape.frame.xPt, shape.frame.yPt, shape.frame.widthPt, shape.frame.heightPt)];
+function writeShape(spid, shape, pib, textBlocks, fontIndexOf, clientData) {
+	const properties = writeShapeProperties(shape, pib);
+	const clientTextbox = writeClientTextbox(textBlocks, fontIndexOf);
+	const children = [writeFsp(spid, 0)];
+	if (properties !== void 0) children.push(properties);
+	children.push(writeClientAnchor(shape.frame.xPt, shape.frame.yPt, shape.frame.widthPt, shape.frame.heightPt));
 	if (clientData !== void 0) children.push(clientData);
 	if (clientTextbox !== void 0) children.push(clientTextbox);
 	return writeContainer(OfficeArtSpContainer, children);
@@ -41,18 +86,191 @@ function writeShape(spid, shape, fontIndexOf, clientData) {
 function writePatriarch() {
 	return writeContainer(OfficeArtSpContainer, [writeAtom(OfficeArtFSPGR, /* @__PURE__ */ new Uint8Array(16), { recVer: 1 }), writeFsp(PATRIARCH_SPID, 5)]);
 }
-function writeDrawing(shapes, fontIndexOf) {
-	const shapeContainers = shapes.map((entry, index) => writeShape(FIRST_CONTENT_SPID + index, entry.shape, fontIndexOf, entry.clientData));
-	return writeContainer(RT_Drawing, [writeContainer(OfficeArtDgContainer, [writeContainer(OfficeArtSpgrContainer, [writePatriarch(), ...shapeContainers])])]);
+function reportDrop(context, diagnostic) {
+	context.sink(diagnostic);
+	if (context.strict) throw new PptUnsupportedContentError(diagnostic.message);
+}
+function planShapeBlocks(blocks, context, hasOleClientData) {
+	const textBlocks = [];
+	let pib;
+	let table;
+	const drop = (block, reason) => {
+		reportDrop(context, {
+			code: PptDiagnosticCodes.BLOCK_DROPPED,
+			severity: "warning",
+			message: `${context.location}: ${reason}`
+		});
+	};
+	for (const block of blocks) {
+		if (block.kind === "embeddedObject" && hasOleClientData) continue;
+		if (block.kind === "paragraph") {
+			textBlocks.push(block);
+			continue;
+		}
+		if (block.kind === "image") {
+			if (!isBlipFormat(block.format)) {
+				reportDrop(context, {
+					code: PptDiagnosticCodes.IMAGE_DROPPED,
+					severity: "warning",
+					message: `${context.location}: an image block in format '${block.format}' is dropped; MSOBLIPTYPE gives this writer a blip record for PNG and JPEG only`
+				});
+				continue;
+			}
+			if (pib !== void 0) {
+				reportDrop(context, {
+					code: PptDiagnosticCodes.IMAGE_DROPPED,
+					severity: "warning",
+					message: `${context.location}: a second image block is dropped; a shape carries exactly one blip-store reference, and an earlier image already consumed it`
+				});
+				continue;
+			}
+			pib = context.blipIndexOf(block);
+			continue;
+		}
+		if (block.kind === "table") {
+			if (table !== void 0) {
+				drop(block, "a second 'table' block is dropped; a shape becomes one table group, and an earlier table already did");
+				continue;
+			}
+			table = block;
+			continue;
+		}
+		drop(block, `a '${block.kind}' block is dropped; this writer produces no [MS-PPT] spelling for it`);
+	}
+	if (table !== void 0) {
+		for (const block of textBlocks) drop(block, "a 'paragraph' block is dropped; a shape carrying a table becomes a table group, which holds its text in cells rather than a text body of its own");
+		if (pib !== void 0) reportDrop(context, {
+			code: PptDiagnosticCodes.IMAGE_DROPPED,
+			severity: "warning",
+			message: `${context.location}: an image block is dropped; a shape carrying a table becomes a table group, which has no blip reference of its own`
+		});
+		return {
+			pib: void 0,
+			textBlocks: [],
+			table
+		};
+	}
+	return {
+		pib,
+		textBlocks,
+		table
+	};
+}
+function tableRowHeights(table, frameHeightMasterUnits) {
+	const stated = table.rows.map((row) => row.heightPt === void 0 ? void 0 : pointsToMasterUnits(row.heightPt));
+	const unstatedCount = stated.filter((height) => height === void 0).length;
+	if (unstatedCount === 0) return stated.map((height) => {
+		if (height === void 0) throw new Error("internal error: a stated row height became unstated in the same pass");
+		return height;
+	});
+	const remaining = frameHeightMasterUnits - stated.reduce((sum, height) => sum + (height ?? 0), 0);
+	const shared = Math.max(1, Math.round(remaining / unstatedCount));
+	return stated.map((height) => height ?? shared);
+}
+function writeTableGroup(spid, shape, table, context) {
+	const { frame } = shape;
+	const rowHeights = tableRowHeights(table, pointsToMasterUnits(frame.heightPt));
+	const declaredWidths = table.columnWidthsPt.map(pointsToMasterUnits);
+	const cellCount = Math.max(1, ...table.rows.map((row) => row.cells.length), declaredWidths.length);
+	const lastDeclared = declaredWidths.at(-1);
+	const equalShare = Math.max(1, Math.round(pointsToMasterUnits(frame.widthPt) / cellCount));
+	const columnWidthsMasterUnits = Array.from({ length: cellCount }, (_, index) => declaredWidths[index] ?? lastDeclared ?? equalShare);
+	const columnBoundaries = [];
+	let columnEdge = pointsToMasterUnits(frame.xPt);
+	for (const width of columnWidthsMasterUnits) {
+		columnBoundaries.push(columnEdge);
+		columnEdge += width;
+	}
+	columnBoundaries.push(columnEdge);
+	const rowBoundaries = [];
+	let rowEdge = pointsToMasterUnits(frame.yPt);
+	for (const height of rowHeights) {
+		rowBoundaries.push(rowEdge);
+		rowEdge += height;
+	}
+	rowBoundaries.push(rowEdge);
+	const rowHeightsPayload = writeIMsoArray(rowHeights, 4);
+	const tableLeft = pointsToMasterUnits(frame.xPt);
+	const tableTop = pointsToMasterUnits(frame.yPt);
+	const tableRight = pointsToMasterUnits(frame.xPt + frame.widthPt);
+	const tableBottom = pointsToMasterUnits(frame.yPt + frame.heightPt);
+	const groupShape = writeContainer(OfficeArtSpContainer, [
+		writeAtom(OfficeArtFSPGR, concatBytes(i32le(tableLeft), i32le(tableTop), i32le(tableRight), i32le(tableBottom)), { recVer: 1 }),
+		writeFsp(spid, 513),
+		...shape.rotationDeg === void 0 ? [] : [writeShapePropertyTable(OfficeArtFOPT, [{
+			opid: 4,
+			op: degreesToFixedPoint(shape.rotationDeg)
+		}])],
+		writeShapePropertyTable(OfficeArtTertiaryFOPT, [{
+			opid: 927,
+			op: 1
+		}, {
+			opid: 928,
+			op: rowHeightsPayload.length,
+			fBid: true,
+			complex: rowHeightsPayload
+		}]),
+		writeClientAnchor(frame.xPt, frame.yPt, frame.widthPt, frame.heightPt)
+	]);
+	let cellSpid = spid + 1;
+	const cellShapes = table.rows.flatMap((row, rowIndex) => row.cells.map((cell, columnIndex) => {
+		const cellLeft = columnBoundaries[columnIndex];
+		const cellRight = columnBoundaries[columnIndex + 1];
+		const cellTop = rowBoundaries[rowIndex];
+		const cellBottom = rowBoundaries[rowIndex + 1];
+		if (cellLeft === void 0 || cellRight === void 0 || cellTop === void 0 || cellBottom === void 0) throw new Error("internal error: a table cell sits outside the grid boundaries derived from its own table");
+		if (cell.colSpan !== void 0 && cell.colSpan > 1) context.sink({
+			code: PptDiagnosticCodes.TABLE_SPAN_DROPPED,
+			severity: "warning",
+			message: `${context.location}: a table cell's colSpan ${String(cell.colSpan)} is dropped; a PowerPoint 97-2003 table is a strict grid of shapes with no merge records, so the cell is written one column wide`
+		});
+		if (cell.rowSpan !== void 0 && cell.rowSpan > 1) context.sink({
+			code: PptDiagnosticCodes.TABLE_SPAN_DROPPED,
+			severity: "warning",
+			message: `${context.location}: a table cell's rowSpan ${String(cell.rowSpan)} is dropped; a PowerPoint 97-2003 table is a strict grid of shapes with no merge records, so the cell is written one row tall`
+		});
+		const paragraphs = cell.blocks.filter((block) => block.kind === "paragraph");
+		for (const block of cell.blocks) if (block.kind !== "paragraph") reportDrop(context, {
+			code: PptDiagnosticCodes.BLOCK_DROPPED,
+			severity: "warning",
+			message: `${context.location}: a '${block.kind}' block inside a table cell is dropped; a table cell in this format is a plain text-box shape with no property table or object reference of its own`
+		});
+		const textbox = writeClientTextbox(paragraphs, context.fontIndexOf);
+		const children = [writeFsp(cellSpid, FSP_CHILD), writeAtom(OfficeArtChildAnchor, concatBytes(i32le(cellLeft), i32le(cellTop), i32le(cellRight), i32le(cellBottom)))];
+		cellSpid += 1;
+		if (textbox !== void 0) children.push(textbox);
+		return writeContainer(OfficeArtSpContainer, children);
+	}));
+	return {
+		bytes: writeContainer(OfficeArtSpgrContainer, [groupShape, ...cellShapes]),
+		shapeCount: 1 + table.rows.reduce((sum, row) => sum + row.cells.length, 0)
+	};
 }
-function writeSlideDrawing(shapes, fontIndexOf) {
-	return writeDrawing(shapes.map((shape) => ({
-		shape,
-		clientData: void 0
-	})), fontIndexOf);
+function writeDrawing(shapes, context) {
+	let nextSpid = FIRST_CONTENT_SPID;
+	let shapeCount = 1;
+	const shapeContainers = [];
+	for (const entry of shapes) {
+		const plan = planShapeBlocks(entry.shape.blocks, context, entry.clientData !== void 0);
+		if (plan.table !== void 0) {
+			const group = writeTableGroup(nextSpid, entry.shape, plan.table, context);
+			nextSpid += group.shapeCount;
+			shapeCount += group.shapeCount;
+			shapeContainers.push(group.bytes);
+			continue;
+		}
+		shapeContainers.push(writeShape(nextSpid, entry.shape, plan.pib, plan.textBlocks, context.fontIndexOf, entry.clientData));
+		nextSpid += 1;
+		shapeCount += 1;
+	}
+	return {
+		bytes: writeContainer(RT_Drawing, [writeContainer(OfficeArtDgContainer, [writeContainer(OfficeArtSpgrContainer, [writePatriarch(), ...shapeContainers])])]),
+		shapeCount,
+		maxSpid: Math.max(PATRIARCH_SPID, nextSpid - 1)
+	};
 }
-function writeDrawingWithClientData(shapes, fontIndexOf) {
-	return writeDrawing(shapes, fontIndexOf);
+function writeSlideDrawing(shapes, context) {
+	return writeDrawing(shapes, context);
 }
 //#endregion
-export { writeDrawingWithClientData, writeSlideDrawing };
+export { writeSlideDrawing };

package/dist/drawing/shapes.cjs

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_errors = require("../errors.cjs");
 const require_record_tree = require("../record/tree.cjs");
 const require_record_types = require("../record/types.cjs");
+const require_drawing_properties = require("./properties.cjs");
 //#region src/drawing/shapes.ts
 const FSP_GROUP = 1;
 const FSP_PATRIARCH = 4;
@@ -44,7 +45,7 @@ function readClientAnchor(record) {
 	if (recLen === 16) return readRectFields(record, 4, "top-left");
 	throw new require_errors.PptFormatError(`OfficeArtClientAnchor declares recLen 0x${recLen.toString(16)}, neither the 0x8 of a SmallRectStruct nor the 0x10 of a RectStruct`);
 }
-function readShapeProperties(shape) {
+function readShapeIdentity(shape) {
 	const fsp = require_record_tree.findChild(require_record_tree.childRecords(shape), require_record_types.OfficeArtFSP);
 	if (fsp === void 0 || fsp.data.length < 8) throw new require_errors.PptFormatError(`OfficeArtSpContainer at offset ${shape.offset} has no readable OfficeArtFSP, so the shape has neither an identity nor its flags`);
 	const view = new DataView(fsp.data.buffer, fsp.data.byteOffset, 8);
@@ -60,8 +61,18 @@ function resolveAnchor(shape, transform) {
 	const child = require_record_tree.findChild(children, require_record_types.OfficeArtChildAnchor);
 	if (child !== void 0) return applyTransform(transform, readRectFields(child, 4, "left-top"));
 }
+function rotationDegOf(properties) {
+	const rotation = properties.get(4);
+	if (rotation === void 0) return;
+	const degrees = require_drawing_properties.fixedPointToDegrees(rotation.value);
+	return degrees === 0 ? void 0 : degrees;
+}
+function isTableGroup(properties) {
+	const tableProperties = properties.get(927);
+	return tableProperties !== void 0 && (tableProperties.value & 1) !== 0;
+}
 function groupTransform(groupShape, parent) {
-	const { spid, flags } = readShapeProperties(groupShape);
+	const { spid, flags } = readShapeIdentity(groupShape);
 	if ((flags & FSP_PATRIARCH) !== 0) return parent;
 	const children = require_record_tree.childRecords(groupShape);
 	const fspgr = require_record_tree.findChild(children, require_record_types.OfficeArtFSPGR);
@@ -81,17 +92,36 @@ function groupTransform(groupShape, parent) {
 	};
 }
 function collectShape(shape, transform, into) {
-	const { spid, flags } = readShapeProperties(shape);
+	const { spid, flags } = readShapeIdentity(shape);
 	if ((flags & FSP_DELETED) !== 0 || (flags & FSP_GROUP) !== 0) return;
+	const children = require_record_tree.childRecords(shape);
+	const properties = require_drawing_properties.readShapeProperties(shape);
 	into.push({
 		spid,
 		anchor: resolveAnchor(shape, transform),
-		clientTextbox: require_record_tree.findChild(require_record_tree.childRecords(shape), require_record_types.OfficeArtClientTextbox)
+		rotationDeg: rotationDegOf(properties),
+		clientTextbox: require_record_tree.findChild(children, require_record_types.OfficeArtClientTextbox),
+		clientData: require_record_tree.findChild(children, require_record_types.OfficeArtClientData),
+		properties
 	});
 }
 function collectGroup(group, parent, into) {
 	const [groupShape, ...rest] = require_record_tree.childRecords(group);
 	if (groupShape === void 0) return;
+	const groupProperties = require_drawing_properties.readShapeProperties(groupShape);
+	if (isTableGroup(groupProperties)) {
+		const anchor = resolveAnchor(groupShape, parent);
+		if (anchor === void 0) throw new require_errors.PptFormatError(`table group shape ${readShapeIdentity(groupShape).spid} carries no anchor, so the table cannot be placed on the slide`);
+		const tableTransform = groupTransform(groupShape, parent);
+		const cells = [];
+		for (const child of rest) if (child.header.recType === 61444) collectShape(child, tableTransform, cells);
+		into.push({
+			anchor,
+			rotationDeg: rotationDegOf(groupProperties),
+			cells
+		});
+		return;
+	}
 	const transform = groupTransform(groupShape, parent);
 	for (const child of rest) if (child.header.recType === 61443) collectGroup(child, transform, into);
 	else if (child.header.recType === 61444) collectShape(child, transform, into);

package/dist/drawing/shapes.d.cts

@@ -1,4 +1,5 @@
 import { t as PptRecord } from "../tree-Du_LXAF0.cjs";
+import { ShapeProperty } from "./properties.cjs";
 //#region src/drawing/shapes.d.ts
 interface ShapeRect {
   readonly left: number;
@@ -9,8 +10,16 @@ interface ShapeRect {
 interface PptShape {
   readonly spid: number;
   readonly anchor: ShapeRect | undefined;
+  readonly rotationDeg: number | undefined;
   readonly clientTextbox: PptRecord | undefined;
+  readonly clientData: PptRecord | undefined;
+  readonly properties: ReadonlyMap<number, ShapeProperty>;
 }
-declare function readDrawingShapes(drawing: PptRecord): PptShape[];
+interface PptTable {
+  readonly anchor: ShapeRect;
+  readonly rotationDeg: number | undefined;
+  readonly cells: readonly PptShape[];
+}
+declare function readDrawingShapes(drawing: PptRecord): readonly (PptShape | PptTable)[];
 //#endregion
-export { PptShape, ShapeRect, readDrawingShapes };
+export { PptShape, PptTable, ShapeRect, readDrawingShapes };

package/dist/drawing/shapes.d.ts

@@ -1,4 +1,5 @@
 import { t as PptRecord } from "../tree-PMcPNgd-.js";
+import { ShapeProperty } from "./properties.js";
 //#region src/drawing/shapes.d.ts
 interface ShapeRect {
   readonly left: number;
@@ -9,8 +10,16 @@ interface ShapeRect {
 interface PptShape {
   readonly spid: number;
   readonly anchor: ShapeRect | undefined;
+  readonly rotationDeg: number | undefined;
   readonly clientTextbox: PptRecord | undefined;
+  readonly clientData: PptRecord | undefined;
+  readonly properties: ReadonlyMap<number, ShapeProperty>;
 }
-declare function readDrawingShapes(drawing: PptRecord): PptShape[];
+interface PptTable {
+  readonly anchor: ShapeRect;
+  readonly rotationDeg: number | undefined;
+  readonly cells: readonly PptShape[];
+}
+declare function readDrawingShapes(drawing: PptRecord): readonly (PptShape | PptTable)[];
 //#endregion
-export { PptShape, ShapeRect, readDrawingShapes };
+export { PptShape, PptTable, ShapeRect, readDrawingShapes };

package/dist/drawing/shapes.js

@@ -1,6 +1,7 @@
 import { PptFormatError } from "../errors.js";
 import { childRecords, findChild } from "../record/tree.js";
-import { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFSP, OfficeArtFSPGR, RT_Drawing } from "../record/types.js";
+import { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFSP, OfficeArtFSPGR, RT_Drawing } from "../record/types.js";
+import { fixedPointToDegrees, readShapeProperties } from "./properties.js";
 //#region src/drawing/shapes.ts
 const FSP_GROUP = 1;
 const FSP_PATRIARCH = 4;
@@ -43,7 +44,7 @@ function readClientAnchor(record) {
 	if (recLen === 16) return readRectFields(record, 4, "top-left");
 	throw new PptFormatError(`OfficeArtClientAnchor declares recLen 0x${recLen.toString(16)}, neither the 0x8 of a SmallRectStruct nor the 0x10 of a RectStruct`);
 }
-function readShapeProperties(shape) {
+function readShapeIdentity(shape) {
 	const fsp = findChild(childRecords(shape), OfficeArtFSP);
 	if (fsp === void 0 || fsp.data.length < 8) throw new PptFormatError(`OfficeArtSpContainer at offset ${shape.offset} has no readable OfficeArtFSP, so the shape has neither an identity nor its flags`);
 	const view = new DataView(fsp.data.buffer, fsp.data.byteOffset, 8);
@@ -59,8 +60,18 @@ function resolveAnchor(shape, transform) {
 	const child = findChild(children, OfficeArtChildAnchor);
 	if (child !== void 0) return applyTransform(transform, readRectFields(child, 4, "left-top"));
 }
+function rotationDegOf(properties) {
+	const rotation = properties.get(4);
+	if (rotation === void 0) return;
+	const degrees = fixedPointToDegrees(rotation.value);
+	return degrees === 0 ? void 0 : degrees;
+}
+function isTableGroup(properties) {
+	const tableProperties = properties.get(927);
+	return tableProperties !== void 0 && (tableProperties.value & 1) !== 0;
+}
 function groupTransform(groupShape, parent) {
-	const { spid, flags } = readShapeProperties(groupShape);
+	const { spid, flags } = readShapeIdentity(groupShape);
 	if ((flags & FSP_PATRIARCH) !== 0) return parent;
 	const children = childRecords(groupShape);
 	const fspgr = findChild(children, OfficeArtFSPGR);
@@ -80,17 +91,36 @@ function groupTransform(groupShape, parent) {
 	};
 }
 function collectShape(shape, transform, into) {
-	const { spid, flags } = readShapeProperties(shape);
+	const { spid, flags } = readShapeIdentity(shape);
 	if ((flags & FSP_DELETED) !== 0 || (flags & FSP_GROUP) !== 0) return;
+	const children = childRecords(shape);
+	const properties = readShapeProperties(shape);
 	into.push({
 		spid,
 		anchor: resolveAnchor(shape, transform),
-		clientTextbox: findChild(childRecords(shape), OfficeArtClientTextbox)
+		rotationDeg: rotationDegOf(properties),
+		clientTextbox: findChild(children, OfficeArtClientTextbox),
+		clientData: findChild(children, OfficeArtClientData),
+		properties
 	});
 }
 function collectGroup(group, parent, into) {
 	const [groupShape, ...rest] = childRecords(group);
 	if (groupShape === void 0) return;
+	const groupProperties = readShapeProperties(groupShape);
+	if (isTableGroup(groupProperties)) {
+		const anchor = resolveAnchor(groupShape, parent);
+		if (anchor === void 0) throw new PptFormatError(`table group shape ${readShapeIdentity(groupShape).spid} carries no anchor, so the table cannot be placed on the slide`);
+		const tableTransform = groupTransform(groupShape, parent);
+		const cells = [];
+		for (const child of rest) if (child.header.recType === 61444) collectShape(child, tableTransform, cells);
+		into.push({
+			anchor,
+			rotationDeg: rotationDegOf(groupProperties),
+			cells
+		});
+		return;
+	}
 	const transform = groupTransform(groupShape, parent);
 	for (const child of rest) if (child.header.recType === 61443) collectGroup(child, transform, into);
 	else if (child.header.recType === 61444) collectShape(child, transform, into);

package/dist/index.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_base64 = require("./base64.cjs");
 const require_errors = require("./errors.cjs");
 const require_record_header = require("./record/header.cjs");
 const require_record_tree = require("./record/tree.cjs");
@@ -8,14 +9,15 @@ const require_text_atoms = require("./text/atoms.cjs");
 const require_units = require("./units.cjs");
 const require_content_write = require("./content-write.cjs");
 const require_content = require("./content.cjs");
+const require_diagnostics = require("./diagnostics.cjs");
 const require_record_write = require("./record/write.cjs");
 const require_document_color_scheme_write = require("./document/color-scheme-write.cjs");
 const require_document_document_atom = require("./document/document-atom.cjs");
 const require_document_document_atom_write = require("./document/document-atom-write.cjs");
 const require_document_fonts = require("./document/fonts.cjs");
 const require_document_fonts_write = require("./document/fonts-write.cjs");
-const require_text_style_write = require("./text/style-write.cjs");
-const require_drawing_shapes_write = require("./drawing/shapes-write.cjs");
+const require_drawing_blips = require("./drawing/blips.cjs");
+const require_drawing_properties = require("./drawing/properties.cjs");
 const require_document_notes_list = require("./document/notes-list.cjs");
 const require_drawing_shapes = require("./drawing/shapes.cjs");
 const require_document_notes = require("./document/notes.cjs");
@@ -23,6 +25,8 @@ const require_document_slide_list = require("./document/slide-list.cjs");
 const require_stream_current_user = require("./stream/current-user.cjs");
 const require_stream_persist = require("./stream/persist.cjs");
 const require_read = require("./read.cjs");
+const require_text_style_write = require("./text/style-write.cjs");
+const require_drawing_shapes_write = require("./drawing/shapes-write.cjs");
 const require_document_master_write = require("./document/master-write.cjs");
 const require_document_notes_list_write = require("./document/notes-list-write.cjs");
 const require_document_notes_write = require("./document/notes-write.cjs");
@@ -64,20 +68,30 @@ exports.CURRENT_USER_HEADER_TOKEN_PLAIN = require_stream_current_user.CURRENT_US
 exports.CURRENT_USER_STREAM = require_read.CURRENT_USER_STREAM;
 exports.DEFAULT_INSET_LEFT_RIGHT_PT = require_read.DEFAULT_INSET_LEFT_RIGHT_PT;
 exports.DEFAULT_INSET_TOP_BOTTOM_PT = require_read.DEFAULT_INSET_TOP_BOTTOM_PT;
+exports.EMU_PER_POINT = require_units.EMU_PER_POINT;
 exports.LINE_BREAK = require_text_atoms.LINE_BREAK;
 exports.MASTER_SLIDE_ID = require_document_master_write.MASTER_SLIDE_ID;
 exports.MASTER_UNITS_PER_POINT = require_units.MASTER_UNITS_PER_POINT;
+exports.NOOP_PPT_DIAGNOSTIC_SINK = require_diagnostics.NOOP_PPT_DIAGNOSTIC_SINK;
 exports.NOTES_MASTER_SLIDE_ID_REF = require_document_notes.NOTES_MASTER_SLIDE_ID_REF;
+exports.OfficeArtBStoreContainer = require_record_types.OfficeArtBStoreContainer;
+exports.OfficeArtBlipJPEG = require_record_types.OfficeArtBlipJPEG;
+exports.OfficeArtBlipPNG = require_record_types.OfficeArtBlipPNG;
 exports.OfficeArtChildAnchor = require_record_types.OfficeArtChildAnchor;
 exports.OfficeArtClientAnchor = require_record_types.OfficeArtClientAnchor;
 exports.OfficeArtClientData = require_record_types.OfficeArtClientData;
 exports.OfficeArtClientTextbox = require_record_types.OfficeArtClientTextbox;
 exports.OfficeArtDgContainer = require_record_types.OfficeArtDgContainer;
+exports.OfficeArtDggContainer = require_record_types.OfficeArtDggContainer;
+exports.OfficeArtFBSE = require_record_types.OfficeArtFBSE;
+exports.OfficeArtFDGGBlock = require_record_types.OfficeArtFDGGBlock;
 exports.OfficeArtFOPT = require_record_types.OfficeArtFOPT;
 exports.OfficeArtFSP = require_record_types.OfficeArtFSP;
 exports.OfficeArtFSPGR = require_record_types.OfficeArtFSPGR;
+exports.OfficeArtSecondaryFOPT = require_record_types.OfficeArtSecondaryFOPT;
 exports.OfficeArtSpContainer = require_record_types.OfficeArtSpContainer;
 exports.OfficeArtSpgrContainer = require_record_types.OfficeArtSpgrContainer;
+exports.OfficeArtTertiaryFOPT = require_record_types.OfficeArtTertiaryFOPT;
 exports.PARAGRAPH_SEPARATOR = require_text_atoms.PARAGRAPH_SEPARATOR;
 exports.PF_ALIGN = require_text_style.PF_ALIGN;
 exports.PF_BULLET_CHAR = require_text_style.PF_BULLET_CHAR;
@@ -100,8 +114,18 @@ exports.PF_SPACE_BEFORE = require_text_style.PF_SPACE_BEFORE;
 exports.PF_TAB_STOPS = require_text_style.PF_TAB_STOPS;
 exports.PF_TEXT_DIRECTION = require_text_style.PF_TEXT_DIRECTION;
 exports.PF_WORD_WRAP = require_text_style.PF_WORD_WRAP;
+exports.PICTURES_STREAM = require_read.PICTURES_STREAM;
 exports.POINTS_PER_INCH = require_units.POINTS_PER_INCH;
 exports.POWERPOINT_DOCUMENT_STREAM = require_read.POWERPOINT_DOCUMENT_STREAM;
+exports.PROPERTY_DX_TEXT_LEFT = require_drawing_properties.PROPERTY_DX_TEXT_LEFT;
+exports.PROPERTY_DX_TEXT_RIGHT = require_drawing_properties.PROPERTY_DX_TEXT_RIGHT;
+exports.PROPERTY_DY_TEXT_BOTTOM = require_drawing_properties.PROPERTY_DY_TEXT_BOTTOM;
+exports.PROPERTY_DY_TEXT_TOP = require_drawing_properties.PROPERTY_DY_TEXT_TOP;
+exports.PROPERTY_PIB = require_drawing_properties.PROPERTY_PIB;
+exports.PROPERTY_ROTATION = require_drawing_properties.PROPERTY_ROTATION;
+exports.PROPERTY_TABLE_PROPERTIES = require_drawing_properties.PROPERTY_TABLE_PROPERTIES;
+exports.PROPERTY_TABLE_ROW_PROPERTIES = require_drawing_properties.PROPERTY_TABLE_ROW_PROPERTIES;
+exports.PptDiagnosticCodes = require_diagnostics.PptDiagnosticCodes;
 exports.PptEncryptedError = require_errors.PptEncryptedError;
 exports.PptFormatError = require_errors.PptFormatError;
 exports.PptUnsupportedContentError = require_errors.PptUnsupportedContentError;
@@ -116,6 +140,12 @@ exports.RT_Drawing = require_record_types.RT_Drawing;
 exports.RT_DrawingGroup = require_record_types.RT_DrawingGroup;
 exports.RT_Environment = require_record_types.RT_Environment;
 exports.RT_ExternalObjectList = require_record_types.RT_ExternalObjectList;
+exports.RT_ExternalObjectListAtom = require_record_types.RT_ExternalObjectListAtom;
+exports.RT_ExternalObjectRefAtom = require_record_types.RT_ExternalObjectRefAtom;
+exports.RT_ExternalOleEmbed = require_record_types.RT_ExternalOleEmbed;
+exports.RT_ExternalOleEmbedAtom = require_record_types.RT_ExternalOleEmbedAtom;
+exports.RT_ExternalOleObjectAtom = require_record_types.RT_ExternalOleObjectAtom;
+exports.RT_ExternalOleObjectStg = require_record_types.RT_ExternalOleObjectStg;
 exports.RT_FontCollection = require_record_types.RT_FontCollection;
 exports.RT_FontEntityAtom = require_record_types.RT_FontEntityAtom;
 exports.RT_List = require_record_types.RT_List;
@@ -148,6 +178,7 @@ exports.STYLE_ITALIC = require_text_style.STYLE_ITALIC;
 exports.STYLE_SHADOW = require_text_style.STYLE_SHADOW;
 exports.STYLE_UNDERLINE = require_text_style.STYLE_UNDERLINE;
 exports.SUMMARY_INFORMATION_STREAM = require_read.SUMMARY_INFORMATION_STREAM;
+exports.TABLE_FLAG_IS_TABLE = require_drawing_properties.TABLE_FLAG_IS_TABLE;
 exports.TEXT_TYPE_BODY = require_text_atoms.TEXT_TYPE_BODY;
 exports.TEXT_TYPE_CENTER_BODY = require_text_atoms.TEXT_TYPE_CENTER_BODY;
 exports.TEXT_TYPE_CENTER_TITLE = require_text_atoms.TEXT_TYPE_CENTER_TITLE;
@@ -157,26 +188,37 @@ exports.TEXT_TYPE_OTHER = require_text_atoms.TEXT_TYPE_OTHER;
 exports.TEXT_TYPE_QUARTER_BODY = require_text_atoms.TEXT_TYPE_QUARTER_BODY;
 exports.TEXT_TYPE_TITLE = require_text_atoms.TEXT_TYPE_TITLE;
 exports.asciiBytes = require_record_write.asciiBytes;
+exports.base64ToBytes = require_base64.base64ToBytes;
+exports.blipForPib = require_drawing_blips.blipForPib;
 exports.buildParagraphs = require_content.buildParagraphs;
 exports.buildPersistDirectory = require_stream_persist.buildPersistDirectory;
 exports.buildTextBody = require_content_write.buildTextBody;
+exports.bytesToBase64 = require_base64.bytesToBase64;
 exports.characterCountOf = require_text_atoms.characterCountOf;
 exports.childRecords = require_record_tree.childRecords;
 exports.collectFontFamilies = require_content_write.collectFontFamilies;
 exports.concatBytes = require_record_write.concatBytes;
+exports.decodeUtf16Le = require_stream_current_user.decodeUtf16Le;
+exports.degreesToFixedPoint = require_drawing_properties.degreesToFixedPoint;
+exports.emuToPoints = require_units.emuToPoints;
 exports.findChild = require_record_tree.findChild;
 exports.findChildren = require_record_tree.findChildren;
 exports.findDescendants = require_record_tree.findDescendants;
+exports.fixedPointToDegrees = require_drawing_properties.fixedPointToDegrees;
 exports.i16le = require_record_write.i16le;
 exports.i32le = require_record_write.i32le;
+exports.isBlipFormat = require_drawing_blips.isBlipFormat;
 exports.isContainerRecord = require_record_header.isContainerRecord;
 exports.layoutMetadataToSummaryInformation = require_metadata.layoutMetadataToSummaryInformation;
 exports.masterUnitsToPoints = require_units.masterUnitsToPoints;
+exports.pointsToEmu = require_units.pointsToEmu;
 exports.pointsToMasterUnits = require_units.pointsToMasterUnits;
+exports.readBlipStore = require_drawing_blips.readBlipStore;
 exports.readCurrentUserAtom = require_stream_current_user.readCurrentUserAtom;
 exports.readDocumentAtom = require_document_document_atom.readDocumentAtom;
 exports.readDrawingShapes = require_drawing_shapes.readDrawingShapes;
 exports.readFontNames = require_document_fonts.readFontNames;
+exports.readIMsoArray = require_drawing_properties.readIMsoArray;
 exports.readNotesAtom = require_document_notes.readNotesAtom;
 exports.readNotesContainerAtom = require_document_notes.readNotesContainerAtom;
 exports.readNotesListWithText = require_document_notes_list.readNotesListWithText;
@@ -188,6 +230,7 @@ exports.readPptStreams = require_read.readPptStreams;
 exports.readRecordAt = require_record_tree.readRecordAt;
 exports.readRecordHeader = require_record_header.readRecordHeader;
 exports.readRecordSequence = require_record_tree.readRecordSequence;
+exports.readShapeProperties = require_drawing_properties.readShapeProperties;
 exports.readSlideListWithText = require_document_slide_list.readSlideListWithText;
 exports.readStyleTextPropAtom = require_text_style.readStyleTextPropAtom;
 exports.readTextBody = require_text_atoms.readTextBody;
@@ -204,8 +247,9 @@ exports.writeAtom = require_record_write.writeAtom;
 exports.writeContainer = require_record_write.writeContainer;
 exports.writeCurrentUserAtom = require_stream_current_user_write.writeCurrentUserAtom;
 exports.writeDocumentAtom = require_document_document_atom_write.writeDocumentAtom;
-exports.writeDrawingWithClientData = require_drawing_shapes_write.writeDrawingWithClientData;
+exports.writeDrawingGroupContainer = require_drawing_blips.writeDrawingGroupContainer;
 exports.writeEnvironment = require_document_fonts_write.writeEnvironment;
+exports.writeIMsoArray = require_drawing_properties.writeIMsoArray;
 exports.writeMainMaster = require_document_master_write.writeMainMaster;
 exports.writeMasterListWithText = require_document_master_write.writeMasterListWithText;
 exports.writeNotesAtom = require_document_notes_write.writeNotesAtom;
@@ -215,6 +259,7 @@ exports.writePersistDirectoryAtom = require_stream_persist_write.writePersistDir
 exports.writePpt = require_write.writePpt;
 exports.writePptContent = require_write.writePptContent;
 exports.writePptStreams = require_write.writePptStreams;
+exports.writeShapePropertyTable = require_drawing_properties.writeShapePropertyTable;
 exports.writeSlideAtom = require_document_master_write.writeSlideAtom;
 exports.writeSlideAtomForSlide = require_document_master_write.writeSlideAtomForSlide;
 exports.writeSlideDrawing = require_drawing_shapes_write.writeSlideDrawing;