@stll/folio-core 0.47.7 → 0.48.0

package/dist/docx/sectionParser.js

@@ -1,6 +1,6 @@
 import { NO_MODELLED_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
 import { parseBorderSpec } from "./borderParser.js";
-import { CAPTURE, dispatchChildren, keptUnless, sequencePositions } from "./containerChildren.js";
+import { CAPTURE, dispatchChildrenWithContext, keptUnless, sequencePositions } from "./containerChildren.js";
 import { parseFooterReference, parseHeaderReference } from "./headerFooterRefParser.js";
 import { parseEndnoteProperties, parseFootnoteProperties } from "./notePropertiesParser.js";
 import { NumberFormatSchema, TextDirectionSchema, narrowEnum } from "./parserEnums.js";
@@ -67,6 +67,165 @@ function parseLineNumberRestart(restart) {
 		default: return;
 	}
 }
+const SECTION_PROPERTY_HANDLERS = {
+	headerReference: (child, { headerRefs, context }) => {
+		const reference = parseHeaderReference(child, context);
+		if (reference) headerRefs.push(reference);
+	},
+	footerReference: (child, { footerRefs, context }) => {
+		const reference = parseFooterReference(child, context);
+		if (reference) footerRefs.push(reference);
+	},
+	footnotePr: (child, { props }) => {
+		const footnotePr = parseFootnoteProperties(child);
+		if (Object.keys(footnotePr).length > 0) {
+			props.footnotePr = footnotePr;
+			return;
+		}
+		return CAPTURE;
+	},
+	endnotePr: (child, { props }) => {
+		const endnotePr = parseEndnoteProperties(child);
+		if (Object.keys(endnotePr).length > 0) {
+			props.endnotePr = endnotePr;
+			return;
+		}
+		return CAPTURE;
+	},
+	type: (child, { props }) => {
+		const sectionStart = parseSectionStart(getAttribute(child, "w", "val"));
+		if (sectionStart) props.sectionStart = sectionStart;
+		return keptUnless(sectionStart !== void 0);
+	},
+	pgSz: (child, { props }) => {
+		const width = parseNumericAttribute(child, "w", "w");
+		if (width !== void 0) props.pageWidth = Math.min(width, MAX_PAGE_DIMENSION_TWIPS);
+		const height = parseNumericAttribute(child, "w", "h");
+		if (height !== void 0) props.pageHeight = Math.min(height, MAX_PAGE_DIMENSION_TWIPS);
+		const orientation = parseOrientation(getAttribute(child, "w", "orient"));
+		if (orientation) props.orientation = orientation;
+		return keptUnless(width !== void 0 || height !== void 0 || orientation !== void 0);
+	},
+	pgMar: (child, { props }) => {
+		const margins = [
+			["top", "marginTop"],
+			["bottom", "marginBottom"],
+			["left", "marginLeft"],
+			["right", "marginRight"],
+			["header", "headerDistance"],
+			["footer", "footerDistance"],
+			["gutter", "gutter"]
+		];
+		let taken = false;
+		for (const [attribute, field] of margins) {
+			const value = parseNumericAttribute(child, "w", attribute);
+			if (value !== void 0) {
+				props[field] = value;
+				taken = true;
+			}
+		}
+		return keptUnless(taken);
+	},
+	paperSrc: (child, { props }) => {
+		const first = parseNumericAttribute(child, "w", "first");
+		if (first !== void 0) props.paperSrcFirst = first;
+		const other = parseNumericAttribute(child, "w", "other");
+		if (other !== void 0) props.paperSrcOther = other;
+		return keptUnless(first !== void 0 || other !== void 0);
+	},
+	pgBorders: (child, { props, context }) => keptUnless(readPageBorders(props, child, context)),
+	lnNumType: (child, { props }) => {
+		const lineNumbers = {};
+		for (const [attribute, field] of [
+			["start", "start"],
+			["countBy", "countBy"],
+			["distance", "distance"]
+		]) {
+			const value = parseNumericAttribute(child, "w", attribute);
+			if (value !== void 0) lineNumbers[field] = value;
+		}
+		const restart = parseLineNumberRestart(getAttribute(child, "w", "restart"));
+		if (restart) lineNumbers.restart = restart;
+		if (Object.keys(lineNumbers).length === 0) return CAPTURE;
+		props.lineNumbers = lineNumbers;
+	},
+	pgNumType: (child, { props }) => {
+		const pageNumbering = {};
+		const format = narrowEnum(getAttribute(child, "w", "fmt"), NumberFormatSchema);
+		if (format) pageNumbering.format = format;
+		const start = parseNumericAttribute(child, "w", "start");
+		if (start !== void 0) pageNumbering.start = start;
+		const chapterStyle = parseNumericAttribute(child, "w", "chapStyle");
+		if (chapterStyle !== void 0) pageNumbering.chapterStyle = chapterStyle;
+		const chapterSeparator = getAttribute(child, "w", "chapSep");
+		if (chapterSeparator) pageNumbering.chapterSeparator = chapterSeparator;
+		if (Object.keys(pageNumbering).length === 0) return CAPTURE;
+		props.pageNumbering = pageNumbering;
+	},
+	cols: (child, { props }) => keptUnless(readColumns(props, child)),
+	formProt: (child, { props, context }) => {
+		props.formProtection = parseBooleanElement(child, "w", context);
+	},
+	vAlign: (child, { props }) => {
+		const verticalAlign = parseVerticalAlign(getAttribute(child, "w", "val"));
+		if (verticalAlign) props.verticalAlign = verticalAlign;
+		return keptUnless(verticalAlign !== void 0);
+	},
+	noEndnote: (child, { props, context }) => {
+		props.noEndnote = parseBooleanElement(child, "w", context);
+	},
+	titlePg: (child, { props, context }) => {
+		props.titlePg = parseBooleanElement(child, "w", context);
+	},
+	textDirection: (child, { props }) => {
+		const textDirection = narrowEnum(getAttribute(child, "w", "val"), TextDirectionSchema);
+		if (textDirection) props.textDirection = textDirection;
+		return keptUnless(textDirection !== void 0);
+	},
+	bidi: (child, { props, context }) => {
+		props.bidi = parseBooleanElement(child, "w", context);
+	},
+	rtlGutter: (child, { props, context }) => {
+		props.rtlGutter = parseBooleanElement(child, "w", context);
+	},
+	docGrid: (child, { props }) => {
+		const docGrid = {};
+		const gridType = getAttribute(child, "w", "type");
+		if (gridType === "default" || gridType === "lines" || gridType === "linesAndChars" || gridType === "snapToChars") docGrid.type = gridType;
+		const linePitch = parseNumericAttribute(child, "w", "linePitch");
+		if (linePitch !== void 0) docGrid.linePitch = linePitch;
+		const charSpace = parseNumericAttribute(child, "w", "charSpace");
+		if (charSpace !== void 0) docGrid.charSpace = charSpace;
+		props.docGrid = docGrid;
+	},
+	printerSettings: (child, { props }) => {
+		const relationshipId = getAttribute(child, "r", "id");
+		if (relationshipId) props.printerSettingsRelationshipId = relationshipId;
+		return keptUnless(Boolean(relationshipId));
+	},
+	sectPrChange: (child, { propertyChanges }) => {
+		const previousSectPr = findChild(child, "w", "sectPr");
+		const change = {
+			type: "sectionPropertyChange",
+			info: parsePropertyChangeInfo(child)
+		};
+		if (previousSectPr) change.previousProperties = parseSectionProperties(previousSectPr);
+		const previousReferences = parseSectionReferenceHistory(child);
+		if (previousReferences !== void 0) change.previousReferences = previousReferences;
+		propertyChanges.push(change);
+	}
+};
+const SECTION_PROPERTY_UNDECLARED = {
+	background: (child, { props, context }) => keptUnless(readBackground(props, child, context)),
+	evenAndOddHeaders: (child, { props, context }) => {
+		props.evenAndOddHeaders = parseBooleanElement(child, "w", context);
+	},
+	footnoteColumns: (child, { props }) => {
+		const columns = parseNumericAttribute(child, "w", "val");
+		if (columns !== void 0) props.footnoteColumns = columns;
+		return keptUnless(columns !== void 0);
+	}
+};
 /**
 * Parse section properties (w:sectPr)
 *
@@ -79,168 +238,18 @@ function parseSectionProperties(sectPr, context) {
 	const headerRefs = [];
 	const footerRefs = [];
 	const propertyChanges = [];
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: sectPr,
 		container: "section-properties",
-		handlers: {
-			headerReference: (child) => {
-				const reference = parseHeaderReference(child, context);
-				if (reference) headerRefs.push(reference);
-			},
-			footerReference: (child) => {
-				const reference = parseFooterReference(child, context);
-				if (reference) footerRefs.push(reference);
-			},
-			footnotePr: (child) => {
-				const footnotePr = parseFootnoteProperties(child);
-				if (Object.keys(footnotePr).length > 0) {
-					props.footnotePr = footnotePr;
-					return;
-				}
-				return CAPTURE;
-			},
-			endnotePr: (child) => {
-				const endnotePr = parseEndnoteProperties(child);
-				if (Object.keys(endnotePr).length > 0) {
-					props.endnotePr = endnotePr;
-					return;
-				}
-				return CAPTURE;
-			},
-			type: (child) => {
-				const sectionStart = parseSectionStart(getAttribute(child, "w", "val"));
-				if (sectionStart) props.sectionStart = sectionStart;
-				return keptUnless(sectionStart !== void 0);
-			},
-			pgSz: (child) => {
-				const width = parseNumericAttribute(child, "w", "w");
-				if (width !== void 0) props.pageWidth = Math.min(width, MAX_PAGE_DIMENSION_TWIPS);
-				const height = parseNumericAttribute(child, "w", "h");
-				if (height !== void 0) props.pageHeight = Math.min(height, MAX_PAGE_DIMENSION_TWIPS);
-				const orientation = parseOrientation(getAttribute(child, "w", "orient"));
-				if (orientation) props.orientation = orientation;
-				return keptUnless(width !== void 0 || height !== void 0 || orientation !== void 0);
-			},
-			pgMar: (child) => {
-				const margins = [
-					["top", "marginTop"],
-					["bottom", "marginBottom"],
-					["left", "marginLeft"],
-					["right", "marginRight"],
-					["header", "headerDistance"],
-					["footer", "footerDistance"],
-					["gutter", "gutter"]
-				];
-				let taken = false;
-				for (const [attribute, field] of margins) {
-					const value = parseNumericAttribute(child, "w", attribute);
-					if (value !== void 0) {
-						props[field] = value;
-						taken = true;
-					}
-				}
-				return keptUnless(taken);
-			},
-			paperSrc: (child) => {
-				const first = parseNumericAttribute(child, "w", "first");
-				if (first !== void 0) props.paperSrcFirst = first;
-				const other = parseNumericAttribute(child, "w", "other");
-				if (other !== void 0) props.paperSrcOther = other;
-				return keptUnless(first !== void 0 || other !== void 0);
-			},
-			pgBorders: (child) => keptUnless(readPageBorders(props, child, context)),
-			lnNumType: (child) => {
-				const lineNumbers = {};
-				for (const [attribute, field] of [
-					["start", "start"],
-					["countBy", "countBy"],
-					["distance", "distance"]
-				]) {
-					const value = parseNumericAttribute(child, "w", attribute);
-					if (value !== void 0) lineNumbers[field] = value;
-				}
-				const restart = parseLineNumberRestart(getAttribute(child, "w", "restart"));
-				if (restart) lineNumbers.restart = restart;
-				if (Object.keys(lineNumbers).length === 0) return CAPTURE;
-				props.lineNumbers = lineNumbers;
-			},
-			pgNumType: (child) => {
-				const pageNumbering = {};
-				const format = narrowEnum(getAttribute(child, "w", "fmt"), NumberFormatSchema);
-				if (format) pageNumbering.format = format;
-				const start = parseNumericAttribute(child, "w", "start");
-				if (start !== void 0) pageNumbering.start = start;
-				const chapterStyle = parseNumericAttribute(child, "w", "chapStyle");
-				if (chapterStyle !== void 0) pageNumbering.chapterStyle = chapterStyle;
-				const chapterSeparator = getAttribute(child, "w", "chapSep");
-				if (chapterSeparator) pageNumbering.chapterSeparator = chapterSeparator;
-				if (Object.keys(pageNumbering).length === 0) return CAPTURE;
-				props.pageNumbering = pageNumbering;
-			},
-			cols: (child) => keptUnless(readColumns(props, child)),
-			formProt: (child) => {
-				props.formProtection = parseBooleanElement(child, "w", context);
-			},
-			vAlign: (child) => {
-				const verticalAlign = parseVerticalAlign(getAttribute(child, "w", "val"));
-				if (verticalAlign) props.verticalAlign = verticalAlign;
-				return keptUnless(verticalAlign !== void 0);
-			},
-			noEndnote: (child) => {
-				props.noEndnote = parseBooleanElement(child, "w", context);
-			},
-			titlePg: (child) => {
-				props.titlePg = parseBooleanElement(child, "w", context);
-			},
-			textDirection: (child) => {
-				const textDirection = narrowEnum(getAttribute(child, "w", "val"), TextDirectionSchema);
-				if (textDirection) props.textDirection = textDirection;
-				return keptUnless(textDirection !== void 0);
-			},
-			bidi: (child) => {
-				props.bidi = parseBooleanElement(child, "w", context);
-			},
-			rtlGutter: (child) => {
-				props.rtlGutter = parseBooleanElement(child, "w", context);
-			},
-			docGrid: (child) => {
-				const docGrid = {};
-				const gridType = getAttribute(child, "w", "type");
-				if (gridType === "default" || gridType === "lines" || gridType === "linesAndChars" || gridType === "snapToChars") docGrid.type = gridType;
-				const linePitch = parseNumericAttribute(child, "w", "linePitch");
-				if (linePitch !== void 0) docGrid.linePitch = linePitch;
-				const charSpace = parseNumericAttribute(child, "w", "charSpace");
-				if (charSpace !== void 0) docGrid.charSpace = charSpace;
-				props.docGrid = docGrid;
-			},
-			printerSettings: (child) => {
-				const relationshipId = getAttribute(child, "r", "id");
-				if (relationshipId) props.printerSettingsRelationshipId = relationshipId;
-				return keptUnless(Boolean(relationshipId));
-			},
-			sectPrChange: (child) => {
-				const previousSectPr = findChild(child, "w", "sectPr");
-				const change = {
-					type: "sectionPropertyChange",
-					info: parsePropertyChangeInfo(child)
-				};
-				if (previousSectPr) change.previousProperties = parseSectionProperties(previousSectPr);
-				const previousReferences = parseSectionReferenceHistory(child);
-				if (previousReferences !== void 0) change.previousReferences = previousReferences;
-				propertyChanges.push(change);
-			}
-		},
+		handlers: SECTION_PROPERTY_HANDLERS,
 		capturePosition: sequencePositions("section-properties", sectPr),
-		undeclared: {
-			background: (child) => keptUnless(readBackground(props, child, context)),
-			evenAndOddHeaders: (child) => {
-				props.evenAndOddHeaders = parseBooleanElement(child, "w", context);
-			},
-			footnoteColumns: (child) => {
-				const columns = parseNumericAttribute(child, "w", "val");
-				if (columns !== void 0) props.footnoteColumns = columns;
-				return keptUnless(columns !== void 0);
-			}
+		undeclared: SECTION_PROPERTY_UNDECLARED,
+		context: {
+			props,
+			headerRefs,
+			footerRefs,
+			propertyChanges,
+			context
 		}
 	});
 	if (preserved) props.preserved = preserved;

package/dist/docx/serializer/paragraphSerializer.js

@@ -5,7 +5,7 @@ import { fieldStateAttributes } from "../fieldState.js";
 import { getParagraphPropertySource, paragraphPropertySourceMatchesEmission } from "../paragraphPropertySource.js";
 import { DATE_UTC_ATTRIBUTE } from "../trackedChangeInfo.js";
 import { toTransitionalNamespaceUri } from "../transitionalSpelling.js";
-import { captureVerbatimXml, sanitizeCapturedXmlElement } from "../verbatimCapture.js";
+import { captureVerbatimXml, createCapturedXmlSanitizer } from "../verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE, cloneElement, getChildElements, getLocalName, parseXml } from "../xmlParser.js";
 import { markupRangeAttributes, moveBookmarkAttributes, serializeBookmarkMarker } from "./markupRangeAttributes.js";
 import { serializeRun } from "./runSerializer.js";
@@ -162,37 +162,35 @@ const hasInvalidParagraphMarkProperties = (root) => {
 	}
 	return false;
 };
-const replayableParagraphPropertySourceXml = (sourceXml) => {
-	return sanitizeCapturedXmlElement(sourceXml, {
-		allowedLocalNames: PARAGRAPH_PROPERTY_ROOT_NAME,
-		allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
-		inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE,
-		requiredNamespaceBindings: PARAGRAPH_APPEND_PREFIXES,
-		validate: (root) => {
-			let paragraphMarkProperties = null;
-			const seenChildren = /* @__PURE__ */ new Set();
-			let previousChildOrder = -1;
-			for (const child of getChildElements(root)) {
-				const localName = getLocalName(child.name);
-				const isWordprocessingChild = toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w;
-				if (isWordprocessingChild) {
-					if (RESERVED_PARAGRAPH_PROPERTY_CHILDREN.has(localName)) return false;
-					const childOrder = PARAGRAPH_PROPERTY_CHILD_ORDER.get(localName);
-					if (childOrder === void 0 || seenChildren.has(localName) || childOrder < previousChildOrder) return false;
-					seenChildren.add(localName);
-					previousChildOrder = childOrder;
-				}
-				if (localName !== "rPr" || !isWordprocessingChild) {
-					if (hasDescendantNamed(child, NAMESPACES.w, "rPr")) return false;
-					continue;
-				}
-				if (paragraphMarkProperties !== null || toTransitionalNamespaceUri(resolveNamespaceBinding(child.namespaceScope, "w") ?? "") !== NAMESPACES.w) return false;
-				paragraphMarkProperties = child;
+const replayableParagraphPropertySourceXml = createCapturedXmlSanitizer({
+	allowedLocalNames: PARAGRAPH_PROPERTY_ROOT_NAME,
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE,
+	requiredNamespaceBindings: PARAGRAPH_APPEND_PREFIXES,
+	validate: (root) => {
+		let paragraphMarkProperties = null;
+		const seenChildren = /* @__PURE__ */ new Set();
+		let previousChildOrder = -1;
+		for (const child of getChildElements(root)) {
+			const localName = getLocalName(child.name);
+			const isWordprocessingChild = toTransitionalNamespaceUri(child.namespaceUri ?? "") === NAMESPACES.w;
+			if (isWordprocessingChild) {
+				if (RESERVED_PARAGRAPH_PROPERTY_CHILDREN.has(localName)) return false;
+				const childOrder = PARAGRAPH_PROPERTY_CHILD_ORDER.get(localName);
+				if (childOrder === void 0 || seenChildren.has(localName) || childOrder < previousChildOrder) return false;
+				seenChildren.add(localName);
+				previousChildOrder = childOrder;
 			}
-			return !(paragraphMarkProperties && hasInvalidParagraphMarkProperties(paragraphMarkProperties) || hasInvalidParagraphPropertyShape(root) || hasInvalidParagraphPropertyRevision(root));
+			if (localName !== "rPr" || !isWordprocessingChild) {
+				if (hasDescendantNamed(child, NAMESPACES.w, "rPr")) return false;
+				continue;
+			}
+			if (paragraphMarkProperties !== null || toTransitionalNamespaceUri(resolveNamespaceBinding(child.namespaceScope, "w") ?? "") !== NAMESPACES.w) return false;
+			paragraphMarkProperties = child;
 		}
-	});
-};
+		return !(paragraphMarkProperties && hasInvalidParagraphMarkProperties(paragraphMarkProperties) || hasInvalidParagraphPropertyShape(root) || hasInvalidParagraphPropertyRevision(root));
+	}
+});
 const verifiedParagraphPropertySource = (formatting, source) => {
 	if (!source) return null;
 	const replayableSource = replayableParagraphPropertySourceXml(source.xml);
@@ -458,9 +456,19 @@ function serializeTrackedChange(tag, change) {
 	flushPending();
 	return segments.join("");
 }
-const TAGGED_WRAPPER_PROPERTY_NAMES = {
-	smartTag: /* @__PURE__ */ new Set(["smartTagPr"]),
-	customXml: /* @__PURE__ */ new Set(["customXmlPr"])
+/** The properties element each tagged wrapper declares ahead of its content. */
+const TAGGED_WRAPPER_PROPERTIES = {
+	smartTag: "smartTagPr",
+	customXml: "customXmlPr"
+};
+const taggedWrapperPropertiesSanitizer = (propertiesName) => createCapturedXmlSanitizer({
+	allowedLocalNames: /* @__PURE__ */ new Set([propertiesName]),
+	allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
+	inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
+});
+const TAGGED_WRAPPER_PROPERTIES_SANITIZERS = {
+	smartTag: taggedWrapperPropertiesSanitizer(TAGGED_WRAPPER_PROPERTIES.smartTag),
+	customXml: taggedWrapperPropertiesSanitizer(TAGGED_WRAPPER_PROPERTIES.customXml)
 };
 /**
 * Emit a `w:smartTag` or a run-level `w:customXml` around content already written.
@@ -477,11 +485,7 @@ const TAGGED_WRAPPER_PROPERTY_NAMES = {
 */
 function serializeTaggedWrapper(kind, wrapper, inner) {
 	const uri = wrapper.uri === void 0 ? "" : ` w:uri="${escapeXmlAttribute(wrapper.uri)}"`;
-	const properties = sanitizeCapturedXmlElement(wrapper.propertiesXml, {
-		allowedLocalNames: TAGGED_WRAPPER_PROPERTY_NAMES[kind],
-		allowedNamespaceUris: WORDPROCESSINGML_NAMESPACE,
-		inheritedNamespaceScope: OOXML_NAMESPACE_SCOPE
-	}) ?? "";
+	const properties = TAGGED_WRAPPER_PROPERTIES_SANITIZERS[kind](wrapper.propertiesXml) ?? "";
 	return `<w:${kind}${uri} w:element="${escapeXmlAttribute(wrapper.element)}">${properties}${inner}</w:${kind}>`;
 }
 /** Emit the `<w:commentReference>` run Word places after a comment range end. */

package/dist/docx/serializer/settingsSerializer.js

@@ -2,11 +2,29 @@ import { serializePartElement } from "./partNamespaces.js";
 import { intAttr } from "./xmlUtils.js";
 import { escapeXmlAttribute, serializeOnOffElement } from "@stll/docx-core";
 //#region src/docx/serializer/settingsSerializer.ts
+/** `w:compatSetting/@w:uri` the named application compatibility settings share. */
+const COMPAT_SETTING_URI = "http://schemas.microsoft.com/office/word";
+/**
+* Named compatibility settings written on alongside `compatibilityMode` 15 and
+* later. Layout never gates run typography on a compatibility setting and
+* never flips `w:mirrorIndents`, so declaring both on describes how the
+* package is already laid out.
+*/
+const MODERN_COMPAT_SETTINGS = ["enableOpenTypeFeatures", "doNotFlipMirrorIndents"];
+const FIRST_MODERN_COMPATIBILITY_MODE = 15;
+const compatSettingXml = (name, val) => `<w:compatSetting w:name="${name}" w:uri="${COMPAT_SETTING_URI}" w:val="${intAttr(val)}"/>`;
+const serializeCompat = (compatibilityMode) => {
+	if (compatibilityMode === void 0) return "";
+	const settings = [compatSettingXml("compatibilityMode", compatibilityMode)];
+	if (compatibilityMode >= FIRST_MODERN_COMPATIBILITY_MODE) for (const name of MODERN_COMPAT_SETTINGS) settings.push(compatSettingXml(name, 1));
+	return `<w:compat>${settings.join("")}</w:compat>`;
+};
 const serializeSettingsXml = (settings) => {
 	const parts = [
 		`<w:defaultTabStop w:val="${intAttr(settings.defaultTabStop)}"/>`,
 		serializeOnOffElement(settings.evenAndOddHeaders, "evenAndOddHeaders"),
-		serializeOnOffElement(settings.updateFields, "updateFields")
+		serializeOnOffElement(settings.updateFields, "updateFields"),
+		serializeCompat(settings.compatibilityMode)
 	];
 	if (settings.themeFontLang) {
 		const attrs = [];

package/dist/docx/settingsParser.js

@@ -1,3 +1,4 @@
+import { parseEndnoteProperties } from "./notePropertiesParser.js";
 import { WORDPROCESSINGML_NAMESPACE_URIS, findChild, findChildByNamespaceUri, findChildren, getAttribute, parseBooleanElement, parseXmlDocument } from "./xmlParser.js";
 //#region src/docx/settingsParser.ts
 /** OOXML default per §17.6.13 when `w:defaultTabStop` is absent. */
@@ -61,6 +62,8 @@ function parseSettings(xml) {
 	const wordprocessingCompat = root ? findChildByNamespaceUri(root, WORDPROCESSINGML_NAMESPACE_URIS, "compat") : null;
 	const adjustLineHeightInTable = wordprocessingCompat ? findChildByNamespaceUri(wordprocessingCompat, WORDPROCESSINGML_NAMESPACE_URIS, "adjustLineHeightInTable") : null;
 	if (adjustLineHeightInTable && parseBooleanElement(adjustLineHeightInTable)) settings.adjustLineHeightInTable = true;
+	const doNotUseIndentAsNumberingTabStop = wordprocessingCompat ? findChildByNamespaceUri(wordprocessingCompat, WORDPROCESSINGML_NAMESPACE_URIS, "doNotUseIndentAsNumberingTabStop") : null;
+	if (doNotUseIndentAsNumberingTabStop && parseBooleanElement(doNotUseIndentAsNumberingTabStop)) settings.doNotUseIndentAsNumberingTabStop = true;
 	const applyBreakingRules = compat ? findChild(compat, "w", "applyBreakingRules") : null;
 	const useLegacyEthiopicAmharicRules = applyBreakingRules !== null && parseBooleanElement(applyBreakingRules);
 	if (noLineBreaksBefore || noLineBreaksAfter || useLegacyEthiopicAmharicRules) settings.lineBreakRules = {
@@ -68,6 +71,11 @@ function parseSettings(xml) {
 		...noLineBreaksAfter ? { noLineBreaksAfter } : {},
 		...useLegacyEthiopicAmharicRules ? { useLegacyEthiopicAmharicRules: true } : {}
 	};
+	const endnotePr = root ? findChild(root, "w", "endnotePr") : null;
+	if (endnotePr) {
+		const endnoteProperties = parseEndnoteProperties(endnotePr);
+		if (Object.keys(endnoteProperties).length > 0) settings.endnotePr = endnoteProperties;
+	}
 	return settings;
 }
 function parseCompatibilityMode(compat) {

package/dist/docx/streamingXmlParser.d.ts

@@ -1,4 +1,4 @@
-import { XmlElement } from "./xmlParser.js";
+import { XmlElement, XmlNamespaceScope } from "./xmlParser.js";
 //#region src/docx/streamingXmlParser.d.ts
 type ParseXmlResult = {
   status: "parsed";
@@ -16,7 +16,11 @@ type AttributeValueSpan = {
   end: number;
 };
 type OpenTagVisitor = (element: XmlElement, attributeValueSpans: ReadonlyMap<string, AttributeValueSpan>) => ReadonlyMap<string, string> | null;
-declare const parseStreamingXml: (xml: string) => ParseXmlResult;
+/**
+ * @param inheritedNamespaceScope the bindings in scope around `xml`, for a
+ *   fragment captured out of a part whose root declared them.
+ */
+declare const parseStreamingXml: (xml: string, inheritedNamespaceScope?: XmlNamespaceScope) => ParseXmlResult;
 /** Rewrite selected decimal attribute values while preserving every other source byte. */
 declare const rewriteStreamingXmlDecimalAttributes: (xml: string, visitOpenTag: OpenTagVisitor) => {
   status: "rewritten";

package/dist/docx/streamingXmlParser.js

@@ -1,4 +1,4 @@
-import { attachXmlNamespaceContext } from "./xmlParser.js";
+import { EMPTY_NAMESPACE_SCOPE, attachXmlNamespaceContext } from "./xmlNamespaceContext.js";
 import { FOLIO_XML_RESOURCE_LIMITS } from "./xmlResourceLimits.js";
 //#region src/docx/streamingXmlParser.ts
 const BUILT_IN_ENTITIES = {
@@ -8,7 +8,7 @@ const BUILT_IN_ENTITIES = {
 	lt: "<",
 	quot: "\""
 };
-const parseStreamingXmlInternal = (xml, visitOpenTag) => {
+const parseStreamingXmlInternal = (xml, visitOpenTag, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) => {
 	const root = { elements: [] };
 	const stack = [];
 	const replacements = [];
@@ -39,6 +39,7 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 			const close = xml.indexOf("?>", open + 2);
 			if (close === -1) return { status: "unsupported" };
 			cursor = close + 2;
+			mergeAdjacentText = false;
 			continue;
 		}
 		if (xml.startsWith("<!", open)) return { status: "unsupported" };
@@ -54,8 +55,8 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 		}
 		const parsedTag = parseOpenTag(xml, open + 1, close, visitOpenTag !== void 0);
 		if (parsedTag.status === "unsupported") return parsedTag;
-		const parent = stack.at(-1)?.element ?? root;
-		attachXmlNamespaceContext(parsedTag.element, parent.namespaceScope);
+		const parent = stack.at(-1)?.element;
+		attachXmlNamespaceContext(parsedTag.element, parent === void 0 ? inheritedNamespaceScope : parent.namespaceScope);
 		const rewritten = visitOpenTag?.(parsedTag.element, parsedTag.attributeValueSpans ?? /* @__PURE__ */ new Map());
 		if (rewritten) for (const [attributeName, value] of rewritten) {
 			const span = parsedTag.attributeValueSpans?.get(attributeName);
@@ -65,7 +66,7 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 				value
 			});
 		}
-		appendElement(parent, parsedTag.element);
+		appendElement(parent ?? root, parsedTag.element);
 		if (!parsedTag.selfClosing) {
 			if (stack.length >= FOLIO_XML_RESOURCE_LIMITS.maxDepth) return { status: "unsupported" };
 			stack.push({
@@ -83,8 +84,12 @@ const parseStreamingXmlInternal = (xml, visitOpenTag) => {
 		replacements
 	};
 };
-const parseStreamingXml = (xml) => {
-	const parsed = parseStreamingXmlInternal(xml);
+/**
+* @param inheritedNamespaceScope the bindings in scope around `xml`, for a
+*   fragment captured out of a part whose root declared them.
+*/
+const parseStreamingXml = (xml, inheritedNamespaceScope = EMPTY_NAMESPACE_SCOPE) => {
+	const parsed = parseStreamingXmlInternal(xml, void 0, inheritedNamespaceScope);
 	return parsed.status === "parsed" ? {
 		status: "parsed",
 		value: parsed.value

package/dist/docx/styleParser.js

@@ -407,22 +407,48 @@ function resolveStyleInheritance(style, styleMap, visited = /* @__PURE__ */ new
 	const mergedRPr = mergeStyleTextFormatting(resolvedParent.rPr, style.rPr);
 	if (mergedRPr) resolved.rPr = mergedRPr;
 	if (style.type === "table") {
-		if (resolvedParent.tblPr || style.tblPr) resolved.tblPr = {
-			...resolvedParent.tblPr,
-			...style.tblPr
-		};
+		if (resolvedParent.tblPr || style.tblPr) {
+			const tblPr = {
+				...resolvedParent.tblPr,
+				...style.tblPr
+			};
+			const borders = mergeSides(resolvedParent.tblPr?.borders, style.tblPr?.borders);
+			if (borders) tblPr.borders = borders;
+			const cellMargins = mergeSides(resolvedParent.tblPr?.cellMargins, style.tblPr?.cellMargins);
+			if (cellMargins) tblPr.cellMargins = cellMargins;
+			resolved.tblPr = tblPr;
+		}
 		if (resolvedParent.trPr || style.trPr) resolved.trPr = {
 			...resolvedParent.trPr,
 			...style.trPr
 		};
-		if (resolvedParent.tcPr || style.tcPr) resolved.tcPr = {
-			...resolvedParent.tcPr,
-			...style.tcPr
-		};
+		if (resolvedParent.tcPr || style.tcPr) {
+			const tcPr = {
+				...resolvedParent.tcPr,
+				...style.tcPr
+			};
+			const borders = mergeSides(resolvedParent.tcPr?.borders, style.tcPr?.borders);
+			if (borders) tcPr.borders = borders;
+			const margins = mergeSides(resolvedParent.tcPr?.margins, style.tcPr?.margins);
+			if (margins) tcPr.margins = margins;
+			resolved.tcPr = tcPr;
+		}
 	}
 	return resolved;
 }
 /**
+* Each child of `w:tblBorders`, `w:tcBorders`, `w:tblCellMar` and `w:tcMar` is
+* its own property, so a style that states one side inherits the others from
+* its `w:basedOn` parent (ECMA-376 §17.7.4.3).
+*/
+function mergeSides(parent, child) {
+	if (!parent || !child) return child ?? parent;
+	return {
+		...parent,
+		...child
+	};
+}
+/**
 * Parse styles.xml content
 *
 * @param stylesXml - XML content of styles.xml