reamkit 1.16.0 → 1.17.0

package/dist/esm/word/docx-reader.js

@@ -1,20 +1,21 @@
 import { ResourceStore } from "../core/ir/resources.js";
 import { FEATURES } from "../core/ir/features.js";
-import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numbering/apply.js";
 import { EMPTY_STYLE_SHEET, resolveBodyStyles, resolveHeadersFootersStyles } from "../core/style-cascade/resolver.js";
 import { resolveTableStyles } from "../core/style-cascade/table.js";
 import "../core/style-cascade/index.js";
+import { applyNumbering, applyNumberingToHeadersFooters } from "../core/numbering/apply.js";
+import "../core/numbering/index.js";
 import { poFindDescendant } from "../core/po-helpers.js";
 import { bytesIncludePartName } from "../core/bytes.js";
 import { DEFAULT_THEME_PALETTE, makeColorResolver } from "../core/drawingml/colors.js";
 import { parseChart, withChartColorStyle } from "../core/drawingml/chart-parser.js";
-import { parseTheme } from "../core/drawingml/theme-parser.js";
+import { parseTheme, parseThemeBgFillStyles, parseThemeEffectStyles, parseThemeFillStyles, parseThemeLineWidths } from "../core/drawingml/theme-parser.js";
 import { isOoxmlRel } from "../core/opc/relationship-types.js";
 import { OpcPackage } from "../core/opc/package.js";
 import { parseCoreProperties } from "../core/opc/core-properties.js";
 import "../core/opc/index.js";
 import { parseXml } from "../pptx/pptx-reader.js";
-import { EMPTY_SECTION, applyAuthorIds, parseCommentThreads, parseDocument, parseHeaderFooter, parseNotes, parsePeople, parseSections } from "./document-parser.js";
+import { EMPTY_SECTION, applyAuthorIds, bodyIndexForBlock, newBlockCounter, parseBackgroundColor, parseBackgroundFill, parseCommentThreads, parseDocument, parseHeaderFooter, parseNotes, parsePeople, parseSections } from "./document-parser.js";
 import { parseStyles } from "./styles-parser.js";
 import { loadEmbeddedFonts } from "./font-table.js";
 import { EMPTY_NUMBERING, parseNumbering } from "./numbering-parser.js";
@@ -48,25 +49,44 @@ var THEME_PART = "word/theme/theme1.xml";
 function readDocx(docx) {
 	const pkg = OpcPackage.open(docx);
 	const main = pkg.getMainDocument();
-	const resolveColor = buildColorResolver(pkg);
+	const resolveColor = buildColorResolver(pkg, main.path);
+	const themeData = loadTheme(pkg, main.path);
+	const themeLineWidths = themeData ? parseThemeLineWidths(themeData) : void 0;
+	const themeStyles = themeData ? {
+		fills: parseThemeFillStyles(themeData),
+		bgFills: parseThemeBgFillStyles(themeData),
+		effects: parseThemeEffectStyles(themeData)
+	} : void 0;
 	const resources = new ResourceStore();
-	const resolveImage = makeImageResolver(pkg, resources);
-	const resolveHyperlink = makeHyperlinkResolver(pkg);
+	const resolveImage = makeImageResolver(pkg, resources, main.path);
+	const resolveHyperlink = makeHyperlinkResolver(pkg, main.path);
 	const losses = [];
+	const settingsData = pkg.getPart(SETTINGS_PART);
+	const settings = settingsData ? parseSettings(settingsData) : EMPTY_SETTINGS;
 	const ctx = {
 		resolveColor,
+		...settings.compatibilityMode === void 0 ? { autoSpacingPt: 14 } : {},
+		...themeLineWidths && themeLineWidths.length > 0 ? { themeLineWidths } : {},
+		...themeStyles ? { themeStyles } : {},
 		resolveImage,
 		resolveHyperlink,
-		resolveDiagram: makeDiagramResolver(pkg, MAIN_DOCUMENT_PART),
+		resolveDiagram: makeDiagramResolver(pkg, main.path, resources),
+		resolveChartPart: makeChartResolver(pkg, main.path),
 		onLoss: (loss) => losses.push(loss),
 		openCommentRanges: /* @__PURE__ */ new Set()
 	};
-	const body = parseDocument(main.data, ctx);
-	const rawSections = parseSections(main.data);
+	const blocks = newBlockCounter();
+	const body = parseDocument(main.data, ctx, blocks);
+	const backgroundColorHex = parseBackgroundColor(main.data);
+	const backgroundFill = parseBackgroundFill(main.data, ctx.resolveImage);
+	const rawSections = parseSections(main.data).map((s) => ({
+		...s,
+		endIndex: bodyIndexForBlock(blocks, s.endIndex)
+	}));
 	const stylesData = pkg.getPart(STYLES_PART);
 	const styles = stylesData ? parseStyles(stylesData) : EMPTY_STYLE_SHEET;
 	const numberingData = pkg.getPart(NUMBERING_PART);
-	const numbering = numberingData ? parseNumbering(numberingData) : EMPTY_NUMBERING;
+	const numbering = numberingData ? parseNumbering(numberingData, makeImageResolver(pkg, resources, NUMBERING_PART)) : EMPTY_NUMBERING;
 	const noteCtx = (part) => ({
 		resolveColor,
 		resolveImage: makeImageResolver(pkg, resources, part),
@@ -81,9 +101,7 @@ function readDocx(docx) {
 	const peopleData = pkg.getPart(PEOPLE_PART);
 	let rawComments = commentsData ? parseCommentThreads(commentsData, commentsExtendedData, noteCtx(COMMENTS_PART)) : void 0;
 	if (rawComments && peopleData) rawComments = applyAuthorIds(rawComments, parsePeople(peopleData));
-	const settingsData = pkg.getPart(SETTINGS_PART);
-	const settings = settingsData ? parseSettings(settingsData) : EMPTY_SETTINGS;
-	const sections = rawSections.length > 0 ? rawSections.map((s) => ({
+	const sections = withInheritedBands(rawSections.length > 0 ? rawSections.map((s) => ({
 		...s,
 		properties: settings.evenAndOddHeaders ? {
 			...s.properties,
@@ -95,9 +113,9 @@ function readDocx(docx) {
 			evenAndOddHeaders: true
 		} : EMPTY_SECTION,
 		endIndex: body.length
-	}];
-	const headersFooters = loadHeadersFootersForSections(pkg, sections, ctx, resources);
-	const charts = loadCharts(pkg, resolveColor);
+	}]);
+	const headersFooters = loadHeadersFootersForSections(pkg, sections, ctx, resources, main.path);
+	const charts = loadCharts(pkg, resolveColor, chartOwningParts(pkg, sections, main.path));
 	const embeddedFonts = loadEmbeddedFonts(pkg);
 	const coreData = pkg.getPart(CORE_PROPS_PART);
 	const info = infoFromCore(coreData ? parseCoreProperties(coreData) : void 0);
@@ -105,19 +123,23 @@ function readDocx(docx) {
 	return {
 		doc: {
 			kind: "flow",
-			body: resolveBodyStyles(applyNumbering(resolveTableStyles(body, styles), numbering), styles),
+			body: resolveBodyStyles(applyNumbering(resolveTableStyles(body, styles), numbering, styles), styles),
 			sections,
 			styles,
 			numbering,
 			...rawFootnotes && rawFootnotes.size > 0 ? { footnotes: transformNotes(rawFootnotes, styles, numbering) } : {},
 			...rawEndnotes && rawEndnotes.size > 0 ? { endnotes: transformNotes(rawEndnotes, styles, numbering) } : {},
 			...rawComments && rawComments.size > 0 ? { comments: transformComments(rawComments, styles, numbering) } : {},
-			headersFooters: resolveHeadersFootersStyles(applyNumberingToHeadersFooters(headersFooters, numbering), styles),
+			headersFooters: resolveHeadersFootersStyles(applyNumberingToHeadersFooters(headersFooters, numbering, styles), styles),
 			charts,
 			resources,
 			...embeddedFonts.size > 0 ? { embeddedFonts } : {},
 			...info ? { info } : {},
-			...language ? { language } : {}
+			...language ? { language } : {},
+			...settings.doNotExpandShiftReturn ? { doNotExpandShiftReturn: true } : {},
+			...settings.displayBackgroundShape && backgroundFill ? { pageBackgroundFill: backgroundFill } : {},
+			...settings.displayBackgroundShape && backgroundColorHex ? { pageBackgroundColorHex: backgroundColorHex } : {},
+			...settings.gutterAtTop ? { gutterAtTop: true } : {}
 		},
 		losses
 	};
@@ -144,7 +166,7 @@ var docxReader = {
 		FEATURES.trackedChanges,
 		FEATURES.fontsEmbedding
 	]),
-	sniff: (bytes) => bytes[0] === 80 && bytes[1] === 75 && bytesIncludePartName(bytes, "word/document.xml"),
+	sniff: (bytes) => bytes[0] === 80 && bytes[1] === 75 && (bytesIncludePartName(bytes, "word/document.xml") || bytesIncludePartName(bytes, "word/styles.xml") || bytesIncludePartName(bytes, "word/_rels/")),
 	read: (bytes) => readDocx(bytes)
 };
 function infoFromCore(core) {
@@ -158,28 +180,39 @@ function infoFromCore(core) {
 		...core.modified ? { modificationDate: core.modified } : {}
 	};
 }
-function makeDiagramResolver(pkg, partName) {
+function makeDiagramResolver(pkg, partName, store) {
 	const cache = /* @__PURE__ */ new Map();
 	return (relId) => {
 		if (cache.has(relId)) return cache.get(relId);
-		let spTree;
+		let resolved;
 		const dataRel = pkg.getPartRelationships(partName).find((r) => r.id === relId);
 		const data = dataRel ? pkg.resolveRelatedPart(partName, dataRel) : void 0;
 		if (data) {
-			const drawRel = pkg.getPartRelationships(data.path).find((r) => r.type.endsWith("/diagramDrawing"));
-			const draw = drawRel ? pkg.resolveRelatedPart(data.path, drawRel) : void 0;
+			const own = pkg.getPartRelationships(data.path).find((r) => r.type.endsWith("/diagramDrawing"));
+			const draw = own ? pkg.resolveRelatedPart(data.path, own) : drawingFromOwner(pkg, partName, data.path);
 			if (draw) for (const root of parseXml(draw.data)) {
-				const found = poFindDescendant(root, "dsp:spTree");
-				if (found) {
-					spTree = found;
+				const spTree = poFindDescendant(root, "dsp:spTree");
+				if (spTree) {
+					resolved = {
+						spTree,
+						resolveImage: makeImageResolver(pkg, store, draw.path)
+					};
 					break;
 				}
 			}
 		}
-		cache.set(relId, spTree);
-		return spTree;
+		cache.set(relId, resolved);
+		return resolved;
 	};
 }
+function drawingFromOwner(pkg, ownerPart, dataPart) {
+	const drawings = pkg.getPartRelationships(ownerPart).filter((r) => r.type.endsWith("/diagramDrawing"));
+	if (drawings.length === 0) return void 0;
+	const index = (path) => /(\d*)\.[^.]+$/u.exec(path)?.[1] ?? "";
+	const want = index(dataPart);
+	const rel = drawings.find((r) => index(r.target) === want) ?? (drawings.length === 1 ? drawings[0] : void 0);
+	return rel ? pkg.resolveRelatedPart(ownerPart, rel) : void 0;
+}
 function makeImageResolver(pkg, store, partName = MAIN_DOCUMENT_PART) {
 	const byRelId = /* @__PURE__ */ new Map();
 	for (const rel of pkg.getPartRelationships(partName)) {
@@ -216,56 +249,115 @@ function makeHyperlinkResolver(pkg, partName = MAIN_DOCUMENT_PART) {
 	for (const rel of pkg.getPartRelationships(partName)) if (rel.type === REL_HYPERLINK && rel.targetMode === "External") byRelId.set(rel.id, rel.target);
 	return (relId) => byRelId.get(relId);
 }
-function loadCharts(pkg, resolveColor) {
+function loadCharts(pkg, resolveColor, parts) {
 	const out = /* @__PURE__ */ new Map();
-	for (const rel of pkg.getPartRelationships(MAIN_DOCUMENT_PART)) {
+	for (const part of parts) for (const rel of pkg.getPartRelationships(part)) {
 		if (!isOoxmlRel(rel.type, "chart")) continue;
-		const resolved = pkg.resolveRelatedPart(MAIN_DOCUMENT_PART, rel);
-		if (!resolved) continue;
+		const resolved = pkg.resolveRelatedPart(part, rel);
+		if (!resolved || out.has(resolved.path)) continue;
 		const chart = parseChart(resolved.data, resolveColor);
-		if (chart) out.set(rel.id, withChartColorStyle(chart, pkg, resolved.path, resolveColor));
+		if (chart) out.set(resolved.path, withChartColorStyle(chart, pkg, resolved.path, resolveColor));
 	}
 	return out;
 }
-function buildColorResolver(pkg) {
-	const themeData = loadTheme(pkg);
+function makeChartResolver(pkg, partName) {
+	const byRelId = /* @__PURE__ */ new Map();
+	for (const rel of pkg.getPartRelationships(partName)) {
+		if (!isOoxmlRel(rel.type, "chart")) continue;
+		const resolved = pkg.resolveRelatedPart(partName, rel);
+		if (resolved) byRelId.set(rel.id, resolved.path);
+	}
+	return (relId) => byRelId.get(relId);
+}
+function buildColorResolver(pkg, mainPart) {
+	const themeData = loadTheme(pkg, mainPart);
 	if (!themeData) return makeColorResolver(DEFAULT_THEME_PALETTE);
 	const palette = new Map(DEFAULT_THEME_PALETTE);
 	for (const [slot, hex] of parseTheme(themeData)) palette.set(slot, hex);
 	return makeColorResolver(palette);
 }
-function loadTheme(pkg) {
-	for (const rel of pkg.getPartRelationships(MAIN_DOCUMENT_PART)) {
+function loadTheme(pkg, mainPart) {
+	for (const rel of pkg.getPartRelationships(mainPart)) {
 		if (!isOoxmlRel(rel.type, "theme")) continue;
-		const resolved = pkg.resolveRelatedPart(MAIN_DOCUMENT_PART, rel);
+		const resolved = pkg.resolveRelatedPart(mainPart, rel);
 		if (resolved) return resolved.data;
 	}
 	return pkg.getPart(THEME_PART);
 }
-function loadHeadersFootersForSections(pkg, sections, ctx, store) {
+/**
+* §17.10.1 — a section that declares no header (or footer) of a given type
+* takes the one before it. endingSectionProps.docx puts its references on the
+* FIRST section and ends with a continuous one that states none, and reading
+* each section alone left the page with no header and no footer at all.
+*
+* @param sections The sections in document order.
+* @returns The same sections, each carrying the bands it inherits.
+*/
+function withInheritedBands(sections) {
+	const out = [];
+	let headers = [];
+	let footers = [];
+	let titlePg = false;
+	for (const section of sections) {
+		const own = section.properties;
+		const inherits = own.headers.length === 0 && own.footers.length === 0;
+		headers = own.headers.length > 0 ? own.headers : headers;
+		footers = own.footers.length > 0 ? own.footers : footers;
+		titlePg = inherits ? titlePg : own.titlePg ?? false;
+		out.push(headers === own.headers && footers === own.footers && titlePg === (own.titlePg ?? false) ? section : {
+			...section,
+			properties: {
+				...own,
+				headers,
+				footers,
+				...titlePg ? { titlePg: true } : {}
+			}
+		});
+	}
+	return out;
+}
+function loadHeadersFootersForSections(pkg, sections, ctx, store, mainPart) {
 	const wanted = /* @__PURE__ */ new Set();
 	for (const s of sections) {
 		for (const h of s.properties.headers) wanted.add(h.relationshipId);
 		for (const f of s.properties.footers) wanted.add(f.relationshipId);
 	}
 	if (wanted.size === 0) return /* @__PURE__ */ new Map();
-	const rels = pkg.getPartRelationships(MAIN_DOCUMENT_PART);
+	const rels = pkg.getPartRelationships(mainPart);
 	if (rels.length === 0) return /* @__PURE__ */ new Map();
 	const out = /* @__PURE__ */ new Map();
 	for (const rel of rels) {
 		if (!wanted.has(rel.id)) continue;
 		if (!isOoxmlRel(rel.type, "header") && !isOoxmlRel(rel.type, "footer")) continue;
-		const resolved = pkg.resolveRelatedPart(MAIN_DOCUMENT_PART, rel);
+		const resolved = pkg.resolveRelatedPart(mainPart, rel);
 		if (!resolved) continue;
 		const hfCtx = {
 			resolveColor: ctx.resolveColor,
 			resolveImage: makeImageResolver(pkg, store, resolved.path),
-			resolveHyperlink: makeHyperlinkResolver(pkg, resolved.path)
+			resolveHyperlink: makeHyperlinkResolver(pkg, resolved.path),
+			resolveChartPart: makeChartResolver(pkg, resolved.path),
+			...ctx.themeLineWidths ? { themeLineWidths: ctx.themeLineWidths } : {},
+			...ctx.themeStyles ? { themeStyles: ctx.themeStyles } : {}
 		};
 		out.set(rel.id, parseHeaderFooter(resolved.data, hfCtx));
 	}
 	return out;
 }
+function chartOwningParts(pkg, sections, mainPart) {
+	const wanted = /* @__PURE__ */ new Set();
+	for (const s of sections) {
+		for (const h of s.properties.headers) wanted.add(h.relationshipId);
+		for (const f of s.properties.footers) wanted.add(f.relationshipId);
+	}
+	const parts = [mainPart];
+	for (const rel of pkg.getPartRelationships(mainPart)) {
+		if (!wanted.has(rel.id)) continue;
+		if (!isOoxmlRel(rel.type, "header") && !isOoxmlRel(rel.type, "footer")) continue;
+		const resolved = pkg.resolveRelatedPart(mainPart, rel);
+		if (resolved) parts.push(resolved.path);
+	}
+	return parts;
+}
 function detectDocxLanguage(stylesData, documentData) {
 	const re = /<w:lang\b[^>]*\bw:val="([^"]+)"/;
 	const decoder = new TextDecoder();

package/dist/esm/word/docx-writer.js

@@ -46,6 +46,10 @@ var RASTER_MEDIA = {
 	jpeg2000: {
 		ext: "jp2",
 		contentType: "image/jp2"
+	},
+	gif: {
+		ext: "gif",
+		contentType: "image/gif"
 	}
 };
 function mediaInfo(bytes) {
@@ -550,7 +554,8 @@ function cellXml(cell, losses, state, scope) {
 }
 function tcPrXml(p) {
 	const out = [];
-	if (p.width !== void 0) out.push(`<w:tcW w:w="${twips(p.width)}" w:type="dxa"/>`);
+	if (p.widthFraction !== void 0) out.push(`<w:tcW w:w="${Math.round(p.widthFraction * 5e3)}" w:type="pct"/>`);
+	else if (p.width !== void 0) out.push(`<w:tcW w:w="${twips(p.width)}" w:type="dxa"/>`);
 	if (p.colSpan !== void 0 && p.colSpan > 1) out.push(`<w:gridSpan w:val="${p.colSpan}"/>`);
 	if (p.merge !== void 0) out.push(p.merge === "start" ? "<w:vMerge w:val=\"restart\"/>" : "<w:vMerge w:val=\"continue\"/>");
 	const borders = bordersXml("w:tcBorders", p.borders);

package/dist/esm/word/drawing-parser.d.ts

@@ -1,7 +1,7 @@
-import { BodyElement, FloatAnchor, ShapeFill, ShapeGeometry, ShapeLine, ShapeShadow, ShapeTextBody, ShapeTransform } from '../core/document-model/index.js';
+import { BodyElement, FloatAnchor, ImageCrop, InlineImage, PictureOutline, RelativeSize, ShapeFill, ShapeGeometry, ShapeGroupChild, ShapeLine, ShapeShadow, ShapeTextBody, ShapeTransform } from '../core/document-model/index.js';
 import { ColorResolver } from '../core/drawingml/colors.js';
 import { PoNode } from '../core/po-helpers.js';
-import { Pt } from '../core/ir/index.js';
+import { Pt, ResourceId } from '../core/ir/index.js';
 /**
  * A parsed DrawingML shape without the owning paragraph's properties (attached by
  * the caller, mirroring how the image branch returns size + id and the caller
@@ -10,10 +10,14 @@ import { Pt } from '../core/ir/index.js';
 export interface ShapeData {
     readonly width: Pt;
     readonly height: Pt;
+    /** §20.5.2.17 — the shapes a `wpg:wgp` group holds, placed in its own box. */
+    readonly children?: ReadonlyArray<ShapeGroupChild>;
     readonly geometry: ShapeGeometry;
     readonly fill: ShapeFill;
     readonly line?: ShapeLine;
     readonly transform?: ShapeTransform;
+    /** `wp14:sizeRelH/V` — a size stated as a share of the page or margins. */
+    readonly relativeSize?: RelativeSize;
     /** The shape's text body (a `wps:txbx`), when it carries one. */
     readonly text?: ShapeTextBody;
 }
@@ -22,6 +26,23 @@ export interface ShapeData {
  * a module cycle with `document-parser` (which imports this module).
  */
 export type ParseBody = (children: ReadonlyArray<PoNode>) => Array<BodyElement>;
+/**
+ * §21.1.2 `a:txBody` — the DrawingML text body a shape may carry instead of a
+ * `wps:txbx`. Supplied by the caller (the reader owns the PresentationML text
+ * reader that knows how to walk it), so this module stays free of it.
+ */
+export type ParseDrawingText = (txBody: PoNode, resolveColor: ColorResolver) => ShapeTextBody | undefined;
+/**
+ * §20.1.4.1.14/§20.1.4.1.15 — the theme's format scheme, as the raw nodes a
+ * `<wps:style>` reference indexes: the fill styles (`a:fillStyleLst`), the
+ * BACKGROUND fill styles (`a:bgFillStyleLst`, which an `a:fillRef` reaches with
+ * an index past 1000) and the effect styles (`a:effectStyleLst`).
+ */
+export interface ThemeStyles {
+    readonly fills?: ReadonlyArray<PoNode>;
+    readonly bgFills?: ReadonlyArray<PoNode>;
+    readonly effects?: ReadonlyArray<PoNode>;
+}
 /**
  * The result of parsing a `<w:drawing>` (or legacy VML picture): an embedded
  * picture, a DrawingML shape, a chart reference, or a SmartArt diagram. Each
@@ -32,6 +53,21 @@ export type DrawingContent = {
     readonly imageId: string;
     readonly width: Pt;
     readonly height: Pt;
+    /** §20.1.2.2.24 `a:ln` on `pic:spPr` / VML `@stroked` — the picture's frame. */
+    readonly outline?: PictureOutline;
+    /** §20.1.8.40 `a:outerShdw` on the same `pic:spPr` — the picture's shadow. */
+    readonly shadow?: ShapeShadow;
+    /** §20.1.8.55 `a:srcRect` — the part of the source the frame shows. */
+    readonly crop?: ImageCrop;
+    /** §20.1.7.6 `a:xfrm @rot` — the picture's rotation (1/60000°, clockwise). */
+    readonly rotation60k?: number;
+    /** §20.1.7.6 `a:xfrm @flipH/@flipV` — the picture drawn mirrored. */
+    readonly flipH?: boolean;
+    readonly flipV?: boolean;
+    /** `wp14:sizeRelH/V` — a size stated as a share of the page or margins. */
+    readonly relativeSize?: RelativeSize;
+    /** §20.4.2.6 `wp:effectExtent` on an INLINE drawing: space reserved around it. */
+    readonly effectExtent?: InlineImage['effectExtent'];
     /** `wp:docPr` `@descr`/`@title` — alternate text for the tagged-PDF Figure. */
     readonly altText?: string;
     readonly float?: FloatAnchor;
@@ -90,7 +126,7 @@ export declare function expandMcChildren(children: ReadonlyArray<PoNode>): Array
  * @param parseBody    Optional body parser for a shape's text box (omitted ⇒ no text).
  * @returns The parsed content, or `null` when no anchor / recognizable graphic is found.
  */
-export declare function parseDrawing(drawing: PoNode, resolveColor: ColorResolver, parseBody?: ParseBody): DrawingContent | null;
+export declare function parseDrawing(drawing: PoNode, resolveColor: ColorResolver, parseBody?: ParseBody, resolveImage?: (relId: string) => ResourceId | undefined, resolveChartPart?: (relId: string) => string | undefined, themeLineWidths?: ReadonlyArray<number>, themeStyles?: ThemeStyles, parseDrawingText?: ParseDrawingText): DrawingContent | null;
 /**
  * Parse a legacy `<w:pict>`/`<w:object>` VML picture (ISO/IEC 29500-1 §14, VML
  * transitional) into an `image` {@link DrawingContent}. Modern files use
@@ -103,7 +139,19 @@ export declare function parseDrawing(drawing: PoNode, resolveColor: ColorResolve
  * @param node The `w:pict` / `w:object` node.
  * @returns The picture, or `null` when there is no embedded `v:imagedata` or no usable size.
  */
-export declare function parseVmlPicture(node: PoNode): DrawingContent | null;
+export declare function parseVmlPicture(node: PoNode, parseBody?: ParseBody): DrawingContent | null;
+/**
+ * §14.1.2.5 — `@filled="f"` or a `<v:fill type="none">` says the shape is not
+ * filled; otherwise `@fillcolor`, defaulting to VML's own white. Exported
+ * because §17.2.1's page background is a `v:background` with exactly this fill
+ * on it — the same gradients and the same pictures.
+ *
+ * @param shape       The VML element carrying the fill.
+ * @param shapeType   Its `v:shapetype`, for the attributes it does not state.
+ * @param resolveImage Resolver for a `v:fill` that paints a PICTURE (`@r:id`).
+ * @returns The fill.
+ */
+export declare function vmlFill(shape: PoNode, shapeType?: PoNode, resolveImage?: (id: string) => ResourceId | undefined): ShapeFill;
 /**
  * §20.1.7.6 `a:xfrm` — how a shape sits in its box: rotated about its centre by
  * `@rot` (sixtieth-thousandths of a degree) and mirrored by `@flipH`/`@flipV`.
@@ -136,7 +184,7 @@ export declare function parseCustGeom(cust: PoNode): ShapeGeometry;
  * @param spPr         The `wps:spPr` node.
  * @param resolveColor Resolver for theme/scheme colours.
  */
-export declare function parseFill(spPr: PoNode, resolveColor: ColorResolver): ShapeFill;
+export declare function parseFill(spPr: PoNode, resolveColor: ColorResolver, resolveImage?: (relId: string) => ResourceId | undefined): ShapeFill;
 /**
  * Parse a shape's drop shadow from its `a:spPr` (§20.1.8.40 `a:effectLst` →
  * `a:outerShdw`).