@stll/folio-core 0.58.3 → 0.58.5

package/dist/controller/canonicalListRendering.d.ts

@@ -0,0 +1,10 @@
+import { document_d_exports } from "../types/document.js";
+import { DocumentOp } from "@stll/docx-core/ops";
+//#region src/controller/canonicalListRendering.d.ts
+type CanonicalListNormalization = {
+  document: document_d_exports.Document;
+  inverse: DocumentOp[];
+};
+declare const normalizeCanonicalListRendering: (document: document_d_exports.Document) => CanonicalListNormalization;
+//#endregion
+export { normalizeCanonicalListRendering };

package/dist/controller/canonicalListRendering.js

@@ -0,0 +1,169 @@
+import { foldListNumberFields, planParagraphListNumberFold, unfoldedListNumberContent } from "../docx/foldedListNumberFields.js";
+import { computeListMarker } from "../docx/listMarkerComputation.js";
+import { listRenderingDefinitionsMatch } from "../docx/listRendering.js";
+import { computeListRendering, getCachedNumberingMap } from "../docx/numberingParser.js";
+import { mergeParagraphNumbering, paragraphNumberingReferenceId, sameStatedParagraphNumbering } from "../docx/numberingReference.js";
+import { assignParagraphIndentationProjection, cloneParagraphWithPropertySource, paragraphFormattingWithAuthoredIndentation, sameParagraphIndentationProjection } from "../docx/paragraphPropertySource.js";
+import { paragraphIndentationFromFormatting } from "../prosemirror/paragraphIndentation.js";
+import { listIndentationProvenancePatch } from "../prosemirror/styles/resolvedStyleAttrs.js";
+import { createStyleResolver } from "../prosemirror/styles/styleResolver.js";
+import { canonicalJson } from "../utils/canonicalJson.js";
+import { panic } from "better-result";
+import { DOCUMENT_OP_TYPES, EMPTY_PROPERTY_SETS, OP_STORIES, registerParagraphPropertySnapshot, withBodyContent } from "@stll/docx-core/ops";
+//#region src/controller/canonicalListRendering.ts
+/** Canonical edits retain authored fields; list rendering follows the current numbering. */
+const normalizeCanonicalListRendering = (document) => {
+	const inverse = [];
+	const styles = createStyleResolver(document.package.styles);
+	const numbering = document.package.numbering === void 0 ? null : getCachedNumberingMap(document.package.numbering);
+	const normalizeBody = (body, story) => {
+		const counters = {
+			numbering,
+			listCounters: /* @__PURE__ */ new Map(),
+			abstractCounters: /* @__PURE__ */ new Map(),
+			restartedNumIds: /* @__PURE__ */ new Set(),
+			previousList: {
+				abstractNumId: null,
+				fromStyle: false,
+				numId: null
+			}
+		};
+		const content = body.content.map((paragraph) => {
+			if (paragraph.type !== "paragraph") return paragraph;
+			registerParagraphPropertySnapshot({
+				paragraph,
+				snapshot: paragraphFormattingWithAuthoredIndentation(paragraph)
+			});
+			const formatting = paragraph.formatting;
+			const numPr = mergeParagraphNumbering(formatting?.numPrFromStyle, formatting?.numPr);
+			if (paragraph.listRendering === void 0 && formatting?.numPrFromStyle === void 0 && (numPr?.kind !== "reference" || numbering === null)) {
+				computeListMarker(paragraph, counters);
+				return paragraph;
+			}
+			const definition = numPr?.kind === "reference" && numbering !== null ? computeListRendering(numPr, numbering) : null;
+			const cached = paragraph.listRendering;
+			const rendering = definition !== null && cached !== void 0 && listRenderingDefinitionsMatch(cached, definition) ? { ...cached } : definition;
+			const next = cloneParagraphWithPropertySource(paragraph, {});
+			if (formatting?.numPrFromStyle !== void 0 && formatting.numPr !== void 0 && paragraphNumberingReferenceId(numPr) !== paragraphNumberingReferenceId(formatting.numPrFromStyle)) {
+				next.formatting = { ...formatting };
+				delete next.formatting.numPrFromStyle;
+				inverse.push({
+					type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
+					story,
+					blockId: paragraph.paraId ?? panic("Canonical numbering normalization requires paragraph identities."),
+					patch: { numPrFromStyle: formatting.numPrFromStyle }
+				});
+			}
+			if (formatting?.numPrFromStyle !== void 0 && numPr?.kind === "reference" && !sameStatedParagraphNumbering(formatting.numPr, numPr)) {
+				next.formatting = {
+					...next.formatting,
+					numPr
+				};
+				inverse.push({
+					type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
+					story,
+					blockId: paragraph.paraId ?? panic("Canonical numbering normalization requires paragraph identities."),
+					patch: { numPr: formatting.numPr ?? null }
+				});
+			}
+			const authoredFormatting = paragraphFormattingWithAuthoredIndentation(next);
+			assignParagraphIndentationProjection({
+				paragraph: next,
+				authored: authoredFormatting,
+				inherited: paragraphIndentationFromFormatting(listIndentationProvenancePatch({
+					direct: paragraphIndentationFromFormatting(authoredFormatting),
+					styleFormatting: styles.resolveParagraphStyle(next.formatting?.styleId).paragraphFormatting,
+					numberingSource: next.formatting?.numPrFromStyle === void 0 ? "paragraph" : "style",
+					numPr: numPr?.kind === "reference" ? {
+						numId: numPr.numId,
+						ilvl: numPr.ilvl ?? 0
+					} : void 0,
+					numbering
+				})._resolvedFormatting) ?? {}
+			});
+			if (canonicalJson(paragraphIndentationFromFormatting(next.formatting)) !== canonicalJson(paragraphIndentationFromFormatting(formatting))) inverse.unshift({
+				type: DOCUMENT_OP_TYPES.SET_PARAGRAPH_PROPS,
+				story,
+				blockId: paragraph.paraId ?? panic("Canonical numbering normalization requires paragraph identities."),
+				patch: {
+					indentLeft: formatting?.indentLeft ?? null,
+					indentRight: formatting?.indentRight ?? null,
+					indentFirstLine: formatting?.indentFirstLine ?? null,
+					hangingIndent: formatting?.hangingIndent ?? null
+				},
+				whenEmpty: formatting === void 0 ? EMPTY_PROPERTY_SETS.OMIT : EMPTY_PROPERTY_SETS.KEEP
+			});
+			if (rendering === null) delete next.listRendering;
+			else {
+				const fields = foldListNumberFields(paragraph.content.map(unfoldedListNumberContent), () => void 0).fieldCount;
+				if (fields === 0) delete rendering.implicitChildLevelAdvances;
+				else rendering.implicitChildLevelAdvances = fields;
+				const template = rendering.markerTemplate ?? rendering.marker;
+				const fold = planParagraphListNumberFold(paragraph.content, !rendering.isBullet && template !== "" && !template.includes("	"));
+				if (fold.suffix === void 0) delete rendering.foldedMarkerSuffix;
+				else rendering.foldedMarkerSuffix = fold.suffix;
+				const child = numbering?.getLevel(rendering.numId, rendering.level + 1)?.pPr;
+				if (fold.suffix !== void 0 && child?.hangingIndent === true && child.indentFirstLine !== void 0 && child.indentFirstLine < 0) rendering.markerSecondSlotOffsetTwips = -child.indentFirstLine;
+				else delete rendering.markerSecondSlotOffsetTwips;
+				rendering.marker = rendering.foldedMarkerSuffix !== void 0 && !template.includes("	") ? `${template}\t${rendering.foldedMarkerSuffix}` : template;
+				next.listRendering = rendering;
+			}
+			computeListMarker(next, counters);
+			registerParagraphPropertySnapshot({
+				paragraph: next,
+				snapshot: authoredFormatting
+			});
+			if (sameParagraphIndentationProjection({
+				left: next,
+				right: paragraph
+			}) && canonicalJson(next.formatting) === canonicalJson(formatting) && canonicalJson(next.listRendering) === canonicalJson(cached)) return paragraph;
+			return next;
+		});
+		return content.every((paragraph, index) => paragraph === body.content[index]) ? body : {
+			...body,
+			...withBodyContent(body, content)
+		};
+	};
+	const pkg = document.package;
+	const body = normalizeBody(pkg.document, OP_STORIES.MAIN);
+	const normalizeParts = (parts, kind) => {
+		if (parts === void 0) return parts;
+		const normalized = new Map([...parts].map(([id, part]) => [id, normalizeBody(part, {
+			kind,
+			rId: id
+		})]));
+		return [...normalized].every(([id, part]) => part === parts.get(id)) ? parts : normalized;
+	};
+	const normalizeNotes = (notes, kind) => {
+		if (notes === void 0) return notes;
+		const normalized = notes.map((note) => normalizeBody(note, {
+			kind,
+			id: note.id
+		}));
+		return normalized.every((note, index) => note === notes[index]) ? notes : normalized;
+	};
+	const headers = normalizeParts(pkg.headers, "header");
+	const footers = normalizeParts(pkg.footers, "footer");
+	const footnotes = normalizeNotes(pkg.footnotes, "footnote");
+	const endnotes = normalizeNotes(pkg.endnotes, "endnote");
+	if (body === pkg.document && headers === pkg.headers && footers === pkg.footers && footnotes === pkg.footnotes && endnotes === pkg.endnotes) return {
+		document,
+		inverse
+	};
+	return {
+		inverse,
+		document: {
+			...document,
+			package: {
+				...pkg,
+				document: body,
+				...headers === void 0 ? {} : { headers },
+				...footers === void 0 ? {} : { footers },
+				...footnotes === void 0 ? {} : { footnotes },
+				...endnotes === void 0 ? {} : { endnotes }
+			}
+		}
+	};
+};
+//#endregion
+export { normalizeCanonicalListRendering };

package/dist/controller/canonicalSession.js

@@ -1,12 +1,13 @@
 import { splitsGraphemeCluster, splitsSurrogatePair } from "../ai-edits/character-boundaries.js";
 import { rangedCommentIds, visitCommentMarkers } from "../docx/commentAnchorIndex.js";
-import { cloneDocumentWithParagraphPropertySources, copyDocumentParagraphPropertySourceContract, copyParagraphPropertySource } from "../docx/paragraphPropertySource.js";
+import { cloneDocumentWithParagraphPropertySources, copyDocumentParagraphPropertySourceContract, copyParagraphPropertySource, restoreParagraphIndentationProjection } from "../docx/paragraphPropertySource.js";
 import { canonicalSelectionRange } from "../prosemirror/canonicalSelectionRange.js";
 import { collectPairedBookmarkIds, footnoteToProseDoc, headerFooterToProseDoc, toProseDoc } from "../prosemirror/conversion/toProseDoc.js";
 import { markPackageChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
 import { runFormattingPatchFromMarks } from "../prosemirror/runFormattingFromMarks.js";
 import { CANONICAL_GAP } from "../types/canonicalCapabilities.js";
 import { canonicalInlineSourceIssue, canonicalNativeCells, projectCanonicalInline } from "./canonicalInlineProjection.js";
+import { normalizeCanonicalListRendering } from "./canonicalListRendering.js";
 import { restoreCanonicalSelection } from "./canonicalSelection.js";
 import { mapTocSelection } from "./canonicalTocSelection.js";
 import { Result, TaggedError, panic } from "better-result";
@@ -237,7 +238,7 @@ const changedStories = ({ document, previous }) => {
 	}
 	return stories;
 };
-const preservePropertySources = ({ target, source, stories = documentStories(source) }) => {
+const preservePropertySources = ({ target, source, stories = documentStories(source), indentation = "derive" }) => {
 	for (const story of stories) {
 		const originals = findStoryBody(source, story)?.content ?? [];
 		const derived = findStoryBody(target, story)?.content ?? [];
@@ -246,7 +247,13 @@ const preservePropertySources = ({ target, source, stories = documentStories(sou
 		for (const [index, original] of originals.entries()) {
 			if (original.type !== "paragraph") continue;
 			const next = original.paraId === void 0 ? derived.at(index) : paragraphs.get(original.paraId);
-			if (next?.type === "paragraph" && next !== original) copyParagraphPropertySource(next, original);
+			if (next?.type === "paragraph" && next !== original) {
+				copyParagraphPropertySource(next, original);
+				if (indentation === "restore") restoreParagraphIndentationProjection({
+					target: next,
+					source: original
+				});
+			}
 		}
 	}
 	copyDocumentParagraphPropertySourceContract(target, source);
@@ -998,6 +1005,14 @@ var CanonicalSession = class {
 		const applied = stagedApplied === void 0 ? applyDocumentOps(this.currentDocument, ops) : Result.ok(stagedApplied);
 		if (applied.isErr()) return refuse(applied.error.message);
 		if (applied.value.inverse.length === 0) return noChange("The intent makes no document change.");
+		if (propertySourceDocument !== void 0) preservePropertySources({
+			target: applied.value.document,
+			source: propertySourceDocument,
+			indentation: "restore"
+		});
+		const normalized = normalizeCanonicalListRendering(applied.value.document);
+		applied.value.document = normalized.document;
+		applied.value.inverse = normalized.inverse.concat(applied.value.inverse);
 		const changed = changedStories({
 			document: applied.value.document,
 			previous: this.currentDocument
@@ -1138,13 +1153,18 @@ const createCanonicalSession = (document, styles) => {
 	const unsupported = unsupportedSeedReason(document);
 	if (unsupported !== null) return refuse(unsupported);
 	const owned = cloneDocumentWithParagraphPropertySources(document);
-	const normalized = normalizeForOps(owned);
+	const identified = normalizeForOps(owned);
 	preservePropertySources({
-		target: normalized,
+		target: identified,
 		source: owned
 	});
-	const validated = validateOpsDocument(normalized);
+	const validated = validateOpsDocument(identified);
 	if (validated.isErr()) return refuse(validated.error.message);
+	const normalized = normalizeCanonicalListRendering(identified).document;
+	preservePropertySources({
+		target: normalized,
+		source: owned
+	});
 	const projected = project({
 		document: normalized,
 		styles

package/dist/docx/blockContentParser.d.ts

@@ -3,6 +3,7 @@ import { NumberingMap } from "./numberingParser.js";
 import { ParseContext } from "./parseContext.js";
 import { XmlElement } from "./xmlParser.js";
 import { OwnedElsewhere } from "./containerChildren.js";
+import { PreviousListState } from "./listMarkerComputation.js";
 import { PreviewLedger } from "./previewBudget.js";
 import { StyleMap } from "./styleParser.js";
 //#region src/docx/blockContentParser.d.ts
@@ -16,11 +17,6 @@ type ParseBlockContentOptions = {
 type BlockContentScope = ParseBlockContentOptions & {
   previews: PreviewLedger;
 };
-type PreviousListState = {
-  abstractNumId: number | null;
-  fromStyle: boolean;
-  numId: number | null;
-};
 type ParseBlockContentState = {
   listCounters: Map<number, number[]>;
   abstractCounters: Map<number, number[]>;

package/dist/docx/blockContentParser.js

@@ -1,9 +1,7 @@
 import { blockCustomXmlShell } from "./blockCustomXmlShell.js";
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
-import { bulletMarkerFontName, convertBulletToUnicode } from "./bulletMarkers.js";
 import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
-import { isNumberingReference } from "./numberingReference.js";
-import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
+import { computeListMarker } from "./listMarkerComputation.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
@@ -11,77 +9,6 @@ import { captureSdtSiblingMarkers, parseSdtProperties } from "./sdtProperties.js
 import { parseTable } from "./tableParser.js";
 import { findWordprocessingChild, getLocalName, mergeXmlnsDeclarations, selectAlternateContentBranch } from "./xmlParser.js";
 //#region src/docx/blockContentParser.ts
-const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }) => {
-	const listRendering = paragraph.listRendering;
-	if (!listRendering || !numbering) {
-		previousList.abstractNumId = null;
-		previousList.fromStyle = false;
-		previousList.numId = null;
-		return;
-	}
-	const { numId, level } = listRendering;
-	if (!isNumberingReference(numId)) {
-		previousList.abstractNumId = null;
-		previousList.fromStyle = false;
-		previousList.numId = null;
-		return;
-	}
-	const firstEncounter = !listCounters.has(numId);
-	if (firstEncounter) listCounters.set(numId, Array.from({ length: 9 }).fill(NaN));
-	let counters = listCounters.get(numId);
-	if (!counters) return;
-	const abstractNumId = numbering.getAbstractNumId(numId);
-	const styleNumbering = paragraph.formatting?.numPrFromStyle;
-	const resumesRestartedInstance = firstEncounter && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
-	const resumesStyleInstance = firstEncounter && !styleNumbering && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.fromStyle === true;
-	if (abstractNumId !== null && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) {
-		const latestAbstractCounters = abstractCounters.get(abstractNumId);
-		if (latestAbstractCounters) {
-			counters = latestAbstractCounters;
-			listCounters.set(numId, counters);
-		}
-	}
-	if (listRendering.startOverride !== void 0 || resumesRestartedInstance || previousList.numId === numId && restartedNumIds.has(numId)) restartedNumIds.add(numId);
-	if (abstractNumId !== null && level > 0) {
-		const latestAbstractCounters = abstractCounters.get(abstractNumId);
-		if (counters.slice(0, level).every(Number.isNaN)) for (let i = 0; i < level; i += 1) {
-			const latestCounter = latestAbstractCounters?.[i];
-			counters[i] = latestCounter !== void 0 && !Number.isNaN(latestCounter) ? latestCounter : numbering.getLevel(numId, i)?.start ?? 1;
-		}
-	}
-	if (Number.isNaN(counters[level])) counters[level] = (numbering.getLevel(numId, level)?.start ?? 1) - 1;
-	counters[level] = (counters[level] ?? 0) + 1;
-	for (let i = level + 1; i < counters.length; i += 1) counters[i] = NaN;
-	const childAdvances = listRendering.implicitChildLevelAdvances ?? 0;
-	if (childAdvances > 0 && level + 1 < counters.length) {
-		const childCounter = counters[level + 1];
-		counters[level + 1] = (childCounter === void 0 || Number.isNaN(childCounter) ? 0 : childCounter) + childAdvances;
-	}
-	if (abstractNumId !== null) abstractCounters.set(abstractNumId, counters);
-	previousList.abstractNumId = abstractNumId;
-	previousList.fromStyle = Boolean(styleNumbering);
-	previousList.numId = numId;
-	const pattern = listRendering.marker;
-	if (listRendering.isBullet) {
-		listRendering.marker = convertBulletToUnicode(pattern || "", bulletMarkerFontName(listRendering.markerFormatting));
-		previousList.abstractNumId = null;
-		previousList.fromStyle = false;
-		previousList.numId = null;
-		return;
-	}
-	let computedMarker = pattern;
-	const useLegalNumbering = numbering.getLevel(numId, level)?.isLgl === true || listRendering.isLegal === true;
-	for (let lvl = 0; lvl <= level; lvl += 1) {
-		const placeholder = `%${lvl + 1}`;
-		if (computedMarker.includes(placeholder)) {
-			const value = counters[lvl] ?? 0;
-			const levelInfo = numbering.getLevel(numId, lvl);
-			const formatted = formatOoxmlCounter(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
-			computedMarker = computedMarker.replaceAll(placeholder, formatted);
-		}
-	}
-	listRendering.marker = computedMarker;
-};
 const withContainerXmlns = (state, element) => ({
 	...state,
 	options: {

package/dist/docx/foldedListNumberFields.d.ts

@@ -72,6 +72,8 @@ type ListNumberFoldPlan = {
  * further in is on the line.
  */
 declare const planListNumberFold: (items: readonly ListNumberFoldItem[], markerShowsFields: boolean) => ListNumberFoldPlan;
+/** Derive the marker fold from current captures, never from cached rendering. */
+declare const planParagraphListNumberFold: (content: readonly document_d_exports.ParagraphContent[], showsFields: boolean) => ListNumberFoldPlan;
 /** The item a capture stands for, which shows on the line; any other item is itself. */
 declare const unfoldedListNumberContent: (content: document_d_exports.ParagraphContent) => document_d_exports.ParagraphContent;
 /**
@@ -82,4 +84,4 @@ declare const unfoldedListNumberContent: (content: document_d_exports.ParagraphC
  */
 declare const normalizeFoldedListNumbers: (paragraph: document_d_exports.Paragraph) => void;
 //#endregion
-export { ListNumberFieldFold, ListNumberFoldItem, ListNumberFoldPlan, foldListNumberFields, foldedListNumberOf, isFoldedListNumber, isFoldedListNumberCapture, isListNumberField, isListNumberGapMarker, isTabOnlyRun, normalizeFoldedListNumbers, planListNumberFold, unfoldedListNumberContent };
+export { ListNumberFieldFold, ListNumberFoldItem, ListNumberFoldPlan, foldListNumberFields, foldedListNumberOf, isFoldedListNumber, isFoldedListNumberCapture, isListNumberField, isListNumberGapMarker, isTabOnlyRun, normalizeFoldedListNumbers, planListNumberFold, planParagraphListNumberFold, unfoldedListNumberContent };

package/dist/docx/foldedListNumberFields.js

@@ -202,6 +202,8 @@ const foldItemOf = (content) => {
 	} : { kind: "tab" };
 	return isZeroWidth(content) ? { kind: "hidden" } : { kind: "shown" };
 };
+/** Derive the marker fold from current captures, never from cached rendering. */
+const planParagraphListNumberFold = (content, showsFields) => planListNumberFold(content.map(foldItemOf), showsFields);
 /** The item a capture stands for, which shows on the line; any other item is itself. */
 const unfoldedListNumberContent = (content) => {
 	const folded = foldedListNumberOf(content);
@@ -253,7 +255,7 @@ const normalizeFoldedListNumbers = (paragraph) => {
 	});
 	const content = paragraph.content;
 	if (!state.showsFields && !content.some(isFoldedListNumberCapture)) return;
-	const plan = planListNumberFold(content.map(foldItemOf), state.showsFields);
+	const plan = planParagraphListNumberFold(content, state.showsFields);
 	const next = [];
 	for (const index of plan.order) {
 		const item = content[index];
@@ -264,4 +266,4 @@ const normalizeFoldedListNumbers = (paragraph) => {
 	if (rendering && state.showsFields) rendering.marker = listMarkerWithFold(state, plan.suffix);
 };
 //#endregion
-export { foldListNumberFields, foldedListNumberOf, isFoldedListNumber, isFoldedListNumberCapture, isListNumberField, isListNumberGapMarker, isTabOnlyRun, normalizeFoldedListNumbers, planListNumberFold, unfoldedListNumberContent };
+export { foldListNumberFields, foldedListNumberOf, isFoldedListNumber, isFoldedListNumberCapture, isListNumberField, isListNumberGapMarker, isTabOnlyRun, normalizeFoldedListNumbers, planListNumberFold, planParagraphListNumberFold, unfoldedListNumberContent };

package/dist/docx/listMarkerComputation.d.ts

@@ -0,0 +1,18 @@
+import { document_d_exports } from "../types/document.js";
+import { NumberingMap } from "./numberingParser.js";
+//#region src/docx/listMarkerComputation.d.ts
+type PreviousListState = {
+  abstractNumId: number | null;
+  fromStyle: boolean;
+  numId: number | null;
+};
+type ComputeListMarkerOptions = {
+  numbering: NumberingMap | null;
+  listCounters: Map<number, number[]>;
+  abstractCounters: Map<number, number[]>;
+  restartedNumIds: Set<number>;
+  previousList: PreviousListState;
+};
+declare const computeListMarker: (paragraph: document_d_exports.Paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }: ComputeListMarkerOptions) => void;
+//#endregion
+export { ComputeListMarkerOptions, PreviousListState, computeListMarker };

package/dist/docx/listMarkerComputation.js

@@ -0,0 +1,77 @@
+import { bulletMarkerFontName, convertBulletToUnicode } from "./bulletMarkers.js";
+import { isNumberingReference } from "./numberingReference.js";
+import { formatOoxmlCounter } from "./ooxmlCounterFormatter.js";
+//#region src/docx/listMarkerComputation.ts
+const computeListMarker = (paragraph, { numbering, listCounters, abstractCounters, restartedNumIds, previousList }) => {
+	const listRendering = paragraph.listRendering;
+	if (!listRendering || !numbering) {
+		previousList.abstractNumId = null;
+		previousList.fromStyle = false;
+		previousList.numId = null;
+		return;
+	}
+	const { numId, level } = listRendering;
+	if (!isNumberingReference(numId)) {
+		previousList.abstractNumId = null;
+		previousList.fromStyle = false;
+		previousList.numId = null;
+		return;
+	}
+	const firstEncounter = !listCounters.has(numId);
+	if (firstEncounter) listCounters.set(numId, Array.from({ length: 9 }).fill(NaN));
+	let counters = listCounters.get(numId);
+	if (!counters) return;
+	const abstractNumId = numbering.getAbstractNumId(numId);
+	const styleNumbering = paragraph.formatting?.numPrFromStyle;
+	const resumesRestartedInstance = firstEncounter && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.numId !== null && previousList.numId !== numId && restartedNumIds.has(previousList.numId);
+	const resumesStyleInstance = firstEncounter && !styleNumbering && listRendering.startOverride === void 0 && abstractNumId !== null && previousList.abstractNumId === abstractNumId && previousList.fromStyle === true;
+	if (abstractNumId !== null && (styleNumbering || resumesRestartedInstance || resumesStyleInstance)) {
+		const latestAbstractCounters = abstractCounters.get(abstractNumId);
+		if (latestAbstractCounters) {
+			counters = latestAbstractCounters;
+			listCounters.set(numId, counters);
+		}
+	}
+	if (listRendering.startOverride !== void 0 || resumesRestartedInstance || previousList.numId === numId && restartedNumIds.has(numId)) restartedNumIds.add(numId);
+	if (abstractNumId !== null && level > 0) {
+		const latestAbstractCounters = abstractCounters.get(abstractNumId);
+		if (counters.slice(0, level).every(Number.isNaN)) for (let i = 0; i < level; i += 1) {
+			const latestCounter = latestAbstractCounters?.[i];
+			counters[i] = latestCounter !== void 0 && !Number.isNaN(latestCounter) ? latestCounter : numbering.getLevel(numId, i)?.start ?? 1;
+		}
+	}
+	if (Number.isNaN(counters[level])) counters[level] = (numbering.getLevel(numId, level)?.start ?? 1) - 1;
+	counters[level] = (counters[level] ?? 0) + 1;
+	for (let i = level + 1; i < counters.length; i += 1) counters[i] = NaN;
+	const childAdvances = listRendering.implicitChildLevelAdvances ?? 0;
+	if (childAdvances > 0 && level + 1 < counters.length) {
+		const childCounter = counters[level + 1];
+		counters[level + 1] = (childCounter === void 0 || Number.isNaN(childCounter) ? 0 : childCounter) + childAdvances;
+	}
+	if (abstractNumId !== null) abstractCounters.set(abstractNumId, counters);
+	previousList.abstractNumId = abstractNumId;
+	previousList.fromStyle = Boolean(styleNumbering);
+	previousList.numId = numId;
+	const pattern = listRendering.marker;
+	if (listRendering.isBullet) {
+		listRendering.marker = convertBulletToUnicode(pattern || "", bulletMarkerFontName(listRendering.markerFormatting));
+		previousList.abstractNumId = null;
+		previousList.fromStyle = false;
+		previousList.numId = null;
+		return;
+	}
+	let computedMarker = pattern;
+	const useLegalNumbering = numbering.getLevel(numId, level)?.isLgl === true || listRendering.isLegal === true;
+	for (let lvl = 0; lvl <= level; lvl += 1) {
+		const placeholder = `%${lvl + 1}`;
+		if (computedMarker.includes(placeholder)) {
+			const value = counters[lvl] ?? 0;
+			const levelInfo = numbering.getLevel(numId, lvl);
+			const formatted = formatOoxmlCounter(value, useLegalNumbering ? "decimal" : levelInfo?.numFmt || "decimal");
+			computedMarker = computedMarker.replaceAll(placeholder, formatted);
+		}
+	}
+	listRendering.marker = computedMarker;
+};
+//#endregion
+export { computeListMarker };

package/dist/docx/paragraphPropertySource.d.ts

@@ -12,12 +12,20 @@ type ParagraphPropertySource = Readonly<{
   [paragraphPropertySourceIndentationBaseline]: Readonly<Pick<document_d_exports.ParagraphFormatting, (typeof INDENTATION_FIELDS)[number]>>;
 }>;
 type IndentationFormatting = Pick<document_d_exports.ParagraphFormatting, (typeof INDENTATION_FIELDS)[number]>;
+type SameParagraphIndentationProjectionOptions = {
+  left: document_d_exports.Paragraph;
+  right: document_d_exports.Paragraph;
+};
+/** Fixed points retain both authored indentation and its effective baseline. */
+declare const sameParagraphIndentationProjection: ({ left, right }: SameParagraphIndentationProjectionOptions) => boolean;
 type CopyParagraphIndentationProjectionOptions = {
   target: document_d_exports.Paragraph;
   source: document_d_exports.Paragraph;
 };
 /** Retain effective-value provenance without copying a durable source identity. */
 declare const copyParagraphIndentationProjection: ({ target, source }: CopyParagraphIndentationProjectionOptions) => void;
+/** History restores its captured authored/effective baseline before normalization. */
+declare const restoreParagraphIndentationProjection: ({ target, source }: CopyParagraphIndentationProjectionOptions) => void;
 type AssignParagraphIndentationProjectionOptions = {
   paragraph: document_d_exports.Paragraph;
   authored: document_d_exports.ParagraphFormatting | undefined;
@@ -171,4 +179,4 @@ declare const linkParagraphPropertySourceCandidate: (target: document_d_exports.
 declare const getParagraphPropertySourceCandidate: (paragraph: document_d_exports.Paragraph) => document_d_exports.Paragraph | undefined;
 declare const getParagraphPropertySourceTransferId: (paragraph: document_d_exports.Paragraph) => string | undefined;
 //#endregion
-export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreParagraphIndentationProjection, restoreTableCellsWithParagraphPropertySources, sameParagraphIndentationProjection, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/docx/paragraphPropertySource.js

@@ -18,16 +18,34 @@ const INDENTATION_FIELDS = [
 const paragraphPropertyCapture = Symbol("paragraphPropertyCapture");
 const paragraphIndentationProjection = Symbol("paragraphIndentationProjection");
 const indentationProjections = /* @__PURE__ */ new WeakMap();
+const assignedIndentationProjections = /* @__PURE__ */ new WeakSet();
 const indentationProjectionFor = (paragraph) => {
 	const handle = Object.getOwnPropertyDescriptor(paragraph, paragraphIndentationProjection)?.value;
 	return typeof handle === "object" && handle !== null ? indentationProjections.get(handle) : void 0;
 };
+/** Fixed points retain both authored indentation and its effective baseline. */
+const sameParagraphIndentationProjection = ({ left, right }) => {
+	const a = indentationProjectionFor(left);
+	const b = indentationProjectionFor(right);
+	if (a === void 0 || b === void 0) return a === b;
+	return INDENTATION_FIELDS.every((key) => a.effective[key] === b.effective[key] && a.authored[key] === b.authored[key]);
+};
 /** Retain effective-value provenance without copying a durable source identity. */
 const copyParagraphIndentationProjection = ({ target, source }) => {
-	if (Object.hasOwn(target, paragraphIndentationProjection)) return;
+	if (assignedIndentationProjections.has(target) || Object.hasOwn(target, paragraphIndentationProjection)) return;
 	const descriptor = Object.getOwnPropertyDescriptor(source, paragraphIndentationProjection);
 	if (descriptor && indentationProjectionFor(source)) Object.defineProperty(target, paragraphIndentationProjection, descriptor);
 };
+/** History restores its captured authored/effective baseline before normalization. */
+const restoreParagraphIndentationProjection = ({ target, source }) => {
+	assignedIndentationProjections.delete(target);
+	Reflect.deleteProperty(target, paragraphIndentationProjection);
+	copyParagraphIndentationProjection({
+		target,
+		source
+	});
+	assignedIndentationProjections.add(target);
+};
 const indentationFields = (formatting) => ({
 	indentLeft: formatting?.indentLeft,
 	indentRight: formatting?.indentRight,
@@ -36,6 +54,7 @@ const indentationFields = (formatting) => ({
 });
 /** Keep the model's effective indentation without making inherited values authored. */
 const assignParagraphIndentationProjection = ({ paragraph, authored, inherited }) => {
+	assignedIndentationProjections.add(paragraph);
 	const effective = {
 		...inherited,
 		...indentationFields(authored)
@@ -50,6 +69,11 @@ const assignParagraphIndentationProjection = ({ paragraph, authored, inherited }
 		...authored,
 		...effective
 	};
+	if (Object.keys(paragraph.formatting).length === 0) delete paragraph.formatting;
+	if (Object.values(effective).every((value) => value === void 0) || getParagraphPropertySource(paragraph) === void 0 && INDENTATION_FIELDS.every((key) => effective[key] === authored?.[key])) {
+		Reflect.deleteProperty(paragraph, paragraphIndentationProjection);
+		return;
+	}
 	const handle = Object.freeze({});
 	indentationProjections.set(handle, Object.freeze({
 		effective: Object.freeze(indentationFields(paragraph.formatting)),
@@ -872,4 +896,4 @@ const linkParagraphPropertySourceCandidate = (target, source) => {
 const getParagraphPropertySourceCandidate = (paragraph) => paragraphPropertySourceCandidates.get(paragraph);
 const getParagraphPropertySourceTransferId = (paragraph) => paragraphPropertySourceTransferIds.get(paragraph);
 //#endregion
-export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, assignDocumentParagraphPropertySourceContract, assignParagraphIndentationProjection, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphIndentationProjection, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesAuthoredIndentation, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreParagraphIndentationProjection, restoreTableCellsWithParagraphPropertySources, sameParagraphIndentationProjection, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };

package/dist/internal/paragraphFormattingSerialization.js

@@ -6,7 +6,7 @@ import { TRANSITIONAL_NAME_BY_STRICT_NAME } from "../docx/strictNames.gen.js";
 import { createCapturedXmlSanitizer } from "../docx/verbatimCapture.js";
 import { NAMESPACES, OOXML_NAMESPACE_SCOPE } from "../docx/xmlParser.js";
 import { escapeXmlAttribute, serializeOnOffElement } from "@stll/docx-core";
-import { outlineLevelStatedValue, paragraphNumberingSlots, sameEffectiveParagraphNumbering } from "@stll/docx-core/model";
+import { mergeParagraphNumbering, outlineLevelStatedValue, paragraphNumberingLevel, paragraphNumberingSlots, sameEffectiveParagraphNumbering } from "@stll/docx-core/model";
 import { serializeSequenceChildren } from "@stll/docx-core/schema";
 //#region src/internal/paragraphFormattingSerialization.ts
 /**
@@ -167,7 +167,10 @@ const modelParagraphFormattingEmission = (input) => {
 				numberingChangeXml,
 				numberingInsertionXml
 			}) : serializeNumbering({
-				numPr,
+				numPr: numPr?.kind === "reference" && numPrFromStyle?.kind === "reference" && numPr.numId === numPrFromStyle.numId ? {
+					kind: "levelOnly",
+					ilvl: paragraphNumberingLevel(mergeParagraphNumbering(numPrFromStyle, numPr)) ?? 0
+				} : numPr,
 				numberingChangeXml,
 				numberingInsertionXml
 			})],

package/dist/markdown/renderBlock.js

@@ -19,56 +19,60 @@ function renderBlocks(ctx, pkg, blocks) {
 	const projection = ctx.opts.trackedChanges === "clean" ? projectAcceptedBlocks(blocks, pkg) : null;
 	if (projection?.completeness === "partial") pushWarning(ctx, "Some tracked structural changes could not be resolved.");
 	const ordered = projection?.blocks ?? blocks;
-	for (const block of ordered) switch (block.type) {
-		case "paragraph": {
-			const { markdown: md, isListItem } = renderParagraphBlock(ctx, pkg, block);
-			if (!md) {
-				prevWasListItem = false;
-				continue;
+	const renderBlock = (block) => {
+		switch (block.type) {
+			case "paragraph": return renderParagraphBlock(ctx, pkg, block);
+			case "table": {
+				ctx.listIndentWidths = [];
+				const md = renderTable(ctx, pkg, block);
+				ctx.listIndentWidths = [];
+				return {
+					type: "paragraph",
+					markdown: md
+				};
 			}
-			if (isListItem && prevWasListItem) out.push(md);
-			else if (out.length) out.push("", md);
-			else out.push(md);
-			prevWasListItem = isListItem;
-			break;
-		}
-		case "table": {
-			ctx.listIndentWidths = [];
-			const md = renderTable(ctx, pkg, block);
-			ctx.listIndentWidths = [];
-			if (md) {
-				if (out.length) out.push("");
-				out.push(md);
+			case "blockSdt":
+			case "blockCustomXml": {
+				ctx.listIndentWidths = [];
+				const nested = renderBlocks(ctx, pkg, block.content);
+				ctx.listIndentWidths = [];
+				return {
+					type: "paragraph",
+					markdown: nested
+				};
 			}
-			prevWasListItem = false;
-			break;
-		}
-		case "blockSdt":
-		case "blockCustomXml": {
-			ctx.listIndentWidths = [];
-			const nested = renderBlocks(ctx, pkg, block.content);
-			if (nested) {
-				if (out.length) out.push("");
-				out.push(nested);
+			case "preservedBlock": {
+				let markdown;
+				if (isAltChunkMarkup(block.xml)) markdown = block.readerText === void 0 ? ALT_CHUNK_READER_DIAGNOSTIC : `${ALT_CHUNK_READER_DIAGNOSTIC}\n\n${block.readerText}`;
+				else if (opaqueRevisionCarrierName(block.xml) !== void 0) markdown = OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC;
+				else if (isOpaqueNestedRowMarkup(block.xml)) markdown = "[Unsupported nested w:tr content]";
+				else return { type: "delimiter" };
+				ctx.listIndentWidths = [];
+				return {
+					type: "paragraph",
+					markdown
+				};
 			}
-			ctx.listIndentWidths = [];
-			prevWasListItem = false;
-			break;
+			case "bookmarkStart":
+			case "bookmarkEnd": return { type: "delimiter" };
+			default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
 		}
-		case "preservedBlock": {
-			const previousLength = out.length;
-			if (isAltChunkMarkup(block.xml)) out.push(block.readerText === void 0 ? ALT_CHUNK_READER_DIAGNOSTIC : `${ALT_CHUNK_READER_DIAGNOSTIC}\n\n${block.readerText}`);
-			else if (opaqueRevisionCarrierName(block.xml) !== void 0) out.push(OPAQUE_REVISION_CARRIER_READER_DIAGNOSTIC);
-			else if (isOpaqueNestedRowMarkup(block.xml)) out.push("[Unsupported nested w:tr content]");
-			if (out.length !== previousLength) {
-				ctx.listIndentWidths = [];
+	};
+	for (const block of ordered) {
+		const rendered = renderBlock(block);
+		switch (rendered.type) {
+			case "delimiter": continue;
+			case "paragraph":
+				if (rendered.markdown && out.length) out.push("");
 				prevWasListItem = false;
-			}
-			break;
+				break;
+			case "listItem":
+				if (out.length && (!prevWasListItem || rendered.separation === "loose")) out.push("");
+				prevWasListItem = true;
+				break;
+			default: panic(`Unsupported rendered block: ${JSON.stringify(rendered)}`);
 		}
-		case "bookmarkStart":
-		case "bookmarkEnd": break;
-		default: panic(`Unsupported block content in markdown: ${JSON.stringify(block)}`);
+		if (rendered.markdown) out.push(rendered.markdown);
 	}
 	ctx.listIndentWidths = outerListIndentWidths;
 	return out.join("\n");

package/dist/markdown/renderParagraph.d.ts

@@ -6,10 +6,14 @@ import { RenderContext } from "./types.js";
  * caller joins blocks.
  */
 declare function renderParagraph(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, para: document_d_exports.Paragraph): string;
-/** A rendered paragraph, and whether it is a Markdown list item. */
+/** List items declare the boundary needed to preserve their Markdown structure. */
 type RenderedParagraph = {
+  type: "paragraph";
   markdown: string;
-  isListItem: boolean;
+} | {
+  type: "listItem";
+  markdown: string;
+  separation: "tight" | "loose";
 };
 /**
  * Render a paragraph. A list item is a paragraph that shows a marker, which is

package/dist/markdown/renderParagraph.js

@@ -47,28 +47,25 @@ function renderParagraphBlock(ctx, pkg, para) {
 	if (headingLevel !== void 0) {
 		ctx.listIndentWidths = [];
 		if (!inline || !inline.trim() && label === void 0) return {
-			markdown: "",
-			isListItem: false
+			type: "paragraph",
+			markdown: ""
 		};
 		const hashes = "#".repeat(Math.min(MAX_MARKDOWN_HEADING_LEVEL, headingLevel + 1));
 		const headingInline = inlineBreaksToHtml(inline);
 		return {
 			markdown: label ? `${hashes} ${label} ${headingInline}` : `${hashes} ${headingInline}`,
-			isListItem: false
+			type: "paragraph"
 		};
 	}
-	if (list && label !== void 0) return {
-		markdown: renderListItem(ctx, list, label, inline),
-		isListItem: true
-	};
+	if (list && label !== void 0) return renderListItem(ctx, list, label, inline);
 	ctx.listIndentWidths = [];
 	if (isQuoteStyle(styleId, ctx.builtInStyles)) return {
 		markdown: inline.split("\n").map((line) => `> ${line}`).join("\n"),
-		isListItem: false
+		type: "paragraph"
 	};
 	return {
-		markdown: escapeLeadingBlockMarker(inline),
-		isListItem: false
+		type: "paragraph",
+		markdown: escapeLeadingBlockMarker(inline)
 	};
 }
 /** The paragraph's 0-based heading level, as `builtInStyles` classifies it. */
@@ -86,7 +83,7 @@ const UNNUMBERED = Object.freeze({});
 * style/list metadata. Escape the leading marker so literal text round-trips.
 */
 function escapeLeadingBlockMarker(text) {
-	return text.replace(/^(?<ws>[ \t]*)(?<marker>[#>])/gmu, "$<ws>\\$<marker>").replace(/^(?<ws>[ \t]*)(?<marker>[-+*])(?<after>[ \t])/gmu, "$<ws>\\$<marker>$<after>").replace(/^(?<ws>[ \t]*)(?<num>\d{1,9})(?<marker>[.)])(?<after>[ \t])/gmu, "$<ws>$<num>\\$<marker>$<after>");
+	return text.replace(/^(?<ws>[ \t]*)(?<marker>[#>=])/gmu, "$<ws>\\$<marker>").replace(/^(?<ws>[ \t]*)(?<marker>[-+*])(?=[ \t]|$)/gmu, "$<ws>\\$<marker>").replace(/^(?<ws>[ \t]*)-(?=[- \t]*$)/gmu, "$<ws>\\-").replace(/^(?<ws>[ \t]*)(?<num>\d{1,9})(?<marker>[.)])(?<after>[ \t])/gmu, "$<ws>$<num>\\$<marker>$<after>");
 }
 /**
 * Only emitted Markdown ancestors contribute columns. OOXML levels may skip
@@ -110,13 +107,22 @@ function listIndentWidth(ctx, level) {
 * a following, deeper item can indent correctly under it.
 */
 function renderListItem(ctx, list, label, inline) {
-	const nativeMarker = list.isBullet || /^\d{1,9}[.)]$/u.test(label);
-	if (!nativeMarker) ctx.listIndentWidths = [];
+	if (!(list.isBullet || /^\d{1,9}[.)]$/u.test(label))) {
+		ctx.listIndentWidths = [];
+		return {
+			type: "paragraph",
+			markdown: escapeLeadingBlockMarker(`${label} ${inline}`).trimEnd()
+		};
+	}
 	ctx.listIndentWidths.length = list.level;
 	const indent = " ".repeat(listIndentWidth(ctx, list.level));
 	const marker = list.isBullet ? "- " : `${label} `;
-	if (nativeMarker) ctx.listIndentWidths[list.level] = marker.length;
-	return `${indent}${marker}${inline}`.trimEnd();
+	ctx.listIndentWidths[list.level] = marker.length;
+	return {
+		type: "listItem",
+		markdown: `${indent}${marker}${escapeLeadingBlockMarker(inline)}`.trimEnd(),
+		separation: inline.trim().length === 0 ? "loose" : "tight"
+	};
 }
 //#endregion
 export { renderParagraph, renderParagraphBlock };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.58.3",
+  "version": "0.58.5",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -146,7 +146,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.36.0",
+    "@stll/docx-core": "^0.36.2",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.6.2",
     "better-result": "3.0.1",