ppt-codec 1.5.0 → 1.6.0

package/dist/read.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_tree = require("./record/tree.cjs");
 const require_record_types = require("./record/types.cjs");
@@ -11,6 +12,8 @@ const require_content = require("./content.cjs");
 const require_encryption = require("./encryption.cjs");
 const require_document_document_atom = require("./document/document-atom.cjs");
 const require_document_fonts = require("./document/fonts.cjs");
+const require_drawing_blips = require("./drawing/blips.cjs");
+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");
@@ -22,6 +25,7 @@ let document_schema_js = require("document-schema.js");
 //#region src/read.ts
 const CURRENT_USER_STREAM = "Current User";
 const POWERPOINT_DOCUMENT_STREAM = "PowerPoint Document";
+const PICTURES_STREAM = "Pictures";
 /** The [MS-OLEPS] Property Set Stream a .ppt's title/author/dates live in when present ([MS-OSHARED] 2.3.3.2.2) -- a genuinely optional stream, unlike the two above, since a valid PowerPoint binary document need not carry document properties at all. */
 const SUMMARY_INFORMATION_STREAM = "SummaryInformation";
 const DEFAULT_INSET_LEFT_RIGHT_PT = 7.2;
@@ -55,14 +59,56 @@ function textRecordsFor(clientTextbox, persist) {
 		records: outlineText.records
 	};
 }
-function blocksFor(clientTextbox, persist, fontNames, masterInfo) {
+function blocksFor(clientTextbox, context) {
 	if (clientTextbox === void 0) return [];
-	const { textType, records } = textRecordsFor(clientTextbox, persist);
+	const { textType, records } = textRecordsFor(clientTextbox, context.persist);
 	const text = require_text_atoms.readTextBody(records);
 	if (text === void 0) return [];
 	const styleRecord = require_record_tree.findChild(records, require_record_types.RT_StyleTextPropAtom);
 	const style = styleRecord === void 0 ? NO_STYLE : require_text_style.readStyleTextPropAtom(styleRecord, require_text_atoms.characterCountOf(text));
-	return require_content.buildParagraphs(text, style, fontNames, masterInfo.styles, textType, masterInfo.colorScheme);
+	return require_content.buildParagraphs(text, style, context.fontNames, context.masterInfo.styles, textType, context.masterInfo.colorScheme);
+}
+function imageBlocksFor(pibProperty, context, widthPt, heightPt) {
+	if (pibProperty === void 0) return [];
+	const blip = require_drawing_blips.blipForPib(context.blips, pibProperty.value);
+	if (blip === void 0) return [];
+	return [{
+		kind: "image",
+		format: blip.format,
+		base64: require_base64.bytesToBase64(blip.bytes),
+		widthPt,
+		heightPt
+	}];
+}
+function tableBlockFor(table, context) {
+	const placed = table.cells.flatMap((cell) => cell.anchor === void 0 || cell.anchor.right <= cell.anchor.left || cell.anchor.bottom <= cell.anchor.top ? [] : [{
+		cell,
+		anchor: cell.anchor
+	}]);
+	const rowTops = [...new Set(placed.map((entry) => entry.anchor.top))].sort((a, b) => a - b);
+	const columnLefts = [...new Set(placed.map((entry) => entry.anchor.left))].sort((a, b) => a - b);
+	const rightmost = Math.max(...placed.map((entry) => entry.anchor.right), ...columnLefts);
+	const columnWidthsPt = columnLefts.map((left, index) => {
+		const right = columnLefts.at(index + 1) ?? rightmost;
+		return require_units.masterUnitsToPoints(right - left);
+	});
+	return {
+		kind: "table",
+		rows: rowTops.map((top) => {
+			const inRow = placed.filter((entry) => entry.anchor.top === top).sort((a, b) => a.anchor.left - b.anchor.left);
+			const bottom = Math.max(...inRow.map((entry) => entry.anchor.bottom), top);
+			const cells = columnLefts.map((left) => {
+				const at = inRow.find((entry) => entry.anchor.left === left);
+				return at === void 0 ? { blocks: [] } : { blocks: blocksFor(at.cell.clientTextbox, context) };
+			});
+			const heightPt = require_units.masterUnitsToPoints(bottom - top);
+			return heightPt > 0 ? {
+				cells,
+				heightPt
+			} : { cells };
+		}),
+		columnWidthsPt
+	};
 }
 function readNotesBySlideId(streamBytes, directory, notesList) {
 	const notes = /* @__PURE__ */ new Map();
@@ -74,7 +120,7 @@ function readNotesBySlideId(streamBytes, directory, notesList) {
 	return notes;
 }
 function colorSchemeFor(slideChildren, master) {
-	const ownScheme = require_record_tree.findChild(slideChildren, require_record_types.RT_ColorSchemeAtom);
+	const ownScheme = require_document_color_scheme.findSlideSchemeColorSchemeAtom(slideChildren);
 	return ownScheme === void 0 ? master.colorScheme : require_document_color_scheme.readSlideSchemeColorSchemeAtom(ownScheme);
 }
 function readMastersById(streamBytes, directory, masterList, documentDefault) {
@@ -86,7 +132,7 @@ function readMastersById(streamBytes, directory, masterList, documentDefault) {
 		const masterChildren = require_record_tree.childRecords(masterContainer);
 		const masterAtoms = masterChildren.filter((record) => record.header.recType === require_record_types.RT_TextMasterStyleAtom).map(require_text_style.readTextMasterStyleAtom);
 		const styles = require_document_master.buildMasterStyleTable(masterAtoms, documentDefault);
-		const colorSchemeRecord = require_record_tree.findChild(masterChildren, require_record_types.RT_ColorSchemeAtom);
+		const colorSchemeRecord = require_document_color_scheme.findSlideSchemeColorSchemeAtom(masterChildren);
 		if (colorSchemeRecord === void 0) throw new require_errors.PptFormatError(`MainMasterContainer for master ${persist.slideId} has no SlideSchemeColorSchemeAtom, which [MS-PPT] 2.5.3 requires`);
 		mastersById.set(persist.slideId, {
 			styles,
@@ -95,7 +141,8 @@ function readMastersById(streamBytes, directory, masterList, documentDefault) {
 	}
 	return mastersById;
 }
-function readSlide(streamBytes, directory, persist, size, fontNames, notes, mastersById) {
+function readSlide(base, size, notes, mastersById) {
+	const { streamBytes, directory, persist } = base;
 	const slideContainer = require_stream_persist.resolvePersistObject(streamBytes, directory, persist.persistIdRef, `SlidePersistAtom for slide ${persist.slideId}`);
 	if (slideContainer.header.recType !== 1006) throw new require_errors.PptFormatError(`persist object ${persist.persistIdRef} is record type 0x${slideContainer.header.recType.toString(16)}, not the RT_Slide (0x${require_record_types.RT_Slide.toString(16)}) its SlidePersistAtom promised`);
 	const slideChildren = require_record_tree.childRecords(slideContainer);
@@ -104,28 +151,54 @@ function readSlide(streamBytes, directory, persist, size, fontNames, notes, mast
 	const { masterIdRef } = require_document_master.readSlideAtom(slideAtomRecord);
 	const master = mastersById.get(masterIdRef);
 	if (master === void 0) throw new require_errors.PptFormatError(`slide ${persist.slideId}'s own SlideAtom names masterIdRef ${masterIdRef}, which the master list does not contain`);
-	const masterInfo = {
-		styles: master.styles,
-		colorScheme: colorSchemeFor(slideChildren, master)
+	const context = {
+		...base,
+		masterInfo: {
+			styles: master.styles,
+			colorScheme: colorSchemeFor(slideChildren, master)
+		}
 	};
 	const drawing = require_record_tree.findChild(slideChildren, require_record_types.RT_Drawing);
 	const shapes = [];
 	for (const shape of drawing === void 0 ? [] : require_drawing_shapes.readDrawingShapes(drawing)) {
+		if (!("clientTextbox" in shape)) {
+			const tableLeft = require_units.masterUnitsToPoints(shape.anchor.left);
+			const tableTop = require_units.masterUnitsToPoints(shape.anchor.top);
+			shapes.push({
+				frame: {
+					xPt: tableLeft,
+					yPt: tableTop,
+					widthPt: Math.max(0, require_units.masterUnitsToPoints(shape.anchor.right) - tableLeft),
+					heightPt: Math.max(0, require_units.masterUnitsToPoints(shape.anchor.bottom) - tableTop)
+				},
+				...shape.rotationDeg === void 0 ? {} : { rotationDeg: shape.rotationDeg },
+				insetLeftPt: DEFAULT_INSET_LEFT_RIGHT_PT,
+				insetTopPt: DEFAULT_INSET_TOP_BOTTOM_PT,
+				insetRightPt: DEFAULT_INSET_LEFT_RIGHT_PT,
+				insetBottomPt: DEFAULT_INSET_TOP_BOTTOM_PT,
+				blocks: [tableBlockFor(shape, context)]
+			});
+			continue;
+		}
 		if (shape.anchor === void 0) continue;
 		const left = require_units.masterUnitsToPoints(shape.anchor.left);
 		const top = require_units.masterUnitsToPoints(shape.anchor.top);
+		const widthPt = Math.max(0, require_units.masterUnitsToPoints(shape.anchor.right) - left);
+		const heightPt = Math.max(0, require_units.masterUnitsToPoints(shape.anchor.bottom) - top);
+		const isPicture = shape.properties.get(260) !== void 0;
 		shapes.push({
 			frame: {
 				xPt: left,
 				yPt: top,
-				widthPt: Math.max(0, require_units.masterUnitsToPoints(shape.anchor.right) - left),
-				heightPt: Math.max(0, require_units.masterUnitsToPoints(shape.anchor.bottom) - top)
+				widthPt,
+				heightPt
 			},
-			insetLeftPt: DEFAULT_INSET_LEFT_RIGHT_PT,
-			insetTopPt: DEFAULT_INSET_TOP_BOTTOM_PT,
-			insetRightPt: DEFAULT_INSET_LEFT_RIGHT_PT,
-			insetBottomPt: DEFAULT_INSET_TOP_BOTTOM_PT,
-			blocks: blocksFor(shape.clientTextbox, persist, fontNames, masterInfo)
+			...shape.rotationDeg === void 0 ? {} : { rotationDeg: shape.rotationDeg },
+			insetLeftPt: isPicture ? 0 : DEFAULT_INSET_LEFT_RIGHT_PT,
+			insetTopPt: isPicture ? 0 : DEFAULT_INSET_TOP_BOTTOM_PT,
+			insetRightPt: isPicture ? 0 : DEFAULT_INSET_LEFT_RIGHT_PT,
+			insetBottomPt: isPicture ? 0 : DEFAULT_INSET_TOP_BOTTOM_PT,
+			blocks: [...imageBlocksFor(shape.properties.get(260), context, widthPt, heightPt), ...blocksFor(shape.clientTextbox, context)]
 		});
 	}
 	return {
@@ -134,7 +207,7 @@ function readSlide(streamBytes, directory, persist, size, fontNames, notes, mast
 		notes
 	};
 }
-function readPptStreams(currentUserStream, powerPointDocumentStream, password) {
+function readPptStreams(currentUserStream, powerPointDocumentStream, password, picturesStream) {
 	const currentUser = require_stream_current_user.readCurrentUserAtom(currentUserStream);
 	const { directory, currentEdit } = require_stream_persist.buildPersistDirectory(powerPointDocumentStream, currentUser.offsetToCurrentEdit);
 	let streamBytes = powerPointDocumentStream;
@@ -162,14 +235,22 @@ function readPptStreams(currentUserStream, powerPointDocumentStream, password) {
 	const slideList = listWithInstance(0);
 	const persists = slideList === void 0 ? [] : require_document_slide_list.readSlideListWithText(slideList);
 	const notesBySlideId = readNotesBySlideId(streamBytes, directory, listWithInstance(2));
+	const blips = require_drawing_blips.readBlipStore(documentContainer, currentUser.encrypted ? void 0 : picturesStream);
 	return {
 		metadata: {},
-		slides: persists.map((persist) => readSlide(streamBytes, directory, persist, size, fontNames, notesBySlideId.get(persist.slideId) ?? "", mastersById))
+		slides: persists.map((persist) => readSlide({
+			streamBytes,
+			directory,
+			persist,
+			fontNames,
+			blips
+		}, size, notesBySlideId.get(persist.slideId) ?? "", mastersById))
 	};
 }
 function readPptContent(bytes, password) {
 	const streams = (0, archive_codec.readCompoundFile)(bytes);
-	const document = readPptStreams(requireStream(streams, CURRENT_USER_STREAM), requireStream(streams, POWERPOINT_DOCUMENT_STREAM), password);
+	const pictures = streams.find((stream) => stream.path === PICTURES_STREAM);
+	const document = readPptStreams(requireStream(streams, CURRENT_USER_STREAM), requireStream(streams, POWERPOINT_DOCUMENT_STREAM), password, pictures === void 0 ? void 0 : pictures.bytes);
 	const metadataStream = streams.find((stream) => stream.path === SUMMARY_INFORMATION_STREAM);
 	if (metadataStream === void 0) return document;
 	return {
@@ -190,6 +271,7 @@ function readPpt(bytes, password) {
 exports.CURRENT_USER_STREAM = CURRENT_USER_STREAM;
 exports.DEFAULT_INSET_LEFT_RIGHT_PT = DEFAULT_INSET_LEFT_RIGHT_PT;
 exports.DEFAULT_INSET_TOP_BOTTOM_PT = DEFAULT_INSET_TOP_BOTTOM_PT;
+exports.PICTURES_STREAM = PICTURES_STREAM;
 exports.POWERPOINT_DOCUMENT_STREAM = POWERPOINT_DOCUMENT_STREAM;
 exports.SUMMARY_INFORMATION_STREAM = SUMMARY_INFORMATION_STREAM;
 exports.readPpt = readPpt;

package/dist/read.d.cts

@@ -2,6 +2,7 @@ import { ContentSlide, DocumentTree, LayoutMetadata } from "document-schema.js";
 //#region src/read.d.ts
 declare const CURRENT_USER_STREAM = "Current User";
 declare const POWERPOINT_DOCUMENT_STREAM = "PowerPoint Document";
+declare const PICTURES_STREAM = "Pictures";
 /** The [MS-OLEPS] Property Set Stream a .ppt's title/author/dates live in when present ([MS-OSHARED] 2.3.3.2.2) -- a genuinely optional stream, unlike the two above, since a valid PowerPoint binary document need not carry document properties at all. */
 declare const SUMMARY_INFORMATION_STREAM = "SummaryInformation";
 declare const DEFAULT_INSET_LEFT_RIGHT_PT: number;
@@ -10,8 +11,8 @@ interface PptDocument {
   readonly metadata: LayoutMetadata;
   readonly slides: readonly ContentSlide[];
 }
-declare function readPptStreams(currentUserStream: Uint8Array<ArrayBuffer>, powerPointDocumentStream: Uint8Array<ArrayBuffer>, password?: string): PptDocument;
+declare function readPptStreams(currentUserStream: Uint8Array<ArrayBuffer>, powerPointDocumentStream: Uint8Array<ArrayBuffer>, password?: string, picturesStream?: Uint8Array<ArrayBuffer>): PptDocument;
 declare function readPptContent(bytes: Uint8Array<ArrayBuffer>, password?: string): PptDocument;
 declare function readPpt(bytes: Uint8Array<ArrayBuffer>, password?: string): DocumentTree;
 //#endregion
-export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, POWERPOINT_DOCUMENT_STREAM, PptDocument, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };
+export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, PICTURES_STREAM, POWERPOINT_DOCUMENT_STREAM, PptDocument, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };

package/dist/read.d.ts

@@ -2,6 +2,7 @@ import { ContentSlide, DocumentTree, LayoutMetadata } from "document-schema.js";
 //#region src/read.d.ts
 declare const CURRENT_USER_STREAM = "Current User";
 declare const POWERPOINT_DOCUMENT_STREAM = "PowerPoint Document";
+declare const PICTURES_STREAM = "Pictures";
 /** The [MS-OLEPS] Property Set Stream a .ppt's title/author/dates live in when present ([MS-OSHARED] 2.3.3.2.2) -- a genuinely optional stream, unlike the two above, since a valid PowerPoint binary document need not carry document properties at all. */
 declare const SUMMARY_INFORMATION_STREAM = "SummaryInformation";
 declare const DEFAULT_INSET_LEFT_RIGHT_PT: number;
@@ -10,8 +11,8 @@ interface PptDocument {
   readonly metadata: LayoutMetadata;
   readonly slides: readonly ContentSlide[];
 }
-declare function readPptStreams(currentUserStream: Uint8Array<ArrayBuffer>, powerPointDocumentStream: Uint8Array<ArrayBuffer>, password?: string): PptDocument;
+declare function readPptStreams(currentUserStream: Uint8Array<ArrayBuffer>, powerPointDocumentStream: Uint8Array<ArrayBuffer>, password?: string, picturesStream?: Uint8Array<ArrayBuffer>): PptDocument;
 declare function readPptContent(bytes: Uint8Array<ArrayBuffer>, password?: string): PptDocument;
 declare function readPpt(bytes: Uint8Array<ArrayBuffer>, password?: string): DocumentTree;
 //#endregion
-export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, POWERPOINT_DOCUMENT_STREAM, PptDocument, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };
+export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, PICTURES_STREAM, POWERPOINT_DOCUMENT_STREAM, PptDocument, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };

package/dist/read.js

@@ -1,15 +1,18 @@
+import { bytesToBase64 } from "./base64.js";
 import { PptEncryptedError, PptFormatError } from "./errors.js";
 import { childRecords, findChild } from "./record/tree.js";
-import { RT_ColorSchemeAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_Environment, RT_MainMaster, RT_OutlineTextRefAtom, RT_Slide, RT_SlideAtom, RT_StyleTextPropAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom } from "./record/types.js";
+import { RT_Document, RT_DocumentAtom, RT_Drawing, RT_Environment, RT_MainMaster, RT_OutlineTextRefAtom, RT_Slide, RT_SlideAtom, RT_StyleTextPropAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom } from "./record/types.js";
 import { readStyleTextPropAtom, readTextMasterStyleAtom } from "./text/style.js";
 import { characterCountOf, readTextBody, readTextHeaderAtom } from "./text/atoms.js";
 import { masterUnitsToPoints } from "./units.js";
-import { readSlideSchemeColorSchemeAtom } from "./document/color-scheme.js";
+import { findSlideSchemeColorSchemeAtom, readSlideSchemeColorSchemeAtom } from "./document/color-scheme.js";
 import { buildMasterStyleTable, readSlideAtom } from "./document/master.js";
 import { buildParagraphs } from "./content.js";
 import { decryptPptDocumentStream } from "./encryption.js";
 import { readDocumentAtom } from "./document/document-atom.js";
 import { readFontNames } from "./document/fonts.js";
+import { blipForPib, readBlipStore } from "./drawing/blips.js";
+import "./drawing/properties.js";
 import { readNotesListWithText } from "./document/notes-list.js";
 import { readDrawingShapes } from "./drawing/shapes.js";
 import { readNotesContainerAtom, readNotesText } from "./document/notes.js";
@@ -21,6 +24,7 @@ import { assembleTree } from "document-schema.js";
 //#region src/read.ts
 const CURRENT_USER_STREAM = "Current User";
 const POWERPOINT_DOCUMENT_STREAM = "PowerPoint Document";
+const PICTURES_STREAM = "Pictures";
 /** The [MS-OLEPS] Property Set Stream a .ppt's title/author/dates live in when present ([MS-OSHARED] 2.3.3.2.2) -- a genuinely optional stream, unlike the two above, since a valid PowerPoint binary document need not carry document properties at all. */
 const SUMMARY_INFORMATION_STREAM = "SummaryInformation";
 const DEFAULT_INSET_LEFT_RIGHT_PT = 7.2;
@@ -54,14 +58,56 @@ function textRecordsFor(clientTextbox, persist) {
 		records: outlineText.records
 	};
 }
-function blocksFor(clientTextbox, persist, fontNames, masterInfo) {
+function blocksFor(clientTextbox, context) {
 	if (clientTextbox === void 0) return [];
-	const { textType, records } = textRecordsFor(clientTextbox, persist);
+	const { textType, records } = textRecordsFor(clientTextbox, context.persist);
 	const text = readTextBody(records);
 	if (text === void 0) return [];
 	const styleRecord = findChild(records, RT_StyleTextPropAtom);
 	const style = styleRecord === void 0 ? NO_STYLE : readStyleTextPropAtom(styleRecord, characterCountOf(text));
-	return buildParagraphs(text, style, fontNames, masterInfo.styles, textType, masterInfo.colorScheme);
+	return buildParagraphs(text, style, context.fontNames, context.masterInfo.styles, textType, context.masterInfo.colorScheme);
+}
+function imageBlocksFor(pibProperty, context, widthPt, heightPt) {
+	if (pibProperty === void 0) return [];
+	const blip = blipForPib(context.blips, pibProperty.value);
+	if (blip === void 0) return [];
+	return [{
+		kind: "image",
+		format: blip.format,
+		base64: bytesToBase64(blip.bytes),
+		widthPt,
+		heightPt
+	}];
+}
+function tableBlockFor(table, context) {
+	const placed = table.cells.flatMap((cell) => cell.anchor === void 0 || cell.anchor.right <= cell.anchor.left || cell.anchor.bottom <= cell.anchor.top ? [] : [{
+		cell,
+		anchor: cell.anchor
+	}]);
+	const rowTops = [...new Set(placed.map((entry) => entry.anchor.top))].sort((a, b) => a - b);
+	const columnLefts = [...new Set(placed.map((entry) => entry.anchor.left))].sort((a, b) => a - b);
+	const rightmost = Math.max(...placed.map((entry) => entry.anchor.right), ...columnLefts);
+	const columnWidthsPt = columnLefts.map((left, index) => {
+		const right = columnLefts.at(index + 1) ?? rightmost;
+		return masterUnitsToPoints(right - left);
+	});
+	return {
+		kind: "table",
+		rows: rowTops.map((top) => {
+			const inRow = placed.filter((entry) => entry.anchor.top === top).sort((a, b) => a.anchor.left - b.anchor.left);
+			const bottom = Math.max(...inRow.map((entry) => entry.anchor.bottom), top);
+			const cells = columnLefts.map((left) => {
+				const at = inRow.find((entry) => entry.anchor.left === left);
+				return at === void 0 ? { blocks: [] } : { blocks: blocksFor(at.cell.clientTextbox, context) };
+			});
+			const heightPt = masterUnitsToPoints(bottom - top);
+			return heightPt > 0 ? {
+				cells,
+				heightPt
+			} : { cells };
+		}),
+		columnWidthsPt
+	};
 }
 function readNotesBySlideId(streamBytes, directory, notesList) {
 	const notes = /* @__PURE__ */ new Map();
@@ -73,7 +119,7 @@ function readNotesBySlideId(streamBytes, directory, notesList) {
 	return notes;
 }
 function colorSchemeFor(slideChildren, master) {
-	const ownScheme = findChild(slideChildren, RT_ColorSchemeAtom);
+	const ownScheme = findSlideSchemeColorSchemeAtom(slideChildren);
 	return ownScheme === void 0 ? master.colorScheme : readSlideSchemeColorSchemeAtom(ownScheme);
 }
 function readMastersById(streamBytes, directory, masterList, documentDefault) {
@@ -85,7 +131,7 @@ function readMastersById(streamBytes, directory, masterList, documentDefault) {
 		const masterChildren = childRecords(masterContainer);
 		const masterAtoms = masterChildren.filter((record) => record.header.recType === RT_TextMasterStyleAtom).map(readTextMasterStyleAtom);
 		const styles = buildMasterStyleTable(masterAtoms, documentDefault);
-		const colorSchemeRecord = findChild(masterChildren, RT_ColorSchemeAtom);
+		const colorSchemeRecord = findSlideSchemeColorSchemeAtom(masterChildren);
 		if (colorSchemeRecord === void 0) throw new PptFormatError(`MainMasterContainer for master ${persist.slideId} has no SlideSchemeColorSchemeAtom, which [MS-PPT] 2.5.3 requires`);
 		mastersById.set(persist.slideId, {
 			styles,
@@ -94,7 +140,8 @@ function readMastersById(streamBytes, directory, masterList, documentDefault) {
 	}
 	return mastersById;
 }
-function readSlide(streamBytes, directory, persist, size, fontNames, notes, mastersById) {
+function readSlide(base, size, notes, mastersById) {
+	const { streamBytes, directory, persist } = base;
 	const slideContainer = resolvePersistObject(streamBytes, directory, persist.persistIdRef, `SlidePersistAtom for slide ${persist.slideId}`);
 	if (slideContainer.header.recType !== 1006) throw new PptFormatError(`persist object ${persist.persistIdRef} is record type 0x${slideContainer.header.recType.toString(16)}, not the RT_Slide (0x${RT_Slide.toString(16)}) its SlidePersistAtom promised`);
 	const slideChildren = childRecords(slideContainer);
@@ -103,28 +150,54 @@ function readSlide(streamBytes, directory, persist, size, fontNames, notes, mast
 	const { masterIdRef } = readSlideAtom(slideAtomRecord);
 	const master = mastersById.get(masterIdRef);
 	if (master === void 0) throw new PptFormatError(`slide ${persist.slideId}'s own SlideAtom names masterIdRef ${masterIdRef}, which the master list does not contain`);
-	const masterInfo = {
-		styles: master.styles,
-		colorScheme: colorSchemeFor(slideChildren, master)
+	const context = {
+		...base,
+		masterInfo: {
+			styles: master.styles,
+			colorScheme: colorSchemeFor(slideChildren, master)
+		}
 	};
 	const drawing = findChild(slideChildren, RT_Drawing);
 	const shapes = [];
 	for (const shape of drawing === void 0 ? [] : readDrawingShapes(drawing)) {
+		if (!("clientTextbox" in shape)) {
+			const tableLeft = masterUnitsToPoints(shape.anchor.left);
+			const tableTop = masterUnitsToPoints(shape.anchor.top);
+			shapes.push({
+				frame: {
+					xPt: tableLeft,
+					yPt: tableTop,
+					widthPt: Math.max(0, masterUnitsToPoints(shape.anchor.right) - tableLeft),
+					heightPt: Math.max(0, masterUnitsToPoints(shape.anchor.bottom) - tableTop)
+				},
+				...shape.rotationDeg === void 0 ? {} : { rotationDeg: shape.rotationDeg },
+				insetLeftPt: DEFAULT_INSET_LEFT_RIGHT_PT,
+				insetTopPt: DEFAULT_INSET_TOP_BOTTOM_PT,
+				insetRightPt: DEFAULT_INSET_LEFT_RIGHT_PT,
+				insetBottomPt: DEFAULT_INSET_TOP_BOTTOM_PT,
+				blocks: [tableBlockFor(shape, context)]
+			});
+			continue;
+		}
 		if (shape.anchor === void 0) continue;
 		const left = masterUnitsToPoints(shape.anchor.left);
 		const top = masterUnitsToPoints(shape.anchor.top);
+		const widthPt = Math.max(0, masterUnitsToPoints(shape.anchor.right) - left);
+		const heightPt = Math.max(0, masterUnitsToPoints(shape.anchor.bottom) - top);
+		const isPicture = shape.properties.get(260) !== void 0;
 		shapes.push({
 			frame: {
 				xPt: left,
 				yPt: top,
-				widthPt: Math.max(0, masterUnitsToPoints(shape.anchor.right) - left),
-				heightPt: Math.max(0, masterUnitsToPoints(shape.anchor.bottom) - top)
+				widthPt,
+				heightPt
 			},
-			insetLeftPt: DEFAULT_INSET_LEFT_RIGHT_PT,
-			insetTopPt: DEFAULT_INSET_TOP_BOTTOM_PT,
-			insetRightPt: DEFAULT_INSET_LEFT_RIGHT_PT,
-			insetBottomPt: DEFAULT_INSET_TOP_BOTTOM_PT,
-			blocks: blocksFor(shape.clientTextbox, persist, fontNames, masterInfo)
+			...shape.rotationDeg === void 0 ? {} : { rotationDeg: shape.rotationDeg },
+			insetLeftPt: isPicture ? 0 : DEFAULT_INSET_LEFT_RIGHT_PT,
+			insetTopPt: isPicture ? 0 : DEFAULT_INSET_TOP_BOTTOM_PT,
+			insetRightPt: isPicture ? 0 : DEFAULT_INSET_LEFT_RIGHT_PT,
+			insetBottomPt: isPicture ? 0 : DEFAULT_INSET_TOP_BOTTOM_PT,
+			blocks: [...imageBlocksFor(shape.properties.get(260), context, widthPt, heightPt), ...blocksFor(shape.clientTextbox, context)]
 		});
 	}
 	return {
@@ -133,7 +206,7 @@ function readSlide(streamBytes, directory, persist, size, fontNames, notes, mast
 		notes
 	};
 }
-function readPptStreams(currentUserStream, powerPointDocumentStream, password) {
+function readPptStreams(currentUserStream, powerPointDocumentStream, password, picturesStream) {
 	const currentUser = readCurrentUserAtom(currentUserStream);
 	const { directory, currentEdit } = buildPersistDirectory(powerPointDocumentStream, currentUser.offsetToCurrentEdit);
 	let streamBytes = powerPointDocumentStream;
@@ -161,14 +234,22 @@ function readPptStreams(currentUserStream, powerPointDocumentStream, password) {
 	const slideList = listWithInstance(0);
 	const persists = slideList === void 0 ? [] : readSlideListWithText(slideList);
 	const notesBySlideId = readNotesBySlideId(streamBytes, directory, listWithInstance(2));
+	const blips = readBlipStore(documentContainer, currentUser.encrypted ? void 0 : picturesStream);
 	return {
 		metadata: {},
-		slides: persists.map((persist) => readSlide(streamBytes, directory, persist, size, fontNames, notesBySlideId.get(persist.slideId) ?? "", mastersById))
+		slides: persists.map((persist) => readSlide({
+			streamBytes,
+			directory,
+			persist,
+			fontNames,
+			blips
+		}, size, notesBySlideId.get(persist.slideId) ?? "", mastersById))
 	};
 }
 function readPptContent(bytes, password) {
 	const streams = readCompoundFile(bytes);
-	const document = readPptStreams(requireStream(streams, CURRENT_USER_STREAM), requireStream(streams, POWERPOINT_DOCUMENT_STREAM), password);
+	const pictures = streams.find((stream) => stream.path === PICTURES_STREAM);
+	const document = readPptStreams(requireStream(streams, CURRENT_USER_STREAM), requireStream(streams, POWERPOINT_DOCUMENT_STREAM), password, pictures === void 0 ? void 0 : pictures.bytes);
 	const metadataStream = streams.find((stream) => stream.path === SUMMARY_INFORMATION_STREAM);
 	if (metadataStream === void 0) return document;
 	return {
@@ -186,4 +267,4 @@ function readPpt(bytes, password) {
 	return assembleTree(document);
 }
 //#endregion
-export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, POWERPOINT_DOCUMENT_STREAM, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };
+export { CURRENT_USER_STREAM, DEFAULT_INSET_LEFT_RIGHT_PT, DEFAULT_INSET_TOP_BOTTOM_PT, PICTURES_STREAM, POWERPOINT_DOCUMENT_STREAM, SUMMARY_INFORMATION_STREAM, readPpt, readPptContent, readPptStreams };

package/dist/record/types.cjs

@@ -10,11 +10,13 @@ const RT_Environment = 1010;
 const RT_SlidePersistAtom = 1011;
 const RT_MainMaster = 1016;
 const RT_ExternalObjectList = 1033;
+const RT_ExternalObjectListAtom = 1034;
 const RT_DrawingGroup = 1035;
 const RT_Drawing = 1036;
 const RT_List = 2e3;
 const RT_FontCollection = 2005;
 const RT_ColorSchemeAtom = 2032;
+const RT_ExternalObjectRefAtom = 3009;
 const RT_PlaceholderAtom = 3011;
 const RT_OutlineTextRefAtom = 3998;
 const RT_TextHeaderAtom = 3999;
@@ -28,17 +30,25 @@ const RT_TextSpecialInfoDefaultAtom = 4009;
 const RT_TextSpecialInfoAtom = 4010;
 const RT_FontEntityAtom = 4023;
 const RT_CString = 4026;
+const RT_ExternalOleObjectAtom = 4035;
+const RT_ExternalOleEmbed = 4044;
+const RT_ExternalOleEmbedAtom = 4045;
 const RT_SlideListWithText = 4080;
 const RT_UserEditAtom = 4085;
 const RT_CurrentUserAtom = 4086;
+const RT_ExternalOleObjectStg = 4113;
 const RT_PersistDirectoryAtom = 6002;
 const RT_CryptSession10Container = 12052;
 const SLIDE_LIST_INSTANCE_SLIDES = 0;
 const SLIDE_LIST_INSTANCE_MASTERS = 1;
 const SLIDE_LIST_INSTANCE_NOTES = 2;
+const OfficeArtDggContainer = 61440;
+const OfficeArtBStoreContainer = 61441;
 const OfficeArtDgContainer = 61442;
 const OfficeArtSpgrContainer = 61443;
 const OfficeArtSpContainer = 61444;
+const OfficeArtFDGGBlock = 61446;
+const OfficeArtFBSE = 61447;
 const OfficeArtFSPGR = 61449;
 const OfficeArtFSP = 61450;
 const OfficeArtFOPT = 61451;
@@ -46,17 +56,29 @@ const OfficeArtClientTextbox = 61453;
 const OfficeArtChildAnchor = 61455;
 const OfficeArtClientAnchor = 61456;
 const OfficeArtClientData = 61457;
+const OfficeArtSecondaryFOPT = 61729;
+const OfficeArtTertiaryFOPT = 61730;
+const OfficeArtBlipJPEG = 61469;
+const OfficeArtBlipPNG = 61470;
 //#endregion
+exports.OfficeArtBStoreContainer = OfficeArtBStoreContainer;
+exports.OfficeArtBlipJPEG = OfficeArtBlipJPEG;
+exports.OfficeArtBlipPNG = OfficeArtBlipPNG;
 exports.OfficeArtChildAnchor = OfficeArtChildAnchor;
 exports.OfficeArtClientAnchor = OfficeArtClientAnchor;
 exports.OfficeArtClientData = OfficeArtClientData;
 exports.OfficeArtClientTextbox = OfficeArtClientTextbox;
 exports.OfficeArtDgContainer = OfficeArtDgContainer;
+exports.OfficeArtDggContainer = OfficeArtDggContainer;
+exports.OfficeArtFBSE = OfficeArtFBSE;
+exports.OfficeArtFDGGBlock = OfficeArtFDGGBlock;
 exports.OfficeArtFOPT = OfficeArtFOPT;
 exports.OfficeArtFSP = OfficeArtFSP;
 exports.OfficeArtFSPGR = OfficeArtFSPGR;
+exports.OfficeArtSecondaryFOPT = OfficeArtSecondaryFOPT;
 exports.OfficeArtSpContainer = OfficeArtSpContainer;
 exports.OfficeArtSpgrContainer = OfficeArtSpgrContainer;
+exports.OfficeArtTertiaryFOPT = OfficeArtTertiaryFOPT;
 exports.RT_CString = RT_CString;
 exports.RT_ColorSchemeAtom = RT_ColorSchemeAtom;
 exports.RT_CryptSession10Container = RT_CryptSession10Container;
@@ -67,6 +89,12 @@ exports.RT_Drawing = RT_Drawing;
 exports.RT_DrawingGroup = RT_DrawingGroup;
 exports.RT_Environment = RT_Environment;
 exports.RT_ExternalObjectList = RT_ExternalObjectList;
+exports.RT_ExternalObjectListAtom = RT_ExternalObjectListAtom;
+exports.RT_ExternalObjectRefAtom = RT_ExternalObjectRefAtom;
+exports.RT_ExternalOleEmbed = RT_ExternalOleEmbed;
+exports.RT_ExternalOleEmbedAtom = RT_ExternalOleEmbedAtom;
+exports.RT_ExternalOleObjectAtom = RT_ExternalOleObjectAtom;
+exports.RT_ExternalOleObjectStg = RT_ExternalOleObjectStg;
 exports.RT_FontCollection = RT_FontCollection;
 exports.RT_FontEntityAtom = RT_FontEntityAtom;
 exports.RT_List = RT_List;

package/dist/record/types.d.cts

@@ -9,11 +9,13 @@ declare const RT_Environment = 1010;
 declare const RT_SlidePersistAtom = 1011;
 declare const RT_MainMaster = 1016;
 declare const RT_ExternalObjectList = 1033;
+declare const RT_ExternalObjectListAtom = 1034;
 declare const RT_DrawingGroup = 1035;
 declare const RT_Drawing = 1036;
 declare const RT_List = 2000;
 declare const RT_FontCollection = 2005;
 declare const RT_ColorSchemeAtom = 2032;
+declare const RT_ExternalObjectRefAtom = 3009;
 declare const RT_PlaceholderAtom = 3011;
 declare const RT_OutlineTextRefAtom = 3998;
 declare const RT_TextHeaderAtom = 3999;
@@ -27,17 +29,25 @@ declare const RT_TextSpecialInfoDefaultAtom = 4009;
 declare const RT_TextSpecialInfoAtom = 4010;
 declare const RT_FontEntityAtom = 4023;
 declare const RT_CString = 4026;
+declare const RT_ExternalOleObjectAtom = 4035;
+declare const RT_ExternalOleEmbed = 4044;
+declare const RT_ExternalOleEmbedAtom = 4045;
 declare const RT_SlideListWithText = 4080;
 declare const RT_UserEditAtom = 4085;
 declare const RT_CurrentUserAtom = 4086;
+declare const RT_ExternalOleObjectStg = 4113;
 declare const RT_PersistDirectoryAtom = 6002;
 declare const RT_CryptSession10Container = 12052;
 declare const SLIDE_LIST_INSTANCE_SLIDES = 0;
 declare const SLIDE_LIST_INSTANCE_MASTERS = 1;
 declare const SLIDE_LIST_INSTANCE_NOTES = 2;
+declare const OfficeArtDggContainer = 61440;
+declare const OfficeArtBStoreContainer = 61441;
 declare const OfficeArtDgContainer = 61442;
 declare const OfficeArtSpgrContainer = 61443;
 declare const OfficeArtSpContainer = 61444;
+declare const OfficeArtFDGGBlock = 61446;
+declare const OfficeArtFBSE = 61447;
 declare const OfficeArtFSPGR = 61449;
 declare const OfficeArtFSP = 61450;
 declare const OfficeArtFOPT = 61451;
@@ -45,5 +55,9 @@ declare const OfficeArtClientTextbox = 61453;
 declare const OfficeArtChildAnchor = 61455;
 declare const OfficeArtClientAnchor = 61456;
 declare const OfficeArtClientData = 61457;
+declare const OfficeArtSecondaryFOPT = 61729;
+declare const OfficeArtTertiaryFOPT = 61730;
+declare const OfficeArtBlipJPEG = 61469;
+declare const OfficeArtBlipPNG = 61470;
 //#endregion
-export { OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSpContainer, OfficeArtSpgrContainer, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };
+export { OfficeArtBStoreContainer, OfficeArtBlipJPEG, OfficeArtBlipPNG, OfficeArtChildAnchor, OfficeArtClientAnchor, OfficeArtClientData, OfficeArtClientTextbox, OfficeArtDgContainer, OfficeArtDggContainer, OfficeArtFBSE, OfficeArtFDGGBlock, OfficeArtFOPT, OfficeArtFSP, OfficeArtFSPGR, OfficeArtSecondaryFOPT, OfficeArtSpContainer, OfficeArtSpgrContainer, OfficeArtTertiaryFOPT, RT_CString, RT_ColorSchemeAtom, RT_CryptSession10Container, RT_CurrentUserAtom, RT_Document, RT_DocumentAtom, RT_Drawing, RT_DrawingGroup, RT_Environment, RT_ExternalObjectList, RT_ExternalObjectListAtom, RT_ExternalObjectRefAtom, RT_ExternalOleEmbed, RT_ExternalOleEmbedAtom, RT_ExternalOleObjectAtom, RT_ExternalOleObjectStg, RT_FontCollection, RT_FontEntityAtom, RT_List, RT_MainMaster, RT_MasterTextPropAtom, RT_Notes, RT_NotesAtom, RT_OutlineTextRefAtom, RT_PersistDirectoryAtom, RT_PlaceholderAtom, RT_Slide, RT_SlideAtom, RT_SlideListWithText, RT_SlidePersistAtom, RT_StyleTextPropAtom, RT_TextBytesAtom, RT_TextCharsAtom, RT_TextHeaderAtom, RT_TextMasterStyleAtom, RT_TextRulerAtom, RT_TextSpecialInfoAtom, RT_TextSpecialInfoDefaultAtom, RT_UserEditAtom, SLIDE_LIST_INSTANCE_MASTERS, SLIDE_LIST_INSTANCE_NOTES, SLIDE_LIST_INSTANCE_SLIDES };