doc-codec 2.5.0 → 2.7.0

package/dist/encryption.d.ts

@@ -4,10 +4,10 @@ interface DecryptedDocStreams {
   readonly table: Uint8Array<ArrayBuffer>;
 }
 /**
- * Decrypts an RC4-encrypted (fEncrypted=1, fObfuscated=0) document's WordDocument and Table streams given the password, verifying it first against the Table stream's own EncryptionHeader.
+ * Decrypts an encrypted document's WordDocument and Table streams given the password, dispatching on `fObfuscated` between [MS-DOC] 2.2.6.2's RC4 encryption header and 2.2.6.1's XOR obfuscation (Method 2).
  *
  * Throws `DocUnsupportedError` for a missing password, an incorrect one, or an encryption scheme this module does not implement (RC4 CryptoAPI) -- there is no partial or best-effort result to return in any of those cases.
  */
-declare function decryptDocStreams(wordDocument: Uint8Array<ArrayBuffer>, table: Uint8Array<ArrayBuffer>, password: string | undefined): DecryptedDocStreams;
+declare function decryptDocStreams(wordDocument: Uint8Array<ArrayBuffer>, table: Uint8Array<ArrayBuffer>, password: string | undefined, fObfuscated: boolean): DecryptedDocStreams;
 //#endregion
 export { DecryptedDocStreams, decryptDocStreams };

package/dist/encryption.js

@@ -1,7 +1,7 @@
 import { DocFormatError, DocUnsupportedError } from "./errors.js";
 import { readUint16LE, readUint32LE } from "./bytes.js";
 import "./fib/offsets.js";
-import { OFFICE_RC4_DOC_BLOCK_SIZE, OFFICE_RC4_VERIFIER_LENGTH, decryptOfficeRc4, deriveOfficeRc4BaseHash, md5 } from "archive-codec";
+import { OFFICE_RC4_DOC_BLOCK_SIZE, OFFICE_RC4_VERIFIER_LENGTH, XOR_OBFUSCATION_ARRAY_LENGTH, XOR_OBFUSCATION_ROTATE_DISTANCE_METHOD2, createXorObfuscationArray, createXorObfuscationKey, createXorObfuscationPasswordVerifier, decryptOfficeRc4, decryptXorObfuscationMethod2, deriveOfficeRc4BaseHash, md5 } from "archive-codec";
 //#region src/encryption.ts
 /** [MS-DOC] 2.2.6.2's own EncryptionHeader field layout, byte offsets within the Table stream's own first FibBase.lKey bytes: EncryptionVersionInfo (vMajor/vMinor, 2 bytes each) at 0, then Salt/EncryptedVerifier/EncryptedVerifierHash, each OFFICE_RC4_VERIFIER_LENGTH (16) bytes, back to back. */
 const HEADER_OFFSET = {
@@ -43,27 +43,61 @@ function verifyPassword(baseHash, header) {
 	if (!(computedHash.length === decryptedVerifierHash.length && computedHash.every((byte, index) => byte === decryptedVerifierHash[index]))) throw new DocUnsupportedError("incorrect password for RC4-encrypted document");
 }
 /** Decrypts everything after `prefixLength` bytes of `stream`, leaving the prefix itself untouched -- WORD_DOCUMENT_UNENCRYPTED_PREFIX for WordDocument, FibBase.lKey for Table, each stream's own block-number counter starting fresh at its own byte 0 (this file's own top comment, point 3). */
-function decryptStream(baseHash, stream, prefixLength) {
+function decryptStreamRc4(baseHash, stream, prefixLength) {
 	const decrypted = new Uint8Array(stream.length);
 	decrypted.set(stream.subarray(0, prefixLength), 0);
 	decrypted.set(decryptOfficeRc4(baseHash, prefixLength, stream.subarray(prefixLength), OFFICE_RC4_DOC_BLOCK_SIZE), prefixLength);
 	return decrypted;
 }
-/**
-* Decrypts an RC4-encrypted (fEncrypted=1, fObfuscated=0) document's WordDocument and Table streams given the password, verifying it first against the Table stream's own EncryptionHeader.
-*
-* Throws `DocUnsupportedError` for a missing password, an incorrect one, or an encryption scheme this module does not implement (RC4 CryptoAPI) -- there is no partial or best-effort result to return in any of those cases.
-*/
-function decryptDocStreams(wordDocument, table, password) {
-	if (password === void 0) throw new DocUnsupportedError("this document is RC4-encrypted ([MS-DOC] 2.2.6.2); call readDocContent with a password to decrypt it");
+/** Decrypts an RC4-encrypted (fEncrypted=1, fObfuscated=0) document's WordDocument and Table streams given the password, verifying it first against the Table stream's own EncryptionHeader. */
+function decryptDocStreamsRc4(wordDocument, table, password) {
 	const header = readRc4Header(table);
 	const baseHash = deriveOfficeRc4BaseHash(password, header.salt);
 	verifyPassword(baseHash, header);
 	const lKey = readUint32LE(wordDocument, 14);
 	return {
-		wordDocument: decryptStream(baseHash, wordDocument, WORD_DOCUMENT_UNENCRYPTED_PREFIX),
-		table: decryptStream(baseHash, table, lKey)
+		wordDocument: decryptStreamRc4(baseHash, wordDocument, WORD_DOCUMENT_UNENCRYPTED_PREFIX),
+		table: decryptStreamRc4(baseHash, table, lKey)
 	};
 }
+/** Decrypts everything after `prefixLength` bytes of `stream` against Method 2's own transform, leaving the prefix itself untouched -- `initialIndex` is `prefixLength % 16`, the XorArrayIndex the decrypted span's own first byte starts at (confirmed against LibreOffice's own `ww8par.cxx` `DecryptXOR`, whose `InitCipher(); Skip(nSt)` is exactly this: reset to 0, then advance by the skipped prefix's own length mod 16). */
+function decryptStreamXor(array, stream, prefixLength) {
+	const decrypted = new Uint8Array(stream.length);
+	decrypted.set(stream.subarray(0, prefixLength), 0);
+	decrypted.set(decryptXorObfuscationMethod2(array, stream.subarray(prefixLength), prefixLength % XOR_OBFUSCATION_ARRAY_LENGTH), prefixLength);
+	return decrypted;
+}
+/**
+* Decrypts an XOR-obfuscated (fEncrypted=1, fObfuscated=1) document's WordDocument and Table streams given the password, verifying it first against FibBase's own lKey field -- not a Table-stream EncryptionHeader the way RC4 needs, see this file's own top comment for why. The Table stream carries no unencrypted prefix under this scheme, unlike RC4's own FibBase.lKey-byte EncryptionHeader; Data (also obfuscated per [MS-DOC], from its own byte 0) is out of scope, matching decryptDocStreamsRc4 and this package's own read.ts, which does not read the Data stream at all.
+*/
+function decryptDocStreamsXor(wordDocument, table, password) {
+	const lKey = readUint32LE(wordDocument, 14);
+	const headerKey = lKey >>> 16 & 65535;
+	const headerVerifier = lKey & 65535;
+	let computedKey;
+	let computedVerifier;
+	try {
+		computedKey = createXorObfuscationKey(password);
+		computedVerifier = createXorObfuscationPasswordVerifier(password);
+	} catch (error) {
+		if (error instanceof RangeError) throw new DocUnsupportedError("incorrect password for XOR-obfuscated document");
+		throw error;
+	}
+	if (computedKey !== headerKey || computedVerifier !== headerVerifier) throw new DocUnsupportedError("incorrect password for XOR-obfuscated document");
+	const array = createXorObfuscationArray(password, XOR_OBFUSCATION_ROTATE_DISTANCE_METHOD2);
+	return {
+		wordDocument: decryptStreamXor(array, wordDocument, WORD_DOCUMENT_UNENCRYPTED_PREFIX),
+		table: decryptStreamXor(array, table, 0)
+	};
+}
+/**
+* Decrypts an encrypted document's WordDocument and Table streams given the password, dispatching on `fObfuscated` between [MS-DOC] 2.2.6.2's RC4 encryption header and 2.2.6.1's XOR obfuscation (Method 2).
+*
+* Throws `DocUnsupportedError` for a missing password, an incorrect one, or an encryption scheme this module does not implement (RC4 CryptoAPI) -- there is no partial or best-effort result to return in any of those cases.
+*/
+function decryptDocStreams(wordDocument, table, password, fObfuscated) {
+	if (password === void 0) throw new DocUnsupportedError(`this document is ${fObfuscated ? "XOR-obfuscated ([MS-DOC] 2.2.6.1)" : "RC4-encrypted ([MS-DOC] 2.2.6.2)"}; call readDocContent with a password to decrypt it`);
+	return fObfuscated ? decryptDocStreamsXor(wordDocument, table, password) : decryptDocStreamsRc4(wordDocument, table, password);
+}
 //#endregion
 export { decryptDocStreams };

package/dist/index.cjs

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_base64 = require("./base64.cjs");
 const require_errors = require("./errors.cjs");
 const require_bytes = require("./bytes.cjs");
+const require_data_stream = require("./data-stream.cjs");
 const require_fib_offsets = require("./fib/offsets.cjs");
 const require_detect = require("./detect.cjs");
 const require_plc = require("./plc.cjs");
@@ -34,6 +36,7 @@ exports.CELL_MARK = require_text_special.CELL_MARK;
 exports.COMPRESSED_CHARACTER_MAP = require_text_characters.COMPRESSED_CHARACTER_MAP;
 exports.DATA_STREAM = require_detect.DATA_STREAM;
 exports.DRAWN_OBJECT = require_text_special.DRAWN_OBJECT;
+exports.DataStreamBuilder = require_data_stream.DataStreamBuilder;
 exports.DocFormatError = require_errors.DocFormatError;
 exports.DocUnsupportedError = require_errors.DocUnsupportedError;
 exports.FC_LCB_VALUE_INDEX = require_fib_offsets.FC_LCB_VALUE_INDEX;
@@ -71,6 +74,7 @@ exports.WORD_DOCUMENT_STREAM = require_detect.WORD_DOCUMENT_STREAM;
 exports.applyCharacterSprms = require_prop_chp.applyCharacterSprms;
 exports.applyParagraphSprms = require_prop_pap.applyParagraphSprms;
 exports.applySectionSprms = require_prop_sep.applySectionSprms;
+exports.base64ToBytes = require_base64.base64ToBytes;
 exports.buildChpxPages = require_prop_fkp_write.buildChpxPages;
 exports.buildFib = require_fib_write.buildFib;
 exports.buildFontTable = require_style_fonts.buildFontTable;
@@ -80,6 +84,7 @@ exports.buildPropertyBinTable = require_prop_fkp_write.buildPropertyBinTable;
 exports.buildSepx = require_prop_sep_write.buildSepx;
 exports.buildStshForStyles = require_style_stsh.buildStshForStyles;
 exports.buildTextClx = require_text_piece_table_write.buildTextClx;
+exports.bytesToBase64 = require_base64.bytesToBase64;
 exports.characterIstdFromGrpprl = require_prop_chp.characterIstdFromGrpprl;
 exports.characterOffset = require_text_piece_table.characterOffset;
 exports.characterSize = require_text_piece_table.characterSize;

package/dist/index.d.cts

@@ -1,4 +1,6 @@
+import { base64ToBytes, bytesToBase64 } from "./base64.cjs";
 import { readInt16LE, readInt32LE, readUint16LE, readUint32LE, readUint8, slice } from "./bytes.cjs";
+import { t as DataStreamBuilder } from "./data-stream-BLCj4-V1.cjs";
 import { DATA_STREAM, SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM, isDocBytes } from "./detect.cjs";
 import { DocFormatError, DocUnsupportedError } from "./errors.cjs";
 import { i as tableStreamName, n as parseFib, r as peekFibBaseFlags, t as Fib } from "./fib-6BFIx153.cjs";
@@ -28,4 +30,4 @@ import { readSubdocumentStories, storyText } from "./subdocument.cjs";
 import { Comment, Footnote, NoteBodies, readNoteBodies } from "./notes.cjs";
 import { DocContent, DocStreams, readDocContent, readDocStreams } from "./read.cjs";
 import { WriteDocContentOptions, writeDocContent } from "./write.cjs";
-export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, CharacterProperties, ChpxFkp, ChpxRunToWrite, Comment, DATA_STREAM, DRAWN_OBJECT, DocContent, DocFormatError, DocSectionProperties, DocStreams, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, Fib, FibWriteSpec, Footnote, HeaderFooterSlot, HeaderFooterStories, HeaderFooterStory, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, NoteBodies, NumberingDefinition, NumberingDefinitions, NumberingLevel, PARAGRAPH_MARK, PapxFkp, PapxLookup, PapxParagraphToWrite, PapxRecord, ParagraphEntry, ParagraphProperties, Piece, PieceTable, Plc, Prl, PropertyBinTable, ReadContext, ResolvedStyleFormatting, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, SectionProperties, Sprm, Style, StyleSheet, TextRange, WORD_DOCUMENT_STREAM, WriteDocContentOptions, applyCharacterSprms, applyParagraphSprms, applySectionSprms, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };
+export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, CharacterProperties, ChpxFkp, ChpxRunToWrite, Comment, DATA_STREAM, DRAWN_OBJECT, DataStreamBuilder, DocContent, DocFormatError, DocSectionProperties, DocStreams, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, Fib, FibWriteSpec, Footnote, HeaderFooterSlot, HeaderFooterStories, HeaderFooterStory, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, NoteBodies, NumberingDefinition, NumberingDefinitions, NumberingLevel, PARAGRAPH_MARK, PapxFkp, PapxLookup, PapxParagraphToWrite, PapxRecord, ParagraphEntry, ParagraphProperties, Piece, PieceTable, Plc, Prl, PropertyBinTable, ReadContext, ResolvedStyleFormatting, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, SectionProperties, Sprm, Style, StyleSheet, TextRange, WORD_DOCUMENT_STREAM, WriteDocContentOptions, applyCharacterSprms, applyParagraphSprms, applySectionSprms, base64ToBytes, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, bytesToBase64, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };

package/dist/index.d.ts

@@ -1,4 +1,6 @@
+import { base64ToBytes, bytesToBase64 } from "./base64.js";
 import { readInt16LE, readInt32LE, readUint16LE, readUint32LE, readUint8, slice } from "./bytes.js";
+import { t as DataStreamBuilder } from "./data-stream-BLCj4-V1.js";
 import { DATA_STREAM, SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM, isDocBytes } from "./detect.js";
 import { DocFormatError, DocUnsupportedError } from "./errors.js";
 import { i as tableStreamName, n as parseFib, r as peekFibBaseFlags, t as Fib } from "./fib-6BFIx153.js";
@@ -28,4 +30,4 @@ import { readSubdocumentStories, storyText } from "./subdocument.js";
 import { Comment, Footnote, NoteBodies, readNoteBodies } from "./notes.js";
 import { DocContent, DocStreams, readDocContent, readDocStreams } from "./read.js";
 import { WriteDocContentOptions, writeDocContent } from "./write.js";
-export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, CharacterProperties, ChpxFkp, ChpxRunToWrite, Comment, DATA_STREAM, DRAWN_OBJECT, DocContent, DocFormatError, DocSectionProperties, DocStreams, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, Fib, FibWriteSpec, Footnote, HeaderFooterSlot, HeaderFooterStories, HeaderFooterStory, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, NoteBodies, NumberingDefinition, NumberingDefinitions, NumberingLevel, PARAGRAPH_MARK, PapxFkp, PapxLookup, PapxParagraphToWrite, PapxRecord, ParagraphEntry, ParagraphProperties, Piece, PieceTable, Plc, Prl, PropertyBinTable, ReadContext, ResolvedStyleFormatting, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, SectionProperties, Sprm, Style, StyleSheet, TextRange, WORD_DOCUMENT_STREAM, WriteDocContentOptions, applyCharacterSprms, applyParagraphSprms, applySectionSprms, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };
+export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, CharacterProperties, ChpxFkp, ChpxRunToWrite, Comment, DATA_STREAM, DRAWN_OBJECT, DataStreamBuilder, DocContent, DocFormatError, DocSectionProperties, DocStreams, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, Fib, FibWriteSpec, Footnote, HeaderFooterSlot, HeaderFooterStories, HeaderFooterStory, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, NoteBodies, NumberingDefinition, NumberingDefinitions, NumberingLevel, PARAGRAPH_MARK, PapxFkp, PapxLookup, PapxParagraphToWrite, PapxRecord, ParagraphEntry, ParagraphProperties, Piece, PieceTable, Plc, Prl, PropertyBinTable, ReadContext, ResolvedStyleFormatting, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, SectionProperties, Sprm, Style, StyleSheet, TextRange, WORD_DOCUMENT_STREAM, WriteDocContentOptions, applyCharacterSprms, applyParagraphSprms, applySectionSprms, base64ToBytes, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, bytesToBase64, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };

package/dist/index.js

@@ -1,5 +1,7 @@
+import { base64ToBytes, bytesToBase64 } from "./base64.js";
 import { DocFormatError, DocUnsupportedError } from "./errors.js";
 import { readInt16LE, readInt32LE, readUint16LE, readUint32LE, readUint8, slice } from "./bytes.js";
+import { DataStreamBuilder } from "./data-stream.js";
 import { FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, LW_OFFSET } from "./fib/offsets.js";
 import { DATA_STREAM, SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM, isDocBytes } from "./detect.js";
 import { findLargestAtMost, parsePlc } from "./plc.js";
@@ -28,4 +30,4 @@ import { NUMBER_FORMAT_BY_NFC, readNumberingDefinitions } from "./list/numbering
 import { readNoteBodies } from "./notes.js";
 import { readDocContent, readDocStreams } from "./read.js";
 import { writeDocContent } from "./write.js";
-export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, DATA_STREAM, DRAWN_OBJECT, DocFormatError, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, PARAGRAPH_MARK, PropertyBinTable, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, WORD_DOCUMENT_STREAM, applyCharacterSprms, applyParagraphSprms, applySectionSprms, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };
+export { ANNOTATION_REFERENCE, CELL_MARK, COMPRESSED_CHARACTER_MAP, DATA_STREAM, DRAWN_OBJECT, DataStreamBuilder, DocFormatError, DocUnsupportedError, FC_LCB_VALUE_INDEX, FIB_BASE_FLAG, FIB_BASE_SIZE, FIB_CB_RG_FC_LCB_OFFSET, FIB_CSLW_OFFSET, FIB_CSLW_REQUIRED, FIB_CSW_REQUIRED, FIB_FC_LCB_BLOB_OFFSET, FIB_LKEY_OFFSET, FIB_RG_LW_OFFSET, FIB_RG_LW_SIZE, FIB_RG_W_OFFSET, FIB_RG_W_SIZE, FIB_W_IDENT, FIELD_BEGIN, FIELD_END, FIELD_SEPARATOR, FKP_PAGE_SIZE, FOOTNOTE_REFERENCE, INLINE_PICTURE, LINE_BREAK, LW_OFFSET, NUMBER_FORMAT_BY_NFC, PARAGRAPH_MARK, PropertyBinTable, SECTION_MARK, SGC, STI_USER_DEFINED, STK, SUMMARY_INFORMATION_STREAM, SYMBOL_ANCHOR, WORD_DOCUMENT_STREAM, applyCharacterSprms, applyParagraphSprms, applySectionSprms, base64ToBytes, buildChpxPages, buildFib, buildFontTable, buildPapxPages, buildPlcfSed, buildPropertyBinTable, buildSepx, buildStshForStyles, buildTextClx, bytesToBase64, characterIstdFromGrpprl, characterOffset, characterSize, decodeSprm, encodeCharacterGrpprl, encodeParagraphGrpprl, encodeSectionGrpprl, endsParagraph, findLargestAtMost, firstFcOfPage, fitsAloneOnPapxPage, headingLevelFromIstd, isAnchorOnly, isDocBytes, layoutMetadataToSummaryInformation, operandSize, parseChpxFkp, parseClx, parseFib, parseFontTable, parsePapxFkp, parsePlc, parseStsh, peekFibBaseFlags, readAllSectionProperties, readDocContent, readDocStreams, readGrpprl, readHeaderFooterStories, readInt16LE, readInt32LE, readNoteBodies, readNumberingDefinitions, readParagraphs, readSubdocumentStories, readTextRange, readUint16LE, readUint32LE, readUint8, resolveStyleFormatting, slice, splitEntriesByBoundaries, storyText, tableStreamName, writeDocContent };

package/dist/pictures-write.cjs

@@ -0,0 +1,85 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_base64 = require("./base64.cjs");
+const require_errors = require("./errors.cjs");
+//#region src/pictures-write.ts
+const PICF_SIZE = 68;
+const PICF_MM_OFFSET = 6;
+const PICF_DXA_GOAL_OFFSET = 28;
+const PICF_DYA_GOAL_OFFSET = 30;
+const PICF_MX_OFFSET = 32;
+const PICF_MY_OFFSET = 34;
+/** MFPF.mm's MM_SHAPE value, [MS-DOC] 2.9.181 -- the plain, no-source-filename form; this writer never emits MM_SHAPEFILE's own cchPicName/stPicName pair, matching what pictures.ts's own reader treats as the common case. */
+const MM_SHAPE = 100;
+const RECORD_HEADER_SIZE = 8;
+/** OfficeArtBlipJPEG / OfficeArtBlipPNG record types, [MS-ODRAW] 2.2.27/2.2.28. */
+const BLIP_JPEG = 61469;
+const BLIP_PNG = 61470;
+/** rh.recInstance for the single-rgbUid (16-byte) form of each blip -- [MS-ODRAW] 2.2.27's own table for JPEG (RGB), 2.2.28's for PNG; the identical values pictures.ts's own ONE_UID_INSTANCES set already recognises on read. */
+const BLIP_INSTANCE_JPEG = 1130;
+const BLIP_INSTANCE_PNG = 1760;
+const BLIP_UID_SIZE = 16;
+/** The one byte following rgbUid in every OfficeArtBlip variant pictures.ts reads -- [MS-ODRAW]'s own BLIPFileTag, 0xFF for a non-metafile blip (PNG/JPEG are never compressed the way a WMF/EMF metafile blip's own tag byte would state). */
+const BLIP_FILE_TAG = 255;
+const BLIP_TAG_SIZE = 1;
+const TWIPS_PER_POINT = 20;
+/** PICMID.mx/my, [MS-DOC]: "the ratio, measured in tenths of a percent, between the final display width/height and the initial picture width/height" -- this writer always states dxaGoal/dyaGoal as the image's own real size and mx/my as "no scaling" (1000, one thousand tenths-of-a-percent = 100%), matching pictures.ts's own read-side arithmetic (dxaGoal * mx / 1000) exactly at mx = 1000. */
+const NO_SCALING = 1e3;
+/** PICMID.dxaGoal/dyaGoal are a signed 16-bit FieldFormatting value in twips -- [MS-DOC] states no narrower bound than that field width itself. */
+const MAX_INT16 = 32767;
+function recordHeaderBytes(recType, recInstance, recLen) {
+	const bytes = new Uint8Array(RECORD_HEADER_SIZE);
+	const view = new DataView(bytes.buffer);
+	view.setUint16(0, recInstance << 4, true);
+	view.setUint16(2, recType, true);
+	view.setUint32(4, recLen, true);
+	return bytes;
+}
+function twipsFromPt(pt, field) {
+	const twips = Math.round(pt * TWIPS_PER_POINT);
+	if (twips < 0 || twips > MAX_INT16) throw new require_errors.DocFormatError(`an image's ${field} of ${String(pt)}pt is ${String(twips)} twips, outside the 0..${String(MAX_INT16)} range PICMID.dxaGoal/dyaGoal (a signed 16-bit field) can hold`);
+	return twips;
+}
+/** Builds one inline picture's own PICFAndOfficeArtData bytes -- everything pictures.ts's readInlinePicture needs given the Data-stream offset it will end up placed at, which this function does not itself decide (see WrittenInlinePicture's own comment). */
+function buildInlinePicture(image) {
+	const recType = image.format === "png" ? BLIP_PNG : image.format === "jpeg" ? BLIP_JPEG : void 0;
+	if (recType === void 0) throw new require_errors.DocUnsupportedError(`doc-codec's writer can only write a 'png' or 'jpeg' inline picture -- the two raster formats its own reader decodes from a real OfficeArtBlip; got '${image.format}'`);
+	const recInstance = image.format === "png" ? BLIP_INSTANCE_PNG : BLIP_INSTANCE_JPEG;
+	const payload = require_base64.base64ToBytes(image.base64);
+	const picf = new Uint8Array(PICF_SIZE);
+	const picfView = new DataView(picf.buffer);
+	picfView.setUint16(PICF_MM_OFFSET, MM_SHAPE, true);
+	picfView.setInt16(PICF_DXA_GOAL_OFFSET, twipsFromPt(image.widthPt, "widthPt"), true);
+	picfView.setInt16(PICF_DYA_GOAL_OFFSET, twipsFromPt(image.heightPt, "heightPt"), true);
+	picfView.setUint16(PICF_MX_OFFSET, NO_SCALING, true);
+	picfView.setUint16(PICF_MY_OFFSET, NO_SCALING, true);
+	const shapeHeader = recordHeaderBytes(61444, 0, 0);
+	const uid = new Uint8Array(BLIP_UID_SIZE);
+	const blipHeader = recordHeaderBytes(recType, recInstance, uid.length + BLIP_TAG_SIZE + payload.length);
+	const data = new Uint8Array(picf.length + shapeHeader.length + blipHeader.length + uid.length + BLIP_TAG_SIZE + payload.length);
+	let cursor = 0;
+	data.set(picf, cursor);
+	cursor += picf.length;
+	data.set(shapeHeader, cursor);
+	cursor += shapeHeader.length;
+	data.set(blipHeader, cursor);
+	cursor += blipHeader.length;
+	data.set(uid, cursor);
+	cursor += uid.length;
+	data[cursor] = BLIP_FILE_TAG;
+	cursor += 1;
+	data.set(payload, cursor);
+	return {
+		data,
+		buildGrpprl: buildPicLocationGrpprl
+	};
+}
+/** sprmCPicLocation, [MS-DOC] 2.6.1 -- a signed 32-bit offset into the Data stream, little-endian. */
+function buildPicLocationGrpprl(dataStreamOffset) {
+	const grpprl = [3, 106];
+	const operand = /* @__PURE__ */ new Uint8Array(4);
+	new DataView(operand.buffer).setInt32(0, dataStreamOffset, true);
+	grpprl.push(...operand);
+	return grpprl;
+}
+//#endregion
+exports.buildInlinePicture = buildInlinePicture;

package/dist/pictures-write.d.cts

@@ -0,0 +1,12 @@
+import { ContentImageBlock } from "document-schema.js";
+//#region src/pictures-write.d.ts
+interface WrittenInlinePicture {
+  /** The whole PICFAndOfficeArtData byte blob to append to the Data stream at whatever offset it ends up placed. */
+  readonly data: Uint8Array<ArrayBuffer>;
+  /** sprmCPicLocation's own grpprl bytes, complete except for its 4-byte operand, which the caller fills in with wherever `data` was actually placed (buildPicLocationGrpprl below) -- the two are split because only the caller (write.ts's own Data-stream accumulator) knows that offset before `data` is placed. */
+  readonly buildGrpprl: (dataStreamOffset: number) => number[];
+}
+/** Builds one inline picture's own PICFAndOfficeArtData bytes -- everything pictures.ts's readInlinePicture needs given the Data-stream offset it will end up placed at, which this function does not itself decide (see WrittenInlinePicture's own comment). */
+declare function buildInlinePicture(image: ContentImageBlock): WrittenInlinePicture;
+//#endregion
+export { WrittenInlinePicture, buildInlinePicture };

package/dist/pictures-write.d.ts

@@ -0,0 +1,12 @@
+import { ContentImageBlock } from "document-schema.js";
+//#region src/pictures-write.d.ts
+interface WrittenInlinePicture {
+  /** The whole PICFAndOfficeArtData byte blob to append to the Data stream at whatever offset it ends up placed. */
+  readonly data: Uint8Array<ArrayBuffer>;
+  /** sprmCPicLocation's own grpprl bytes, complete except for its 4-byte operand, which the caller fills in with wherever `data` was actually placed (buildPicLocationGrpprl below) -- the two are split because only the caller (write.ts's own Data-stream accumulator) knows that offset before `data` is placed. */
+  readonly buildGrpprl: (dataStreamOffset: number) => number[];
+}
+/** Builds one inline picture's own PICFAndOfficeArtData bytes -- everything pictures.ts's readInlinePicture needs given the Data-stream offset it will end up placed at, which this function does not itself decide (see WrittenInlinePicture's own comment). */
+declare function buildInlinePicture(image: ContentImageBlock): WrittenInlinePicture;
+//#endregion
+export { WrittenInlinePicture, buildInlinePicture };

package/dist/pictures-write.js

@@ -0,0 +1,84 @@
+import { base64ToBytes } from "./base64.js";
+import { DocFormatError, DocUnsupportedError } from "./errors.js";
+//#region src/pictures-write.ts
+const PICF_SIZE = 68;
+const PICF_MM_OFFSET = 6;
+const PICF_DXA_GOAL_OFFSET = 28;
+const PICF_DYA_GOAL_OFFSET = 30;
+const PICF_MX_OFFSET = 32;
+const PICF_MY_OFFSET = 34;
+/** MFPF.mm's MM_SHAPE value, [MS-DOC] 2.9.181 -- the plain, no-source-filename form; this writer never emits MM_SHAPEFILE's own cchPicName/stPicName pair, matching what pictures.ts's own reader treats as the common case. */
+const MM_SHAPE = 100;
+const RECORD_HEADER_SIZE = 8;
+/** OfficeArtBlipJPEG / OfficeArtBlipPNG record types, [MS-ODRAW] 2.2.27/2.2.28. */
+const BLIP_JPEG = 61469;
+const BLIP_PNG = 61470;
+/** rh.recInstance for the single-rgbUid (16-byte) form of each blip -- [MS-ODRAW] 2.2.27's own table for JPEG (RGB), 2.2.28's for PNG; the identical values pictures.ts's own ONE_UID_INSTANCES set already recognises on read. */
+const BLIP_INSTANCE_JPEG = 1130;
+const BLIP_INSTANCE_PNG = 1760;
+const BLIP_UID_SIZE = 16;
+/** The one byte following rgbUid in every OfficeArtBlip variant pictures.ts reads -- [MS-ODRAW]'s own BLIPFileTag, 0xFF for a non-metafile blip (PNG/JPEG are never compressed the way a WMF/EMF metafile blip's own tag byte would state). */
+const BLIP_FILE_TAG = 255;
+const BLIP_TAG_SIZE = 1;
+const TWIPS_PER_POINT = 20;
+/** PICMID.mx/my, [MS-DOC]: "the ratio, measured in tenths of a percent, between the final display width/height and the initial picture width/height" -- this writer always states dxaGoal/dyaGoal as the image's own real size and mx/my as "no scaling" (1000, one thousand tenths-of-a-percent = 100%), matching pictures.ts's own read-side arithmetic (dxaGoal * mx / 1000) exactly at mx = 1000. */
+const NO_SCALING = 1e3;
+/** PICMID.dxaGoal/dyaGoal are a signed 16-bit FieldFormatting value in twips -- [MS-DOC] states no narrower bound than that field width itself. */
+const MAX_INT16 = 32767;
+function recordHeaderBytes(recType, recInstance, recLen) {
+	const bytes = new Uint8Array(RECORD_HEADER_SIZE);
+	const view = new DataView(bytes.buffer);
+	view.setUint16(0, recInstance << 4, true);
+	view.setUint16(2, recType, true);
+	view.setUint32(4, recLen, true);
+	return bytes;
+}
+function twipsFromPt(pt, field) {
+	const twips = Math.round(pt * TWIPS_PER_POINT);
+	if (twips < 0 || twips > MAX_INT16) throw new DocFormatError(`an image's ${field} of ${String(pt)}pt is ${String(twips)} twips, outside the 0..${String(MAX_INT16)} range PICMID.dxaGoal/dyaGoal (a signed 16-bit field) can hold`);
+	return twips;
+}
+/** Builds one inline picture's own PICFAndOfficeArtData bytes -- everything pictures.ts's readInlinePicture needs given the Data-stream offset it will end up placed at, which this function does not itself decide (see WrittenInlinePicture's own comment). */
+function buildInlinePicture(image) {
+	const recType = image.format === "png" ? BLIP_PNG : image.format === "jpeg" ? BLIP_JPEG : void 0;
+	if (recType === void 0) throw new DocUnsupportedError(`doc-codec's writer can only write a 'png' or 'jpeg' inline picture -- the two raster formats its own reader decodes from a real OfficeArtBlip; got '${image.format}'`);
+	const recInstance = image.format === "png" ? BLIP_INSTANCE_PNG : BLIP_INSTANCE_JPEG;
+	const payload = base64ToBytes(image.base64);
+	const picf = new Uint8Array(PICF_SIZE);
+	const picfView = new DataView(picf.buffer);
+	picfView.setUint16(PICF_MM_OFFSET, MM_SHAPE, true);
+	picfView.setInt16(PICF_DXA_GOAL_OFFSET, twipsFromPt(image.widthPt, "widthPt"), true);
+	picfView.setInt16(PICF_DYA_GOAL_OFFSET, twipsFromPt(image.heightPt, "heightPt"), true);
+	picfView.setUint16(PICF_MX_OFFSET, NO_SCALING, true);
+	picfView.setUint16(PICF_MY_OFFSET, NO_SCALING, true);
+	const shapeHeader = recordHeaderBytes(61444, 0, 0);
+	const uid = new Uint8Array(BLIP_UID_SIZE);
+	const blipHeader = recordHeaderBytes(recType, recInstance, uid.length + BLIP_TAG_SIZE + payload.length);
+	const data = new Uint8Array(picf.length + shapeHeader.length + blipHeader.length + uid.length + BLIP_TAG_SIZE + payload.length);
+	let cursor = 0;
+	data.set(picf, cursor);
+	cursor += picf.length;
+	data.set(shapeHeader, cursor);
+	cursor += shapeHeader.length;
+	data.set(blipHeader, cursor);
+	cursor += blipHeader.length;
+	data.set(uid, cursor);
+	cursor += uid.length;
+	data[cursor] = BLIP_FILE_TAG;
+	cursor += 1;
+	data.set(payload, cursor);
+	return {
+		data,
+		buildGrpprl: buildPicLocationGrpprl
+	};
+}
+/** sprmCPicLocation, [MS-DOC] 2.6.1 -- a signed 32-bit offset into the Data stream, little-endian. */
+function buildPicLocationGrpprl(dataStreamOffset) {
+	const grpprl = [3, 106];
+	const operand = /* @__PURE__ */ new Uint8Array(4);
+	new DataView(operand.buffer).setInt32(0, dataStreamOffset, true);
+	grpprl.push(...operand);
+	return grpprl;
+}
+//#endregion
+export { buildInlinePicture };

package/dist/pictures.cjs

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_base64 = require("./base64.cjs");
 const require_bytes = require("./bytes.cjs");
 //#region src/pictures.ts
 const PICF_SIZE = 68;
@@ -59,10 +60,11 @@ function readInlinePicture(dataStream, picLocation) {
 	if (uidBytes === void 0) return void 0;
 	const blipDataStart = cursor + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
 	const blipDataLength = blipHeader.recLen - uidBytes - BLIP_TAG_SIZE;
+	const blipBytes = require_bytes.slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream");
 	return {
 		kind: "image",
 		format,
-		base64: bytesToBase64(require_bytes.slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream")),
+		base64: require_base64.bytesToBase64(blipBytes),
 		widthPt: dxaGoal * mx / SCALE_DENOMINATOR / TWIPS_PER_POINT,
 		heightPt: dyaGoal * my / SCALE_DENOMINATOR / TWIPS_PER_POINT
 	};
@@ -74,20 +76,5 @@ function blipFormat(recType) {
 		default: return;
 	}
 }
-const BASE64_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-function bytesToBase64(bytes) {
-	let out = "";
-	const len = bytes.length;
-	for (let index = 0; index < len; index += 3) {
-		const b0 = bytes[index] ?? 0;
-		const b1 = index + 1 < len ? bytes[index + 1] ?? 0 : 0;
-		const b2 = index + 2 < len ? bytes[index + 2] ?? 0 : 0;
-		out += BASE64_TABLE.charAt(b0 >> 2);
-		out += BASE64_TABLE.charAt((b0 & 3) << 4 | b1 >> 4);
-		out += index + 1 < len ? BASE64_TABLE.charAt((b1 & 15) << 2 | b2 >> 6) : "=";
-		out += index + 2 < len ? BASE64_TABLE.charAt(b2 & 63) : "=";
-	}
-	return out;
-}
 //#endregion
 exports.readInlinePicture = readInlinePicture;

package/dist/pictures.js

@@ -1,3 +1,4 @@
+import { bytesToBase64 } from "./base64.js";
 import { readInt16LE, readUint16LE, readUint32LE, readUint8, slice } from "./bytes.js";
 //#region src/pictures.ts
 const PICF_SIZE = 68;
@@ -58,10 +59,11 @@ function readInlinePicture(dataStream, picLocation) {
 	if (uidBytes === void 0) return void 0;
 	const blipDataStart = cursor + RECORD_HEADER_SIZE + uidBytes + BLIP_TAG_SIZE;
 	const blipDataLength = blipHeader.recLen - uidBytes - BLIP_TAG_SIZE;
+	const blipBytes = slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream");
 	return {
 		kind: "image",
 		format,
-		base64: bytesToBase64(slice(dataStream, blipDataStart, blipDataLength, "OfficeArtBlip file data in the Data stream")),
+		base64: bytesToBase64(blipBytes),
 		widthPt: dxaGoal * mx / SCALE_DENOMINATOR / TWIPS_PER_POINT,
 		heightPt: dyaGoal * my / SCALE_DENOMINATOR / TWIPS_PER_POINT
 	};
@@ -73,20 +75,5 @@ function blipFormat(recType) {
 		default: return;
 	}
 }
-const BASE64_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-function bytesToBase64(bytes) {
-	let out = "";
-	const len = bytes.length;
-	for (let index = 0; index < len; index += 3) {
-		const b0 = bytes[index] ?? 0;
-		const b1 = index + 1 < len ? bytes[index + 1] ?? 0 : 0;
-		const b2 = index + 2 < len ? bytes[index + 2] ?? 0 : 0;
-		out += BASE64_TABLE.charAt(b0 >> 2);
-		out += BASE64_TABLE.charAt((b0 & 3) << 4 | b1 >> 4);
-		out += index + 1 < len ? BASE64_TABLE.charAt((b1 & 15) << 2 | b2 >> 6) : "=";
-		out += index + 2 < len ? BASE64_TABLE.charAt(b2 & 63) : "=";
-	}
-	return out;
-}
 //#endregion
 export { readInlinePicture };

package/dist/prop/sep-write.cjs

@@ -45,16 +45,23 @@ function buildSepx(grpprl) {
 	bytes.set(grpprl, 2);
 	return bytes;
 }
-/** PlcfSed for exactly one section: two CPs (0 and ccpText) bracketing the single Sed ([MS-DOC] 2.9.269) this writer ever emits, whose fcSepx names where buildSepx's own bytes were placed in the WordDocument stream and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. */
-function buildPlcfSed(ccpText, fcSepx) {
-	const bytes = /* @__PURE__ */ new Uint8Array(20);
+/** PlcfSed for `startCps.length` sections, [MS-DOC] 2.9.269/2.8.26: `startCps` (each section's own PlcfSed.aCp[i], "the beginning of a range of text ... that constitutes a section") plus a trailing `ccpText` -- the "last CP does not begin a new section" terminator -- bracketing one 12-byte Sed per section, each naming where that section's own buildSepx bytes were placed in the WordDocument stream (`fcSepxList`, the same order as `startCps`) and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. A single-section document is simply the `startCps.length === 1` case. */
+function buildPlcfSed(startCps, ccpText, fcSepxList) {
+	if (startCps.length !== fcSepxList.length) throw new require_errors.DocFormatError(`internal defect: buildPlcfSed was given ${String(startCps.length)} section start CPs but ${String(fcSepxList.length)} Sepx offsets -- these must be the same length`);
+	const keys = [...startCps, ccpText];
+	const keyBytes = keys.length * 4;
+	const bytes = new Uint8Array(keyBytes + fcSepxList.length * 12);
 	const view = new DataView(bytes.buffer);
-	view.setUint32(0, 0, true);
-	view.setUint32(4, ccpText, true);
-	view.setUint16(8, 0, true);
-	view.setUint32(10, fcSepx, true);
-	view.setUint16(14, 0, true);
-	view.setUint32(16, 4294967295, true);
+	keys.forEach((cp, index) => {
+		view.setUint32(index * 4, cp, true);
+	});
+	fcSepxList.forEach((fcSepx, index) => {
+		const base = keyBytes + index * 12;
+		view.setUint16(base, 0, true);
+		view.setUint32(base + 2, fcSepx, true);
+		view.setUint16(base + 6, 0, true);
+		view.setUint32(base + 8, 4294967295, true);
+	});
 	return bytes;
 }
 //#endregion

package/dist/prop/sep-write.d.cts

@@ -3,7 +3,7 @@ import { ContentSection } from "document-schema.js";
 declare function encodeSectionGrpprl(section: Pick<ContentSection, "pageSize" | "margins">): number[];
 /** Sepx, [MS-DOC] 2.9.279: a 2-byte cb (grpprl's own length) followed by the grpprl itself. */
 declare function buildSepx(grpprl: readonly number[]): Uint8Array<ArrayBuffer>;
-/** PlcfSed for exactly one section: two CPs (0 and ccpText) bracketing the single Sed ([MS-DOC] 2.9.269) this writer ever emits, whose fcSepx names where buildSepx's own bytes were placed in the WordDocument stream and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. */
-declare function buildPlcfSed(ccpText: number, fcSepx: number): Uint8Array<ArrayBuffer>;
+/** PlcfSed for `startCps.length` sections, [MS-DOC] 2.9.269/2.8.26: `startCps` (each section's own PlcfSed.aCp[i], "the beginning of a range of text ... that constitutes a section") plus a trailing `ccpText` -- the "last CP does not begin a new section" terminator -- bracketing one 12-byte Sed per section, each naming where that section's own buildSepx bytes were placed in the WordDocument stream (`fcSepxList`, the same order as `startCps`) and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. A single-section document is simply the `startCps.length === 1` case. */
+declare function buildPlcfSed(startCps: readonly number[], ccpText: number, fcSepxList: readonly number[]): Uint8Array<ArrayBuffer>;
 //#endregion
 export { buildPlcfSed, buildSepx, encodeSectionGrpprl };

package/dist/prop/sep-write.d.ts

@@ -3,7 +3,7 @@ import { ContentSection } from "document-schema.js";
 declare function encodeSectionGrpprl(section: Pick<ContentSection, "pageSize" | "margins">): number[];
 /** Sepx, [MS-DOC] 2.9.279: a 2-byte cb (grpprl's own length) followed by the grpprl itself. */
 declare function buildSepx(grpprl: readonly number[]): Uint8Array<ArrayBuffer>;
-/** PlcfSed for exactly one section: two CPs (0 and ccpText) bracketing the single Sed ([MS-DOC] 2.9.269) this writer ever emits, whose fcSepx names where buildSepx's own bytes were placed in the WordDocument stream and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. */
-declare function buildPlcfSed(ccpText: number, fcSepx: number): Uint8Array<ArrayBuffer>;
+/** PlcfSed for `startCps.length` sections, [MS-DOC] 2.9.269/2.8.26: `startCps` (each section's own PlcfSed.aCp[i], "the beginning of a range of text ... that constitutes a section") plus a trailing `ccpText` -- the "last CP does not begin a new section" terminator -- bracketing one 12-byte Sed per section, each naming where that section's own buildSepx bytes were placed in the WordDocument stream (`fcSepxList`, the same order as `startCps`) and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. A single-section document is simply the `startCps.length === 1` case. */
+declare function buildPlcfSed(startCps: readonly number[], ccpText: number, fcSepxList: readonly number[]): Uint8Array<ArrayBuffer>;
 //#endregion
 export { buildPlcfSed, buildSepx, encodeSectionGrpprl };

package/dist/prop/sep-write.js

@@ -44,16 +44,23 @@ function buildSepx(grpprl) {
 	bytes.set(grpprl, 2);
 	return bytes;
 }
-/** PlcfSed for exactly one section: two CPs (0 and ccpText) bracketing the single Sed ([MS-DOC] 2.9.269) this writer ever emits, whose fcSepx names where buildSepx's own bytes were placed in the WordDocument stream and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. */
-function buildPlcfSed(ccpText, fcSepx) {
-	const bytes = /* @__PURE__ */ new Uint8Array(20);
+/** PlcfSed for `startCps.length` sections, [MS-DOC] 2.9.269/2.8.26: `startCps` (each section's own PlcfSed.aCp[i], "the beginning of a range of text ... that constitutes a section") plus a trailing `ccpText` -- the "last CP does not begin a new section" terminator -- bracketing one 12-byte Sed per section, each naming where that section's own buildSepx bytes were placed in the WordDocument stream (`fcSepxList`, the same order as `startCps`) and whose fn/fnMpr/fcMpr fields carry the values [MS-DOC] states are ignored. A single-section document is simply the `startCps.length === 1` case. */
+function buildPlcfSed(startCps, ccpText, fcSepxList) {
+	if (startCps.length !== fcSepxList.length) throw new DocFormatError(`internal defect: buildPlcfSed was given ${String(startCps.length)} section start CPs but ${String(fcSepxList.length)} Sepx offsets -- these must be the same length`);
+	const keys = [...startCps, ccpText];
+	const keyBytes = keys.length * 4;
+	const bytes = new Uint8Array(keyBytes + fcSepxList.length * 12);
 	const view = new DataView(bytes.buffer);
-	view.setUint32(0, 0, true);
-	view.setUint32(4, ccpText, true);
-	view.setUint16(8, 0, true);
-	view.setUint32(10, fcSepx, true);
-	view.setUint16(14, 0, true);
-	view.setUint32(16, 4294967295, true);
+	keys.forEach((cp, index) => {
+		view.setUint32(index * 4, cp, true);
+	});
+	fcSepxList.forEach((fcSepx, index) => {
+		const base = keyBytes + index * 12;
+		view.setUint16(base, 0, true);
+		view.setUint32(base + 2, fcSepx, true);
+		view.setUint16(base + 6, 0, true);
+		view.setUint32(base + 8, 4294967295, true);
+	});
 	return bytes;
 }
 //#endregion

package/dist/read.cjs

@@ -39,8 +39,7 @@ function readDocStreams(bytes, password) {
 	let wordDocument = wordDocumentStream.bytes;
 	let table = tableStream.bytes;
 	if (flags.fEncrypted) {
-		if (flags.fObfuscated) throw new require_errors.DocUnsupportedError("this document is XOR-obfuscated ([MS-DOC] 2.2.6.1); doc-codec cannot decrypt it, and reading its streams as plaintext would produce arbitrary text rather than the document's own");
-		const decrypted = require_encryption.decryptDocStreams(wordDocument, table, password);
+		const decrypted = require_encryption.decryptDocStreams(wordDocument, table, password, flags.fObfuscated);
 		wordDocument = decrypted.wordDocument;
 		table = decrypted.table;
 	}

package/dist/read.js

@@ -1,4 +1,4 @@
-import { DocFormatError, DocUnsupportedError } from "./errors.js";
+import { DocFormatError } from "./errors.js";
 import { slice } from "./bytes.js";
 import { DATA_STREAM, SUMMARY_INFORMATION_STREAM, WORD_DOCUMENT_STREAM } from "./detect.js";
 import { decryptDocStreams } from "./encryption.js";
@@ -38,8 +38,7 @@ function readDocStreams(bytes, password) {
 	let wordDocument = wordDocumentStream.bytes;
 	let table = tableStream.bytes;
 	if (flags.fEncrypted) {
-		if (flags.fObfuscated) throw new DocUnsupportedError("this document is XOR-obfuscated ([MS-DOC] 2.2.6.1); doc-codec cannot decrypt it, and reading its streams as plaintext would produce arbitrary text rather than the document's own");
-		const decrypted = decryptDocStreams(wordDocument, table, password);
+		const decrypted = decryptDocStreams(wordDocument, table, password, flags.fObfuscated);
 		wordDocument = decrypted.wordDocument;
 		table = decrypted.table;
 	}