document-content-model 4.3.3 → 7.6.1

package/dist/content-json-schema-defs.cjs

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_math = require("./math.cjs");
+const require_mathml = require("./mathml.cjs");
 const require_schema_io = require("./schema-io.cjs");
+let zod = require("zod");
 //#region src/content-json-schema-defs.ts
 const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER;
 const EMBEDDED_OBJECT_KINDS = [
@@ -8,9 +10,40 @@ const EMBEDDED_OBJECT_KINDS = [
 	"wordprocessing",
 	"presentation",
 	"spreadsheet",
-	"drawing"
+	"drawing",
+	"chart"
 ];
 const CONTENT_DOCUMENT_URI = require_schema_io.schemaUriFor("ContentDocument");
+let cachedMathMlJsonSchemas;
+function getMathMlJsonSchemas() {
+	if (cachedMathMlJsonSchemas === void 0) {
+		const registry = zod.z.registry();
+		registry.add(require_mathml.MathMlAttributeSchema, { id: "MathMlAttribute" });
+		registry.add(require_mathml.MathMlElementSchema, { id: "MathMlElement" });
+		registry.add(require_mathml.MathMlNodeSchema, { id: "MathMlNode" });
+		const { schemas } = zod.z.toJSONSchema(registry, { uri: (id) => `#/$defs/${id}` });
+		cachedMathMlJsonSchemas = schemas;
+	}
+	return cachedMathMlJsonSchemas;
+}
+function mathMlDef(id) {
+	const generated = getMathMlJsonSchemas()[id];
+	if (generated === void 0) throw new Error(`z.toJSONSchema() produced no schema for registered id "${id}"`);
+	const stripped = { ...generated };
+	delete stripped.$schema;
+	delete stripped.$id;
+	return stripped;
+}
+function cacheMathMlDef(id) {
+	const value = mathMlDef(id);
+	Object.defineProperty(CONTENT_DEFS, id, {
+		value,
+		enumerable: true,
+		configurable: true,
+		writable: false
+	});
+	return value;
+}
 function mathBinderDef(kind) {
 	return {
 		type: "object",
@@ -120,6 +153,34 @@ const CONTENT_DEFS = {
 			"justify"
 		]
 	},
+	SourceResidue: {
+		type: "object",
+		properties: {
+			format: {
+				type: "string",
+				enum: [
+					"docx",
+					"pptx",
+					"xlsx",
+					"odt",
+					"ods",
+					"odp",
+					"odg",
+					"odm",
+					"odb",
+					"odf",
+					"markdown",
+					"pdf",
+					"epub",
+					"rtf",
+					"wpd"
+				]
+			},
+			xml: { type: "string" }
+		},
+		required: ["format", "xml"],
+		additionalProperties: false
+	},
 	ContentStrokeStyle: {
 		type: "string",
 		enum: [
@@ -143,6 +204,18 @@ const CONTENT_DEFS = {
 		additionalProperties: false
 	},
 	ContentCellBorders: {
+		type: "object",
+		properties: {
+			left: { $ref: "#/$defs/ContentBorder" },
+			right: { $ref: "#/$defs/ContentBorder" },
+			top: { $ref: "#/$defs/ContentBorder" },
+			bottom: { $ref: "#/$defs/ContentBorder" },
+			diagonalUp: { $ref: "#/$defs/ContentBorder" },
+			diagonalDown: { $ref: "#/$defs/ContentBorder" }
+		},
+		additionalProperties: false
+	},
+	ContentParagraphBorders: {
 		type: "object",
 		properties: {
 			left: { $ref: "#/$defs/ContentBorder" },
@@ -152,6 +225,88 @@ const CONTENT_DEFS = {
 		},
 		additionalProperties: false
 	},
+	ContentCellPatternType: {
+		type: "string",
+		enum: [
+			"percent5",
+			"percent10",
+			"percent12",
+			"percent15",
+			"percent20",
+			"percent25",
+			"percent30",
+			"percent35",
+			"percent37",
+			"percent40",
+			"percent45",
+			"percent50",
+			"percent55",
+			"percent60",
+			"percent62",
+			"percent65",
+			"percent70",
+			"percent75",
+			"percent80",
+			"percent85",
+			"percent87",
+			"percent90",
+			"percent95",
+			"horizontalStripe",
+			"verticalStripe",
+			"diagonalStripe",
+			"reverseDiagonalStripe",
+			"horizontalCross",
+			"diagonalCross",
+			"thinHorizontalStripe",
+			"thinVerticalStripe",
+			"thinDiagonalStripe",
+			"thinReverseDiagonalStripe",
+			"thinHorizontalCross",
+			"thinDiagonalCross",
+			"mediumGray",
+			"darkGray",
+			"lightGray",
+			"darkHorizontal",
+			"darkVertical",
+			"darkDown",
+			"darkUp",
+			"darkGrid",
+			"darkTrellis",
+			"lightHorizontal",
+			"lightVertical",
+			"lightDown",
+			"lightUp",
+			"lightGrid",
+			"lightTrellis",
+			"gray125",
+			"gray0625"
+		]
+	},
+	ContentCellFill: { oneOf: [{
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "solid"
+			},
+			color: { $ref: "#/$defs/Color" }
+		},
+		required: ["kind", "color"],
+		additionalProperties: false
+	}, {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "pattern"
+			},
+			patternType: { $ref: "#/$defs/ContentCellPatternType" },
+			foregroundColor: { $ref: "#/$defs/Color" },
+			backgroundColor: { $ref: "#/$defs/Color" }
+		},
+		required: ["kind", "patternType"],
+		additionalProperties: false
+	}] },
 	ContentListMembership: {
 		type: "object",
 		properties: {
@@ -160,6 +315,19 @@ const CONTENT_DEFS = {
 				type: "integer",
 				minimum: 0,
 				maximum: MAX_SAFE_INTEGER
+			},
+			checked: { type: "boolean" },
+			itemId: { type: "string" },
+			format: {
+				type: "string",
+				enum: [
+					"bullet",
+					"decimal",
+					"lowerLetter",
+					"upperLetter",
+					"lowerRoman",
+					"upperRoman"
+				]
 			}
 		},
 		required: ["level"],
@@ -180,7 +348,16 @@ const CONTENT_DEFS = {
 			},
 			color: { $ref: "#/$defs/Color" },
 			hyperlink: { type: "string" },
+			verticalAlign: {
+				type: "string",
+				enum: ["superscript", "subscript"]
+			},
+			direction: {
+				type: "string",
+				enum: ["ltr", "rtl"]
+			},
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -189,6 +366,28 @@ const CONTENT_DEFS = {
 		required: ["text"],
 		additionalProperties: false
 	},
+	RunConstructExtent: {
+		type: "object",
+		properties: {
+			descriptor: { $ref: "#/$defs/ConstructDescriptor" },
+			startRun: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			},
+			endRun: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			}
+		},
+		required: [
+			"descriptor",
+			"startRun",
+			"endRun"
+		],
+		additionalProperties: false
+	},
 	ContentParagraph: {
 		type: "object",
 		properties: {
@@ -200,7 +399,13 @@ const CONTENT_DEFS = {
 				type: "array",
 				items: { $ref: "#/$defs/ContentRun" }
 			},
+			constructs: {
+				type: "array",
+				items: { $ref: "#/$defs/RunConstructExtent" }
+			},
 			styleId: { type: "string" },
+			codeLanguage: { type: "string" },
+			preformatted: { type: "boolean" },
 			headingLevel: {
 				type: "integer",
 				exclusiveMinimum: 0,
@@ -215,8 +420,17 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0
 			},
 			indentLeftPt: { type: "number" },
+			indentRightPt: { type: "number" },
 			indentFirstLinePt: { type: "number" },
+			direction: {
+				type: "string",
+				enum: ["ltr", "rtl"]
+			},
+			pageBreakBefore: { type: "boolean" },
+			pageBreakAfter: { type: "boolean" },
+			borders: { $ref: "#/$defs/ContentParagraphBorders" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -225,6 +439,62 @@ const CONTENT_DEFS = {
 		required: ["kind", "runs"],
 		additionalProperties: false
 	},
+	ContentFloatOrigin: {
+		type: "string",
+		enum: [
+			"page",
+			"margin",
+			"leftMargin",
+			"rightMargin",
+			"topMargin",
+			"bottomMargin",
+			"insideMargin",
+			"outsideMargin",
+			"column",
+			"character",
+			"paragraph",
+			"line",
+			"frame"
+		]
+	},
+	ContentFloatAlign: {
+		type: "string",
+		enum: [
+			"left",
+			"right",
+			"top",
+			"bottom",
+			"center",
+			"inside",
+			"outside"
+		]
+	},
+	ContentFloatAxis: { anyOf: [{
+		type: "object",
+		properties: {
+			relativeTo: { $ref: "#/$defs/ContentFloatOrigin" },
+			offsetPt: { type: "number" }
+		},
+		required: ["relativeTo", "offsetPt"],
+		additionalProperties: false
+	}, {
+		type: "object",
+		properties: {
+			relativeTo: { $ref: "#/$defs/ContentFloatOrigin" },
+			align: { $ref: "#/$defs/ContentFloatAlign" }
+		},
+		required: ["relativeTo", "align"],
+		additionalProperties: false
+	}] },
+	ContentFloatPosition: {
+		type: "object",
+		properties: {
+			horizontal: { $ref: "#/$defs/ContentFloatAxis" },
+			vertical: { $ref: "#/$defs/ContentFloatAxis" }
+		},
+		required: ["horizontal", "vertical"],
+		additionalProperties: false
+	},
 	ContentImageBlock: {
 		type: "object",
 		properties: {
@@ -234,7 +504,12 @@ const CONTENT_DEFS = {
 			},
 			format: {
 				type: "string",
-				enum: ["png", "jpeg"]
+				enum: [
+					"png",
+					"jpeg",
+					"svg",
+					"gif"
+				]
 			},
 			base64: { type: "string" },
 			widthPt: {
@@ -246,7 +521,9 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0
 			},
 			altText: { type: "string" },
+			floatPosition: { $ref: "#/$defs/ContentFloatPosition" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -269,6 +546,7 @@ const CONTENT_DEFS = {
 				const: "pageBreak"
 			},
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -294,9 +572,19 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0,
 				maximum: MAX_SAFE_INTEGER
 			},
-			background: { $ref: "#/$defs/Color" },
+			background: { $ref: "#/$defs/ContentCellFill" },
 			borders: { $ref: "#/$defs/ContentCellBorders" },
+			verticalAlign: {
+				type: "string",
+				enum: [
+					"top",
+					"center",
+					"bottom"
+				]
+			},
+			formula: { type: "string" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -315,6 +603,10 @@ const CONTENT_DEFS = {
 			heightPt: {
 				type: "number",
 				exclusiveMinimum: 0
+			},
+			direction: {
+				type: "string",
+				enum: ["ltr", "rtl"]
 			}
 		},
 		required: ["cells"],
@@ -335,10 +627,11 @@ const CONTENT_DEFS = {
 				type: "array",
 				items: {
 					type: "number",
-					exclusiveMinimum: 0
+					minimum: 0
 				}
 			},
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -365,6 +658,7 @@ const CONTENT_DEFS = {
 			document: { $ref: CONTENT_DOCUMENT_URI },
 			frame: { $ref: "#/$defs/Box" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -420,7 +714,7 @@ const CONTENT_DEFS = {
 		{ $ref: "#/$defs/ContentConstructStart" },
 		{ $ref: "#/$defs/ContentConstructEnd" }
 	] },
-	PackageBlockLeaf: { oneOf: [
+	TreeBlockLeaf: { oneOf: [
 		{ $ref: "#/$defs/ContentParagraph" },
 		{ $ref: "#/$defs/ContentTable" },
 		{ $ref: "#/$defs/ContentImageBlock" },
@@ -475,6 +769,18 @@ const CONTENT_DEFS = {
 		properties: {
 			pageSize: { $ref: "#/$defs/PageSize" },
 			margins: { $ref: "#/$defs/Margins" },
+			breakType: {
+				type: "string",
+				enum: [
+					"nextPage",
+					"continuous",
+					"evenPage",
+					"oddPage"
+				]
+			},
+			headers: { $ref: "#/$defs/ContentPageFurniture" },
+			footers: { $ref: "#/$defs/ContentPageFurniture" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			kind: {
 				type: "string",
 				const: "section"
@@ -487,11 +793,30 @@ const CONTENT_DEFS = {
 		],
 		additionalProperties: false
 	},
+	ContentPageFurniture: {
+		type: "object",
+		properties: {
+			default: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentBlock" }
+			},
+			even: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentBlock" }
+			},
+			first: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentBlock" }
+			}
+		},
+		additionalProperties: false
+	},
 	SlideDescriptor: {
 		type: "object",
 		properties: {
 			size: { $ref: "#/$defs/PageSize" },
 			notes: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			kind: {
 				type: "string",
 				const: "slide"
@@ -521,6 +846,15 @@ const CONTENT_DEFS = {
 				items: { $ref: "#/$defs/ContentSheetRow" }
 			},
 			printSettings: { $ref: "#/$defs/ContentSheetPrintSettings" },
+			dataValidations: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentSheetDataValidation" }
+			},
+			conditionalFormats: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentSheetConditionalFormat" }
+			},
+			source: { $ref: "#/$defs/SourceResidue" },
 			kind: {
 				type: "string",
 				const: "sheet"
@@ -540,6 +874,7 @@ const CONTENT_DEFS = {
 		type: "object",
 		properties: {
 			size: { $ref: "#/$defs/PageSize" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			kind: {
 				type: "string",
 				const: "drawPage"
@@ -580,6 +915,7 @@ const CONTENT_DEFS = {
 			},
 			paintOrder: { type: "number" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -605,7 +941,13 @@ const CONTENT_DEFS = {
 				type: "array",
 				items: { $ref: "#/$defs/ContentRun" }
 			},
+			constructs: {
+				type: "array",
+				items: { $ref: "#/$defs/RunConstructExtent" }
+			},
 			styleId: { type: "string" },
+			codeLanguage: { type: "string" },
+			preformatted: { type: "boolean" },
 			headingLevel: {
 				type: "integer",
 				exclusiveMinimum: 0,
@@ -620,8 +962,17 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0
 			},
 			indentLeftPt: { type: "number" },
+			indentRightPt: { type: "number" },
 			indentFirstLinePt: { type: "number" },
+			direction: {
+				type: "string",
+				enum: ["ltr", "rtl"]
+			},
+			pageBreakBefore: { type: "boolean" },
+			pageBreakAfter: { type: "boolean" },
+			borders: { $ref: "#/$defs/ContentParagraphBorders" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -645,7 +996,13 @@ const CONTENT_DEFS = {
 				type: "array",
 				items: { $ref: "#/$defs/ContentRun" }
 			},
+			constructs: {
+				type: "array",
+				items: { $ref: "#/$defs/RunConstructExtent" }
+			},
 			styleId: { type: "string" },
+			codeLanguage: { type: "string" },
+			preformatted: { type: "boolean" },
 			headingLevel: {
 				type: "integer",
 				exclusiveMinimum: 0,
@@ -660,8 +1017,17 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0
 			},
 			indentLeftPt: { type: "number" },
+			indentRightPt: { type: "number" },
 			indentFirstLinePt: { type: "number" },
+			direction: {
+				type: "string",
+				enum: ["ltr", "rtl"]
+			},
+			pageBreakBefore: { type: "boolean" },
+			pageBreakAfter: { type: "boolean" },
+			borders: { $ref: "#/$defs/ContentParagraphBorders" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -690,6 +1056,7 @@ const CONTENT_DEFS = {
 			value: { $ref: "#/$defs/ContentCellValue" },
 			formula: { type: "string" },
 			displayText: { type: "string" },
+			numberFormatCode: { type: "string" },
 			runs: {
 				type: "array",
 				items: { $ref: "#/$defs/ContentRun" }
@@ -704,7 +1071,7 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0,
 				maximum: MAX_SAFE_INTEGER
 			},
-			background: { $ref: "#/$defs/Color" },
+			background: { $ref: "#/$defs/ContentCellFill" },
 			borders: { $ref: "#/$defs/ContentCellBorders" },
 			alignment: { $ref: "#/$defs/Alignment" },
 			verticalAlignment: {
@@ -717,6 +1084,7 @@ const CONTENT_DEFS = {
 			},
 			comment: { $ref: "#/$defs/ContentSheetCellComment" },
 			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
 			frames: {
 				type: "array",
 				items: { $ref: "#/$defs/LayoutFrame" }
@@ -1035,106 +1403,669 @@ const CONTENT_DEFS = {
 		required: ["start", "end"],
 		additionalProperties: false
 	},
-	ContentSheetImage: {
+	ContentSheetRange: {
 		type: "object",
 		properties: {
-			kind: {
-				type: "string",
-				const: "image"
-			},
-			format: {
-				type: "string",
-				enum: ["png", "jpeg"]
-			},
-			base64: { type: "string" },
-			widthPt: {
-				type: "number",
-				exclusiveMinimum: 0
-			},
-			heightPt: {
-				type: "number",
-				exclusiveMinimum: 0
-			},
-			altText: { type: "string" },
-			sourcePath: { type: "string" },
-			frames: {
-				type: "array",
-				items: { $ref: "#/$defs/LayoutFrame" }
+			startRow: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
 			},
-			anchorRow: {
+			startColumn: {
 				type: "integer",
 				minimum: 0,
 				maximum: MAX_SAFE_INTEGER
 			},
-			anchorColumn: {
+			endRow: {
 				type: "integer",
 				minimum: 0,
 				maximum: MAX_SAFE_INTEGER
 			},
-			offsetXPt: { type: "number" },
-			offsetYPt: { type: "number" }
+			endColumn: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			}
 		},
 		required: [
-			"kind",
-			"format",
-			"base64",
-			"widthPt",
-			"heightPt",
-			"anchorRow",
-			"anchorColumn",
-			"offsetXPt",
-			"offsetYPt"
+			"startRow",
+			"startColumn",
+			"endRow",
+			"endColumn"
 		],
 		additionalProperties: false
 	},
-	ContentStroke: {
+	SheetRuleOperator: {
+		type: "string",
+		enum: [
+			"between",
+			"notBetween",
+			"equal",
+			"notEqual",
+			"greaterThan",
+			"greaterThanOrEqual",
+			"lessThan",
+			"lessThanOrEqual"
+		]
+	},
+	ContentSheetDataValidation: {
 		type: "object",
 		properties: {
-			color: { $ref: "#/$defs/Color" },
-			widthPt: {
-				type: "number",
-				exclusiveMinimum: 0
+			ranges: {
+				type: "array",
+				items: { $ref: "#/$defs/ContentSheetRange" }
 			},
-			style: { $ref: "#/$defs/ContentStrokeStyle" }
+			type: {
+				type: "string",
+				enum: [
+					"whole",
+					"decimal",
+					"list",
+					"date",
+					"time",
+					"textLength",
+					"custom"
+				]
+			},
+			operator: { $ref: "#/$defs/SheetRuleOperator" },
+			formula1: { type: "string" },
+			formula2: { type: "string" },
+			allowBlank: { type: "boolean" },
+			showInputMessage: { type: "boolean" },
+			promptTitle: { type: "string" },
+			prompt: { type: "string" },
+			showErrorMessage: { type: "boolean" },
+			errorStyle: {
+				type: "string",
+				enum: [
+					"stop",
+					"warning",
+					"information"
+				]
+			},
+			errorTitle: { type: "string" },
+			error: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
-		required: ["color", "widthPt"],
+		required: ["ranges", "type"],
 		additionalProperties: false
 	},
-	ContentPathPoint: {
+	ContentSheetConditionalFormatStyle: {
 		type: "object",
 		properties: {
-			xPt: { type: "number" },
-			yPt: { type: "number" }
+			textColor: { $ref: "#/$defs/Color" },
+			background: { $ref: "#/$defs/Color" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
-		required: ["xPt", "yPt"],
 		additionalProperties: false
 	},
-	ContentPathSegment: { oneOf: [{
+	ContentSheetConditionalFormatValue: {
 		type: "object",
 		properties: {
-			kind: {
+			type: {
 				type: "string",
-				const: "line"
+				enum: [
+					"num",
+					"percent",
+					"max",
+					"min",
+					"formula",
+					"percentile"
+				]
 			},
-			to: { $ref: "#/$defs/ContentPathPoint" }
+			value: { type: "string" }
 		},
-		required: ["kind", "to"],
+		required: ["type"],
 		additionalProperties: false
-	}, {
-		type: "object",
-		properties: {
-			kind: {
-				type: "string",
-				const: "cubic"
+	},
+	ContentSheetConditionalFormat: { oneOf: [
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "cellIs"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				operator: { $ref: "#/$defs/SheetRuleOperator" },
+				formula1: { type: "string" },
+				formula2: { type: "string" },
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
 			},
-			control1: { $ref: "#/$defs/ContentPathPoint" },
-			control2: { $ref: "#/$defs/ContentPathPoint" },
-			to: { $ref: "#/$defs/ContentPathPoint" }
+			required: [
+				"type",
+				"ranges",
+				"operator",
+				"formula1"
+			],
+			additionalProperties: false
 		},
-		required: [
-			"kind",
-			"control1",
-			"control2",
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					enum: [
+						"containsText",
+						"notContainsText",
+						"beginsWith",
+						"endsWith"
+					]
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				text: { type: "string" },
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
+			},
+			required: [
+				"type",
+				"ranges",
+				"text"
+			],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					enum: [
+						"containsBlanks",
+						"notContainsBlanks",
+						"containsErrors",
+						"notContainsErrors",
+						"uniqueValues",
+						"duplicateValues"
+					]
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
+			},
+			required: ["type", "ranges"],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "top10"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				rank: {
+					type: "number",
+					exclusiveMinimum: 0
+				},
+				percent: { type: "boolean" },
+				bottom: { type: "boolean" },
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
+			},
+			required: [
+				"type",
+				"ranges",
+				"rank"
+			],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "aboveAverage"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				aboveAverage: { type: "boolean" },
+				equalAverage: { type: "boolean" },
+				stdDev: {
+					type: "integer",
+					exclusiveMinimum: 0,
+					maximum: MAX_SAFE_INTEGER
+				},
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
+			},
+			required: ["type", "ranges"],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "timePeriod"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				timePeriod: {
+					type: "string",
+					enum: [
+						"yesterday",
+						"today",
+						"tomorrow",
+						"last7Days",
+						"thisMonth",
+						"lastMonth",
+						"nextMonth",
+						"thisWeek",
+						"lastWeek",
+						"nextWeek",
+						"thisYear",
+						"lastYear",
+						"nextYear"
+					]
+				},
+				style: { $ref: "#/$defs/ContentSheetConditionalFormatStyle" }
+			},
+			required: [
+				"type",
+				"ranges",
+				"timePeriod"
+			],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "colorScale"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				stops: {
+					minItems: 2,
+					maxItems: 3,
+					type: "array",
+					items: {
+						type: "object",
+						properties: {
+							value: { $ref: "#/$defs/ContentSheetConditionalFormatValue" },
+							color: { $ref: "#/$defs/Color" }
+						},
+						required: ["value", "color"],
+						additionalProperties: false
+					}
+				}
+			},
+			required: [
+				"type",
+				"ranges",
+				"stops"
+			],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "dataBar"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				min: { $ref: "#/$defs/ContentSheetConditionalFormatValue" },
+				max: { $ref: "#/$defs/ContentSheetConditionalFormatValue" },
+				color: { $ref: "#/$defs/Color" },
+				showValue: { type: "boolean" }
+			},
+			required: [
+				"type",
+				"ranges",
+				"min",
+				"max",
+				"color"
+			],
+			additionalProperties: false
+		},
+		{
+			type: "object",
+			properties: {
+				type: {
+					type: "string",
+					const: "iconSet"
+				},
+				ranges: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetRange" }
+				},
+				priority: {
+					type: "integer",
+					minimum: -MAX_SAFE_INTEGER,
+					maximum: MAX_SAFE_INTEGER
+				},
+				stopIfTrue: { type: "boolean" },
+				source: { $ref: "#/$defs/SourceResidue" },
+				iconSetType: { type: "string" },
+				thresholds: {
+					type: "array",
+					items: { $ref: "#/$defs/ContentSheetConditionalFormatValue" }
+				},
+				reverse: { type: "boolean" },
+				showValue: { type: "boolean" }
+			},
+			required: [
+				"type",
+				"ranges",
+				"iconSetType",
+				"thresholds"
+			],
+			additionalProperties: false
+		}
+	] },
+	ContentSheetImage: {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "image"
+			},
+			format: {
+				type: "string",
+				enum: [
+					"png",
+					"jpeg",
+					"svg",
+					"gif"
+				]
+			},
+			base64: { type: "string" },
+			widthPt: {
+				type: "number",
+				exclusiveMinimum: 0
+			},
+			heightPt: {
+				type: "number",
+				exclusiveMinimum: 0
+			},
+			altText: { type: "string" },
+			floatPosition: { $ref: "#/$defs/ContentFloatPosition" },
+			sourcePath: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" },
+			frames: {
+				type: "array",
+				items: { $ref: "#/$defs/LayoutFrame" }
+			},
+			anchorRow: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			},
+			anchorColumn: {
+				type: "integer",
+				minimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			},
+			offsetXPt: { type: "number" },
+			offsetYPt: { type: "number" }
+		},
+		required: [
+			"kind",
+			"format",
+			"base64",
+			"widthPt",
+			"heightPt",
+			"anchorRow",
+			"anchorColumn",
+			"offsetXPt",
+			"offsetYPt"
+		],
+		additionalProperties: false
+	},
+	ContentStrokeDash: {
+		type: "object",
+		properties: {
+			dots1: {
+				type: "integer",
+				exclusiveMinimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			},
+			dots1LengthPt: {
+				type: "number",
+				exclusiveMinimum: 0
+			},
+			dots2: {
+				type: "integer",
+				exclusiveMinimum: 0,
+				maximum: MAX_SAFE_INTEGER
+			},
+			dots2LengthPt: {
+				type: "number",
+				exclusiveMinimum: 0
+			},
+			distancePt: {
+				type: "number",
+				minimum: 0
+			}
+		},
+		required: [
+			"dots1",
+			"dots1LengthPt",
+			"distancePt"
+		],
+		additionalProperties: false
+	},
+	ContentStroke: {
+		type: "object",
+		properties: {
+			color: { $ref: "#/$defs/Color" },
+			widthPt: {
+				type: "number",
+				exclusiveMinimum: 0
+			},
+			style: { $ref: "#/$defs/ContentStrokeStyle" },
+			opacity: {
+				type: "number",
+				minimum: 0,
+				maximum: 1
+			},
+			dashPattern: { $ref: "#/$defs/ContentStrokeDash" }
+		},
+		required: ["color", "widthPt"],
+		additionalProperties: false
+	},
+	ContentGradientStyle: {
+		type: "string",
+		enum: [
+			"linear",
+			"axial",
+			"radial",
+			"ellipsoid",
+			"square",
+			"rectangular"
+		]
+	},
+	ContentGradientFill: {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "gradient"
+			},
+			style: { $ref: "#/$defs/ContentGradientStyle" },
+			startColor: { $ref: "#/$defs/Color" },
+			endColor: { $ref: "#/$defs/Color" },
+			angleDeg: { type: "number" }
+		},
+		required: [
+			"kind",
+			"style",
+			"startColor",
+			"endColor"
+		],
+		additionalProperties: false
+	},
+	ContentHatchStyle: {
+		type: "string",
+		enum: [
+			"single",
+			"double",
+			"triple"
+		]
+	},
+	ContentHatchFill: {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "hatch"
+			},
+			style: { $ref: "#/$defs/ContentHatchStyle" },
+			color: { $ref: "#/$defs/Color" },
+			distancePt: {
+				type: "number",
+				minimum: 0
+			},
+			rotationDeg: { type: "number" }
+		},
+		required: [
+			"kind",
+			"style",
+			"color",
+			"distancePt"
+		],
+		additionalProperties: false
+	},
+	ContentBitmapFill: {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "bitmap"
+			},
+			format: {
+				type: "string",
+				enum: [
+					"png",
+					"jpeg",
+					"svg",
+					"gif"
+				]
+			},
+			base64: { type: "string" }
+		},
+		required: [
+			"kind",
+			"format",
+			"base64"
+		],
+		additionalProperties: false
+	},
+	ContentFillPattern: { oneOf: [
+		{ $ref: "#/$defs/ContentGradientFill" },
+		{ $ref: "#/$defs/ContentHatchFill" },
+		{ $ref: "#/$defs/ContentBitmapFill" }
+	] },
+	ContentPathPoint: {
+		type: "object",
+		properties: {
+			xPt: { type: "number" },
+			yPt: { type: "number" }
+		},
+		required: ["xPt", "yPt"],
+		additionalProperties: false
+	},
+	ContentPathSegment: { oneOf: [{
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "line"
+			},
+			to: { $ref: "#/$defs/ContentPathPoint" }
+		},
+		required: ["kind", "to"],
+		additionalProperties: false
+	}, {
+		type: "object",
+		properties: {
+			kind: {
+				type: "string",
+				const: "cubic"
+			},
+			control1: { $ref: "#/$defs/ContentPathPoint" },
+			control2: { $ref: "#/$defs/ContentPathPoint" },
+			to: { $ref: "#/$defs/ContentPathPoint" }
+		},
+		required: [
+			"kind",
+			"control1",
+			"control2",
 			"to"
 		],
 		additionalProperties: false
@@ -1167,9 +2098,16 @@ const CONTENT_DEFS = {
 				frame: { $ref: "#/$defs/Box" },
 				rotationDeg: { type: "number" },
 				fill: { $ref: "#/$defs/Color" },
+				fillPattern: { $ref: "#/$defs/ContentFillPattern" },
+				fillOpacity: {
+					type: "number",
+					minimum: 0,
+					maximum: 1
+				},
 				stroke: { $ref: "#/$defs/ContentStroke" },
 				paintOrder: { type: "number" },
 				sourcePath: { type: "string" },
+				source: { $ref: "#/$defs/SourceResidue" },
 				frames: {
 					type: "array",
 					items: { $ref: "#/$defs/LayoutFrame" }
@@ -1188,9 +2126,16 @@ const CONTENT_DEFS = {
 				frame: { $ref: "#/$defs/Box" },
 				rotationDeg: { type: "number" },
 				fill: { $ref: "#/$defs/Color" },
+				fillPattern: { $ref: "#/$defs/ContentFillPattern" },
+				fillOpacity: {
+					type: "number",
+					minimum: 0,
+					maximum: 1
+				},
 				stroke: { $ref: "#/$defs/ContentStroke" },
 				paintOrder: { type: "number" },
 				sourcePath: { type: "string" },
+				source: { $ref: "#/$defs/SourceResidue" },
 				frames: {
 					type: "array",
 					items: { $ref: "#/$defs/LayoutFrame" }
@@ -1211,6 +2156,7 @@ const CONTENT_DEFS = {
 				stroke: { $ref: "#/$defs/ContentStroke" },
 				paintOrder: { type: "number" },
 				sourcePath: { type: "string" },
+				source: { $ref: "#/$defs/SourceResidue" },
 				frames: {
 					type: "array",
 					items: { $ref: "#/$defs/LayoutFrame" }
@@ -1238,6 +2184,12 @@ const CONTENT_DEFS = {
 					items: { $ref: "#/$defs/ContentSubpath" }
 				},
 				fill: { $ref: "#/$defs/Color" },
+				fillPattern: { $ref: "#/$defs/ContentFillPattern" },
+				fillOpacity: {
+					type: "number",
+					minimum: 0,
+					maximum: 1
+				},
 				fillRule: {
 					type: "string",
 					enum: ["nonzero", "evenodd"]
@@ -1245,6 +2197,7 @@ const CONTENT_DEFS = {
 				stroke: { $ref: "#/$defs/ContentStroke" },
 				paintOrder: { type: "number" },
 				sourcePath: { type: "string" },
+				source: { $ref: "#/$defs/SourceResidue" },
 				frames: {
 					type: "array",
 					items: { $ref: "#/$defs/LayoutFrame" }
@@ -1278,7 +2231,8 @@ const CONTENT_DEFS = {
 				maximum: MAX_SAFE_INTEGER
 			},
 			offsetXPt: { type: "number" },
-			offsetYPt: { type: "number" }
+			offsetYPt: { type: "number" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: [
 			"objectKind",
@@ -1298,7 +2252,7 @@ const CONTENT_DEFS = {
 					{ $ref: "#/$defs/HeadingGroup" },
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/SectionConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1316,7 +2270,7 @@ const CONTENT_DEFS = {
 					{ $ref: "#/$defs/HeadingGroup" },
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/SectionConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1333,7 +2287,7 @@ const CONTENT_DEFS = {
 				items: { oneOf: [
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/ShapeConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1363,7 +2317,7 @@ const CONTENT_DEFS = {
 				items: { oneOf: [
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/ShapeConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1407,7 +2361,7 @@ const CONTENT_DEFS = {
 					{ $ref: "#/$defs/HeadingGroup" },
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/SectionConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1424,7 +2378,7 @@ const CONTENT_DEFS = {
 				items: { oneOf: [
 					{ $ref: "#/$defs/ListGroup" },
 					{ $ref: "#/$defs/ShapeConstructGroup" },
-					{ $ref: "#/$defs/PackageBlockLeaf" }
+					{ $ref: "#/$defs/TreeBlockLeaf" }
 				] }
 			}
 		},
@@ -1469,7 +2423,8 @@ const CONTENT_DEFS = {
 			options: {
 				type: "array",
 				items: { type: "string" }
-			}
+			},
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["kind", "controlType"],
 		additionalProperties: false
@@ -1482,7 +2437,8 @@ const CONTENT_DEFS = {
 				const: "field"
 			},
 			instruction: { type: "string" },
-			cachedResult: { type: "string" }
+			cachedResult: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["kind", "instruction"],
 		additionalProperties: false
@@ -1504,7 +2460,8 @@ const CONTENT_DEFS = {
 				]
 			},
 			name: { type: "string" },
-			definition: { type: "string" }
+			definition: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: [
 			"kind",
@@ -1544,7 +2501,8 @@ const CONTENT_DEFS = {
 				const: "link"
 			},
 			target: { $ref: "#/$defs/LinkTarget" },
-			title: { type: "string" }
+			title: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["kind", "target"],
 		additionalProperties: false
@@ -1567,7 +2525,8 @@ const CONTENT_DEFS = {
 				]
 			},
 			author: { type: "string" },
-			dateIso: { type: "string" }
+			dateIso: { type: "string" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["kind", "change"],
 		additionalProperties: false
@@ -1595,7 +2554,8 @@ const CONTENT_DEFS = {
 				maximum: MAX_SAFE_INTEGER
 			},
 			protected: { type: "boolean" },
-			source: { $ref: "#/$defs/DivisionSource" }
+			linked: { $ref: "#/$defs/DivisionSource" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["kind"],
 		additionalProperties: false
@@ -1620,7 +2580,9 @@ const CONTENT_DEFS = {
 				exclusiveMinimum: 0
 			},
 			indentLeftPt: { type: "number" },
-			indentFirstLinePt: { type: "number" }
+			indentFirstLinePt: { type: "number" },
+			pageBreakBefore: { type: "boolean" },
+			pageBreakAfter: { type: "boolean" }
 		},
 		additionalProperties: false
 	},
@@ -1654,111 +2616,15 @@ const CONTENT_DEFS = {
 		required: ["kind"],
 		additionalProperties: {}
 	},
-	MathMlAttribute: {
-		type: "object",
-		properties: {
-			name: { type: "string" },
-			value: { type: "string" }
-		},
-		required: ["name", "value"],
-		additionalProperties: false
+	get MathMlAttribute() {
+		return cacheMathMlDef("MathMlAttribute");
 	},
-	MathMlElement: {
-		type: "object",
-		properties: {
-			type: {
-				type: "string",
-				const: "element"
-			},
-			tag: { type: "string" },
-			attributes: {
-				type: "array",
-				items: { $ref: "#/$defs/MathMlAttribute" }
-			},
-			children: {
-				type: "array",
-				items: { $ref: "#/$defs/MathMlNode" }
-			}
-		},
-		required: [
-			"type",
-			"tag",
-			"attributes",
-			"children"
-		],
-		additionalProperties: false
+	get MathMlElement() {
+		return cacheMathMlDef("MathMlElement");
+	},
+	get MathMlNode() {
+		return cacheMathMlDef("MathMlNode");
 	},
-	MathMlNode: { oneOf: [
-		{
-			type: "object",
-			properties: {
-				type: {
-					type: "string",
-					const: "text"
-				},
-				value: { type: "string" }
-			},
-			required: ["type", "value"],
-			additionalProperties: false
-		},
-		{
-			type: "object",
-			properties: {
-				type: {
-					type: "string",
-					const: "cdata"
-				},
-				value: { type: "string" }
-			},
-			required: ["type", "value"],
-			additionalProperties: false
-		},
-		{
-			type: "object",
-			properties: {
-				type: {
-					type: "string",
-					const: "comment"
-				},
-				value: { type: "string" }
-			},
-			required: ["type", "value"],
-			additionalProperties: false
-		},
-		{
-			type: "object",
-			properties: {
-				type: {
-					type: "string",
-					const: "declaration"
-				},
-				attributes: {
-					type: "array",
-					items: { $ref: "#/$defs/MathMlAttribute" }
-				}
-			},
-			required: ["type", "attributes"],
-			additionalProperties: false
-		},
-		{
-			type: "object",
-			properties: {
-				type: {
-					type: "string",
-					const: "pi"
-				},
-				target: { type: "string" },
-				content: { type: "string" }
-			},
-			required: [
-				"type",
-				"target",
-				"content"
-			],
-			additionalProperties: false
-		},
-		{ $ref: "#/$defs/MathMlElement" }
-	] },
 	ContentFormula: {
 		type: "object",
 		properties: {
@@ -1769,7 +2635,8 @@ const CONTENT_DEFS = {
 			starMath: { type: "string" },
 			presentation: { $ref: "#/$defs/MathPresentation" },
 			content: { $ref: "#/$defs/MathExpression" },
-			provenance: { $ref: "#/$defs/MathProvenance" }
+			provenance: { $ref: "#/$defs/MathProvenance" },
+			source: { $ref: "#/$defs/SourceResidue" }
 		},
 		required: ["mathml"],
 		additionalProperties: false