asciidoc-abundant-tree 0.2.1 → 0.2.2

package/README.md

@@ -295,7 +295,7 @@ const book = await parseAbundantTree({
 });
 ```
 
-`attributes` are the include attributes as Asciidoctor parses them, the same an Asciidoctor include processor receives, so the bookshelf build and this parser can register the same selector. A resolver that throws fails construction with `include.resolver-failed`; returned text that does not match its source leaves those lines without coordinates and reports `origin-map.selection-mismatch`.
+`attributes` are the include attributes as Asciidoctor parses them, the same an Asciidoctor include processor receives, so the bookshelf build and this parser can register the same selector. A blank positional attribute is `null`: the first one in `[,beta]`, the second one in `[beta,,gamma]`. A resolver that throws fails construction with `include.resolver-failed`; returned text that does not match its source leaves those lines without coordinates and reports `origin-map.selection-mismatch`.
 
 `parseAbundantTree` reads only the supplied source file. Interdocument xrefs keep their raw target and official href when Asciidoctor exposes one, but this package does not open the referenced `.adoc` file.
 

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

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

package/dist/browser.d.mts

@@ -154,7 +154,7 @@ type XrefOccurrenceNode = NodeBase & {
 };
 type AnchorOccurrenceNode = NodeBase & {
   kind: "anchor";
-  syntax: "double-bracket" | "macro";
+  syntax: "double-bracket" | "macro" | "bibliography";
   raw: string;
   ids: string[];
   reftext?: string;
@@ -179,6 +179,7 @@ type TargetNode = NodeBase & {
   title?: string;
   idOrigin: "source" | "asciidoctor-generated" | "unknown";
   sourceSpan?: SourceSpan;
+  containingSectionId?: string;
 };
 type TextNode = NodeBase & {
   kind: "text";

package/dist/browser.mjs

@@ -204,6 +204,7 @@ function addAnchorTargets(targets, anchorOccurrences) {
 			title: anchor.reftext,
 			idOrigin: "source",
 			sourceSpan: anchor.sourceSpan,
+			containingSectionId: anchor.containingSectionId,
 			asciidoctor: definedObject({
 				resolvedId: id,
 				resolvedType: targetType,
@@ -371,7 +372,8 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 	const lastRecord = sourceRecords.at(-1);
 	if (!firstRecord || !lastRecord) return recoveryFailure$1("source-coordinate.generated-line", `Parser core interval ${logicalSpan.startLine}-${logicalSpan.endLine} has no source-backed lines for ${options.diagnosticContext}.`, options.logicalSourceSpan);
 	const relativePath = firstRecord.origin.relativePath;
-	if (!relativePath || sourceRecords.some((record) => record.origin.relativePath !== relativePath)) return recoveryFailure$1("block-origin.multi-source-span", `Block span ${logicalSpan.startLine}-${logicalSpan.endLine} maps to more than one origin source file for ${options.diagnosticContext}.`, options.logicalSourceSpan);
+	if (firstRecord.origin.absolutePath !== lastRecord.origin.absolutePath) return recoveryFailure$1("block-origin.multi-source-span", `${options.diagnosticContext} starts at ${originLabel(firstRecord.origin)} and ends at ${originLabel(lastRecord.origin)}; no single origin source file holds its raw.`, options.logicalSourceSpan);
+	if (!authorLinesInSourceOrder(sourceRecords, firstRecord.origin)) return recoveryFailure$1("block-origin.multi-source-span", `${options.diagnosticContext} from ${originLabel(firstRecord.origin)} to ${originLabel(lastRecord.origin)} reads ${relativePath} out of source order; no contiguous raw exists.`, options.logicalSourceSpan);
 	const sourceFile = sourceFileForOrigin$1(document, firstRecord.origin);
 	if (!sourceFile) return recoveryFailure$1("line-origin.source-file-missing", `Origin file line table is missing for ${relativePath}.`, options.logicalSourceSpan);
 	const lineSpan = {
@@ -423,6 +425,47 @@ function recoverSourceAwarePointSourceLayer(document, logicalSourceSpan, raw) {
 		}
 	};
 }
+/**
+* 块的 content span 在作者文件里的行区间。
+*
+* 内容的首行或尾行来自被引入的文件时，作者文件里与之对应的是那条 include 指令：从块里紧挨在内容之前的
+* 作者行往后一行起，到紧挨在内容之后的作者行往前一行止。作者文件由块的首行决定，调用方应已用
+* {@link recoverSourceAwareSourceLayer} 确认整块落在同一个作者文件里。
+*/
+function recoverSourceAwareContentLineSpan(document, blockSpan, contentSpan) {
+	const blockRecords = recordsForSpan(document, blockSpan)?.filter(hasOrigin);
+	const author = blockRecords?.[0]?.origin.absolutePath;
+	if (!blockRecords || author === void 0) return;
+	const authored = blockRecords.filter((record) => record.origin.absolutePath === author);
+	const inside = (record) => record.logicalLine >= contentSpan.startLine && record.logicalLine <= contentSpan.endLine;
+	const firstInside = authored.find(inside);
+	const lastInside = authored.findLast(inside);
+	const before = authored.findLast((record) => record.logicalLine < contentSpan.startLine);
+	const after = authored.find((record) => record.logicalLine > contentSpan.endLine);
+	const startsWithAuthorLine = firstInside !== void 0 && firstInside.logicalLine === firstOriginLine(blockRecords, contentSpan);
+	const endsWithAuthorLine = lastInside !== void 0 && lastInside.logicalLine === lastOriginLine(blockRecords, contentSpan);
+	const startLine = startsWithAuthorLine ? firstInside.origin.sourceLine : before && before.origin.sourceLine + 1;
+	const endLine = endsWithAuthorLine ? lastInside.origin.sourceLine : after && after.origin.sourceLine - 1;
+	if (startLine === void 0 || endLine === void 0 || startLine > endLine) return;
+	return {
+		startLine,
+		endLine
+	};
+}
+/**
+* 一段逻辑行在源文件里落在哪些行上：`relativePath` 与 `line` 的组合，用 {@link originPointKey} 编成键。
+*
+* 出现处回源后只剩来源坐标；判断它在不在一个块里，就看它的来源是不是这个块某条逻辑行的来源
+* （10 号书「结构关系在 Logical Document 上判定」）。被引入文件里的行也在其中。
+*/
+function originPointsForSpan(document, logicalSpan) {
+	const points = /* @__PURE__ */ new Set();
+	for (const record of recordsForSpan(document, logicalSpan) ?? []) if (hasOrigin(record)) points.add(originPointKey(record.origin.relativePath, record.origin.sourceLine));
+	return points;
+}
+function originPointKey(relativePath, line) {
+	return `${relativePath}\n${line}`;
+}
 function recoverSourceAwareDocumentTitleSourceLayer(document, logicalTitleSpan) {
 	if (!logicalTitleSpan) return;
 	return recoverSourceAwarePointSourceLayer(document, logicalTitleSpan, document.lines[logicalTitleSpan.start.line - 1]?.text ?? "");
@@ -460,22 +503,6 @@ function recoverSourceAwareTitleSpan(document, logicalTitleSpan) {
 	const recovered = recoverSourceAwareSpan(document, logicalTitleSpan, false);
 	return recovered.ok ? recovered.sourceSpan : void 0;
 }
-function sourceScopeFromSourceAwareInterval(document, span, headingLogicalLine) {
-	const headingRecord = document.lines[headingLogicalLine - 1];
-	if (!headingRecord || !hasOrigin(headingRecord)) return;
-	let endLine = headingRecord.origin.sourceLine;
-	for (let logicalLine = span.startLine; logicalLine <= span.endLine; logicalLine += 1) {
-		const record = document.lines[logicalLine - 1];
-		if (!record || !hasOrigin(record)) continue;
-		if (record.origin.relativePath !== headingRecord.origin.relativePath) continue;
-		endLine = Math.max(endLine, record.origin.sourceLine);
-	}
-	return {
-		relativePath: headingRecord.origin.relativePath,
-		startLine: headingRecord.origin.sourceLine,
-		endLine
-	};
-}
 function recoverSourceAwareSpan(document, logicalSourceSpan, requireColumns) {
 	const start = recoverSourceAwarePoint(document, logicalSourceSpan.start, requireColumns);
 	if (!start.ok) return start;
@@ -487,7 +514,7 @@ function recoverSourceAwareSpan(document, logicalSourceSpan, requireColumns) {
 			line: start.line
 		}
 	};
-	if (start.relativePath !== end.relativePath) return recoveryFailure$1("block-origin.multi-source-span", `Source span ${logicalSourceSpan.start.line}-${logicalSourceSpan.end.line} maps to more than one origin source file.`, logicalSourceSpan);
+	if (start.relativePath !== end.relativePath) return recoveryFailure$1("block-origin.multi-source-span", `Source span starts at ${start.relativePath}:${start.line} and ends at ${end.relativePath}:${end.line}; no single origin source file holds it.`, logicalSourceSpan);
 	return {
 		ok: true,
 		relativePath: start.relativePath,
@@ -557,6 +584,24 @@ function recordsForSpan(document, span) {
 function hasOrigin(record) {
 	return "origin" in record;
 }
+function originLabel(origin) {
+	return `${origin.relativePath}:${origin.sourceLine}`;
+}
+function authorLinesInSourceOrder(records, author) {
+	let previous = 0;
+	for (const record of records) {
+		if (record.origin.absolutePath !== author.absolutePath) continue;
+		if (record.origin.sourceLine <= previous) return false;
+		previous = record.origin.sourceLine;
+	}
+	return true;
+}
+function firstOriginLine(records, span) {
+	return records.find((record) => record.logicalLine >= span.startLine && record.logicalLine <= span.endLine)?.logicalLine;
+}
+function lastOriginLine(records, span) {
+	return records.findLast((record) => record.logicalLine >= span.startLine && record.logicalLine <= span.endLine)?.logicalLine;
+}
 function sourceFileForOrigin$1(document, origin) {
 	return document.sourceFiles.find((sourceFile) => sourceFile.absolutePath === origin.absolutePath);
 }
@@ -1101,7 +1146,7 @@ function buildDescriptionList(block, startLine, context, interval) {
 		delimiter: descriptionListDelimiterMatch(context.lineTable, startLine)?.raw,
 		metadata: metadata.map((surface) => surface.node),
 		metadataSpan: interval?.metadataSpan,
-		contentSpan: source ? originLineSpan(context, contentSpan) : void 0,
+		contentSpan: source ? originLineSpan(context, contentSpan, span) : void 0,
 		span: source?.span,
 		source,
 		asciidoctor: definedObject({
@@ -1380,7 +1425,7 @@ function buildListing(block, delimiterLine, context, interval) {
 		metadata: metadata.map((surface) => surface.node),
 		content: block.getSource?.() ?? (contentSpan ? sourceLines(context.lineTable, contentSpan.startLine, contentSpan.endLine).join("\n") : void 0),
 		metadataSpan: interval?.metadataSpan,
-		contentSpan: source ? originLineSpan(context, contentSpan) : void 0,
+		contentSpan: source ? originLineSpan(context, contentSpan, span) : void 0,
 		span: source?.span,
 		source,
 		asciidoctor: definedObject({
@@ -1484,10 +1529,15 @@ function registerOfficialBlockTarget(context, block, options) {
 		title: options.title ?? block.getTitle?.(),
 		idOrigin: options.idOrigin ?? (options.targetType === "section" ? "asciidoctor-generated" : "source"),
 		sourceSpan: options.sourceSpan,
+		containingSectionId: options.targetType === "section" ? void 0 : blockSectionId(context, block),
 		source: options.source,
 		asciidoctor
 	}));
 }
+function blockSectionId(context, block) {
+	const line = context.intervalByBlock.get(block)?.span.startLine;
+	return line === void 0 ? void 0 : context.sectionByLine.get(line)?.ids[0];
+}
 function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 	if (!context.logicalSource && !context.sourceAwareDocument) {
 		const sourceSpan = sourceSpanFromLineSpan(context.lineTable, fallbackSpan);
@@ -1517,15 +1567,9 @@ function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 function sameLineSpan(left, right) {
 	return left.startLine === right.startLine && left.endLine === right.endLine;
 }
-function originLineSpan(context, span) {
+function originLineSpan(context, span, blockSpan) {
 	if (!span || !context.logicalSource && !context.sourceAwareDocument) return span;
-	if (context.sourceAwareDocument) {
-		const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, span, {
-			raw: false,
-			diagnosticContext: "block content"
-		});
-		return recovered.ok ? recovered.lineSpan : void 0;
-	}
+	if (context.sourceAwareDocument) return recoverSourceAwareContentLineSpan(context.sourceAwareDocument, blockSpan, span);
 	if (!context.logicalSource) return;
 	const recovered = recoverOriginSourceLayer(context.logicalSource, span, {
 		raw: false,
@@ -1544,6 +1588,13 @@ function collectHeadingInlineMetadataInSpan(context, logicalSpan, source) {
 }
 function collectOccurrencesInSpan(context, groupedByLine, occurrences, logicalSpan, source) {
 	if (!context.logicalSource && !context.sourceAwareDocument) return collectOccurrencesInLineRange(groupedByLine, logicalSpan.startLine, logicalSpan.endLine);
+	if (context.sourceAwareDocument) {
+		const points = originPointsForSpan(context.sourceAwareDocument, logicalSpan);
+		return occurrences.filter((occurrence) => {
+			const { relativePath, line } = occurrence.source ?? {};
+			return relativePath !== void 0 && line !== void 0 && points.has(originPointKey(relativePath, line));
+		});
+	}
 	if (!source?.relativePath || !source.span) return [];
 	const relativePath = source.relativePath;
 	const sourceSpan = source.span;
@@ -1611,61 +1662,12 @@ function locate(block, location) {
 	if (location) block.sourceLocation = location;
 }
 //#endregion
-//#region src/book-entry/source-scope-index.ts
-const sectionSourceScopeBySection = /* @__PURE__ */ new WeakMap();
-function registerSectionSourceScope(section, scope) {
-	sectionSourceScopeBySection.set(section, scope);
-}
-function buildSourceScopeIndex(sections) {
-	return { candidates: sections.flatMap((section) => {
-		const scope = sourceScopeForSection(section);
-		if (!scope) return [];
-		return [{
-			...scope,
-			section
-		}];
-	}) };
-}
-function sourceScopeForSection(section) {
-	const registered = sectionSourceScopeBySection.get(section);
-	if (registered) return registered;
-	const relativePath = section.source?.relativePath;
-	const startLine = section.source?.span?.startLine ?? section.source?.line;
-	const endLine = section.source?.span?.endLine ?? section.source?.line ?? startLine;
-	if (!relativePath || startLine === void 0 || endLine === void 0) return;
-	return {
-		relativePath,
-		startLine,
-		endLine
-	};
-}
-function lookupContainingSection(index, lookup) {
-	const relativePath = lookup.relativePath ?? lookup.source?.relativePath;
-	const line = lookup.line ?? lookup.source?.line;
-	if (!relativePath || line === void 0) return;
-	let containingSection;
-	for (const candidate of index.candidates) {
-		if (candidate.relativePath !== relativePath) continue;
-		if (line < candidate.startLine || line > candidate.endLine) continue;
-		containingSection = candidate.section;
-	}
-	return containingSection;
-}
-function assignContainingSectionIdsFromSourceScope(xrefs, anchors, headingInlineMetadataOccurrences, index) {
-	for (const occurrence of [
-		...xrefs,
-		...anchors,
-		...headingInlineMetadataOccurrences
-	]) {
-		const sectionId = lookupContainingSection(index, occurrence)?.ids[0];
-		if (sectionId !== void 0) occurrence.containingSectionId = sectionId;
-	}
-}
-//#endregion
 //#region src/inline-occurrence-scanner.ts
 const shorthandXrefPattern = /<<([^>,]+)(?:,\s*([^>]+))?>>/gu;
 const macroXrefPattern = /xref:([^\s[]+)\[([^\]]*)\]/gu;
-const anchorPattern = /\[\[([^,\]]+)(?:,([^\]]+))?\]\]|anchor:([^\s[]+)\[([^\]]*)\]/gu;
+const anchorId = String.raw`[\p{Alphabetic}_:][\p{Alphabetic}\p{N}\p{Pc}\-:.]*`;
+const anchorPattern = new RegExp(String.raw`(?<![\\\[])\[\[(${anchorId})(?:, *(.+?))? ?\]\]` + String.raw`|(?<!\\)anchor:(${anchorId})\[(?:\]|(.*?[^\\])\])`, "gu");
+const bibliographyAnchorPattern = new RegExp(String.raw`^(\s*[*-]+\s+)\[\[\[(${anchorId})(?:, *(.+?))?\]\]\]`, "u");
 const headingInlineMetadataPattern = /hmeta:([^\s[]+)\[([^\]]*)\]/gu;
 function scanInlineOccurrencesInOfficialBlocks(options) {
 	const xrefOccurrences = [];
@@ -1683,8 +1685,9 @@ function scanInlineOccurrencesInOfficialBlocks(options) {
 		if (officialBlockPolicy(surface.block) !== "scan") continue;
 		if (!scansMacroSubstitutedContent(surface)) continue;
 		if (surface.context === "table") scanTableInlineRange(options.lineTable, surface.block, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics);
-		else scanInlineRange(options.lineTable, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics, descendantUnscannableRanges(surface, options.intervalByBlock));
+		else scanInlineRange(options.lineTable, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics, descendantUnscannableRanges(surface, options.intervalByBlock), isBibliographyList(surface));
 	}
+	assignContainingSectionIds(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.sectionByLine);
 	const sourceAwareDocument = sourceAwareDocumentForLineTable(options.lineTable);
 	const logicalSource = logicalSourceForLineTable(options.lineTable);
 	const recoveredXrefs = sourceAwareDocument ? recoverSourceAwareInlineOrigins(xrefOccurrences, sourceAwareDocument, options.toolDiagnostics) : logicalSource ? recoverInlineOrigins(xrefOccurrences, logicalSource, options.toolDiagnostics) : xrefOccurrences;
@@ -1801,12 +1804,13 @@ 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 = []) {
+function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges = [], bibliography = false) {
 	for (let lineNumber = startLine; lineNumber <= endLine; lineNumber += 1) {
 		if (isLineInRanges(lineNumber, skipRanges)) continue;
 		const line = lineTable.lines[lineNumber - 1];
 		if (!line) continue;
 		scanXrefMatches(lineTable, line, xrefOccurrences);
+		if (bibliography) scanBibliographyAnchor(lineTable, line, anchorOccurrences);
 		scanAnchorMatches(lineTable, line, anchorOccurrences);
 		scanHeadingInlineMetadataMatches(lineTable, line, headingInlineMetadataOccurrences, toolDiagnostics);
 	}
@@ -1965,7 +1969,7 @@ function scanAnchorMatches(lineTable, line, anchorOccurrences) {
 			syntax: doubleBracketId ? "double-bracket" : "macro",
 			raw,
 			ids: [id],
-			reftext: match[2] ?? match[4] ?? void 0,
+			reftext: doubleBracketId ? match[2] : match[4] ?? "",
 			anchorScope: line.text.trim() === raw && doubleBracketId ? "block" : "inline",
 			sourceSpan,
 			source: {
@@ -1976,6 +1980,31 @@ function scanAnchorMatches(lineTable, line, anchorOccurrences) {
 		}));
 	}
 }
+function scanBibliographyAnchor(lineTable, line, anchorOccurrences) {
+	const match = bibliographyAnchorPattern.exec(line.text);
+	const [, marker, id, reftext] = match ?? [];
+	if (marker === void 0 || id === void 0) return;
+	const raw = match?.[0].slice(marker.length) ?? "";
+	const sourceSpan = sourceSpanForRange(lineTable, line.number, marker.length, raw);
+	anchorOccurrences.push(definedObject({
+		kind: "anchor",
+		syntax: "bibliography",
+		raw,
+		ids: [id],
+		reftext,
+		anchorScope: "inline",
+		sourceSpan,
+		source: {
+			raw,
+			line: line.number,
+			sourceSpan
+		}
+	}));
+}
+function isBibliographyList(surface) {
+	const list = surface.context === "list_item" ? surface.parent : surface;
+	return list?.context === "ulist" && list.block.getStyle?.() === "bibliography";
+}
 function scanHeadingInlineMetadataMatches(lineTable, line, headingInlineMetadataOccurrences, toolDiagnostics) {
 	for (const match of line.text.matchAll(headingInlineMetadataPattern)) {
 		if (match.index === void 0 || !match[1]) continue;
@@ -2516,18 +2545,14 @@ function projectSourceSurfaces(options) {
 		if (policy === "diagnostic") toolDiagnostics.push(unknownContextDiagnostic(surface, interval));
 	}
 	const { sections, sectionByBlock } = buildSectionSurfaces(blockSurfaces, intervalByBlock, options.lineTable, toolDiagnostics, logicalSource, sourceAwareDocument);
-	const sectionByLine = logicalSource || sourceAwareDocument ? /* @__PURE__ */ new Map() : mapSectionScope(sections, options.lineTable.lines.length);
+	const sectionByLine = mapSectionScope(blockSurfaces, sectionByBlock, intervalByBlock);
 	const { xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences } = scanInlineOccurrencesInOfficialBlocks({
 		lineTable: options.lineTable,
 		blockSurfaces,
 		intervalByBlock,
+		sectionByLine,
 		toolDiagnostics
 	});
-	let sectionScopeIndex;
-	if (logicalSource || sourceAwareDocument) {
-		sectionScopeIndex = buildSourceScopeIndex(sections);
-		assignContainingSectionIdsFromSourceScope(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, sectionScopeIndex);
-	} else assignContainingSectionIds(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, sectionByLine);
 	return {
 		blockSurfaces,
 		intervalByBlock,
@@ -2538,7 +2563,6 @@ function projectSourceSurfaces(options) {
 		anchorOccurrences,
 		headingInlineMetadataOccurrences,
 		sectionByLine,
-		...sectionScopeIndex ? { sectionScopeIndex } : {},
 		toolDiagnostics
 	};
 }
@@ -2611,10 +2635,6 @@ function buildSectionSurfaces(blockSurfaces, intervalByBlock, lineTable, toolDia
 			}),
 			children: []
 		});
-		if (logicalSource || sourceAwareDocument) {
-			const sourceScope = sourceAwareDocument ? sourceScopeFromSourceAwareInterval(sourceAwareDocument, interval.span, sourceLine) : logicalSource ? sectionSourceScopeFromLogicalInterval(logicalSource, interval.span, sourceLine) : void 0;
-			if (sourceScope) registerSectionSourceScope(section, sourceScope);
-		}
 		sections.push(section);
 		sectionByBlock.set(surface.block, section);
 	}
@@ -2658,21 +2678,6 @@ function nextOriginHeadingBoundary(index, current) {
 	if (!index || !current) return;
 	return index.get(current.relativePath)?.find((candidate) => candidate.sliceStartLine > current.sliceStartLine);
 }
-function sectionSourceScopeFromLogicalInterval(logicalSource, span, headingLogicalLine) {
-	const headingOrigin = logicalSource.lineOrigins[headingLogicalLine - 1];
-	if (!headingOrigin) return;
-	let endLine = headingOrigin.sourceLine;
-	for (let logicalLine = span.startLine; logicalLine <= span.endLine; logicalLine += 1) {
-		const origin = logicalSource.lineOrigins[logicalLine - 1];
-		if (!origin || origin.relativePath !== headingOrigin.relativePath) continue;
-		endLine = Math.max(endLine, origin.sourceLine);
-	}
-	return {
-		relativePath: headingOrigin.relativePath,
-		startLine: headingOrigin.sourceLine,
-		endLine
-	};
-}
 function sourceAwareOriginForLine(document, logicalLine) {
 	const record = document.lines[logicalLine - 1];
 	if (!record || !("origin" in record)) return;
@@ -2686,12 +2691,13 @@ function hasDiagnosticPolicyAncestor(surface) {
 	}
 	return false;
 }
-function mapSectionScope(sections, totalLines) {
+function mapSectionScope(blockSurfaces, sectionByBlock, intervalByBlock) {
 	const result = /* @__PURE__ */ new Map();
-	for (const section of sections) {
-		const start = section.span?.startLine ?? section.line ?? 1;
-		const end = section.span?.endLine ?? totalLines;
-		for (let line = start; line <= end; line += 1) result.set(line, section);
+	for (const surface of blockSurfaces) {
+		const section = sectionByBlock.get(surface.block);
+		const span = intervalByBlock.get(surface.block)?.span;
+		if (!section || !span) continue;
+		for (let line = span.startLine; line <= span.endLine; line += 1) result.set(line, section);
 	}
 	return result;
 }

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-DMOLXZbF.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-DmT-MEPN.mjs";
 import { relative, resolve, sep } from "node:path";
 import { existsSync } from "node:fs";
 import process from "node:process";

package/dist/index.d.mts

@@ -156,7 +156,7 @@ type XrefOccurrenceNode = NodeBase & {
 };
 type AnchorOccurrenceNode = NodeBase & {
   kind: "anchor";
-  syntax: "double-bracket" | "macro";
+  syntax: "double-bracket" | "macro" | "bibliography";
   raw: string;
   ids: string[];
   reftext?: string;
@@ -181,6 +181,7 @@ type TargetNode = NodeBase & {
   title?: string;
   idOrigin: "source" | "asciidoctor-generated" | "unknown";
   sourceSpan?: SourceSpan;
+  containingSectionId?: string;
 };
 type TextNode = NodeBase & {
   kind: "text";
@@ -221,7 +222,7 @@ type IncludeResolver = {
 };
 type IncludeResolverRequest = {
   readonly target: string;
-  readonly attributes: Readonly<Record<string, string>>;
+  readonly attributes: Readonly<Record<string, string | null>>;
   readonly sourcePath: string;
 };
 type IncludeResolution = {

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

package/dist/{src-DMOLXZbF.mjs → src-DmT-MEPN.mjs}

@@ -284,6 +284,18 @@ function addFieldTriple(graph, subject, fieldName, value) {
 }
 //#endregion
 //#region src/rdf12-projection/heading-ownership.ts
+/**
+* 出现处或目标所属的 section 对应的标题节点。
+*
+* 所属 section 已在逻辑文档上判定（10 号书「结构关系在 Logical Document 上判定」），标题可以和出现处不在
+* 同一个源文件里：被引入的文件没有自己的标题时，它属于引入它的那个标题。ID 在一份文档里唯一，
+* 仍多于一个候选时不选。
+*/
+function findHeadingBySectionId(nodeIndex, sectionId) {
+	if (sectionId === void 0) return;
+	const candidates = nodeIndex.entries().filter((entry) => entry.kind === "section" && entry.node.ids.includes(sectionId));
+	return candidates.length === 1 ? candidates[0] : void 0;
+}
 function findInnermostHeadingBySourceLine(input) {
 	return input.nodeIndex.entries().filter((entry) => containsLine(entry, input)).map((entry, index) => ({
 		entry,
@@ -377,14 +389,8 @@ function addHeadingLabels$1(catalog, entry) {
 	for (const id of entry.node.ids) addCatalogEntry(catalog, entry, labelKind, id);
 }
 function addLocalTargetAlias(catalog, input, target) {
-	if (target.targetType === "section" || !target.id || target.sourceSpan === void 0) return;
-	const relativePath = sourceRelativePathOrFallback(target.source, input.relativePath, input.document.mode);
-	if (relativePath === void 0) return;
-	const owner = findInnermostHeadingBySourceLine({
-		nodeIndex: input.nodeIndex,
-		relativePath,
-		line: target.sourceSpan.start.line
-	});
+	if (target.targetType === "section" || !target.id || target.sourceSpan === void 0 && target.containingSectionId === void 0) return;
+	const owner = findHeadingBySectionId(input.nodeIndex, target.containingSectionId) ?? ownerBySourceLine(input, target);
 	if (owner === void 0) return;
 	addCatalogEntry(catalog, owner, "addressLabel", target.id);
 	input.graph.add(rdf12Triple(owner.iri, iriTerm(`${namespaces.aat}addressLabel`), stringLiteral(target.id)));
@@ -397,6 +403,15 @@ function addCatalogEntry(catalog, entry, labelKind, value) {
 		value
 	});
 }
+function ownerBySourceLine(input, target) {
+	const relativePath = sourceRelativePathOrFallback(target.source, input.relativePath, input.document.mode);
+	if (relativePath === void 0 || target.sourceSpan === void 0) return;
+	return findInnermostHeadingBySourceLine({
+		nodeIndex: input.nodeIndex,
+		relativePath,
+		line: target.sourceSpan.start.line
+	});
+}
 //#endregion
 //#region src/rdf12-projection/path-coordinate.ts
 function computePathCoordinate(input) {
@@ -755,7 +770,8 @@ function recoverSourceAwareSourceLayer(document, logicalSpan, options) {
 	const lastRecord = sourceRecords.at(-1);
 	if (!firstRecord || !lastRecord) return recoveryFailure$1("source-coordinate.generated-line", `Parser core interval ${logicalSpan.startLine}-${logicalSpan.endLine} has no source-backed lines for ${options.diagnosticContext}.`, options.logicalSourceSpan);
 	const relativePath = firstRecord.origin.relativePath;
-	if (!relativePath || sourceRecords.some((record) => record.origin.relativePath !== relativePath)) return recoveryFailure$1("block-origin.multi-source-span", `Block span ${logicalSpan.startLine}-${logicalSpan.endLine} maps to more than one origin source file for ${options.diagnosticContext}.`, options.logicalSourceSpan);
+	if (firstRecord.origin.absolutePath !== lastRecord.origin.absolutePath) return recoveryFailure$1("block-origin.multi-source-span", `${options.diagnosticContext} starts at ${originLabel(firstRecord.origin)} and ends at ${originLabel(lastRecord.origin)}; no single origin source file holds its raw.`, options.logicalSourceSpan);
+	if (!authorLinesInSourceOrder(sourceRecords, firstRecord.origin)) return recoveryFailure$1("block-origin.multi-source-span", `${options.diagnosticContext} from ${originLabel(firstRecord.origin)} to ${originLabel(lastRecord.origin)} reads ${relativePath} out of source order; no contiguous raw exists.`, options.logicalSourceSpan);
 	const sourceFile = sourceFileForOrigin$1(document, firstRecord.origin);
 	if (!sourceFile) return recoveryFailure$1("line-origin.source-file-missing", `Origin file line table is missing for ${relativePath}.`, options.logicalSourceSpan);
 	const lineSpan = {
@@ -807,6 +823,47 @@ function recoverSourceAwarePointSourceLayer(document, logicalSourceSpan, raw) {
 		}
 	};
 }
+/**
+* 块的 content span 在作者文件里的行区间。
+*
+* 内容的首行或尾行来自被引入的文件时，作者文件里与之对应的是那条 include 指令：从块里紧挨在内容之前的
+* 作者行往后一行起，到紧挨在内容之后的作者行往前一行止。作者文件由块的首行决定，调用方应已用
+* {@link recoverSourceAwareSourceLayer} 确认整块落在同一个作者文件里。
+*/
+function recoverSourceAwareContentLineSpan(document, blockSpan, contentSpan) {
+	const blockRecords = recordsForSpan(document, blockSpan)?.filter(hasOrigin);
+	const author = blockRecords?.[0]?.origin.absolutePath;
+	if (!blockRecords || author === void 0) return;
+	const authored = blockRecords.filter((record) => record.origin.absolutePath === author);
+	const inside = (record) => record.logicalLine >= contentSpan.startLine && record.logicalLine <= contentSpan.endLine;
+	const firstInside = authored.find(inside);
+	const lastInside = authored.findLast(inside);
+	const before = authored.findLast((record) => record.logicalLine < contentSpan.startLine);
+	const after = authored.find((record) => record.logicalLine > contentSpan.endLine);
+	const startsWithAuthorLine = firstInside !== void 0 && firstInside.logicalLine === firstOriginLine(blockRecords, contentSpan);
+	const endsWithAuthorLine = lastInside !== void 0 && lastInside.logicalLine === lastOriginLine(blockRecords, contentSpan);
+	const startLine = startsWithAuthorLine ? firstInside.origin.sourceLine : before && before.origin.sourceLine + 1;
+	const endLine = endsWithAuthorLine ? lastInside.origin.sourceLine : after && after.origin.sourceLine - 1;
+	if (startLine === void 0 || endLine === void 0 || startLine > endLine) return;
+	return {
+		startLine,
+		endLine
+	};
+}
+/**
+* 一段逻辑行在源文件里落在哪些行上：`relativePath` 与 `line` 的组合，用 {@link originPointKey} 编成键。
+*
+* 出现处回源后只剩来源坐标；判断它在不在一个块里，就看它的来源是不是这个块某条逻辑行的来源
+* （10 号书「结构关系在 Logical Document 上判定」）。被引入文件里的行也在其中。
+*/
+function originPointsForSpan(document, logicalSpan) {
+	const points = /* @__PURE__ */ new Set();
+	for (const record of recordsForSpan(document, logicalSpan) ?? []) if (hasOrigin(record)) points.add(originPointKey(record.origin.relativePath, record.origin.sourceLine));
+	return points;
+}
+function originPointKey(relativePath, line) {
+	return `${relativePath}\n${line}`;
+}
 function recoverSourceAwareDocumentTitleSourceLayer(document, logicalTitleSpan) {
 	if (!logicalTitleSpan) return;
 	return recoverSourceAwarePointSourceLayer(document, logicalTitleSpan, document.lines[logicalTitleSpan.start.line - 1]?.text ?? "");
@@ -844,22 +901,6 @@ function recoverSourceAwareTitleSpan(document, logicalTitleSpan) {
 	const recovered = recoverSourceAwareSpan(document, logicalTitleSpan, false);
 	return recovered.ok ? recovered.sourceSpan : void 0;
 }
-function sourceScopeFromSourceAwareInterval(document, span, headingLogicalLine) {
-	const headingRecord = document.lines[headingLogicalLine - 1];
-	if (!headingRecord || !hasOrigin(headingRecord)) return;
-	let endLine = headingRecord.origin.sourceLine;
-	for (let logicalLine = span.startLine; logicalLine <= span.endLine; logicalLine += 1) {
-		const record = document.lines[logicalLine - 1];
-		if (!record || !hasOrigin(record)) continue;
-		if (record.origin.relativePath !== headingRecord.origin.relativePath) continue;
-		endLine = Math.max(endLine, record.origin.sourceLine);
-	}
-	return {
-		relativePath: headingRecord.origin.relativePath,
-		startLine: headingRecord.origin.sourceLine,
-		endLine
-	};
-}
 function recoverSourceAwareSpan(document, logicalSourceSpan, requireColumns) {
 	const start = recoverSourceAwarePoint(document, logicalSourceSpan.start, requireColumns);
 	if (!start.ok) return start;
@@ -871,7 +912,7 @@ function recoverSourceAwareSpan(document, logicalSourceSpan, requireColumns) {
 			line: start.line
 		}
 	};
-	if (start.relativePath !== end.relativePath) return recoveryFailure$1("block-origin.multi-source-span", `Source span ${logicalSourceSpan.start.line}-${logicalSourceSpan.end.line} maps to more than one origin source file.`, logicalSourceSpan);
+	if (start.relativePath !== end.relativePath) return recoveryFailure$1("block-origin.multi-source-span", `Source span starts at ${start.relativePath}:${start.line} and ends at ${end.relativePath}:${end.line}; no single origin source file holds it.`, logicalSourceSpan);
 	return {
 		ok: true,
 		relativePath: start.relativePath,
@@ -941,6 +982,24 @@ function recordsForSpan(document, span) {
 function hasOrigin(record) {
 	return "origin" in record;
 }
+function originLabel(origin) {
+	return `${origin.relativePath}:${origin.sourceLine}`;
+}
+function authorLinesInSourceOrder(records, author) {
+	let previous = 0;
+	for (const record of records) {
+		if (record.origin.absolutePath !== author.absolutePath) continue;
+		if (record.origin.sourceLine <= previous) return false;
+		previous = record.origin.sourceLine;
+	}
+	return true;
+}
+function firstOriginLine(records, span) {
+	return records.find((record) => record.logicalLine >= span.startLine && record.logicalLine <= span.endLine)?.logicalLine;
+}
+function lastOriginLine(records, span) {
+	return records.findLast((record) => record.logicalLine >= span.startLine && record.logicalLine <= span.endLine)?.logicalLine;
+}
 function sourceFileForOrigin$1(document, origin) {
 	return document.sourceFiles.find((sourceFile) => sourceFile.absolutePath === origin.absolutePath);
 }
@@ -1623,10 +1682,10 @@ function writeSourceBinding(context, xrefIri, xref) {
 }
 function sourceHeadingForXref(context, xref) {
 	if (xref.sourceSpan === void 0) return;
+	const selectorHeading = findHeadingBySectionId(context.nodeIndex, xref.containingSectionId)?.iri;
+	if (selectorHeading !== void 0) return selectorHeading;
 	const relativePath = sourceRelativePathOrFallback(xref.source, context.relativePath, context.document.mode);
 	if (relativePath === void 0) return;
-	const selectorHeading = sourceHeadingBySelector(context.nodeIndex, relativePath, xref.containingSectionId);
-	if (selectorHeading !== void 0) return selectorHeading;
 	const line = xref.sourceSpan.start.line;
 	return findInnermostHeadingBySourceLine({
 		nodeIndex: context.nodeIndex,
@@ -1634,13 +1693,6 @@ function sourceHeadingForXref(context, xref) {
 		line
 	})?.iri;
 }
-function sourceHeadingBySelector(nodeIndex, relativePath, selector) {
-	if (selector === void 0) return;
-	const candidates = nodeIndex.entries().filter((entry) => {
-		return entry.relativePath === relativePath && entry.kind === "section" && entry.node.ids.includes(selector);
-	});
-	return candidates.length === 1 ? candidates[0]?.iri : void 0;
-}
 function writeTargetBinding(context, xrefIri, xref) {
 	const result = bindSelector(context.labelCatalog, xref.target);
 	if (result.status === "bound") {
@@ -3531,6 +3583,7 @@ function addAnchorTargets(targets, anchorOccurrences) {
 			title: anchor.reftext,
 			idOrigin: "source",
 			sourceSpan: anchor.sourceSpan,
+			containingSectionId: anchor.containingSectionId,
 			asciidoctor: definedObject({
 				resolvedId: id,
 				resolvedType: targetType,
@@ -4095,7 +4148,7 @@ function buildDescriptionList(block, startLine, context, interval) {
 		delimiter: descriptionListDelimiterMatch(context.lineTable, startLine)?.raw,
 		metadata: metadata.map((surface) => surface.node),
 		metadataSpan: interval?.metadataSpan,
-		contentSpan: source ? originLineSpan(context, contentSpan) : void 0,
+		contentSpan: source ? originLineSpan(context, contentSpan, span) : void 0,
 		span: source?.span,
 		source,
 		asciidoctor: definedObject({
@@ -4374,7 +4427,7 @@ function buildListing(block, delimiterLine, context, interval) {
 		metadata: metadata.map((surface) => surface.node),
 		content: block.getSource?.() ?? (contentSpan ? sourceLines(context.lineTable, contentSpan.startLine, contentSpan.endLine).join("\n") : void 0),
 		metadataSpan: interval?.metadataSpan,
-		contentSpan: source ? originLineSpan(context, contentSpan) : void 0,
+		contentSpan: source ? originLineSpan(context, contentSpan, span) : void 0,
 		span: source?.span,
 		source,
 		asciidoctor: definedObject({
@@ -4478,10 +4531,15 @@ function registerOfficialBlockTarget(context, block, options) {
 		title: options.title ?? block.getTitle?.(),
 		idOrigin: options.idOrigin ?? (options.targetType === "section" ? "asciidoctor-generated" : "source"),
 		sourceSpan: options.sourceSpan,
+		containingSectionId: options.targetType === "section" ? void 0 : blockSectionId(context, block),
 		source: options.source,
 		asciidoctor
 	}));
 }
+function blockSectionId(context, block) {
+	const line = context.intervalByBlock.get(block)?.span.startLine;
+	return line === void 0 ? void 0 : context.sectionByLine.get(line)?.ids[0];
+}
 function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 	if (!context.logicalSource && !context.sourceAwareDocument) {
 		const sourceSpan = sourceSpanFromLineSpan(context.lineTable, fallbackSpan);
@@ -4511,15 +4569,9 @@ function blockSourceLayer(context, interval, fallbackSpan, diagnosticContext) {
 function sameLineSpan(left, right) {
 	return left.startLine === right.startLine && left.endLine === right.endLine;
 }
-function originLineSpan(context, span) {
+function originLineSpan(context, span, blockSpan) {
 	if (!span || !context.logicalSource && !context.sourceAwareDocument) return span;
-	if (context.sourceAwareDocument) {
-		const recovered = recoverSourceAwareSourceLayer(context.sourceAwareDocument, span, {
-			raw: false,
-			diagnosticContext: "block content"
-		});
-		return recovered.ok ? recovered.lineSpan : void 0;
-	}
+	if (context.sourceAwareDocument) return recoverSourceAwareContentLineSpan(context.sourceAwareDocument, blockSpan, span);
 	if (!context.logicalSource) return;
 	const recovered = recoverOriginSourceLayer(context.logicalSource, span, {
 		raw: false,
@@ -4538,6 +4590,13 @@ function collectHeadingInlineMetadataInSpan(context, logicalSpan, source) {
 }
 function collectOccurrencesInSpan(context, groupedByLine, occurrences, logicalSpan, source) {
 	if (!context.logicalSource && !context.sourceAwareDocument) return collectOccurrencesInLineRange(groupedByLine, logicalSpan.startLine, logicalSpan.endLine);
+	if (context.sourceAwareDocument) {
+		const points = originPointsForSpan(context.sourceAwareDocument, logicalSpan);
+		return occurrences.filter((occurrence) => {
+			const { relativePath, line } = occurrence.source ?? {};
+			return relativePath !== void 0 && line !== void 0 && points.has(originPointKey(relativePath, line));
+		});
+	}
 	if (!source?.relativePath || !source.span) return [];
 	const relativePath = source.relativePath;
 	const sourceSpan = source.span;
@@ -4605,61 +4664,12 @@ function locate(block, location) {
 	if (location) block.sourceLocation = location;
 }
 //#endregion
-//#region src/book-entry/source-scope-index.ts
-const sectionSourceScopeBySection = /* @__PURE__ */ new WeakMap();
-function registerSectionSourceScope(section, scope) {
-	sectionSourceScopeBySection.set(section, scope);
-}
-function buildSourceScopeIndex(sections) {
-	return { candidates: sections.flatMap((section) => {
-		const scope = sourceScopeForSection(section);
-		if (!scope) return [];
-		return [{
-			...scope,
-			section
-		}];
-	}) };
-}
-function sourceScopeForSection(section) {
-	const registered = sectionSourceScopeBySection.get(section);
-	if (registered) return registered;
-	const relativePath = section.source?.relativePath;
-	const startLine = section.source?.span?.startLine ?? section.source?.line;
-	const endLine = section.source?.span?.endLine ?? section.source?.line ?? startLine;
-	if (!relativePath || startLine === void 0 || endLine === void 0) return;
-	return {
-		relativePath,
-		startLine,
-		endLine
-	};
-}
-function lookupContainingSection(index, lookup) {
-	const relativePath = lookup.relativePath ?? lookup.source?.relativePath;
-	const line = lookup.line ?? lookup.source?.line;
-	if (!relativePath || line === void 0) return;
-	let containingSection;
-	for (const candidate of index.candidates) {
-		if (candidate.relativePath !== relativePath) continue;
-		if (line < candidate.startLine || line > candidate.endLine) continue;
-		containingSection = candidate.section;
-	}
-	return containingSection;
-}
-function assignContainingSectionIdsFromSourceScope(xrefs, anchors, headingInlineMetadataOccurrences, index) {
-	for (const occurrence of [
-		...xrefs,
-		...anchors,
-		...headingInlineMetadataOccurrences
-	]) {
-		const sectionId = lookupContainingSection(index, occurrence)?.ids[0];
-		if (sectionId !== void 0) occurrence.containingSectionId = sectionId;
-	}
-}
-//#endregion
 //#region src/inline-occurrence-scanner.ts
 const shorthandXrefPattern = /<<([^>,]+)(?:,\s*([^>]+))?>>/gu;
 const macroXrefPattern = /xref:([^\s[]+)\[([^\]]*)\]/gu;
-const anchorPattern = /\[\[([^,\]]+)(?:,([^\]]+))?\]\]|anchor:([^\s[]+)\[([^\]]*)\]/gu;
+const anchorId = String.raw`[\p{Alphabetic}_:][\p{Alphabetic}\p{N}\p{Pc}\-:.]*`;
+const anchorPattern = new RegExp(String.raw`(?<![\\\[])\[\[(${anchorId})(?:, *(.+?))? ?\]\]` + String.raw`|(?<!\\)anchor:(${anchorId})\[(?:\]|(.*?[^\\])\])`, "gu");
+const bibliographyAnchorPattern = new RegExp(String.raw`^(\s*[*-]+\s+)\[\[\[(${anchorId})(?:, *(.+?))?\]\]\]`, "u");
 const headingInlineMetadataPattern = /hmeta:([^\s[]+)\[([^\]]*)\]/gu;
 function scanInlineOccurrencesInOfficialBlocks(options) {
 	const xrefOccurrences = [];
@@ -4677,8 +4687,9 @@ function scanInlineOccurrencesInOfficialBlocks(options) {
 		if (officialBlockPolicy(surface.block) !== "scan") continue;
 		if (!scansMacroSubstitutedContent(surface)) continue;
 		if (surface.context === "table") scanTableInlineRange(options.lineTable, surface.block, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics);
-		else scanInlineRange(options.lineTable, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics, descendantUnscannableRanges(surface, options.intervalByBlock));
+		else scanInlineRange(options.lineTable, span.startLine, span.endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.toolDiagnostics, descendantUnscannableRanges(surface, options.intervalByBlock), isBibliographyList(surface));
 	}
+	assignContainingSectionIds(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, options.sectionByLine);
 	const sourceAwareDocument = sourceAwareDocumentForLineTable(options.lineTable);
 	const logicalSource = logicalSourceForLineTable(options.lineTable);
 	const recoveredXrefs = sourceAwareDocument ? recoverSourceAwareInlineOrigins(xrefOccurrences, sourceAwareDocument, options.toolDiagnostics) : logicalSource ? recoverInlineOrigins(xrefOccurrences, logicalSource, options.toolDiagnostics) : xrefOccurrences;
@@ -4795,12 +4806,13 @@ 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 = []) {
+function scanInlineRange(lineTable, startLine, endLine, xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, toolDiagnostics, skipRanges = [], bibliography = false) {
 	for (let lineNumber = startLine; lineNumber <= endLine; lineNumber += 1) {
 		if (isLineInRanges(lineNumber, skipRanges)) continue;
 		const line = lineTable.lines[lineNumber - 1];
 		if (!line) continue;
 		scanXrefMatches(lineTable, line, xrefOccurrences);
+		if (bibliography) scanBibliographyAnchor(lineTable, line, anchorOccurrences);
 		scanAnchorMatches(lineTable, line, anchorOccurrences);
 		scanHeadingInlineMetadataMatches(lineTable, line, headingInlineMetadataOccurrences, toolDiagnostics);
 	}
@@ -4959,7 +4971,7 @@ function scanAnchorMatches(lineTable, line, anchorOccurrences) {
 			syntax: doubleBracketId ? "double-bracket" : "macro",
 			raw,
 			ids: [id],
-			reftext: match[2] ?? match[4] ?? void 0,
+			reftext: doubleBracketId ? match[2] : match[4] ?? "",
 			anchorScope: line.text.trim() === raw && doubleBracketId ? "block" : "inline",
 			sourceSpan,
 			source: {
@@ -4970,6 +4982,31 @@ function scanAnchorMatches(lineTable, line, anchorOccurrences) {
 		}));
 	}
 }
+function scanBibliographyAnchor(lineTable, line, anchorOccurrences) {
+	const match = bibliographyAnchorPattern.exec(line.text);
+	const [, marker, id, reftext] = match ?? [];
+	if (marker === void 0 || id === void 0) return;
+	const raw = match?.[0].slice(marker.length) ?? "";
+	const sourceSpan = sourceSpanForRange(lineTable, line.number, marker.length, raw);
+	anchorOccurrences.push(definedObject({
+		kind: "anchor",
+		syntax: "bibliography",
+		raw,
+		ids: [id],
+		reftext,
+		anchorScope: "inline",
+		sourceSpan,
+		source: {
+			raw,
+			line: line.number,
+			sourceSpan
+		}
+	}));
+}
+function isBibliographyList(surface) {
+	const list = surface.context === "list_item" ? surface.parent : surface;
+	return list?.context === "ulist" && list.block.getStyle?.() === "bibliography";
+}
 function scanHeadingInlineMetadataMatches(lineTable, line, headingInlineMetadataOccurrences, toolDiagnostics) {
 	for (const match of line.text.matchAll(headingInlineMetadataPattern)) {
 		if (match.index === void 0 || !match[1]) continue;
@@ -5510,18 +5547,14 @@ function projectSourceSurfaces(options) {
 		if (policy === "diagnostic") toolDiagnostics.push(unknownContextDiagnostic(surface, interval));
 	}
 	const { sections, sectionByBlock } = buildSectionSurfaces(blockSurfaces, intervalByBlock, options.lineTable, toolDiagnostics, logicalSource, sourceAwareDocument);
-	const sectionByLine = logicalSource || sourceAwareDocument ? /* @__PURE__ */ new Map() : mapSectionScope(sections, options.lineTable.lines.length);
+	const sectionByLine = mapSectionScope(blockSurfaces, sectionByBlock, intervalByBlock);
 	const { xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences } = scanInlineOccurrencesInOfficialBlocks({
 		lineTable: options.lineTable,
 		blockSurfaces,
 		intervalByBlock,
+		sectionByLine,
 		toolDiagnostics
 	});
-	let sectionScopeIndex;
-	if (logicalSource || sourceAwareDocument) {
-		sectionScopeIndex = buildSourceScopeIndex(sections);
-		assignContainingSectionIdsFromSourceScope(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, sectionScopeIndex);
-	} else assignContainingSectionIds(xrefOccurrences, anchorOccurrences, headingInlineMetadataOccurrences, sectionByLine);
 	return {
 		blockSurfaces,
 		intervalByBlock,
@@ -5532,7 +5565,6 @@ function projectSourceSurfaces(options) {
 		anchorOccurrences,
 		headingInlineMetadataOccurrences,
 		sectionByLine,
-		...sectionScopeIndex ? { sectionScopeIndex } : {},
 		toolDiagnostics
 	};
 }
@@ -5605,10 +5637,6 @@ function buildSectionSurfaces(blockSurfaces, intervalByBlock, lineTable, toolDia
 			}),
 			children: []
 		});
-		if (logicalSource || sourceAwareDocument) {
-			const sourceScope = sourceAwareDocument ? sourceScopeFromSourceAwareInterval(sourceAwareDocument, interval.span, sourceLine) : logicalSource ? sectionSourceScopeFromLogicalInterval(logicalSource, interval.span, sourceLine) : void 0;
-			if (sourceScope) registerSectionSourceScope(section, sourceScope);
-		}
 		sections.push(section);
 		sectionByBlock.set(surface.block, section);
 	}
@@ -5652,21 +5680,6 @@ function nextOriginHeadingBoundary(index, current) {
 	if (!index || !current) return;
 	return index.get(current.relativePath)?.find((candidate) => candidate.sliceStartLine > current.sliceStartLine);
 }
-function sectionSourceScopeFromLogicalInterval(logicalSource, span, headingLogicalLine) {
-	const headingOrigin = logicalSource.lineOrigins[headingLogicalLine - 1];
-	if (!headingOrigin) return;
-	let endLine = headingOrigin.sourceLine;
-	for (let logicalLine = span.startLine; logicalLine <= span.endLine; logicalLine += 1) {
-		const origin = logicalSource.lineOrigins[logicalLine - 1];
-		if (!origin || origin.relativePath !== headingOrigin.relativePath) continue;
-		endLine = Math.max(endLine, origin.sourceLine);
-	}
-	return {
-		relativePath: headingOrigin.relativePath,
-		startLine: headingOrigin.sourceLine,
-		endLine
-	};
-}
 function sourceAwareOriginForLine(document, logicalLine) {
 	const record = document.lines[logicalLine - 1];
 	if (!record || !("origin" in record)) return;
@@ -5680,12 +5693,13 @@ function hasDiagnosticPolicyAncestor(surface) {
 	}
 	return false;
 }
-function mapSectionScope(sections, totalLines) {
+function mapSectionScope(blockSurfaces, sectionByBlock, intervalByBlock) {
 	const result = /* @__PURE__ */ new Map();
-	for (const section of sections) {
-		const start = section.span?.startLine ?? section.line ?? 1;
-		const end = section.span?.endLine ?? totalLines;
-		for (let line = start; line <= end; line += 1) result.set(line, section);
+	for (const surface of blockSurfaces) {
+		const section = sectionByBlock.get(surface.block);
+		const span = intervalByBlock.get(surface.block)?.span;
+		if (!section || !span) continue;
+		for (let line = span.startLine; line <= span.endLine; line += 1) result.set(line, section);
 	}
 	return result;
 }

package/package.json

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