rtf-codec 3.0.4 → 4.0.0

package/README.md

@@ -121,7 +121,7 @@ On the way out, **every non-ASCII character leaves as `\uN`** with a one-charact
 | Paragraphs                                               | `\par`, `\pard`, alignment, indents, spacing, `\slN`/`\slmultN`, `\pagebb`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | Runs                                                     | `\b`, `\i`, `\ul` (every variant), `\strike`, `\fN`, `\fsN`, `\cfN`, `\v` (dropped as hidden)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | Tables                                                   | `\trowd`, `\cellxN`, `\trleftN`, `\cell`, `\row`, multi-paragraph cells                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| Table cells                                              | `\clbrdrt`/`l`/`b`/`r` with the whole `<brdr>` production, `\clcbpatN` shading, and both merge families (`\clvmgf`/`\clvmrg`, `\clmgf`/`\clmrg`)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| Table cells                                              | `\clbrdrt`/`l`/`b`/`r` with the whole `<brdr>` production, `\clcbpatN`/`\clcfpatN`/`\clshdngN` shading (a real two-colour pattern fill, not just a flat colour -- see below), and both merge families (`\clvmgf`/`\clvmrg`, `\clmgf`/`\clmrg`)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | Bookmarks                                                | `\*\bkmkstart`/`\*\bkmkend` as `anchor` constructs, with `\bkmkcolfN`/`\bkmkcollN` quarantined as residue                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | Revision marks                                           | The whole `<chrev>` production as `provenance` constructs: `\revised`, `\deleted`, `\mvf`/`\mvt`, `\crauthN`, with authors and `\revdttmN` dates                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | Form fields                                              | A `\field` whose `\*\fldinst` names FORMTEXT/FORMCHECKBOX/FORMDROPDOWN, plus whatever `\*\formfield` data it carries (`\*\ffname` as its tag, `\*\ffhelptext` as its alias when `\ffownhelp` says it is author-set rather than auto-generated, `\ffprot` as its lock, a checkbox's own `\ffres`/`\ffdefres` as its checked state, a dropdown's own `\ffres`/`\ffdefres` as its selected entry alongside its `\*\ffl` option list), as a `contentControl` construct (plainText/checkbox/dropDown). A plainText field's own `\*\ffdeftext` group is recognised but its content is skipped whole rather than captured, since `value` names the control's CURRENT value, which for a text field is the wrapped-run text already carried in the extent's own children, not `\ffdeftext`'s default/reset text (see Write below for the one direction `\ffdeftext` does feed `value`); the same applies to the four other `\*\formfield` destination strings RTF's own Form Fields table names alongside it (`\*\ffformat`, `\*\ffstattext`, `\*\ffentrymcr`, `\*\ffexitmcr`), each skipped whole for the identical reason -- no `ContentControlDescriptor` field exists to carry any of them |
@@ -161,7 +161,7 @@ Each of these is reported through a diagnostic rather than dropped silently —
 | A real, foreign `\object`'s OLE data                                                                                                                    | This package's own `\objdata` payload round-trips fully (see [Embedded objects](#embedded-objects)); a real Word-authored OLESaveToStream structure (an actual embedded `.xls`/`.doc`/OLE-control payload) has no decoder here and degrades with a diagnostic, recovering `\result`'s own fallback paragraphs when present instead of the real object.                                                                                                                                                                                                                                                                                                              |
 | Superscript/subscript (`\super`, `\sub`, `\upN`, `\dnN`), character scaling, kerning, background colour                                                 | **A schema gap, not an RTF one.** `ContentRun` carries no vertical-alignment field at all -- `epub-codec` reports the identical gap for its own `<sub>`/`<sup>`, and `ooxml.js`'s docx reader has no `w:vertAlign` handling either. Closing it is a change to `document-schema.js` and every codec that would then carry it, not to this one.                                                                                                                                                                                                                                                                                                                       |
 | Right-to-left text (`\rtlch`, `\ltrch`, `\rtlpar`, `\rtlrow`, `\rtldoc`)                                                                                | The same shape of gap: no `ContentDocument` field carries text direction, at any of the four scopes RTF states it at.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| Cell vertical alignment (`\clvertalt`/`\clvertalc`/`\clvertalb`), diagonal cell borders (`\cldglu`/`\cldgll`), `\clshdngN`                              | `ContentTableCell.borders` has no diagonal member, so a diagonal rule is not a side; `\clshdngN`'s own shading percentage names a genuine two-colour pattern fill, which `document-schema.js`'s `ContentCellFill` can now express (ExaDev/documents.js#951) but this package does not yet resolve either `\clcbpatN`'s own foreground colour or `\clshdngN`'s percentage into one -- `\clcbpatN`'s background colour alone still reads and writes as a `'solid'` fill.                                                                                                                                                                                              |
+| Cell vertical alignment (`\clvertalt`/`\clvertalc`/`\clvertalb`), diagonal cell borders (`\cldglu`/`\cldgll`)                                           | `ContentTableCell.borders` has no diagonal member, so a diagonal rule is not a side; there is no vertical-alignment field to carry the other three into either.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | A bookmark whose two halves straddle a table cell wall                                                                                                  | `document-schema.js` ratifies this as a drop rather than a shape to repair: each block list is its own bracket scope, and pairing across two of them would need the marker ids its contract deliberately refuses.                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | A contentControl extent that crosses another contentControl extent in the same paragraph                                                                | RTF's `\*\formfield` destination can only nest, never cross: a `{\field...}` group nests cleanly inside another one's own `\fldrslt`, but two extents that start-before/end-after each other have no valid brace sequence, since whichever closes second would close the other's own braces instead of its own.                                                                                                                                                                                                                                                                                                                                                     |
 | Two block-scoped bookmarks whose real ranges are disjoint but whose halves both land in the same paragraph (one's `\bkmkend`, the other's `\bkmkstart`) | A paragraph is this reader's finest addressable block-extent unit, so the shared paragraph's own block index gets claimed by both bookmarks' extents even though their real text never overlapped -- a genuine crossing pair, not a nesting one, and `document-schema.js`'s own construct group has no shape for that (a tree would need two subtrees crossing, which no tree holds). The later-starting bookmark is dropped with a diagnostic; the earlier one keeps its extent intact.                                                                                                                                                                            |

package/dist/cell-format.cjs

@@ -1,6 +1,35 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_units = require("./units.cjs");
+let document_schema_js = require("document-schema.js");
 //#region src/cell-format.ts
+const PERCENT_STEPS = [
+	[5, "percent5"],
+	[10, "percent10"],
+	[12, "percent12"],
+	[15, "percent15"],
+	[20, "percent20"],
+	[25, "percent25"],
+	[30, "percent30"],
+	[35, "percent35"],
+	[37, "percent37"],
+	[40, "percent40"],
+	[45, "percent45"],
+	[50, "percent50"],
+	[55, "percent55"],
+	[60, "percent60"],
+	[62, "percent62"],
+	[65, "percent65"],
+	[70, "percent70"],
+	[75, "percent75"],
+	[80, "percent80"],
+	[85, "percent85"],
+	[87, "percent87"],
+	[90, "percent90"],
+	[95, "percent95"]
+];
+function nearestPercentType(percent) {
+	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - percent) < Math.abs(best[0] - percent) ? step : best)[1];
+}
 const CELL_BORDER_SIDES = /* @__PURE__ */ new Map([
 	["clbrdrt", "top"],
 	["clbrdrl", "left"],
@@ -49,6 +78,8 @@ function newPendingCell() {
 		borders: {},
 		side: void 0,
 		backgroundIndex: void 0,
+		foregroundIndex: void 0,
+		shadingPercent: void 0,
 		verticalMergeFirst: false,
 		verticalMergeContinuation: false,
 		horizontalMergeFirst: false,
@@ -83,6 +114,12 @@ function applyCellDefinitionControlWord(name, param, cell) {
 		case "clcbpat":
 			cell.backgroundIndex = param;
 			return true;
+		case "clcfpat":
+			cell.foregroundIndex = param;
+			return true;
+		case "clshdng":
+			cell.shadingPercent = param === void 0 ? void 0 : param / 100;
+			return true;
 	}
 	const pending = cell.side === void 0 ? void 0 : cell.borders[cell.side];
 	if (pending === void 0) return false;
@@ -121,6 +158,26 @@ function resolveBorder(pending, colorAt) {
 		...style === void 0 || style === "solid" ? {} : { style }
 	};
 }
+function resolveCellFill(pending, colorAt) {
+	if (pending.backgroundIndex === void 0) return;
+	const backgroundColor = colorAt(pending.backgroundIndex);
+	const shading = pending.shadingPercent ?? 0;
+	if (shading <= 0) return backgroundColor === void 0 ? void 0 : {
+		kind: "solid",
+		color: backgroundColor
+	};
+	const foregroundColor = pending.foregroundIndex === void 0 ? void 0 : colorAt(pending.foregroundIndex);
+	if (shading >= 100) return foregroundColor === void 0 ? void 0 : {
+		kind: "solid",
+		color: foregroundColor
+	};
+	return {
+		kind: "pattern",
+		patternType: nearestPercentType(shading),
+		...foregroundColor === void 0 ? {} : { foregroundColor },
+		...backgroundColor === void 0 ? {} : { backgroundColor }
+	};
+}
 function borderControlWords(side, border, colorIndex) {
 	const sideWord = [...CELL_BORDER_SIDES].find(([, value]) => value === side)?.[0];
 	if (sideWord === void 0) return "";
@@ -134,9 +191,29 @@ const BORDER_STYLE_CONTROL_WORDS = {
 	dotted: "brdrdot",
 	double: "brdrdb"
 };
+/** The inverse of PERCENT_STEPS, keyed by patternType. */
+const PERCENT_TYPE_TO_VALUE = new Map(PERCENT_STEPS.map(([percent, patternType]) => [patternType, percent]));
+function cellFillControlWords(fill, colorIndexOf) {
+	switch (fill.kind) {
+		case "solid": {
+			const index = colorIndexOf(fill.color);
+			return index === void 0 ? "" : `\\clcbpat${String(index)}`;
+		}
+		case "pattern": {
+			const percent = PERCENT_TYPE_TO_VALUE.get(fill.patternType);
+			if (percent === void 0) throw new Error(`rtf-codec cannot write a '${fill.patternType}' cell fill: RTF's own \\clshdngN is a flat two-colour percentage blend with no named stripe/cross/grid pattern of its own, and that pattern name belongs only to the ST_Shd/ST_PatternType half of ContentCellPatternType's shared vocabulary`);
+			const backgroundIndex = fill.backgroundColor === void 0 ? void 0 : colorIndexOf(fill.backgroundColor);
+			const foregroundIndex = fill.foregroundColor === void 0 ? void 0 : colorIndexOf(fill.foregroundColor);
+			return (backgroundIndex === void 0 ? "" : `\\clcbpat${String(backgroundIndex)}`) + (foregroundIndex === void 0 ? "" : `\\clcfpat${String(foregroundIndex)}`) + `\\clshdng${String(percent * 100)}`;
+		}
+		default: throw new Error(`rtf-codec cannot write a cell fill with kind '${(0, document_schema_js.unrecognizedFillKind)(fill)}': ContentCellFillSchema's discriminated union only defines 'solid' and 'pattern'`);
+	}
+}
 //#endregion
 exports.CELL_BORDER_SIDES = CELL_BORDER_SIDES;
 exports.applyCellDefinitionControlWord = applyCellDefinitionControlWord;
 exports.borderControlWords = borderControlWords;
+exports.cellFillControlWords = cellFillControlWords;
 exports.newPendingCell = newPendingCell;
 exports.resolveBorder = resolveBorder;
+exports.resolveCellFill = resolveCellFill;

package/dist/cell-format.d.cts

@@ -1,4 +1,4 @@
-import { Color, ContentBorder, ContentStrokeStyle } from "document-schema.js";
+import { Color, ContentBorder, ContentCellFill, ContentStrokeStyle } from "document-schema.js";
 //#region src/cell-format.d.ts
 type CellBorderSide = "top" | "left" | "bottom" | "right";
 declare const CELL_BORDER_SIDES: ReadonlyMap<string, CellBorderSide>;
@@ -12,6 +12,8 @@ interface PendingCell {
   borders: Partial<Record<CellBorderSide, PendingBorder>>;
   side: CellBorderSide | undefined;
   backgroundIndex: number | undefined;
+  foregroundIndex: number | undefined;
+  shadingPercent: number | undefined;
   verticalMergeFirst: boolean;
   verticalMergeContinuation: boolean;
   horizontalMergeFirst: boolean;
@@ -20,6 +22,8 @@ interface PendingCell {
 declare function newPendingCell(): PendingCell;
 declare function applyCellDefinitionControlWord(name: string, param: number | undefined, cell: PendingCell): boolean;
 declare function resolveBorder(pending: PendingBorder, colorAt: (index: number) => Color | undefined): ContentBorder | undefined;
+declare function resolveCellFill(pending: PendingCell, colorAt: (index: number) => Color | undefined): ContentCellFill | undefined;
 declare function borderControlWords(side: CellBorderSide, border: ContentBorder, colorIndex: number | undefined): string;
+declare function cellFillControlWords(fill: ContentCellFill, colorIndexOf: (color: Color) => number | undefined): string;
 //#endregion
-export { CELL_BORDER_SIDES, CellBorderSide, PendingBorder, PendingCell, applyCellDefinitionControlWord, borderControlWords, newPendingCell, resolveBorder };
+export { CELL_BORDER_SIDES, CellBorderSide, PendingBorder, PendingCell, applyCellDefinitionControlWord, borderControlWords, cellFillControlWords, newPendingCell, resolveBorder, resolveCellFill };

package/dist/cell-format.d.ts

@@ -1,4 +1,4 @@
-import { Color, ContentBorder, ContentStrokeStyle } from "document-schema.js";
+import { Color, ContentBorder, ContentCellFill, ContentStrokeStyle } from "document-schema.js";
 //#region src/cell-format.d.ts
 type CellBorderSide = "top" | "left" | "bottom" | "right";
 declare const CELL_BORDER_SIDES: ReadonlyMap<string, CellBorderSide>;
@@ -12,6 +12,8 @@ interface PendingCell {
   borders: Partial<Record<CellBorderSide, PendingBorder>>;
   side: CellBorderSide | undefined;
   backgroundIndex: number | undefined;
+  foregroundIndex: number | undefined;
+  shadingPercent: number | undefined;
   verticalMergeFirst: boolean;
   verticalMergeContinuation: boolean;
   horizontalMergeFirst: boolean;
@@ -20,6 +22,8 @@ interface PendingCell {
 declare function newPendingCell(): PendingCell;
 declare function applyCellDefinitionControlWord(name: string, param: number | undefined, cell: PendingCell): boolean;
 declare function resolveBorder(pending: PendingBorder, colorAt: (index: number) => Color | undefined): ContentBorder | undefined;
+declare function resolveCellFill(pending: PendingCell, colorAt: (index: number) => Color | undefined): ContentCellFill | undefined;
 declare function borderControlWords(side: CellBorderSide, border: ContentBorder, colorIndex: number | undefined): string;
+declare function cellFillControlWords(fill: ContentCellFill, colorIndexOf: (color: Color) => number | undefined): string;
 //#endregion
-export { CELL_BORDER_SIDES, CellBorderSide, PendingBorder, PendingCell, applyCellDefinitionControlWord, borderControlWords, newPendingCell, resolveBorder };
+export { CELL_BORDER_SIDES, CellBorderSide, PendingBorder, PendingCell, applyCellDefinitionControlWord, borderControlWords, cellFillControlWords, newPendingCell, resolveBorder, resolveCellFill };

package/dist/cell-format.js

@@ -1,5 +1,34 @@
 import { pointsToTwips, twipsToPoints } from "./units.js";
+import { unrecognizedFillKind } from "document-schema.js";
 //#region src/cell-format.ts
+const PERCENT_STEPS = [
+	[5, "percent5"],
+	[10, "percent10"],
+	[12, "percent12"],
+	[15, "percent15"],
+	[20, "percent20"],
+	[25, "percent25"],
+	[30, "percent30"],
+	[35, "percent35"],
+	[37, "percent37"],
+	[40, "percent40"],
+	[45, "percent45"],
+	[50, "percent50"],
+	[55, "percent55"],
+	[60, "percent60"],
+	[62, "percent62"],
+	[65, "percent65"],
+	[70, "percent70"],
+	[75, "percent75"],
+	[80, "percent80"],
+	[85, "percent85"],
+	[87, "percent87"],
+	[90, "percent90"],
+	[95, "percent95"]
+];
+function nearestPercentType(percent) {
+	return PERCENT_STEPS.reduce((best, step) => Math.abs(step[0] - percent) < Math.abs(best[0] - percent) ? step : best)[1];
+}
 const CELL_BORDER_SIDES = /* @__PURE__ */ new Map([
 	["clbrdrt", "top"],
 	["clbrdrl", "left"],
@@ -48,6 +77,8 @@ function newPendingCell() {
 		borders: {},
 		side: void 0,
 		backgroundIndex: void 0,
+		foregroundIndex: void 0,
+		shadingPercent: void 0,
 		verticalMergeFirst: false,
 		verticalMergeContinuation: false,
 		horizontalMergeFirst: false,
@@ -82,6 +113,12 @@ function applyCellDefinitionControlWord(name, param, cell) {
 		case "clcbpat":
 			cell.backgroundIndex = param;
 			return true;
+		case "clcfpat":
+			cell.foregroundIndex = param;
+			return true;
+		case "clshdng":
+			cell.shadingPercent = param === void 0 ? void 0 : param / 100;
+			return true;
 	}
 	const pending = cell.side === void 0 ? void 0 : cell.borders[cell.side];
 	if (pending === void 0) return false;
@@ -120,6 +157,26 @@ function resolveBorder(pending, colorAt) {
 		...style === void 0 || style === "solid" ? {} : { style }
 	};
 }
+function resolveCellFill(pending, colorAt) {
+	if (pending.backgroundIndex === void 0) return;
+	const backgroundColor = colorAt(pending.backgroundIndex);
+	const shading = pending.shadingPercent ?? 0;
+	if (shading <= 0) return backgroundColor === void 0 ? void 0 : {
+		kind: "solid",
+		color: backgroundColor
+	};
+	const foregroundColor = pending.foregroundIndex === void 0 ? void 0 : colorAt(pending.foregroundIndex);
+	if (shading >= 100) return foregroundColor === void 0 ? void 0 : {
+		kind: "solid",
+		color: foregroundColor
+	};
+	return {
+		kind: "pattern",
+		patternType: nearestPercentType(shading),
+		...foregroundColor === void 0 ? {} : { foregroundColor },
+		...backgroundColor === void 0 ? {} : { backgroundColor }
+	};
+}
 function borderControlWords(side, border, colorIndex) {
 	const sideWord = [...CELL_BORDER_SIDES].find(([, value]) => value === side)?.[0];
 	if (sideWord === void 0) return "";
@@ -133,5 +190,23 @@ const BORDER_STYLE_CONTROL_WORDS = {
 	dotted: "brdrdot",
 	double: "brdrdb"
 };
+/** The inverse of PERCENT_STEPS, keyed by patternType. */
+const PERCENT_TYPE_TO_VALUE = new Map(PERCENT_STEPS.map(([percent, patternType]) => [patternType, percent]));
+function cellFillControlWords(fill, colorIndexOf) {
+	switch (fill.kind) {
+		case "solid": {
+			const index = colorIndexOf(fill.color);
+			return index === void 0 ? "" : `\\clcbpat${String(index)}`;
+		}
+		case "pattern": {
+			const percent = PERCENT_TYPE_TO_VALUE.get(fill.patternType);
+			if (percent === void 0) throw new Error(`rtf-codec cannot write a '${fill.patternType}' cell fill: RTF's own \\clshdngN is a flat two-colour percentage blend with no named stripe/cross/grid pattern of its own, and that pattern name belongs only to the ST_Shd/ST_PatternType half of ContentCellPatternType's shared vocabulary`);
+			const backgroundIndex = fill.backgroundColor === void 0 ? void 0 : colorIndexOf(fill.backgroundColor);
+			const foregroundIndex = fill.foregroundColor === void 0 ? void 0 : colorIndexOf(fill.foregroundColor);
+			return (backgroundIndex === void 0 ? "" : `\\clcbpat${String(backgroundIndex)}`) + (foregroundIndex === void 0 ? "" : `\\clcfpat${String(foregroundIndex)}`) + `\\clshdng${String(percent * 100)}`;
+		}
+		default: throw new Error(`rtf-codec cannot write a cell fill with kind '${unrecognizedFillKind(fill)}': ContentCellFillSchema's discriminated union only defines 'solid' and 'pattern'`);
+	}
+}
 //#endregion
-export { CELL_BORDER_SIDES, applyCellDefinitionControlWord, borderControlWords, newPendingCell, resolveBorder };
+export { CELL_BORDER_SIDES, applyCellDefinitionControlWord, borderControlWords, cellFillControlWords, newPendingCell, resolveBorder, resolveCellFill };

package/dist/codec.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_read = require("./read.cjs");
 const require_write = require("./write.cjs");
-let zod = require("zod");
 let document_schema_js = require("document-schema.js");
+let zod = require("zod");
 //#region src/codec.ts
 const RTF_MAGIC = [
 	123,

package/dist/codec.d.cts

@@ -1425,10 +1425,10 @@ declare const rtfContentCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, U
         endColumn: z.ZodNumber;
       }, z.core.$strip>>;
       type: z.ZodEnum<{
-        decimal: "decimal";
-        list: "list";
         date: "date";
         custom: "custom";
+        decimal: "decimal";
+        list: "list";
         time: "time";
         whole: "whole";
         textLength: "textLength";

package/dist/codec.d.ts

@@ -1425,10 +1425,10 @@ declare const rtfContentCodec: z.ZodCodec<z.ZodCustom<Uint8Array<ArrayBuffer>, U
         endColumn: z.ZodNumber;
       }, z.core.$strip>>;
       type: z.ZodEnum<{
-        decimal: "decimal";
-        list: "list";
         date: "date";
         custom: "custom";
+        decimal: "decimal";
+        list: "list";
         time: "time";
         whole: "whole";
         textLength: "textLength";

package/dist/codec.js

@@ -1,7 +1,7 @@
 import { readRtf, readRtfContent } from "./read.js";
 import { writeRtf, writeRtfContent } from "./write.js";
-import { z } from "zod";
 import { ContentDocumentSchema, DocumentTreeSchema } from "document-schema.js";
+import { z } from "zod";
 //#region src/codec.ts
 const RTF_MAGIC = [
 	123,

package/dist/read.cjs

@@ -634,15 +634,12 @@ var ContentBuilder = class {
 				rowSpan += 1;
 			}
 			const borders = this.resolveBorders(definition);
-			const backgroundColor = definition?.backgroundIndex === void 0 ? void 0 : this.header.colors[definition.backgroundIndex];
+			const background = definition === void 0 ? void 0 : require_cell_format.resolveCellFill(definition, (index) => this.header.colors[index]);
 			return {
 				blocks: cell.blocks,
 				...colSpan > 1 ? { colSpan } : {},
 				...rowSpan > 1 ? { rowSpan } : {},
-				...backgroundColor === void 0 ? {} : { background: {
-					kind: "solid",
-					color: backgroundColor
-				} },
+				...background === void 0 ? {} : { background },
 				...borders === void 0 ? {} : { borders }
 			};
 		}) }));

package/dist/read.js

@@ -2,7 +2,7 @@ import { bytesToBase64, hexToBytes } from "./base64.js";
 import { RtfDiagnosticCodes, RtfInputTooLargeError, RtfNestingLimitExceededError, RtfNotAnRtfDocumentError } from "./diagnostics.js";
 import { appendBytes, asciiStringFromBytes, rtfBytesFromLatin1 } from "./bytes.js";
 import { halfPointsToPoints, pixelsToPoints, twipsToPoints } from "./units.js";
-import { applyCellDefinitionControlWord, newPendingCell, resolveBorder } from "./cell-format.js";
+import { applyCellDefinitionControlWord, newPendingCell, resolveBorder, resolveCellFill } from "./cell-format.js";
 import { NO_REVISION, bookmarkAnchorDescriptor, coalesceRunConstructs, formFieldContentControl, formFieldControlType, provenanceDescriptors } from "./constructs.js";
 import { readEmbeddedObjectData } from "./embedded-object.js";
 import { decodeCodepageBytes } from "./codepage.js";
@@ -633,15 +633,12 @@ var ContentBuilder = class {
 				rowSpan += 1;
 			}
 			const borders = this.resolveBorders(definition);
-			const backgroundColor = definition?.backgroundIndex === void 0 ? void 0 : this.header.colors[definition.backgroundIndex];
+			const background = definition === void 0 ? void 0 : resolveCellFill(definition, (index) => this.header.colors[index]);
 			return {
 				blocks: cell.blocks,
 				...colSpan > 1 ? { colSpan } : {},
 				...rowSpan > 1 ? { rowSpan } : {},
-				...backgroundColor === void 0 ? {} : { background: {
-					kind: "solid",
-					color: backgroundColor
-				} },
+				...background === void 0 ? {} : { background },
 				...borders === void 0 ? {} : { borders }
 			};
 		}) }));

package/dist/write.cjs

@@ -79,7 +79,11 @@ function collectTables(document) {
 			return;
 		}
 		if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) {
-			noteColor(cell.background === void 0 ? void 0 : (0, document_schema_js.resolveCellFillColor)(cell.background));
+			if (cell.background?.kind === "solid") noteColor(cell.background.color);
+			else if (cell.background?.kind === "pattern") {
+				noteColor(cell.background.foregroundColor);
+				noteColor(cell.background.backgroundColor);
+			}
 			for (const side of CELL_BORDER_ORDER) noteColor(cell.borders?.[side]?.color);
 			for (const inner of cell.blocks) noteBlock(inner);
 		}
@@ -631,11 +635,7 @@ var RtfWriter = class {
 			const border = borders[side];
 			if (border !== void 0) out += require_cell_format.borderControlWords(side, border, colorIndexOf(border.color, this.tables.colors));
 		}
-		const cellBackgroundColor = cell.background === void 0 ? void 0 : (0, document_schema_js.resolveCellFillColor)(cell.background);
-		if (cellBackgroundColor !== void 0) {
-			const index = colorIndexOf(cellBackgroundColor, this.tables.colors);
-			if (index !== void 0) out += `\\clcbpat${String(index)}`;
-		}
+		if (cell.background !== void 0) out += require_cell_format.cellFillControlWords(cell.background, (color) => colorIndexOf(color, this.tables.colors));
 		return `${out}\\cellx${String(rightTwips)}`;
 	}
 	writeCellBlocks(blocks) {

package/dist/write.js

@@ -1,11 +1,11 @@
 import { base64ToBytes, bytesToHex } from "./base64.js";
 import { RtfDiagnosticCodes, RtfUnsupportedDocumentKindError } from "./diagnostics.js";
 import { pointsToHalfPoints, pointsToTwips } from "./units.js";
-import { borderControlWords } from "./cell-format.js";
+import { borderControlWords, cellFillControlWords } from "./cell-format.js";
 import { bookmarkResidueControlWords, dttmFromIso, isBookmarkAnchor } from "./constructs.js";
 import { writeEmbeddedObjectData } from "./embedded-object.js";
 import { parseRtfListNumId } from "./list-id.js";
-import { clampHeadingLevel, colorToRgbHex, flattenTree, resolveCellFillColor } from "document-schema.js";
+import { clampHeadingLevel, colorToRgbHex, flattenTree } from "document-schema.js";
 //#region src/write.ts
 const LEVEL_NUMBER_FORMAT_BULLET = 23;
 const LEVEL_NUMBER_FORMAT_ARABIC = 0;
@@ -78,7 +78,11 @@ function collectTables(document) {
 			return;
 		}
 		if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) {
-			noteColor(cell.background === void 0 ? void 0 : resolveCellFillColor(cell.background));
+			if (cell.background?.kind === "solid") noteColor(cell.background.color);
+			else if (cell.background?.kind === "pattern") {
+				noteColor(cell.background.foregroundColor);
+				noteColor(cell.background.backgroundColor);
+			}
 			for (const side of CELL_BORDER_ORDER) noteColor(cell.borders?.[side]?.color);
 			for (const inner of cell.blocks) noteBlock(inner);
 		}
@@ -630,11 +634,7 @@ var RtfWriter = class {
 			const border = borders[side];
 			if (border !== void 0) out += borderControlWords(side, border, colorIndexOf(border.color, this.tables.colors));
 		}
-		const cellBackgroundColor = cell.background === void 0 ? void 0 : resolveCellFillColor(cell.background);
-		if (cellBackgroundColor !== void 0) {
-			const index = colorIndexOf(cellBackgroundColor, this.tables.colors);
-			if (index !== void 0) out += `\\clcbpat${String(index)}`;
-		}
+		if (cell.background !== void 0) out += cellFillControlWords(cell.background, (color) => colorIndexOf(color, this.tables.colors));
 		return `${out}\\cellx${String(rightTwips)}`;
 	}
 	writeCellBlocks(blocks) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rtf-codec",
-  "version": "3.0.4",
+  "version": "4.0.0",
   "description": "Hand-written Rich Text Format (RTF 1.9.1) reader and writer against the shared document-schema.js content pivot.",
   "type": "module",
   "repository": {