asciidoc-abundant-tree 0.2.3 → 0.2.4

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

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

package/dist/browser.mjs

@@ -281,11 +281,14 @@ function quotedLineTable(lineTable, depth) {
 	views.set(depth, view);
 	return view;
 }
+function isLineComment(text) {
+	return text.startsWith("//") && !text.startsWith("///");
+}
 function paragraphLine(lineTable, startLine, n, skipsLineComments) {
 	let counted = 0;
 	for (let line = startLine; line <= lineTable.lines.length; line += 1) {
 		const text = lineText(lineTable, line);
-		if (skipsLineComments && text.startsWith("//") && !text.startsWith("///")) continue;
+		if (skipsLineComments && isLineComment(text)) continue;
 		counted += 1;
 		if (counted === n) return line;
 	}
@@ -868,6 +871,7 @@ function officialBlockPolicy(block) {
 		case "sidebar":
 		case "open": return block.getContentModel?.() === "simple" ? "scan" : "recurse";
 		case "olist":
+		case "colist":
 		case "preamble":
 		case "section":
 		case "ulist": return "recurse";
@@ -875,6 +879,13 @@ function officialBlockPolicy(block) {
 		case "literal":
 		case "pass":
 		case "stem": return "skip";
+		case "thematic_break":
+		case "page_break":
+		case "toc":
+		case "image":
+		case "audio":
+		case "video":
+		case "floating_title": return "skip";
 		default: return "diagnostic";
 	}
 }
@@ -976,16 +987,32 @@ function buildNode(block, context) {
 	if (blockContext === "open" && officialLine !== void 0) return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	if (officialBlockPolicy(block) === "diagnostic") return;
 	if (officialLine !== void 0) {
+		const id = block.getId?.();
 		registerOfficialBlockTarget(context, block, {
 			targetType: "block",
+			idOrigin: blockContext === "floating_title" && !interval?.metadata.some((surface) => id && surface.ids.includes(id)) ? "asciidoctor-generated" : "source",
 			sourceSpan: interval?.sourceSpan ?? sourceSpanFromLineSpan(context.lineTable, {
 				startLine: officialLine,
 				endLine: officialLine
 			})
 		});
+		requestTitleBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
+function requestTitleBindings(context, block) {
+	const blockContext = block.getContext?.();
+	const line = context.intervalByBlock.get(block)?.blockStartLine;
+	if (blockContext !== "section" && blockContext !== "floating_title" || line === void 0) return;
+	const xrefs = collectXrefsInSpan(context, {
+		startLine: line,
+		endLine: line
+	});
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -1010,6 +1037,7 @@ function buildSection(block, context) {
 		source: section.source,
 		asciidoctor: section.asciidoctor
 	});
+	requestTitleBindings(context, block);
 	section.children = childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	return section;
 }
@@ -1518,14 +1546,17 @@ function complete(block, parent, lineTable, depth) {
 	if (depth > 0) quoteDepths.set(block, depth);
 	const location = block.getSourceLocation?.();
 	const anchor = location?.getLineNumber?.();
-	if (location && anchor !== void 0 && opensMarkdownQuote(block, quotedLineTable(lineTable, depth))) {
+	const view = quotedLineTable(lineTable, depth);
+	if (location && anchor !== void 0 && opensMarkdownQuote(block, view)) {
 		markdownQuotes.add(block);
-		relocateQuoted(block, location, anchor, lineTable, depth);
+		relocateReader(block, location, anchor, numbering(lineTable, anchor, 1, (line) => !isLineComment(lineText(view, line))), quotedLineTable(lineTable, depth + 1));
 	}
+	if (location && anchor !== void 0 && block.getContext?.() === "table" && !cellLineMappers.has(block)) relocateReader(block, location, anchor, numbering(lineTable, anchor + 1, anchor + 1, (line) => !isLineComment(lineText(view, line))), view);
 	const children = childBlocksOf(block);
 	const childDepth = markdownQuotes.has(block) ? depth + 1 : depth;
 	for (const child of children) complete(child, block, lineTable, childDepth);
 	for (const cellBlock of cellBlocksOf(block)) complete(cellBlock, void 0, lineTable, childDepth);
+	if (block.getContext?.() === "colist") locate(block, children[0]?.getSourceLocation?.());
 	if (!block.getSourceLocation?.() && block.getContext?.() === "open") {
 		const location = children.find((child) => child.getSourceLocation?.())?.getSourceLocation?.();
 		if (location) {
@@ -1534,23 +1565,37 @@ function complete(block, parent, lineTable, depth) {
 		}
 	}
 }
-function relocateQuoted(quote, location, anchor, lineTable, depth) {
-	const outer = quotedLineTable(lineTable, depth);
-	const inner = quotedLineTable(lineTable, depth + 1);
-	const toSource = (relative) => paragraphLine(outer, anchor, relative, true);
+function numbering(lineTable, from, first, visible) {
+	return {
+		visible,
+		toSource: (line) => {
+			let counted = first - 1;
+			for (let source = from; source <= lineTable.lines.length; source += 1) if (visible(source)) {
+				counted += 1;
+				if (counted === line) return source;
+			}
+			return Math.max(from, lineTable.lines.length);
+		}
+	};
+}
+function relocateReader(container, location, anchor, reader, view) {
+	if (container.getContext?.() === "table") cellLineMappers.set(container, reader.toSource);
 	const relocate = (block) => {
 		for (const child of [...childBlocksOf(block), ...cellBlocksOf(block)]) {
 			const relative = child.getSourceLocation?.()?.getLineNumber?.();
-			if (relative !== void 0) {
-				const line = toSource(relative);
+			const line = relative === void 0 ? void 0 : reader.toSource(relative);
+			if (relative !== void 0 && line !== void 0) {
 				locate(child, new Cursor(location.getFile?.(), location.getDirectory?.(), location.getPath?.(), line));
 				if (line === anchor) takenFromParent.add(child);
+				if (child.getContext?.() === "table") {
+					relocateReader(child, location, line, numbering(view, line + 1, relative + 1, (source) => reader.visible(source) && !isLineComment(lineText(view, source))), view);
+					continue;
+				}
 			}
-			if (child.getContext?.() === "table") cellLineMappers.set(child, toSource);
-			if (!opensMarkdownQuote(child, inner)) relocate(child);
+			if (!opensMarkdownQuote(child, view)) relocate(child);
 		}
 	};
-	relocate(quote);
+	relocate(container);
 }
 function cellBlocksOf(block) {
 	return asciidocCellDocuments(block).flatMap(childBlocksOf);
@@ -1816,6 +1861,38 @@ 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;
@@ -1846,7 +1923,7 @@ 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);
+	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? contentSpanForContext(surface, span, lineTable);
 	const sourceSpan = sourceSpanFromLineSpan(sourceTable, span);
 	const titleSpan = titleSpanForSurface(surface, sourceTable);
 	return {
@@ -1857,7 +1934,8 @@ function resolveSourceInterval(surface, sourceTable) {
 		...metadataSpan ? { metadataSpan } : {},
 		...contentSpan ? { contentSpan } : {},
 		...sourceSpan ? { sourceSpan } : {},
-		...titleSpan ? { titleSpan } : {}
+		...titleSpan ? { titleSpan } : {},
+		...delimited ? { delimited: true } : {}
 	};
 }
 function nextSiblingStartLine(surface, lineTable) {
@@ -1900,7 +1978,7 @@ function resolveDelimitedBlockSpan(lineTable, startLine, surface) {
 }
 function resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) {
 	const anchorText = lineText(lineTable, startLine);
-	if (isMarkdownQuote(surface.block)) return markdownQuoteSpan(lineTable, sourceTable, startLine, surface);
+	if (isMarkdownQuote(surface.block)) return markdownQuoteSpan(lineTable, startLine);
 	const firstLine = firstSourceLine(surface);
 	if (firstLine === void 0) return;
 	const official = withoutWhitespace(firstLine);
@@ -1944,18 +2022,10 @@ function isAirQuote(surface, anchorText, officialFirstLine) {
 	const opened = anchorText.slice(1).trimEnd();
 	return withoutWhitespace(surface.block.getSourceLines?.().length === 1 && opened.endsWith("\"") ? opened.slice(0, -1) : opened) === officialFirstLine;
 }
-function markdownQuoteSpan(lineTable, sourceTable, startLine, surface) {
-	const contentEnd = lastChildIntervalEnd(sourceTable, startLine, surface);
-	let endLine = contentEnd;
-	for (let next = paragraphLine(lineTable, endLine, 2, true); next > endLine; next = paragraphLine(lineTable, endLine, 2, true)) {
-		const text = lineText(lineTable, next).trimEnd();
-		if (text === ">") {
-			endLine = next;
-			continue;
-		}
-		if (/^(?:> )?-- /u.test(text)) endLine = next;
-		break;
-	}
+function markdownQuoteSpan(lineTable, startLine) {
+	const endLine = paragraphEndLine(lineTable, startLine, false);
+	let contentEnd = endLine > startLine && /^(?:> )?-- /u.test(lineText(lineTable, endLine).trimEnd()) ? endLine - 1 : endLine;
+	while (contentEnd > startLine && isEmptyQuotedLine(lineTable, contentEnd)) contentEnd -= 1;
 	return {
 		span: {
 			startLine,
@@ -1967,6 +2037,10 @@ function markdownQuoteSpan(lineTable, sourceTable, startLine, surface) {
 		}
 	};
 }
+function isEmptyQuotedLine(lineTable, line) {
+	const text = lineText(lineTable, line).trimEnd();
+	return text === ">" || isLineComment(text);
+}
 function withoutWhitespace(text) {
 	return text.replace(/\s+/gu, "");
 }
@@ -1979,7 +2053,7 @@ function firstSourceLine(surface) {
 	const firstChild = surface.children[0];
 	return firstChild ? firstSourceLine(firstChild) : void 0;
 }
-function contentSpanForContext(surface, span) {
+function contentSpanForContext(surface, span, lineTable) {
 	if (surface.context === "paragraph") return {
 		startLine: surface.sourceLine ?? span.startLine,
 		endLine: span.endLine
@@ -1988,7 +2062,7 @@ function contentSpanForContext(surface, span) {
 		const line = surface.sourceLine ?? span.startLine;
 		return {
 			startLine: line,
-			endLine: line
+			endLine: surface.parent?.context === "dlist" ? line : listItemTextEndLine(lineTable, line)
 		};
 	}
 }
@@ -2102,13 +2176,26 @@ function scanSurfaces(collected, surfaces, intervalByBlock) {
 			continue;
 		}
 		if (interval.metadataSpan) scanMetadataRange(collected.lineTable, interval.metadataSpan.startLine, interval.metadataSpan.endLine, collected.xrefOccurrences, collected.anchorOccurrences);
+		if (isHeading(surface) && surface.sourceLine !== void 0) {
+			const line = collected.lineTable.lines[surface.sourceLine - 1];
+			if (line) {
+				scanXrefMatches(collected.lineTable, line, collected.xrefOccurrences);
+				scanAnchorMatches(collected.lineTable, line, collected.anchorOccurrences);
+			}
+		}
 		const span = interval.contentSpan ?? interval.span;
 		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));
+		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);
 	}
 }
+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) {
@@ -2163,11 +2250,11 @@ function parseMacroLabel(raw) {
 function compareSourceSpans(left, right) {
 	return (left.sourceSpan?.start.line ?? 0) - (right.sourceSpan?.start.line ?? 0) || (left.sourceSpan?.start.column ?? 0) - (right.sourceSpan?.start.column ?? 0);
 }
-function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges = [], bibliography = false) {
+function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges, bibliography, commentView) {
 	for (let lineNumber = startLine; lineNumber <= endLine; lineNumber += 1) {
 		if (isLineInRanges(lineNumber, skipRanges)) continue;
 		const line = lineTable.lines[lineNumber - 1];
-		if (!line) continue;
+		if (!line || commentView && isLineComment(lineText(commentView, lineNumber))) continue;
 		scanXrefMatches(lineTable, line, xrefOccurrences);
 		if (bibliography) scanBibliographyAnchor(lineTable, line, anchorOccurrences);
 		scanAnchorMatches(lineTable, line, anchorOccurrences);
@@ -2200,7 +2287,7 @@ function scanXrefMatches(lineTable, line, xrefOccurrences) {
 	}
 }
 function scanTable(collected, block) {
-	for (const range of mergeLineSpans(ordinaryCellRanges(block))) scanInlineRange(collected.lineTable, range.startLine, range.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics);
+	for (const range of mergeLineSpans(ordinaryCellRanges(block))) scanInlineRange(collected.lineTable, range.startLine, range.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, [], false, collected.lineTable);
 	for (const document of asciidocCellDocuments(block)) {
 		const surfaces = walkOfficialBlocks(document);
 		const intervalByBlock = /* @__PURE__ */ new WeakMap();

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-DuMegO5s.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-8G5Sgsvr.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-DuMegO5s.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, o as exportAnimationYaml, r as serializeAbundantTree, t as rdf12 } from "./src-8G5Sgsvr.mjs";
 export { exportAnimationYaml, formatAbundantTree, parseAbundantTree, rdf12, serializeAbundantTree, serializeAbundantTreeToJson };

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

@@ -1056,11 +1056,14 @@ function quotedLineTable(lineTable, depth) {
 	views.set(depth, view);
 	return view;
 }
+function isLineComment(text) {
+	return text.startsWith("//") && !text.startsWith("///");
+}
 function paragraphLine(lineTable, startLine, n, skipsLineComments) {
 	let counted = 0;
 	for (let line = startLine; line <= lineTable.lines.length; line += 1) {
 		const text = lineText(lineTable, line);
-		if (skipsLineComments && text.startsWith("//") && !text.startsWith("///")) continue;
+		if (skipsLineComments && isLineComment(text)) continue;
 		counted += 1;
 		if (counted === n) return line;
 	}
@@ -3870,6 +3873,7 @@ function officialBlockPolicy(block) {
 		case "sidebar":
 		case "open": return block.getContentModel?.() === "simple" ? "scan" : "recurse";
 		case "olist":
+		case "colist":
 		case "preamble":
 		case "section":
 		case "ulist": return "recurse";
@@ -3877,6 +3881,13 @@ function officialBlockPolicy(block) {
 		case "literal":
 		case "pass":
 		case "stem": return "skip";
+		case "thematic_break":
+		case "page_break":
+		case "toc":
+		case "image":
+		case "audio":
+		case "video":
+		case "floating_title": return "skip";
 		default: return "diagnostic";
 	}
 }
@@ -3978,16 +3989,32 @@ function buildNode(block, context) {
 	if (blockContext === "open" && officialLine !== void 0) return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	if (officialBlockPolicy(block) === "diagnostic") return;
 	if (officialLine !== void 0) {
+		const id = block.getId?.();
 		registerOfficialBlockTarget(context, block, {
 			targetType: "block",
+			idOrigin: blockContext === "floating_title" && !interval?.metadata.some((surface) => id && surface.ids.includes(id)) ? "asciidoctor-generated" : "source",
 			sourceSpan: interval?.sourceSpan ?? sourceSpanFromLineSpan(context.lineTable, {
 				startLine: officialLine,
 				endLine: officialLine
 			})
 		});
+		requestTitleBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
+function requestTitleBindings(context, block) {
+	const blockContext = block.getContext?.();
+	const line = context.intervalByBlock.get(block)?.blockStartLine;
+	if (blockContext !== "section" && blockContext !== "floating_title" || line === void 0) return;
+	const xrefs = collectXrefsInSpan(context, {
+		startLine: line,
+		endLine: line
+	});
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -4012,6 +4039,7 @@ function buildSection(block, context) {
 		source: section.source,
 		asciidoctor: section.asciidoctor
 	});
+	requestTitleBindings(context, block);
 	section.children = childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	return section;
 }
@@ -4520,14 +4548,17 @@ function complete(block, parent, lineTable, depth) {
 	if (depth > 0) quoteDepths.set(block, depth);
 	const location = block.getSourceLocation?.();
 	const anchor = location?.getLineNumber?.();
-	if (location && anchor !== void 0 && opensMarkdownQuote(block, quotedLineTable(lineTable, depth))) {
+	const view = quotedLineTable(lineTable, depth);
+	if (location && anchor !== void 0 && opensMarkdownQuote(block, view)) {
 		markdownQuotes.add(block);
-		relocateQuoted(block, location, anchor, lineTable, depth);
+		relocateReader(block, location, anchor, numbering(lineTable, anchor, 1, (line) => !isLineComment(lineText(view, line))), quotedLineTable(lineTable, depth + 1));
 	}
+	if (location && anchor !== void 0 && block.getContext?.() === "table" && !cellLineMappers.has(block)) relocateReader(block, location, anchor, numbering(lineTable, anchor + 1, anchor + 1, (line) => !isLineComment(lineText(view, line))), view);
 	const children = childBlocksOf(block);
 	const childDepth = markdownQuotes.has(block) ? depth + 1 : depth;
 	for (const child of children) complete(child, block, lineTable, childDepth);
 	for (const cellBlock of cellBlocksOf(block)) complete(cellBlock, void 0, lineTable, childDepth);
+	if (block.getContext?.() === "colist") locate(block, children[0]?.getSourceLocation?.());
 	if (!block.getSourceLocation?.() && block.getContext?.() === "open") {
 		const location = children.find((child) => child.getSourceLocation?.())?.getSourceLocation?.();
 		if (location) {
@@ -4536,23 +4567,37 @@ function complete(block, parent, lineTable, depth) {
 		}
 	}
 }
-function relocateQuoted(quote, location, anchor, lineTable, depth) {
-	const outer = quotedLineTable(lineTable, depth);
-	const inner = quotedLineTable(lineTable, depth + 1);
-	const toSource = (relative) => paragraphLine(outer, anchor, relative, true);
+function numbering(lineTable, from, first, visible) {
+	return {
+		visible,
+		toSource: (line) => {
+			let counted = first - 1;
+			for (let source = from; source <= lineTable.lines.length; source += 1) if (visible(source)) {
+				counted += 1;
+				if (counted === line) return source;
+			}
+			return Math.max(from, lineTable.lines.length);
+		}
+	};
+}
+function relocateReader(container, location, anchor, reader, view) {
+	if (container.getContext?.() === "table") cellLineMappers.set(container, reader.toSource);
 	const relocate = (block) => {
 		for (const child of [...childBlocksOf(block), ...cellBlocksOf(block)]) {
 			const relative = child.getSourceLocation?.()?.getLineNumber?.();
-			if (relative !== void 0) {
-				const line = toSource(relative);
+			const line = relative === void 0 ? void 0 : reader.toSource(relative);
+			if (relative !== void 0 && line !== void 0) {
 				locate(child, new Cursor(location.getFile?.(), location.getDirectory?.(), location.getPath?.(), line));
 				if (line === anchor) takenFromParent.add(child);
+				if (child.getContext?.() === "table") {
+					relocateReader(child, location, line, numbering(view, line + 1, relative + 1, (source) => reader.visible(source) && !isLineComment(lineText(view, source))), view);
+					continue;
+				}
 			}
-			if (child.getContext?.() === "table") cellLineMappers.set(child, toSource);
-			if (!opensMarkdownQuote(child, inner)) relocate(child);
+			if (!opensMarkdownQuote(child, view)) relocate(child);
 		}
 	};
-	relocate(quote);
+	relocate(container);
 }
 function cellBlocksOf(block) {
 	return asciidocCellDocuments(block).flatMap(childBlocksOf);
@@ -4818,6 +4863,38 @@ 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;
@@ -4848,7 +4925,7 @@ 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);
+	const contentSpan = delimited?.contentSpan ?? undelimited?.contentSpan ?? sourceContentSpan ?? contentSpanForContext(surface, span, lineTable);
 	const sourceSpan = sourceSpanFromLineSpan(sourceTable, span);
 	const titleSpan = titleSpanForSurface(surface, sourceTable);
 	return {
@@ -4859,7 +4936,8 @@ function resolveSourceInterval(surface, sourceTable) {
 		...metadataSpan ? { metadataSpan } : {},
 		...contentSpan ? { contentSpan } : {},
 		...sourceSpan ? { sourceSpan } : {},
-		...titleSpan ? { titleSpan } : {}
+		...titleSpan ? { titleSpan } : {},
+		...delimited ? { delimited: true } : {}
 	};
 }
 function nextSiblingStartLine(surface, lineTable) {
@@ -4902,7 +4980,7 @@ function resolveDelimitedBlockSpan(lineTable, startLine, surface) {
 }
 function resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) {
 	const anchorText = lineText(lineTable, startLine);
-	if (isMarkdownQuote(surface.block)) return markdownQuoteSpan(lineTable, sourceTable, startLine, surface);
+	if (isMarkdownQuote(surface.block)) return markdownQuoteSpan(lineTable, startLine);
 	const firstLine = firstSourceLine(surface);
 	if (firstLine === void 0) return;
 	const official = withoutWhitespace(firstLine);
@@ -4946,18 +5024,10 @@ function isAirQuote(surface, anchorText, officialFirstLine) {
 	const opened = anchorText.slice(1).trimEnd();
 	return withoutWhitespace(surface.block.getSourceLines?.().length === 1 && opened.endsWith("\"") ? opened.slice(0, -1) : opened) === officialFirstLine;
 }
-function markdownQuoteSpan(lineTable, sourceTable, startLine, surface) {
-	const contentEnd = lastChildIntervalEnd(sourceTable, startLine, surface);
-	let endLine = contentEnd;
-	for (let next = paragraphLine(lineTable, endLine, 2, true); next > endLine; next = paragraphLine(lineTable, endLine, 2, true)) {
-		const text = lineText(lineTable, next).trimEnd();
-		if (text === ">") {
-			endLine = next;
-			continue;
-		}
-		if (/^(?:> )?-- /u.test(text)) endLine = next;
-		break;
-	}
+function markdownQuoteSpan(lineTable, startLine) {
+	const endLine = paragraphEndLine(lineTable, startLine, false);
+	let contentEnd = endLine > startLine && /^(?:> )?-- /u.test(lineText(lineTable, endLine).trimEnd()) ? endLine - 1 : endLine;
+	while (contentEnd > startLine && isEmptyQuotedLine(lineTable, contentEnd)) contentEnd -= 1;
 	return {
 		span: {
 			startLine,
@@ -4969,6 +5039,10 @@ function markdownQuoteSpan(lineTable, sourceTable, startLine, surface) {
 		}
 	};
 }
+function isEmptyQuotedLine(lineTable, line) {
+	const text = lineText(lineTable, line).trimEnd();
+	return text === ">" || isLineComment(text);
+}
 function withoutWhitespace(text) {
 	return text.replace(/\s+/gu, "");
 }
@@ -4981,7 +5055,7 @@ function firstSourceLine(surface) {
 	const firstChild = surface.children[0];
 	return firstChild ? firstSourceLine(firstChild) : void 0;
 }
-function contentSpanForContext(surface, span) {
+function contentSpanForContext(surface, span, lineTable) {
 	if (surface.context === "paragraph") return {
 		startLine: surface.sourceLine ?? span.startLine,
 		endLine: span.endLine
@@ -4990,7 +5064,7 @@ function contentSpanForContext(surface, span) {
 		const line = surface.sourceLine ?? span.startLine;
 		return {
 			startLine: line,
-			endLine: line
+			endLine: surface.parent?.context === "dlist" ? line : listItemTextEndLine(lineTable, line)
 		};
 	}
 }
@@ -5104,13 +5178,26 @@ function scanSurfaces(collected, surfaces, intervalByBlock) {
 			continue;
 		}
 		if (interval.metadataSpan) scanMetadataRange(collected.lineTable, interval.metadataSpan.startLine, interval.metadataSpan.endLine, collected.xrefOccurrences, collected.anchorOccurrences);
+		if (isHeading(surface) && surface.sourceLine !== void 0) {
+			const line = collected.lineTable.lines[surface.sourceLine - 1];
+			if (line) {
+				scanXrefMatches(collected.lineTable, line, collected.xrefOccurrences);
+				scanAnchorMatches(collected.lineTable, line, collected.anchorOccurrences);
+			}
+		}
 		const span = interval.contentSpan ?? interval.span;
 		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));
+		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);
 	}
 }
+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) {
@@ -5165,11 +5252,11 @@ function parseMacroLabel(raw) {
 function compareSourceSpans(left, right) {
 	return (left.sourceSpan?.start.line ?? 0) - (right.sourceSpan?.start.line ?? 0) || (left.sourceSpan?.start.column ?? 0) - (right.sourceSpan?.start.column ?? 0);
 }
-function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges = [], bibliography = false) {
+function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges, bibliography, commentView) {
 	for (let lineNumber = startLine; lineNumber <= endLine; lineNumber += 1) {
 		if (isLineInRanges(lineNumber, skipRanges)) continue;
 		const line = lineTable.lines[lineNumber - 1];
-		if (!line) continue;
+		if (!line || commentView && isLineComment(lineText(commentView, lineNumber))) continue;
 		scanXrefMatches(lineTable, line, xrefOccurrences);
 		if (bibliography) scanBibliographyAnchor(lineTable, line, anchorOccurrences);
 		scanAnchorMatches(lineTable, line, anchorOccurrences);
@@ -5202,7 +5289,7 @@ function scanXrefMatches(lineTable, line, xrefOccurrences) {
 	}
 }
 function scanTable(collected, block) {
-	for (const range of mergeLineSpans(ordinaryCellRanges(block))) scanInlineRange(collected.lineTable, range.startLine, range.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics);
+	for (const range of mergeLineSpans(ordinaryCellRanges(block))) scanInlineRange(collected.lineTable, range.startLine, range.endLine, collected.xrefOccurrences, collected.anchorOccurrences, collected.headingInlineMetadataOccurrences, collected.toolDiagnostics, [], false, collected.lineTable);
 	for (const document of asciidocCellDocuments(block)) {
 		const surfaces = walkOfficialBlocks(document);
 		const intervalByBlock = /* @__PURE__ */ new WeakMap();

package/package.json

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