asciidoc-abundant-tree 0.2.4 → 0.2.6

package/dist/animation-yaml-export/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { o as exportAnimationYaml } from "../src-8G5Sgsvr.mjs";
+import { o as exportAnimationYaml } from "../src-COUYWnMz.mjs";
 import process from "node:process";
 //#region src/animation-yaml-export/cli.ts
 const USAGE = `Usage:

package/dist/browser.mjs

@@ -407,6 +407,7 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 	};
 	const sourceSpan = options.logicalSourceSpan ? recoverSourceAwareSpan(document, options.logicalSourceSpan, false) : void 0;
 	if (sourceSpan && !sourceSpan.ok) return sourceSpan;
+	const raw = options.raw === "lines" ? `${sourceLines(sourceFile.lineTable, lineSpan.startLine, lineSpan.endLine).join("\n")}\n` : options.raw === "sourceSpan" && sourceSpan?.sourceSpan ? sliceSourceSpan(sourceFile.lineTable, sourceSpan.sourceSpan) : void 0;
 	return {
 		ok: true,
 		relativePath,
@@ -417,10 +418,13 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 			line: lineSpan.startLine,
 			span: lineSpan,
 			...sourceSpan?.sourceSpan ? { sourceSpan: sourceSpan.sourceSpan } : {},
-			...options.raw ? { raw: `${sourceLines(sourceFile.lineTable, lineSpan.startLine, lineSpan.endLine).join("\n")}\n` } : {}
+			...raw === void 0 ? {} : { raw }
 		}
 	};
 }
+function sliceSourceSpan(lineTable, span) {
+	return sourceLines(lineTable, span.start.line, span.end.line).map((text, index, lines) => Array.from(text).slice(index === 0 ? span.start.column - 1 : 0, index === lines.length - 1 ? span.end.column - 1 : void 0).join("")).join("\n");
+}
 function recoverSourceAwarePointSourceLayer(document, logicalSourceSpan, raw) {
 	const recovered = recoverSourceAwareSpan(document, logicalSourceSpan, true);
 	if (!recovered.ok) {
@@ -787,12 +791,7 @@ function trimBlankEdges(lines) {
 	return lines.slice(first, last);
 }
 function descriptionMetadataTermKey(term) {
-	const raw = term.source?.raw;
-	const sourceSpan = term.sourceSpan;
-	if (!raw || !sourceSpan || sourceSpan.start.line !== sourceSpan.end.line) return term.text;
-	const [line] = raw.split(/\r?\n/u);
-	if (line === void 0) return term.text;
-	return Array.from(line).slice(sourceSpan.start.column - 1, sourceSpan.end.column - 1).join("");
+	return term.source?.raw || term.text;
 }
 function mergeRunSource(run) {
 	const sources = run.map((list) => list.source);
@@ -848,12 +847,12 @@ function sourcesHaveContiguousLineSpans(sources) {
 	return true;
 }
 function earliestPosition(positions) {
-	return positions.reduce((earliest, position) => comparePositions(position, earliest) < 0 ? position : earliest);
+	return positions.reduce((earliest, position) => comparePositions$1(position, earliest) < 0 ? position : earliest);
 }
 function latestPosition(positions) {
-	return positions.reduce((latest, position) => comparePositions(position, latest) > 0 ? position : latest);
+	return positions.reduce((latest, position) => comparePositions$1(position, latest) > 0 ? position : latest);
 }
-function comparePositions(left, right) {
+function comparePositions$1(left, right) {
 	return left.line - right.line || left.column - right.column;
 }
 //#endregion
@@ -861,7 +860,6 @@ function comparePositions(left, right) {
 function officialBlockPolicy(block) {
 	switch (block.getContext?.()) {
 		case "admonition":
-		case "dlist":
 		case "list_item":
 		case "paragraph":
 		case "table":
@@ -872,6 +870,7 @@ function officialBlockPolicy(block) {
 		case "open": return block.getContentModel?.() === "simple" ? "scan" : "recurse";
 		case "olist":
 		case "colist":
+		case "dlist":
 		case "preamble":
 		case "section":
 		case "ulist": return "recurse";
@@ -939,6 +938,165 @@ function descriptionListItemFromRaw(rawItem) {
 	};
 }
 //#endregion
+//#region src/official-delimiter.ts
+const DELIMITED_BLOCKS = {
+	"--": ["open", new Set([
+		"comment",
+		"example",
+		"literal",
+		"listing",
+		"pass",
+		"quote",
+		"sidebar",
+		"source",
+		"verse",
+		"admonition",
+		"abstract",
+		"partintro"
+	])],
+	"----": ["listing", new Set(["literal", "source"])],
+	"....": ["literal", new Set(["listing", "source"])],
+	"====": ["example", new Set(["admonition"])],
+	"****": ["sidebar", /* @__PURE__ */ new Set()],
+	____: ["quote", new Set(["verse"])],
+	"++++": ["pass", new Set([
+		"stem",
+		"latexmath",
+		"asciimath"
+	])],
+	"|===": ["table", /* @__PURE__ */ new Set()],
+	",===": ["table", /* @__PURE__ */ new Set()],
+	":===": ["table", /* @__PURE__ */ new Set()],
+	"!===": ["table", /* @__PURE__ */ new Set()],
+	"~~~~": ["open", new Set(["abstract", "partintro"])],
+	"////": ["comment", /* @__PURE__ */ new Set()],
+	"```": ["fenced_code", /* @__PURE__ */ new Set()]
+};
+const DELIMITED_BLOCK_HEADS = new Set(Object.keys(DELIMITED_BLOCKS).map((delimiter) => delimiter.slice(0, 2)));
+const DELIMITED_BLOCK_TAILS = Object.fromEntries(Object.keys(DELIMITED_BLOCKS).filter((delimiter) => delimiter.length === 4).map((delimiter) => [delimiter, delimiter.slice(-1)]));
+function officialDelimiter(line) {
+	let candidate = line;
+	let lineLength = candidate.length;
+	if (lineLength < 2 || !DELIMITED_BLOCK_HEADS.has(candidate.slice(0, 2))) return;
+	let tip;
+	let tipLength;
+	if (lineLength === 2) {
+		tip = candidate;
+		tipLength = 2;
+	} else {
+		tipLength = lineLength < 5 ? lineLength : 4;
+		tip = candidate.slice(0, tipLength);
+		if (tip.startsWith("`")) {
+			if (tipLength === 4) {
+				if (tip === "````") return;
+				tip = tip.slice(0, 3);
+				if (tip !== "```") return;
+				candidate = tip;
+				lineLength = 3;
+				tipLength = 3;
+			} else if (tip !== "```") return;
+		} else if (tipLength === 3) return;
+	}
+	const entry = DELIMITED_BLOCKS[tip];
+	if (!entry) return;
+	const tail = DELIMITED_BLOCK_TAILS[tip];
+	if (!(lineLength === tipLength || tail !== void 0 && isUniform(candidate.slice(1), tail))) return;
+	const [context, masq] = entry;
+	return {
+		context,
+		masq,
+		terminator: candidate
+	};
+}
+function delimiterOpens(delimiter, context, style) {
+	if (context === void 0) return false;
+	if (delimiter.context === "fenced_code") return context === "listing";
+	return delimiter.context === context || delimiter.masq.has(context) || style !== null && style !== void 0 && delimiter.masq.has(style);
+}
+function isUniform(text, character) {
+	return [...text].every((each) => each === character);
+}
+//#endregion
+//#region src/official-paragraph.ts
+const CC_ALPHA = String.raw`\p{Alphabetic}`;
+const CC_WORD = String.raw`\p{Alphabetic}\p{N}\p{Pc}`;
+const BlockAttributeLineRx = new RegExp(String.raw`^\[(?:|[${CC_WORD}.#%{,"'].*|\[(?:|[${CC_ALPHA}_:][${CC_WORD}\-:.]*(?:, *.+)?)\])\]$`, "u");
+const AnyListRx = /^(?:[ \t]*(?:-|\*\**|\.\.*|•|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|(?!\/\/[^/])[ \t]*[^ \t].*?(?::::{0,2}|;;)(?:$|[ \t])|<(?:\d+|\.)>[ \t])/;
+const BlockAnchorRx = new RegExp(String.raw`^\[\[(?:|([${CC_ALPHA}_:][${CC_WORD}\-:.]*)(?:, *(.+))?)\]\]$`, "u");
+const BlockAttributeListRx = new RegExp(String.raw`^\[(|[${CC_WORD}.#%{,"'].*)\]$`, "u");
+const DescriptionListRx = /^(?!\/\/[^/])[ \t]*([^ \t].*?)(:::{0,2}|;;)(?:$|[ \t]+([\s\S]*)$)/;
+const BlockTitleRx = /^\.(\.?[^ \t.].*)$/;
+const AttributeEntryRx = new RegExp(String.raw`^:(!?[${CC_WORD}][^:]*):(?:[ \t]+(.*))?$`, "u");
+function paragraphEndLine(lineTable, startLine, breakAtList, skipsLineComments = true) {
+	let last = startLine;
+	for (let line = startLine + 1; line <= lineTable.lines.length; line += 1) {
+		const text = lineText(lineTable, line).trimEnd();
+		if (text === "" || text === "+" || terminatesParagraph(text, breakAtList)) break;
+		if (!(skipsLineComments && isLineComment(text))) last = line;
+	}
+	return last;
+}
+function listItemTextEndLine(lineTable, markerLine) {
+	let line = markerLine + 1;
+	while (line <= lineTable.lines.length && isTextOnlyMetadata(lineText(lineTable, line).trimEnd())) line += 1;
+	const text = lineText(lineTable, line).trimEnd();
+	if (line > lineTable.lines.length || text === "" || text === "+" || terminatesParagraph(text, true)) return markerLine;
+	return paragraphEndLine(lineTable, line, true);
+}
+function descriptionText(lineTable, termLine, occupied) {
+	const termText = lineText(lineTable, termLine).trimEnd();
+	const itemText = DescriptionListRx.exec(termText)?.[3];
+	const hasText = Boolean(itemText);
+	const termTextColumn = [...termText].length - [...itemText ?? ""].length + 1;
+	const lastLine = lineTable.lines.length;
+	let line = termLine + 1;
+	if (!hasText) while (line <= lastLine && lineText(lineTable, line).trim() === "") line += 1;
+	while (line <= lastLine && isDescriptionMetadata(lineText(lineTable, line).trimEnd(), !hasText)) line += 1;
+	const text = lineText(lineTable, line).trimEnd();
+	if (!(line <= lastLine && text !== "" && text !== "+" && !terminatesParagraph(text, true) && !occupied(line))) return hasText ? {
+		span: {
+			startLine: termLine,
+			endLine: termLine
+		},
+		startColumn: termTextColumn,
+		readsLineComments: false
+	} : void 0;
+	const readsLineComments = hasText && /^[ \t]/u.test(lineText(lineTable, line));
+	return {
+		span: {
+			startLine: hasText ? termLine : line,
+			endLine: paragraphEndLine(lineTable, line, true, !readsLineComments)
+		},
+		startColumn: hasText ? termTextColumn : 1,
+		...hasText && line > termLine + 1 ? { discardedSpan: {
+			startLine: termLine + 1,
+			endLine: line - 1
+		} } : {},
+		readsLineComments
+	};
+}
+function isDescriptionMetadata(text, textOnly) {
+	if (isLineComment(text)) return true;
+	return !textOnly && (text.startsWith(".") && BlockTitleRx.test(text) || text.startsWith(":") && AttributeEntryRx.test(text));
+}
+function isTextOnlyMetadata(text) {
+	if (text.startsWith("[[")) return text.endsWith("]]") && BlockAnchorRx.test(text);
+	if (text.startsWith("[")) return text.endsWith("]") && BlockAttributeListRx.test(text);
+	return isLineComment(text);
+}
+function descriptionListDelimiter(text) {
+	const match = DescriptionListRx.exec(text);
+	if (!match?.[1] || !match[2]) return;
+	const indent = text.length - text.replace(/^[ \t]*/u, "").length;
+	return {
+		raw: match[2],
+		index: indent + match[1].length
+	};
+}
+function terminatesParagraph(text, breakAtList) {
+	return officialDelimiter(text) !== void 0 || text.startsWith("[") && BlockAttributeLineRx.test(text) || breakAtList && AnyListRx.test(text);
+}
+//#endregion
 //#region src/official-projector.ts
 function projectOfficialDocument(options) {
 	const targets = [];
@@ -997,6 +1155,7 @@ function buildNode(block, context) {
 			})
 		});
 		requestTitleBindings(context, block);
+		requestListItemBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
@@ -1013,6 +1172,15 @@ function requestTitleBindings(context, block) {
 		xrefs
 	});
 }
+function requestListItemBindings(context, block) {
+	if (block.getContext?.() !== "list_item") return;
+	const span = context.intervalByBlock.get(block)?.contentSpan;
+	const xrefs = span ? collectXrefsInSpan(context, span) : [];
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -1097,15 +1265,16 @@ function buildDescriptionTerm(block, context) {
 	const span = interval?.contentSpan ?? interval?.span;
 	const sourceSpan = line === void 0 ? void 0 : descriptionTermSourceSpan(context.lineTable, line);
 	const source = span && sourceSpan ? descriptionPartSourceLayer(context, span, sourceSpan, "description term") : span ? blockSourceLayer(context, interval, span, "description term") : void 0;
-	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, sourceSpan)) : [];
+	const occurrenceSpan = occurrenceSpanOf(context, source, sourceSpan);
+	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, occurrenceSpan)) : [];
 	const anchors = span ? collectAnchorsInSpan(context, span).filter((anchor) => {
-		if (!isOccurrenceInsideSourceSpan(anchor, sourceSpan)) return false;
+		if (!isOccurrenceInsideSourceSpan(anchor, occurrenceSpan)) return false;
 		const key = anchorKey(anchor);
 		if (context.usedAnchorKeys.has(key)) return false;
 		context.usedAnchorKeys.add(key);
 		return true;
 	}) : [];
-	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, sourceSpan)) : [];
+	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, occurrenceSpan)) : [];
 	context.bindingRequests.push({
 		block,
 		xrefs
@@ -1131,17 +1300,18 @@ function buildDescription(block, context) {
 	const line = block.getSourceLocation?.()?.getLineNumber?.();
 	const interval = context.intervalByBlock.get(block);
 	const span = interval?.contentSpan ?? interval?.span;
-	const sourceSpan = line === void 0 ? void 0 : descriptionTextSourceSpan(context.lineTable, line);
+	const sourceSpan = interval?.contentSourceSpan;
 	const source = span && sourceSpan ? descriptionPartSourceLayer(context, span, sourceSpan, "description item") : span ? blockSourceLayer(context, interval, span, "description item") : void 0;
-	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, sourceSpan)) : [];
+	const occurrenceSpan = occurrenceSpanOf(context, source, sourceSpan);
+	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, occurrenceSpan)) : [];
 	const anchors = span ? collectAnchorsInSpan(context, span).filter((anchor) => {
-		if (!isOccurrenceInsideSourceSpan(anchor, sourceSpan)) return false;
+		if (!isOccurrenceInsideSourceSpan(anchor, occurrenceSpan)) return false;
 		const key = anchorKey(anchor);
 		if (context.usedAnchorKeys.has(key)) return false;
 		context.usedAnchorKeys.add(key);
 		return true;
 	}) : [];
-	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, sourceSpan)) : [];
+	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, occurrenceSpan)) : [];
 	context.bindingRequests.push({
 		block,
 		xrefs
@@ -1188,31 +1358,13 @@ function descriptionTermSourceSpan(lineTable, line) {
 		}
 	};
 }
-function descriptionTextSourceSpan(lineTable, line) {
-	const delimiter = descriptionListDelimiterMatch(lineTable, line);
-	if (!delimiter) return;
-	const text = lineText(lineTable, line);
-	const afterDelimiterIndex = delimiter.index + delimiter.raw.length;
-	const firstTextIndex = /\S/u.exec(text.slice(afterDelimiterIndex))?.index ?? 0;
-	return {
-		start: {
-			line,
-			column: [...text.slice(0, afterDelimiterIndex + firstTextIndex)].length + 1
-		},
-		end: {
-			line,
-			column: [...text].length + 1
-		}
-	};
-}
 function descriptionListDelimiterMatch(lineTable, line) {
 	const text = lineText(lineTable, line);
-	const match = /:{2,4}|;;/u.exec(text);
-	if (!match || match.index === void 0) return;
+	const delimiter = descriptionListDelimiter(text);
+	if (!delimiter) return;
 	return {
-		raw: match[0],
-		index: match.index,
-		column: [...text.slice(0, match.index)].length + 1
+		...delimiter,
+		column: [...text.slice(0, delimiter.index)].length + 1
 	};
 }
 function descriptionPartSourceLayer(context, span, sourceSpan, diagnosticContext) {
@@ -1223,20 +1375,28 @@ function descriptionPartSourceLayer(context, span, sourceSpan, diagnosticContext
 	});
 	const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, span, {
 		logicalSourceSpan: sourceSpan,
+		raw: "sourceSpan",
 		diagnosticContext
 	});
 	return recovered.ok ? recovered.sourceLayer : void 0;
 }
 function sourceTextForSpan(context, sourceSpan) {
-	if (sourceSpan.start.line !== sourceSpan.end.line) return;
-	return Array.from(lineText(context.lineTable, sourceSpan.start.line)).slice(sourceSpan.start.column - 1, sourceSpan.end.column - 1).join("");
+	const lines = [];
+	for (let line = sourceSpan.start.line; line <= sourceSpan.end.line; line += 1) {
+		const chars = Array.from(lineText(context.lineTable, line));
+		lines.push(chars.slice(line === sourceSpan.start.line ? sourceSpan.start.column - 1 : 0, line === sourceSpan.end.line ? sourceSpan.end.column - 1 : void 0).join(""));
+	}
+	return lines.join("\n");
+}
+function occurrenceSpanOf(context, source, sourceSpan) {
+	return context.sourceAwareDocument ? source?.sourceSpan : sourceSpan;
 }
 function isOccurrenceInsideSourceSpan(occurrence, sourceSpan) {
 	if (!sourceSpan || !occurrence.sourceSpan) return true;
-	const start = occurrence.sourceSpan.start;
-	const end = occurrence.sourceSpan.end;
-	if (start.line !== sourceSpan.start.line || end.line !== sourceSpan.end.line) return false;
-	return start.column >= sourceSpan.start.column && end.column <= sourceSpan.end.column;
+	return comparePositions(occurrence.sourceSpan.start, sourceSpan.start) >= 0 && comparePositions(occurrence.sourceSpan.end, sourceSpan.end) <= 0;
+}
+function comparePositions(left, right) {
+	return left.line - right.line || left.column - right.column;
 }
 function mergeNodeLineSpans(spans) {
 	const present = spans.filter(isLineSpan);
@@ -1453,7 +1613,7 @@ function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 	const logicalSourceSpan = sameLineSpan(fallbackSpan, interval.span) ? interval.sourceSpan : void 0;
 	const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, fallbackSpan, {
 		logicalSourceSpan,
-		raw: true,
+		raw: "lines",
 		diagnosticContext
 	});
 	return recovered.ok ? recovered.sourceLayer : void 0;
@@ -1782,117 +1942,6 @@ function parseStyleIdRoles(part) {
 	});
 }
 //#endregion
-//#region src/official-delimiter.ts
-const DELIMITED_BLOCKS = {
-	"--": ["open", new Set([
-		"comment",
-		"example",
-		"literal",
-		"listing",
-		"pass",
-		"quote",
-		"sidebar",
-		"source",
-		"verse",
-		"admonition",
-		"abstract",
-		"partintro"
-	])],
-	"----": ["listing", new Set(["literal", "source"])],
-	"....": ["literal", new Set(["listing", "source"])],
-	"====": ["example", new Set(["admonition"])],
-	"****": ["sidebar", /* @__PURE__ */ new Set()],
-	____: ["quote", new Set(["verse"])],
-	"++++": ["pass", new Set([
-		"stem",
-		"latexmath",
-		"asciimath"
-	])],
-	"|===": ["table", /* @__PURE__ */ new Set()],
-	",===": ["table", /* @__PURE__ */ new Set()],
-	":===": ["table", /* @__PURE__ */ new Set()],
-	"!===": ["table", /* @__PURE__ */ new Set()],
-	"~~~~": ["open", new Set(["abstract", "partintro"])],
-	"////": ["comment", /* @__PURE__ */ new Set()],
-	"```": ["fenced_code", /* @__PURE__ */ new Set()]
-};
-const DELIMITED_BLOCK_HEADS = new Set(Object.keys(DELIMITED_BLOCKS).map((delimiter) => delimiter.slice(0, 2)));
-const DELIMITED_BLOCK_TAILS = Object.fromEntries(Object.keys(DELIMITED_BLOCKS).filter((delimiter) => delimiter.length === 4).map((delimiter) => [delimiter, delimiter.slice(-1)]));
-function officialDelimiter(line) {
-	let candidate = line;
-	let lineLength = candidate.length;
-	if (lineLength < 2 || !DELIMITED_BLOCK_HEADS.has(candidate.slice(0, 2))) return;
-	let tip;
-	let tipLength;
-	if (lineLength === 2) {
-		tip = candidate;
-		tipLength = 2;
-	} else {
-		tipLength = lineLength < 5 ? lineLength : 4;
-		tip = candidate.slice(0, tipLength);
-		if (tip.startsWith("`")) {
-			if (tipLength === 4) {
-				if (tip === "````") return;
-				tip = tip.slice(0, 3);
-				if (tip !== "```") return;
-				candidate = tip;
-				lineLength = 3;
-				tipLength = 3;
-			} else if (tip !== "```") return;
-		} else if (tipLength === 3) return;
-	}
-	const entry = DELIMITED_BLOCKS[tip];
-	if (!entry) return;
-	const tail = DELIMITED_BLOCK_TAILS[tip];
-	if (!(lineLength === tipLength || tail !== void 0 && isUniform(candidate.slice(1), tail))) return;
-	const [context, masq] = entry;
-	return {
-		context,
-		masq,
-		terminator: candidate
-	};
-}
-function delimiterOpens(delimiter, context, style) {
-	if (context === void 0) return false;
-	if (delimiter.context === "fenced_code") return context === "listing";
-	return delimiter.context === context || delimiter.masq.has(context) || style !== null && style !== void 0 && delimiter.masq.has(style);
-}
-function isUniform(text, character) {
-	return [...text].every((each) => each === character);
-}
-//#endregion
-//#region src/official-paragraph.ts
-const CC_ALPHA = String.raw`\p{Alphabetic}`;
-const CC_WORD = String.raw`\p{Alphabetic}\p{N}\p{Pc}`;
-const BlockAttributeLineRx = new RegExp(String.raw`^\[(?:|[${CC_WORD}.#%{,"'].*|\[(?:|[${CC_ALPHA}_:][${CC_WORD}\-:.]*(?:, *.+)?)\])\]$`, "u");
-const AnyListRx = /^(?:[ \t]*(?:-|\*\**|\.\.*|•|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|(?!\/\/[^/])[ \t]*[^ \t].*?(?::::{0,2}|;;)(?:$|[ \t])|<(?:\d+|\.)>[ \t])/;
-const BlockAnchorRx = new RegExp(String.raw`^\[\[(?:|([${CC_ALPHA}_:][${CC_WORD}\-:.]*)(?:, *(.+))?)\]\]$`, "u");
-const BlockAttributeListRx = new RegExp(String.raw`^\[(|[${CC_WORD}.#%{,"'].*)\]$`, "u");
-function paragraphEndLine(lineTable, startLine, breakAtList) {
-	let last = startLine;
-	for (let line = startLine + 1; line <= lineTable.lines.length; line += 1) {
-		const text = lineText(lineTable, line).trimEnd();
-		if (text === "" || text === "+" || terminatesParagraph(text, breakAtList)) break;
-		if (!isLineComment(text)) last = line;
-	}
-	return last;
-}
-function listItemTextEndLine(lineTable, markerLine) {
-	let line = markerLine + 1;
-	while (line <= lineTable.lines.length && isTextOnlyMetadata(lineText(lineTable, line).trimEnd())) line += 1;
-	const text = lineText(lineTable, line).trimEnd();
-	if (line > lineTable.lines.length || text === "" || text === "+" || terminatesParagraph(text, true)) return markerLine;
-	return paragraphEndLine(lineTable, line, true);
-}
-function isTextOnlyMetadata(text) {
-	if (text.startsWith("[[")) return text.endsWith("]]") && BlockAnchorRx.test(text);
-	if (text.startsWith("[")) return text.endsWith("]") && BlockAttributeListRx.test(text);
-	return isLineComment(text);
-}
-function terminatesParagraph(text, breakAtList) {
-	return officialDelimiter(text) !== void 0 || text.startsWith("[") && BlockAttributeLineRx.test(text) || breakAtList && AnyListRx.test(text);
-}
-//#endregion
 //#region src/source-interval-resolver.ts
 function resolveSourceInterval(surface, sourceTable) {
 	if (surface.sourceLine === void 0) return;
@@ -1902,12 +1951,13 @@ function resolveSourceInterval(surface, sourceTable) {
 	const startLine = metadata.at(0)?.line ?? blockStartLine;
 	const diagnostics = [];
 	const delimitedContext = isDelimitedContext(surface.context);
+	const description = isDescription(surface) ? descriptionTextOf(surface, lineTable) : void 0;
 	const synthesized = borrowsChildSourceLocation(surface.block);
 	const delimited = delimitedContext ? resolveDelimitedBlockSpan(lineTable, blockStartLine, surface) : void 0;
 	const undelimited = delimitedContext && delimited === void 0 && !synthesized ? resolveUndelimitedBlockSpan(lineTable, sourceTable, blockStartLine, surface) : void 0;
 	const sourceContentSpan = sourceContentSpanForContext(surface, lineTable, blockStartLine);
 	const nextSiblingStart = nextSiblingStartLine(surface, lineTable);
-	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, lineTable) : void 0;
+	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, sourceTable) : void 0;
 	const endLine = delimited?.span.endLine ?? undelimited?.span.endLine ?? sourceContentSpan?.endLine ?? childEndLine ?? (nextSiblingStart !== void 0 ? nextSiblingStart - 1 : void 0) ?? parentEndLine(surface, sourceTable) ?? lineTable.lines.length;
 	const span = normalizeLineSpan({
 		startLine,
@@ -1923,9 +1973,11 @@ function resolveSourceInterval(surface, sourceTable) {
 		message: `Could not locate ${surface.context} block delimiter from official source line ${blockStartLine}.`,
 		source: spanForLineText(sourceTable, blockStartLine, 1)
 	});
-	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? contentSpanForContext(surface, span, lineTable);
+	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? description?.span ?? contentSpanForContext(surface, span, lineTable);
 	const sourceSpan = sourceSpanFromLineSpan(sourceTable, span);
 	const titleSpan = titleSpanForSurface(surface, sourceTable);
+	const contentSourceSpan = description ? descriptionSourceSpan(description, sourceTable, lineTable) : void 0;
+	const readsLineComments = delimited !== void 0 || description?.readsLineComments === true;
 	return {
 		blockStartLine,
 		metadata,
@@ -1933,9 +1985,33 @@ function resolveSourceInterval(surface, sourceTable) {
 		diagnostics,
 		...metadataSpan ? { metadataSpan } : {},
 		...contentSpan ? { contentSpan } : {},
+		...contentSourceSpan ? { contentSourceSpan } : {},
+		...description?.discardedSpan ? { discardedSpan: description.discardedSpan } : {},
 		...sourceSpan ? { sourceSpan } : {},
 		...titleSpan ? { titleSpan } : {},
-		...delimited ? { delimited: true } : {}
+		...readsLineComments ? { readsLineComments: true } : {}
+	};
+}
+function isDescription(surface) {
+	const list = surface.parent;
+	return list?.context === "dlist" && descriptionListItemsFromBlock(list.block).some((item) => item.description === surface.block);
+}
+function descriptionTextOf(surface, lineTable) {
+	const termLine = surface.parent?.children[surface.indexInParent - 1]?.sourceLine;
+	if (termLine === void 0) return;
+	return descriptionText(lineTable, termLine, (line) => surface.children.some((child) => child.sourceLine === line));
+}
+function descriptionSourceSpan(description, sourceTable, lineTable) {
+	const { startLine, endLine } = description.span;
+	return {
+		start: {
+			line: startLine,
+			column: [...lineText(sourceTable, startLine)].length - [...lineText(lineTable, startLine)].length + description.startColumn
+		},
+		end: {
+			line: endLine,
+			column: [...lineText(sourceTable, endLine)].length + 1
+		}
 	};
 }
 function nextSiblingStartLine(surface, lineTable) {
@@ -1949,13 +2025,24 @@ function metadataForSurface(surface, lineTable, blockStartLine) {
 	if (takesParentSourceLocation(surface.block)) return [];
 	return collectPrecedingMetadata(lineTable, blockStartLine);
 }
-function lastChildEndLine(surface, lineTable) {
-	const childLines = surface.children.flatMap((child) => descendantSourceLines(child));
+function lastChildEndLine(surface, sourceTable) {
+	const childLines = surface.children.map((child) => enclosedEndLine(child, sourceTable)).filter((line) => line !== void 0);
 	if (childLines.length === 0) return;
-	return Math.min(Math.max(...childLines), lastContentLine(lineTable));
+	return Math.min(Math.max(...childLines), lastContentLine(sourceTable));
+}
+function enclosedEndLine(surface, sourceTable) {
+	const ends = [surface.sourceLine === void 0 ? void 0 : ownEndLine(surface, sourceTable, surface.sourceLine), ...surface.children.map((child) => enclosedEndLine(child, sourceTable))].filter((line) => line !== void 0);
+	return ends.length > 0 ? Math.max(...ends) : void 0;
 }
-function descendantSourceLines(surface) {
-	return [...surface.sourceLine === void 0 ? [] : [surface.sourceLine], ...surface.children.flatMap((child) => descendantSourceLines(child))];
+function ownEndLine(surface, sourceTable, startLine) {
+	const lineTable = quotedLineTable(sourceTable, markdownQuoteDepth(surface.block));
+	const delimited = isDelimitedContext(surface.context) && !borrowsChildSourceLocation(surface.block) ? resolveDelimitedBlockSpan(lineTable, startLine, surface) ?? resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) : void 0;
+	if (delimited) return delimited.span.endLine;
+	const paragraph = sourceContentSpanForContext(surface, lineTable, startLine);
+	if (paragraph) return paragraph.endLine;
+	if (isDescription(surface)) return descriptionTextOf(surface, lineTable)?.span.endLine ?? startLine;
+	if (surface.context === "list_item" && surface.parent?.context !== "dlist") return listItemTextEndLine(lineTable, startLine);
+	return startLine;
 }
 function parentEndLine(surface, lineTable) {
 	const parent = surface.parent;
@@ -2187,15 +2274,12 @@ function scanSurfaces(collected, surfaces, intervalByBlock) {
 		if (officialBlockPolicy(surface.block) !== "scan") continue;
 		if (!scansMacroSubstitutedContent(surface)) continue;
 		if (surface.context === "table") scanTable(collected, surface.block);
-		else scanInlineRange(collected.lineTable, span.startLine, span.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, descendantUnscannableRanges(surface, intervalByBlock), isBibliographyList(surface), skipsLineComments(surface, interval) ? quotedLineTable(collected.lineTable, markdownQuoteDepth(surface.block)) : null);
+		else scanInlineRange(collected.lineTable, span.startLine, span.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, [...descendantUnscannableRanges(surface, intervalByBlock), ...interval.discardedSpan ? [interval.discardedSpan] : []], isBibliographyList(surface), interval.readsLineComments ? null : quotedLineTable(collected.lineTable, markdownQuoteDepth(surface.block)));
 	}
 }
 function isHeading(surface) {
 	return surface.context === "section" || surface.context === "floating_title";
 }
-function skipsLineComments(surface, interval) {
-	return interval.delimited !== true || surface.block.getContentModel?.() === "compound";
-}
 function hasDiagnosticPolicyAncestor$1(surface) {
 	let current = surface.parent;
 	while (current) {
@@ -2208,7 +2292,7 @@ function isPreambleParagraph(surface) {
 	return surface.context === "paragraph" && surface.parent?.context === "preamble";
 }
 function scansMacroSubstitutedContent(surface) {
-	if (surface.context === "dlist" || surface.context === "table") return true;
+	if (surface.context === "table") return true;
 	const substitutions = surface.block.getSubstitutions?.();
 	return !Array.isArray(substitutions) || substitutions.includes("macros");
 }
@@ -2505,7 +2589,7 @@ function projectSourceSurfaces(options) {
 		].includes(surface.context ?? "")) {
 			const recovered = recoverSourceAwareSourceLayer(sourceAwareDocument, interval.span, {
 				logicalSourceSpan: interval.sourceSpan,
-				raw: true,
+				raw: "lines",
 				diagnosticContext: `${surface.context} block`
 			});
 			if (!recovered.ok) toolDiagnostics.push(recovered.diagnostic);

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-8G5Sgsvr.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-COUYWnMz.mjs";
 import { relative, resolve, sep } from "node:path";
 import { existsSync } from "node:fs";
 import process from "node:process";

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, o as exportAnimationYaml, r as serializeAbundantTree, t as rdf12 } from "./src-8G5Sgsvr.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, o as exportAnimationYaml, r as serializeAbundantTree, t as rdf12 } from "./src-COUYWnMz.mjs";
 export { exportAnimationYaml, formatAbundantTree, parseAbundantTree, rdf12, serializeAbundantTree, serializeAbundantTreeToJson };

package/dist/{src-8G5Sgsvr.mjs → src-COUYWnMz.mjs}

@@ -780,6 +780,7 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 	};
 	const sourceSpan = options.logicalSourceSpan ? recoverSourceAwareSpan(document, options.logicalSourceSpan, false) : void 0;
 	if (sourceSpan && !sourceSpan.ok) return sourceSpan;
+	const raw = options.raw === "lines" ? `${sourceLines(sourceFile.lineTable, lineSpan.startLine, lineSpan.endLine).join("\n")}\n` : options.raw === "sourceSpan" && sourceSpan?.sourceSpan ? sliceSourceSpan(sourceFile.lineTable, sourceSpan.sourceSpan) : void 0;
 	return {
 		ok: true,
 		relativePath,
@@ -790,10 +791,13 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 			line: lineSpan.startLine,
 			span: lineSpan,
 			...sourceSpan?.sourceSpan ? { sourceSpan: sourceSpan.sourceSpan } : {},
-			...options.raw ? { raw: `${sourceLines(sourceFile.lineTable, lineSpan.startLine, lineSpan.endLine).join("\n")}\n` } : {}
+			...raw === void 0 ? {} : { raw }
 		}
 	};
 }
+function sliceSourceSpan(lineTable, span) {
+	return sourceLines(lineTable, span.start.line, span.end.line).map((text, index, lines) => Array.from(text).slice(index === 0 ? span.start.column - 1 : 0, index === lines.length - 1 ? span.end.column - 1 : void 0).join("")).join("\n");
+}
 function recoverSourceAwarePointSourceLayer(document, logicalSourceSpan, raw) {
 	const recovered = recoverSourceAwareSpan(document, logicalSourceSpan, true);
 	if (!recovered.ok) {
@@ -3789,12 +3793,7 @@ function trimBlankEdges(lines) {
 	return lines.slice(first, last);
 }
 function descriptionMetadataTermKey(term) {
-	const raw = term.source?.raw;
-	const sourceSpan = term.sourceSpan;
-	if (!raw || !sourceSpan || sourceSpan.start.line !== sourceSpan.end.line) return term.text;
-	const [line] = raw.split(/\r?\n/u);
-	if (line === void 0) return term.text;
-	return Array.from(line).slice(sourceSpan.start.column - 1, sourceSpan.end.column - 1).join("");
+	return term.source?.raw || term.text;
 }
 function mergeRunSource(run) {
 	const sources = run.map((list) => list.source);
@@ -3850,12 +3849,12 @@ function sourcesHaveContiguousLineSpans(sources) {
 	return true;
 }
 function earliestPosition(positions) {
-	return positions.reduce((earliest, position) => comparePositions(position, earliest) < 0 ? position : earliest);
+	return positions.reduce((earliest, position) => comparePositions$1(position, earliest) < 0 ? position : earliest);
 }
 function latestPosition(positions) {
-	return positions.reduce((latest, position) => comparePositions(position, latest) > 0 ? position : latest);
+	return positions.reduce((latest, position) => comparePositions$1(position, latest) > 0 ? position : latest);
 }
-function comparePositions(left, right) {
+function comparePositions$1(left, right) {
 	return left.line - right.line || left.column - right.column;
 }
 //#endregion
@@ -3863,7 +3862,6 @@ function comparePositions(left, right) {
 function officialBlockPolicy(block) {
 	switch (block.getContext?.()) {
 		case "admonition":
-		case "dlist":
 		case "list_item":
 		case "paragraph":
 		case "table":
@@ -3874,6 +3872,7 @@ function officialBlockPolicy(block) {
 		case "open": return block.getContentModel?.() === "simple" ? "scan" : "recurse";
 		case "olist":
 		case "colist":
+		case "dlist":
 		case "preamble":
 		case "section":
 		case "ulist": return "recurse";
@@ -3941,6 +3940,165 @@ function descriptionListItemFromRaw(rawItem) {
 	};
 }
 //#endregion
+//#region src/official-delimiter.ts
+const DELIMITED_BLOCKS = {
+	"--": ["open", new Set([
+		"comment",
+		"example",
+		"literal",
+		"listing",
+		"pass",
+		"quote",
+		"sidebar",
+		"source",
+		"verse",
+		"admonition",
+		"abstract",
+		"partintro"
+	])],
+	"----": ["listing", new Set(["literal", "source"])],
+	"....": ["literal", new Set(["listing", "source"])],
+	"====": ["example", new Set(["admonition"])],
+	"****": ["sidebar", /* @__PURE__ */ new Set()],
+	____: ["quote", new Set(["verse"])],
+	"++++": ["pass", new Set([
+		"stem",
+		"latexmath",
+		"asciimath"
+	])],
+	"|===": ["table", /* @__PURE__ */ new Set()],
+	",===": ["table", /* @__PURE__ */ new Set()],
+	":===": ["table", /* @__PURE__ */ new Set()],
+	"!===": ["table", /* @__PURE__ */ new Set()],
+	"~~~~": ["open", new Set(["abstract", "partintro"])],
+	"////": ["comment", /* @__PURE__ */ new Set()],
+	"```": ["fenced_code", /* @__PURE__ */ new Set()]
+};
+const DELIMITED_BLOCK_HEADS = new Set(Object.keys(DELIMITED_BLOCKS).map((delimiter) => delimiter.slice(0, 2)));
+const DELIMITED_BLOCK_TAILS = Object.fromEntries(Object.keys(DELIMITED_BLOCKS).filter((delimiter) => delimiter.length === 4).map((delimiter) => [delimiter, delimiter.slice(-1)]));
+function officialDelimiter(line) {
+	let candidate = line;
+	let lineLength = candidate.length;
+	if (lineLength < 2 || !DELIMITED_BLOCK_HEADS.has(candidate.slice(0, 2))) return;
+	let tip;
+	let tipLength;
+	if (lineLength === 2) {
+		tip = candidate;
+		tipLength = 2;
+	} else {
+		tipLength = lineLength < 5 ? lineLength : 4;
+		tip = candidate.slice(0, tipLength);
+		if (tip.startsWith("`")) {
+			if (tipLength === 4) {
+				if (tip === "````") return;
+				tip = tip.slice(0, 3);
+				if (tip !== "```") return;
+				candidate = tip;
+				lineLength = 3;
+				tipLength = 3;
+			} else if (tip !== "```") return;
+		} else if (tipLength === 3) return;
+	}
+	const entry = DELIMITED_BLOCKS[tip];
+	if (!entry) return;
+	const tail = DELIMITED_BLOCK_TAILS[tip];
+	if (!(lineLength === tipLength || tail !== void 0 && isUniform(candidate.slice(1), tail))) return;
+	const [context, masq] = entry;
+	return {
+		context,
+		masq,
+		terminator: candidate
+	};
+}
+function delimiterOpens(delimiter, context, style) {
+	if (context === void 0) return false;
+	if (delimiter.context === "fenced_code") return context === "listing";
+	return delimiter.context === context || delimiter.masq.has(context) || style !== null && style !== void 0 && delimiter.masq.has(style);
+}
+function isUniform(text, character) {
+	return [...text].every((each) => each === character);
+}
+//#endregion
+//#region src/official-paragraph.ts
+const CC_ALPHA = String.raw`\p{Alphabetic}`;
+const CC_WORD = String.raw`\p{Alphabetic}\p{N}\p{Pc}`;
+const BlockAttributeLineRx = new RegExp(String.raw`^\[(?:|[${CC_WORD}.#%{,"'].*|\[(?:|[${CC_ALPHA}_:][${CC_WORD}\-:.]*(?:, *.+)?)\])\]$`, "u");
+const AnyListRx = /^(?:[ \t]*(?:-|\*\**|\.\.*|•|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|(?!\/\/[^/])[ \t]*[^ \t].*?(?::::{0,2}|;;)(?:$|[ \t])|<(?:\d+|\.)>[ \t])/;
+const BlockAnchorRx = new RegExp(String.raw`^\[\[(?:|([${CC_ALPHA}_:][${CC_WORD}\-:.]*)(?:, *(.+))?)\]\]$`, "u");
+const BlockAttributeListRx = new RegExp(String.raw`^\[(|[${CC_WORD}.#%{,"'].*)\]$`, "u");
+const DescriptionListRx = /^(?!\/\/[^/])[ \t]*([^ \t].*?)(:::{0,2}|;;)(?:$|[ \t]+([\s\S]*)$)/;
+const BlockTitleRx = /^\.(\.?[^ \t.].*)$/;
+const AttributeEntryRx = new RegExp(String.raw`^:(!?[${CC_WORD}][^:]*):(?:[ \t]+(.*))?$`, "u");
+function paragraphEndLine(lineTable, startLine, breakAtList, skipsLineComments = true) {
+	let last = startLine;
+	for (let line = startLine + 1; line <= lineTable.lines.length; line += 1) {
+		const text = lineText(lineTable, line).trimEnd();
+		if (text === "" || text === "+" || terminatesParagraph(text, breakAtList)) break;
+		if (!(skipsLineComments && isLineComment(text))) last = line;
+	}
+	return last;
+}
+function listItemTextEndLine(lineTable, markerLine) {
+	let line = markerLine + 1;
+	while (line <= lineTable.lines.length && isTextOnlyMetadata(lineText(lineTable, line).trimEnd())) line += 1;
+	const text = lineText(lineTable, line).trimEnd();
+	if (line > lineTable.lines.length || text === "" || text === "+" || terminatesParagraph(text, true)) return markerLine;
+	return paragraphEndLine(lineTable, line, true);
+}
+function descriptionText(lineTable, termLine, occupied) {
+	const termText = lineText(lineTable, termLine).trimEnd();
+	const itemText = DescriptionListRx.exec(termText)?.[3];
+	const hasText = Boolean(itemText);
+	const termTextColumn = [...termText].length - [...itemText ?? ""].length + 1;
+	const lastLine = lineTable.lines.length;
+	let line = termLine + 1;
+	if (!hasText) while (line <= lastLine && lineText(lineTable, line).trim() === "") line += 1;
+	while (line <= lastLine && isDescriptionMetadata(lineText(lineTable, line).trimEnd(), !hasText)) line += 1;
+	const text = lineText(lineTable, line).trimEnd();
+	if (!(line <= lastLine && text !== "" && text !== "+" && !terminatesParagraph(text, true) && !occupied(line))) return hasText ? {
+		span: {
+			startLine: termLine,
+			endLine: termLine
+		},
+		startColumn: termTextColumn,
+		readsLineComments: false
+	} : void 0;
+	const readsLineComments = hasText && /^[ \t]/u.test(lineText(lineTable, line));
+	return {
+		span: {
+			startLine: hasText ? termLine : line,
+			endLine: paragraphEndLine(lineTable, line, true, !readsLineComments)
+		},
+		startColumn: hasText ? termTextColumn : 1,
+		...hasText && line > termLine + 1 ? { discardedSpan: {
+			startLine: termLine + 1,
+			endLine: line - 1
+		} } : {},
+		readsLineComments
+	};
+}
+function isDescriptionMetadata(text, textOnly) {
+	if (isLineComment(text)) return true;
+	return !textOnly && (text.startsWith(".") && BlockTitleRx.test(text) || text.startsWith(":") && AttributeEntryRx.test(text));
+}
+function isTextOnlyMetadata(text) {
+	if (text.startsWith("[[")) return text.endsWith("]]") && BlockAnchorRx.test(text);
+	if (text.startsWith("[")) return text.endsWith("]") && BlockAttributeListRx.test(text);
+	return isLineComment(text);
+}
+function descriptionListDelimiter(text) {
+	const match = DescriptionListRx.exec(text);
+	if (!match?.[1] || !match[2]) return;
+	const indent = text.length - text.replace(/^[ \t]*/u, "").length;
+	return {
+		raw: match[2],
+		index: indent + match[1].length
+	};
+}
+function terminatesParagraph(text, breakAtList) {
+	return officialDelimiter(text) !== void 0 || text.startsWith("[") && BlockAttributeLineRx.test(text) || breakAtList && AnyListRx.test(text);
+}
+//#endregion
 //#region src/official-projector.ts
 function projectOfficialDocument(options) {
 	const targets = [];
@@ -3999,6 +4157,7 @@ function buildNode(block, context) {
 			})
 		});
 		requestTitleBindings(context, block);
+		requestListItemBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
@@ -4015,6 +4174,15 @@ function requestTitleBindings(context, block) {
 		xrefs
 	});
 }
+function requestListItemBindings(context, block) {
+	if (block.getContext?.() !== "list_item") return;
+	const span = context.intervalByBlock.get(block)?.contentSpan;
+	const xrefs = span ? collectXrefsInSpan(context, span) : [];
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -4099,15 +4267,16 @@ function buildDescriptionTerm(block, context) {
 	const span = interval?.contentSpan ?? interval?.span;
 	const sourceSpan = line === void 0 ? void 0 : descriptionTermSourceSpan(context.lineTable, line);
 	const source = span && sourceSpan ? descriptionPartSourceLayer(context, span, sourceSpan, "description term") : span ? blockSourceLayer(context, interval, span, "description term") : void 0;
-	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, sourceSpan)) : [];
+	const occurrenceSpan = occurrenceSpanOf(context, source, sourceSpan);
+	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, occurrenceSpan)) : [];
 	const anchors = span ? collectAnchorsInSpan(context, span).filter((anchor) => {
-		if (!isOccurrenceInsideSourceSpan(anchor, sourceSpan)) return false;
+		if (!isOccurrenceInsideSourceSpan(anchor, occurrenceSpan)) return false;
 		const key = anchorKey(anchor);
 		if (context.usedAnchorKeys.has(key)) return false;
 		context.usedAnchorKeys.add(key);
 		return true;
 	}) : [];
-	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, sourceSpan)) : [];
+	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, occurrenceSpan)) : [];
 	context.bindingRequests.push({
 		block,
 		xrefs
@@ -4133,17 +4302,18 @@ function buildDescription(block, context) {
 	const line = block.getSourceLocation?.()?.getLineNumber?.();
 	const interval = context.intervalByBlock.get(block);
 	const span = interval?.contentSpan ?? interval?.span;
-	const sourceSpan = line === void 0 ? void 0 : descriptionTextSourceSpan(context.lineTable, line);
+	const sourceSpan = interval?.contentSourceSpan;
 	const source = span && sourceSpan ? descriptionPartSourceLayer(context, span, sourceSpan, "description item") : span ? blockSourceLayer(context, interval, span, "description item") : void 0;
-	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, sourceSpan)) : [];
+	const occurrenceSpan = occurrenceSpanOf(context, source, sourceSpan);
+	const xrefs = span ? collectXrefsInSpan(context, span).filter((xref) => isOccurrenceInsideSourceSpan(xref, occurrenceSpan)) : [];
 	const anchors = span ? collectAnchorsInSpan(context, span).filter((anchor) => {
-		if (!isOccurrenceInsideSourceSpan(anchor, sourceSpan)) return false;
+		if (!isOccurrenceInsideSourceSpan(anchor, occurrenceSpan)) return false;
 		const key = anchorKey(anchor);
 		if (context.usedAnchorKeys.has(key)) return false;
 		context.usedAnchorKeys.add(key);
 		return true;
 	}) : [];
-	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, sourceSpan)) : [];
+	const headingInlineMetadata = span ? collectHeadingInlineMetadataInSpan(context, span).filter((occurrence) => isOccurrenceInsideSourceSpan(occurrence, occurrenceSpan)) : [];
 	context.bindingRequests.push({
 		block,
 		xrefs
@@ -4190,31 +4360,13 @@ function descriptionTermSourceSpan(lineTable, line) {
 		}
 	};
 }
-function descriptionTextSourceSpan(lineTable, line) {
-	const delimiter = descriptionListDelimiterMatch(lineTable, line);
-	if (!delimiter) return;
-	const text = lineText(lineTable, line);
-	const afterDelimiterIndex = delimiter.index + delimiter.raw.length;
-	const firstTextIndex = /\S/u.exec(text.slice(afterDelimiterIndex))?.index ?? 0;
-	return {
-		start: {
-			line,
-			column: [...text.slice(0, afterDelimiterIndex + firstTextIndex)].length + 1
-		},
-		end: {
-			line,
-			column: [...text].length + 1
-		}
-	};
-}
 function descriptionListDelimiterMatch(lineTable, line) {
 	const text = lineText(lineTable, line);
-	const match = /:{2,4}|;;/u.exec(text);
-	if (!match || match.index === void 0) return;
+	const delimiter = descriptionListDelimiter(text);
+	if (!delimiter) return;
 	return {
-		raw: match[0],
-		index: match.index,
-		column: [...text.slice(0, match.index)].length + 1
+		...delimiter,
+		column: [...text.slice(0, delimiter.index)].length + 1
 	};
 }
 function descriptionPartSourceLayer(context, span, sourceSpan, diagnosticContext) {
@@ -4225,20 +4377,28 @@ function descriptionPartSourceLayer(context, span, sourceSpan, diagnosticContext
 	});
 	const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, span, {
 		logicalSourceSpan: sourceSpan,
+		raw: "sourceSpan",
 		diagnosticContext
 	});
 	return recovered.ok ? recovered.sourceLayer : void 0;
 }
 function sourceTextForSpan(context, sourceSpan) {
-	if (sourceSpan.start.line !== sourceSpan.end.line) return;
-	return Array.from(lineText(context.lineTable, sourceSpan.start.line)).slice(sourceSpan.start.column - 1, sourceSpan.end.column - 1).join("");
+	const lines = [];
+	for (let line = sourceSpan.start.line; line <= sourceSpan.end.line; line += 1) {
+		const chars = Array.from(lineText(context.lineTable, line));
+		lines.push(chars.slice(line === sourceSpan.start.line ? sourceSpan.start.column - 1 : 0, line === sourceSpan.end.line ? sourceSpan.end.column - 1 : void 0).join(""));
+	}
+	return lines.join("\n");
+}
+function occurrenceSpanOf(context, source, sourceSpan) {
+	return context.sourceAwareDocument ? source?.sourceSpan : sourceSpan;
 }
 function isOccurrenceInsideSourceSpan(occurrence, sourceSpan) {
 	if (!sourceSpan || !occurrence.sourceSpan) return true;
-	const start = occurrence.sourceSpan.start;
-	const end = occurrence.sourceSpan.end;
-	if (start.line !== sourceSpan.start.line || end.line !== sourceSpan.end.line) return false;
-	return start.column >= sourceSpan.start.column && end.column <= sourceSpan.end.column;
+	return comparePositions(occurrence.sourceSpan.start, sourceSpan.start) >= 0 && comparePositions(occurrence.sourceSpan.end, sourceSpan.end) <= 0;
+}
+function comparePositions(left, right) {
+	return left.line - right.line || left.column - right.column;
 }
 function mergeNodeLineSpans(spans) {
 	const present = spans.filter(isLineSpan);
@@ -4455,7 +4615,7 @@ function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 	const logicalSourceSpan = sameLineSpan(fallbackSpan, interval.span) ? interval.sourceSpan : void 0;
 	const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, fallbackSpan, {
 		logicalSourceSpan,
-		raw: true,
+		raw: "lines",
 		diagnosticContext
 	});
 	return recovered.ok ? recovered.sourceLayer : void 0;
@@ -4784,117 +4944,6 @@ function parseStyleIdRoles(part) {
 	});
 }
 //#endregion
-//#region src/official-delimiter.ts
-const DELIMITED_BLOCKS = {
-	"--": ["open", new Set([
-		"comment",
-		"example",
-		"literal",
-		"listing",
-		"pass",
-		"quote",
-		"sidebar",
-		"source",
-		"verse",
-		"admonition",
-		"abstract",
-		"partintro"
-	])],
-	"----": ["listing", new Set(["literal", "source"])],
-	"....": ["literal", new Set(["listing", "source"])],
-	"====": ["example", new Set(["admonition"])],
-	"****": ["sidebar", /* @__PURE__ */ new Set()],
-	____: ["quote", new Set(["verse"])],
-	"++++": ["pass", new Set([
-		"stem",
-		"latexmath",
-		"asciimath"
-	])],
-	"|===": ["table", /* @__PURE__ */ new Set()],
-	",===": ["table", /* @__PURE__ */ new Set()],
-	":===": ["table", /* @__PURE__ */ new Set()],
-	"!===": ["table", /* @__PURE__ */ new Set()],
-	"~~~~": ["open", new Set(["abstract", "partintro"])],
-	"////": ["comment", /* @__PURE__ */ new Set()],
-	"```": ["fenced_code", /* @__PURE__ */ new Set()]
-};
-const DELIMITED_BLOCK_HEADS = new Set(Object.keys(DELIMITED_BLOCKS).map((delimiter) => delimiter.slice(0, 2)));
-const DELIMITED_BLOCK_TAILS = Object.fromEntries(Object.keys(DELIMITED_BLOCKS).filter((delimiter) => delimiter.length === 4).map((delimiter) => [delimiter, delimiter.slice(-1)]));
-function officialDelimiter(line) {
-	let candidate = line;
-	let lineLength = candidate.length;
-	if (lineLength < 2 || !DELIMITED_BLOCK_HEADS.has(candidate.slice(0, 2))) return;
-	let tip;
-	let tipLength;
-	if (lineLength === 2) {
-		tip = candidate;
-		tipLength = 2;
-	} else {
-		tipLength = lineLength < 5 ? lineLength : 4;
-		tip = candidate.slice(0, tipLength);
-		if (tip.startsWith("`")) {
-			if (tipLength === 4) {
-				if (tip === "````") return;
-				tip = tip.slice(0, 3);
-				if (tip !== "```") return;
-				candidate = tip;
-				lineLength = 3;
-				tipLength = 3;
-			} else if (tip !== "```") return;
-		} else if (tipLength === 3) return;
-	}
-	const entry = DELIMITED_BLOCKS[tip];
-	if (!entry) return;
-	const tail = DELIMITED_BLOCK_TAILS[tip];
-	if (!(lineLength === tipLength || tail !== void 0 && isUniform(candidate.slice(1), tail))) return;
-	const [context, masq] = entry;
-	return {
-		context,
-		masq,
-		terminator: candidate
-	};
-}
-function delimiterOpens(delimiter, context, style) {
-	if (context === void 0) return false;
-	if (delimiter.context === "fenced_code") return context === "listing";
-	return delimiter.context === context || delimiter.masq.has(context) || style !== null && style !== void 0 && delimiter.masq.has(style);
-}
-function isUniform(text, character) {
-	return [...text].every((each) => each === character);
-}
-//#endregion
-//#region src/official-paragraph.ts
-const CC_ALPHA = String.raw`\p{Alphabetic}`;
-const CC_WORD = String.raw`\p{Alphabetic}\p{N}\p{Pc}`;
-const BlockAttributeLineRx = new RegExp(String.raw`^\[(?:|[${CC_WORD}.#%{,"'].*|\[(?:|[${CC_ALPHA}_:][${CC_WORD}\-:.]*(?:, *.+)?)\])\]$`, "u");
-const AnyListRx = /^(?:[ \t]*(?:-|\*\**|\.\.*|•|\d+\.|[a-zA-Z]\.|[IVXivx]+\))[ \t]|(?!\/\/[^/])[ \t]*[^ \t].*?(?::::{0,2}|;;)(?:$|[ \t])|<(?:\d+|\.)>[ \t])/;
-const BlockAnchorRx = new RegExp(String.raw`^\[\[(?:|([${CC_ALPHA}_:][${CC_WORD}\-:.]*)(?:, *(.+))?)\]\]$`, "u");
-const BlockAttributeListRx = new RegExp(String.raw`^\[(|[${CC_WORD}.#%{,"'].*)\]$`, "u");
-function paragraphEndLine(lineTable, startLine, breakAtList) {
-	let last = startLine;
-	for (let line = startLine + 1; line <= lineTable.lines.length; line += 1) {
-		const text = lineText(lineTable, line).trimEnd();
-		if (text === "" || text === "+" || terminatesParagraph(text, breakAtList)) break;
-		if (!isLineComment(text)) last = line;
-	}
-	return last;
-}
-function listItemTextEndLine(lineTable, markerLine) {
-	let line = markerLine + 1;
-	while (line <= lineTable.lines.length && isTextOnlyMetadata(lineText(lineTable, line).trimEnd())) line += 1;
-	const text = lineText(lineTable, line).trimEnd();
-	if (line > lineTable.lines.length || text === "" || text === "+" || terminatesParagraph(text, true)) return markerLine;
-	return paragraphEndLine(lineTable, line, true);
-}
-function isTextOnlyMetadata(text) {
-	if (text.startsWith("[[")) return text.endsWith("]]") && BlockAnchorRx.test(text);
-	if (text.startsWith("[")) return text.endsWith("]") && BlockAttributeListRx.test(text);
-	return isLineComment(text);
-}
-function terminatesParagraph(text, breakAtList) {
-	return officialDelimiter(text) !== void 0 || text.startsWith("[") && BlockAttributeLineRx.test(text) || breakAtList && AnyListRx.test(text);
-}
-//#endregion
 //#region src/source-interval-resolver.ts
 function resolveSourceInterval(surface, sourceTable) {
 	if (surface.sourceLine === void 0) return;
@@ -4904,12 +4953,13 @@ function resolveSourceInterval(surface, sourceTable) {
 	const startLine = metadata.at(0)?.line ?? blockStartLine;
 	const diagnostics = [];
 	const delimitedContext = isDelimitedContext(surface.context);
+	const description = isDescription(surface) ? descriptionTextOf(surface, lineTable) : void 0;
 	const synthesized = borrowsChildSourceLocation(surface.block);
 	const delimited = delimitedContext ? resolveDelimitedBlockSpan(lineTable, blockStartLine, surface) : void 0;
 	const undelimited = delimitedContext && delimited === void 0 && !synthesized ? resolveUndelimitedBlockSpan(lineTable, sourceTable, blockStartLine, surface) : void 0;
 	const sourceContentSpan = sourceContentSpanForContext(surface, lineTable, blockStartLine);
 	const nextSiblingStart = nextSiblingStartLine(surface, lineTable);
-	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, lineTable) : void 0;
+	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, sourceTable) : void 0;
 	const endLine = delimited?.span.endLine ?? undelimited?.span.endLine ?? sourceContentSpan?.endLine ?? childEndLine ?? (nextSiblingStart !== void 0 ? nextSiblingStart - 1 : void 0) ?? parentEndLine(surface, sourceTable) ?? lineTable.lines.length;
 	const span = normalizeLineSpan({
 		startLine,
@@ -4925,9 +4975,11 @@ function resolveSourceInterval(surface, sourceTable) {
 		message: `Could not locate ${surface.context} block delimiter from official source line ${blockStartLine}.`,
 		source: spanForLineText(sourceTable, blockStartLine, 1)
 	});
-	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? contentSpanForContext(surface, span, lineTable);
+	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? description?.span ?? contentSpanForContext(surface, span, lineTable);
 	const sourceSpan = sourceSpanFromLineSpan(sourceTable, span);
 	const titleSpan = titleSpanForSurface(surface, sourceTable);
+	const contentSourceSpan = description ? descriptionSourceSpan(description, sourceTable, lineTable) : void 0;
+	const readsLineComments = delimited !== void 0 || description?.readsLineComments === true;
 	return {
 		blockStartLine,
 		metadata,
@@ -4935,9 +4987,33 @@ function resolveSourceInterval(surface, sourceTable) {
 		diagnostics,
 		...metadataSpan ? { metadataSpan } : {},
 		...contentSpan ? { contentSpan } : {},
+		...contentSourceSpan ? { contentSourceSpan } : {},
+		...description?.discardedSpan ? { discardedSpan: description.discardedSpan } : {},
 		...sourceSpan ? { sourceSpan } : {},
 		...titleSpan ? { titleSpan } : {},
-		...delimited ? { delimited: true } : {}
+		...readsLineComments ? { readsLineComments: true } : {}
+	};
+}
+function isDescription(surface) {
+	const list = surface.parent;
+	return list?.context === "dlist" && descriptionListItemsFromBlock(list.block).some((item) => item.description === surface.block);
+}
+function descriptionTextOf(surface, lineTable) {
+	const termLine = surface.parent?.children[surface.indexInParent - 1]?.sourceLine;
+	if (termLine === void 0) return;
+	return descriptionText(lineTable, termLine, (line) => surface.children.some((child) => child.sourceLine === line));
+}
+function descriptionSourceSpan(description, sourceTable, lineTable) {
+	const { startLine, endLine } = description.span;
+	return {
+		start: {
+			line: startLine,
+			column: [...lineText(sourceTable, startLine)].length - [...lineText(lineTable, startLine)].length + description.startColumn
+		},
+		end: {
+			line: endLine,
+			column: [...lineText(sourceTable, endLine)].length + 1
+		}
 	};
 }
 function nextSiblingStartLine(surface, lineTable) {
@@ -4951,13 +5027,24 @@ function metadataForSurface(surface, lineTable, blockStartLine) {
 	if (takesParentSourceLocation(surface.block)) return [];
 	return collectPrecedingMetadata(lineTable, blockStartLine);
 }
-function lastChildEndLine(surface, lineTable) {
-	const childLines = surface.children.flatMap((child) => descendantSourceLines(child));
+function lastChildEndLine(surface, sourceTable) {
+	const childLines = surface.children.map((child) => enclosedEndLine(child, sourceTable)).filter((line) => line !== void 0);
 	if (childLines.length === 0) return;
-	return Math.min(Math.max(...childLines), lastContentLine(lineTable));
+	return Math.min(Math.max(...childLines), lastContentLine(sourceTable));
+}
+function enclosedEndLine(surface, sourceTable) {
+	const ends = [surface.sourceLine === void 0 ? void 0 : ownEndLine(surface, sourceTable, surface.sourceLine), ...surface.children.map((child) => enclosedEndLine(child, sourceTable))].filter((line) => line !== void 0);
+	return ends.length > 0 ? Math.max(...ends) : void 0;
 }
-function descendantSourceLines(surface) {
-	return [...surface.sourceLine === void 0 ? [] : [surface.sourceLine], ...surface.children.flatMap((child) => descendantSourceLines(child))];
+function ownEndLine(surface, sourceTable, startLine) {
+	const lineTable = quotedLineTable(sourceTable, markdownQuoteDepth(surface.block));
+	const delimited = isDelimitedContext(surface.context) && !borrowsChildSourceLocation(surface.block) ? resolveDelimitedBlockSpan(lineTable, startLine, surface) ?? resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) : void 0;
+	if (delimited) return delimited.span.endLine;
+	const paragraph = sourceContentSpanForContext(surface, lineTable, startLine);
+	if (paragraph) return paragraph.endLine;
+	if (isDescription(surface)) return descriptionTextOf(surface, lineTable)?.span.endLine ?? startLine;
+	if (surface.context === "list_item" && surface.parent?.context !== "dlist") return listItemTextEndLine(lineTable, startLine);
+	return startLine;
 }
 function parentEndLine(surface, lineTable) {
 	const parent = surface.parent;
@@ -5189,15 +5276,12 @@ function scanSurfaces(collected, surfaces, intervalByBlock) {
 		if (officialBlockPolicy(surface.block) !== "scan") continue;
 		if (!scansMacroSubstitutedContent(surface)) continue;
 		if (surface.context === "table") scanTable(collected, surface.block);
-		else scanInlineRange(collected.lineTable, span.startLine, span.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, descendantUnscannableRanges(surface, intervalByBlock), isBibliographyList(surface), skipsLineComments(surface, interval) ? quotedLineTable(collected.lineTable, markdownQuoteDepth(surface.block)) : null);
+		else scanInlineRange(collected.lineTable, span.startLine, span.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, [...descendantUnscannableRanges(surface, intervalByBlock), ...interval.discardedSpan ? [interval.discardedSpan] : []], isBibliographyList(surface), interval.readsLineComments ? null : quotedLineTable(collected.lineTable, markdownQuoteDepth(surface.block)));
 	}
 }
 function isHeading(surface) {
 	return surface.context === "section" || surface.context === "floating_title";
 }
-function skipsLineComments(surface, interval) {
-	return interval.delimited !== true || surface.block.getContentModel?.() === "compound";
-}
 function hasDiagnosticPolicyAncestor$1(surface) {
 	let current = surface.parent;
 	while (current) {
@@ -5210,7 +5294,7 @@ function isPreambleParagraph(surface) {
 	return surface.context === "paragraph" && surface.parent?.context === "preamble";
 }
 function scansMacroSubstitutedContent(surface) {
-	if (surface.context === "dlist" || surface.context === "table") return true;
+	if (surface.context === "table") return true;
 	const substitutions = surface.block.getSubstitutions?.();
 	return !Array.isArray(substitutions) || substitutions.includes("macros");
 }
@@ -5507,7 +5591,7 @@ function projectSourceSurfaces(options) {
 		].includes(surface.context ?? "")) {
 			const recovered = recoverSourceAwareSourceLayer(sourceAwareDocument, interval.span, {
 				logicalSourceSpan: interval.sourceSpan,
-				raw: true,
+				raw: "lines",
 				diagnosticContext: `${surface.context} block`
 			});
 			if (!recovered.ok) toolDiagnostics.push(recovered.diagnostic);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asciidoc-abundant-tree",
-	"version": "0.2.4",
+	"version": "0.2.6",
 	"description": "Recover a source-aware, analysis-ready tree from AsciiDoc files and explicit book-entry include graphs.",
 	"license": "Apache-2.0",
 	"author": {