@heroiclands/package-build 25.5.4 → 25.6.0

package/docs/reference/theme-pages.md

@@ -218,6 +218,7 @@ something to show:
 | Within            | `within`         | a place                                                | the places whose `data.parents` names it, a paragraph to each kind of place                  |
 | Governed by       | `governedby`     | a place                                                | the affiliation its `data.government` names, with that affiliation's kind                    |
 | Governed places   | `governedplaces` | an affiliation                                         | the places whose `data.government` names it, a paragraph to each kind of place               |
+| Office holders    | `officeholders`  | an affiliation                                         | each office a living being holds, one line each, with its holders                            |
 | Chronology        | `chronology`     | a place                                                | the [event views](format-details.md#event-views)                                             |
 | Events            | `events`         | a being, an affiliation or a people                    | the event views                                                                              |
 | Accounts          | `accounts`       | an affiliation, a place or a people                    | the event views                                                                              |

package/e2e.mjs

@@ -799,7 +799,7 @@ export function suiteExecutables(command) {
 }
 
 /** The Chrome for Testing build shared by local and CI Cypress runs. */
-export const CHROME_BUILD_ID = "158.0.8122.0";
+export const CHROME_BUILD_ID = "159.0.8136.0";
 
 /**
  * The browser cache survives reseeding and container teardown.

package/engine/base-compiler.mjs

@@ -61,6 +61,7 @@
  * @module
  */
 
+import { scanPageBreaks } from "./page-breaks.mjs";
 import { scanAlerts } from "./content-alerts.mjs";
 import { authoredFrontmatter } from "./index-records.mjs";
 import { markupAnchorFindings } from "./anchors.mjs";
@@ -697,6 +698,7 @@ export class BasePackCompiler {
         for (const secretError of [
             ...(scanned?.blocks ?? scanBlocks(body)).errors,
             ...(scanned?.alerts ?? scanAlerts(body)).errors,
+            ...scanPageBreaks(body).errors,
             ...(scanned?.spans ?? scanSpans(body)).errors,
             ...scanRuns(body, this.corpus?.runs, syntax).errors,
             ...markupAnchorFindings(body, syntax),

package/engine/compile-corpus.mjs

@@ -42,6 +42,7 @@ import { indexRecordsFor } from "./content-index.mjs";
 import { buildContentLinkIndex } from "./helpers.mjs";
 import { loadPackConfig } from "./pack-config.mjs";
 import { runContext } from "./content-scripts.mjs";
+import { resolveReference } from "./wikilinks.mjs";
 import { prepareTreeSqlTables } from "./sql-tables.mjs";
 
 /**
@@ -99,13 +100,16 @@ export async function buildCompileCorpus({
     const corpusOptions = { config: resolved, records };
     const sqlOptions = { ...corpusOptions, skipDirectories, parsed };
     const sqlTables = await prepareTreeSqlTables(contentBase, sqlOptions);
+    const linkIndex = buildContentLinkIndex(contentBase, router, { ...corpusOptions, sqlTables });
     return {
         currentDate: resolved.currentDate,
-        runs: runContext(resolved, records),
+        runs: runContext(resolved, records, {
+            referenceName: (target) => resolveReference(linkIndex, target)?.name,
+        }),
         records,
         parsed,
         problems: collected,
-        linkIndex: buildContentLinkIndex(contentBase, router, { ...corpusOptions, sqlTables }),
+        linkIndex,
         sqlTables,
     };
 }

package/engine/content-charset.mjs

@@ -177,7 +177,7 @@ export const NOTATION = Object.freeze(
  */
 const SCRIPT_BLOCKS = Object.freeze([
     [0xf0000, 0xf2fff], // plane 15: Pirzath, Thuravark, Semaron, the reserved alphabets, Teng Chou
-    [0xf3000, 0xf3fff], // Ch'alish P'ilam Common
+    [0xf3000, 0xf4fff], // Ch'alish P'ilam Common and Ceremonial
     [0x1e960, 0x1ec6f], // Zethu overflow, Qalezu, Zethu
     [0x1ecc0, 0x1ecff], // Qalezu catch-before forms
     [0x1ed50, 0x1ed7f], // Veldikko

package/engine/content-format.yaml

@@ -96,6 +96,7 @@ types:
             - durability
             - made
             - lost
+            - unique
         subTypes: []
     armorlocation:
         data:
@@ -114,6 +115,7 @@ types:
             - durability
             - made
             - lost
+            - unique
             - quantity
             - potency
             - strength
@@ -130,6 +132,7 @@ types:
             - durability
             - made
             - lost
+            - unique
             - capacity
         subTypes: []
     miscgear:
@@ -141,6 +144,7 @@ types:
             - durability
             - made
             - lost
+            - unique
             - quantity
         subTypes: []
     mystery:
@@ -189,6 +193,7 @@ types:
             - durability
             - made
             - lost
+            - unique
             - quantity
         subTypes:
             - none
@@ -268,6 +273,7 @@ types:
             - durability
             - made
             - lost
+            - unique
         subTypes: []
     lore:
         data:
@@ -323,6 +329,7 @@ types:
             - culture
             - population
             - government
+            - settlements
             - market
             - borders
             - routes
@@ -343,10 +350,12 @@ types:
         subTypes:
             - world
             - region
+            - district
             - settlement
             - site
             - structure
             - feature
+            - route
             - celestial
     scenario:
         data:
@@ -355,7 +364,6 @@ types:
             - cast
             - factions
             - follows
-            - status
             - party.size
             - party.archetypes
         subTypes:
@@ -740,12 +748,6 @@ vocabularies:
         - "4"
         - "5"
         - "6"
-    holdingModel:
-        - held
-        - endowed
-        - registered
-        - kin
-        - polis
     bearing:
         - N
         - NE

package/engine/content-html.mjs

@@ -64,7 +64,8 @@ import { positionInBody, splitFrontmatter } from "./diagnostics.mjs";
  * markdown's own angle brackets out of it: an autolink is `<https://…>`, and
  * `https` is followed by `:` rather than whitespace or `>`, so the pattern
  * stops. A comparison written in prose — `a < b` — has no name after the
- * bracket at all.
+ * bracket at all. A doubled `<<` opens a quotation, so its second bracket
+ * never starts an HTML tag.
  *
  * Attributes are consumed as "anything but a bracket", deliberately loosely: a
  * finding names the tag, and a pattern that tried to parse attribute syntax
@@ -73,7 +74,7 @@ import { positionInBody, splitFrontmatter } from "./diagnostics.mjs";
  *
  * @type {RegExp}
  */
-export const HTML_TAG = /<\/?[A-Za-z][A-Za-z0-9-]*(?:\s[^<>]*)?\/?>/g;
+export const HTML_TAG = /(?<!<)<\/?[A-Za-z][A-Za-z0-9-]*(?:\s[^<>]*)?\/?>/g;
 
 /**
  * What a note carrying raw HTML is told.

package/engine/content-index.mjs

@@ -141,6 +141,8 @@ import { EXPRESSION, renderMarkdownExpressions } from "./markdown-expressions.mj
 import { scanFigures } from "./content-figures.mjs";
 import { eventNoteIndex } from "./event-fields.mjs";
 import { derivedSections } from "./derived-sections.mjs";
+import { officeBodyKey, officeHolders } from "./office-holders.mjs";
+import { inheritDistrictGovernments } from "./holdings.mjs";
 // One reader for a note's anchors, shared with the link checker and with the
 // builds that emit a link. Re-exported because this is where callers
 // have always addressed it.
@@ -1311,6 +1313,8 @@ export function collectContentIndex(
         parsed,
     });
     resolveCultures(records, { contentPackage, contentBase, foreignRecord, problems, parsed });
+    // A district stating no government falls under its parent's.
+    inheritDistrictGovernments(records, { foreignRecord });
     const cultureNotes = records
         .filter((record) => isNoteRecord(record) && record.type === "lore")
         .map((record) => ({
@@ -1333,6 +1337,24 @@ export function collectContentIndex(
     for (const [note, inherited] of inheritance.values)
         if (Object.keys(inherited).length) note.fm.data = { ...note.fm.data, ...inherited };
 
+    // An office's holders are the living beings naming it, read once every
+    // being is recorded. A public body lists only public beings, as its page
+    // does.
+    phase("index office holders");
+    const publicHolders = officeHolders(records.filter((record) => !isGmNote(record)));
+    const allHolders = officeHolders(records);
+    for (const record of records) {
+        if (!isNoteRecord(record) || record.type !== "affiliation") continue;
+        const held = (isGmNote(record) ? allHolders : publicHolders).get(officeBodyKey(record));
+        if (!held) continue;
+        record.officeHolders = [...held].map(([office, holders]) => ({
+            office,
+            holders: holders.map((being) =>
+                readCanonicalKey(canonicalKey(being.package, "note", "being", being.shortcode)),
+            ),
+        }));
+    }
+
     // Automatic lexical sections require only the recorded frontmatter. Their
     // published anchors and journal targets therefore use the same pure body
     // projection as the surfaces, without making the index emitter async.
@@ -1924,6 +1946,7 @@ export function emitContentIndex({ contentBase, outDir, config, publication } =
                 record.data?.events?.length,
         ) ||
             derivedSections(notes, {
+                rawOf: (file) => parsed.get(file)?.raw,
                 fileOf: (record) => noteFile(tree, record),
                 config: resolved,
                 foreignIndex: loadForeignIndexes(resolved, [contentPackage]).index,

package/engine/content-links.mjs

@@ -56,6 +56,7 @@ import { readWikilink } from "./wikilink-syntax.mjs";
 import { encodeAddresses } from "./address-values.mjs";
 import fs from "node:fs";
 import { cultureRecordProblems, cultureInheritedFields } from "./culture-parents.mjs";
+import { governmentInherited } from "./holdings.mjs";
 import path from "node:path";
 
 import { matchAllOutsideCode } from "./code-fences.mjs";
@@ -248,6 +249,13 @@ export function buildLinkIndex(
         if (typeof record.languageCode === "string") note.languageCode = record.languageCode;
         const hierarchyProblems = cultureRecordProblems(record);
         note.inheritedCultureFields = cultureInheritedFields(record);
+        // A district's government taken from its parent is the parent's
+        // authored value, checked where it is written, not here.
+        if (governmentInherited(record))
+            note.inheritedCultureFields = new Set([
+                ...(note.inheritedCultureFields ?? []),
+                "government",
+            ]);
         if (hierarchyProblems)
             note.reportedCultureParents = new Set(
                 hierarchyProblems

package/engine/content-render.mjs

@@ -28,6 +28,7 @@
  * | quotes, dashes and ellipses | as written | typographic | as written | as written, set by Typst |
  * | raw HTML in a note | passed through | passed through | shown as text | shown as text |
  * | a name's first use | bold | bold | bold, with an index | bold |
+ * | `--- {.page-break}` | omitted | omitted | omitted | a weak page break |
  * | the output | HTML | HTML | HTML | the token stream, for the Typst stage |
  *
  * A target differs from the others only in that table. The shared plugins are
@@ -39,6 +40,8 @@
  *
  * A note reaches {@link Renderer#render} with its index-dependent constructs
  * already resolved by {@link module:engine/content-expand.expandContent}.
+ * Valid authored page breaks are omitted before these stages.
+ *
  * {@link Renderer#prepare} then writes the constructs markdown-it has no
  * syntax for as HTML between blank lines, in this order:
  *
@@ -64,6 +67,7 @@
  * @module
  */
 
+import { omitPageBreaks, pageBreakPlugin } from "./page-breaks.mjs";
 import MarkdownIt from "markdown-it";
 import footnotePlugin from "markdown-it-footnote";
 import deflistPlugin from "markdown-it-deflist";
@@ -122,7 +126,14 @@ function parseVerseContent(token, md, env, region) {
     const inline = token.type === "verse_inline";
     const paired = inline ? undefined : env.verses?.get(body);
     const footnotes = new Set(Object.keys(env.footnotes?.refs ?? {}).map((key) => key.slice(1)));
-    const model = paired?.model ?? region.model ?? parseVerse(body, { inline, footnotes });
+    const model =
+        paired?.model ??
+        region.model ??
+        parseVerse(region.logicalBody ?? body, {
+            inline,
+            footnotes,
+            sourceOffsets: region.bodyOffsets,
+        });
     token.meta ??= {};
     token.meta.verse = region;
     token.meta.versePaired = paired;
@@ -395,6 +406,7 @@ export function createRenderer(target, options = {}) {
 
     use("footnotes", footnotePlugin);
     if (book) {
+        use("page-breaks", pageBreakPlugin);
         use("alerts", alertMarkdownPlugin);
         use("spans", spanMarkdownPlugin, { verseInline: quotedVerse });
         use("verse-div", verseDivPlugin);
@@ -442,7 +454,7 @@ export function createRenderer(target, options = {}) {
 
     /** Write the constructs markdown-it has no syntax for as HTML. */
     const prepare = (markdown, env = {}) => {
-        let text = String(markdown ?? "");
+        let text = omitPageBreaks(String(markdown ?? ""));
         if (preview) text = sourceMalformedAlerts(text);
         let verses = env.verses;
         if (env.runs) {

package/engine/content-scripts.mjs

@@ -74,6 +74,9 @@ import { plainRomanVerse } from "./roman-verse.mjs";
 import { encodeText } from "./encoding.mjs";
 import { WIKILINK } from "./wikilink-syntax.mjs";
 import { matchAllOutsideCode } from "./code-fences.mjs";
+import { noteAddressOf } from "./word-rows.mjs";
+import { isNoteRecord } from "./index-records.mjs";
+import { parseAddress, isAddressTuple, renderAddress } from "./address.mjs";
 import { parseExtensionAttributes } from "./extension-attributes.mjs";
 
 /** The keys this module reads, which no construct passes through as written. */
@@ -118,6 +121,7 @@ const CONFIG = "package-build.config.yaml";
  * @property {ReadonlyMap<string, import("./verse-metre.mjs").MetreBook>} [metreBooks] -
  *   What each configured language's verse is counted by, from
  *   {@link module:engine/verse-metre.metreBooksFromRecords}.
+ * @property {(target: string) => string|undefined} [referenceName] - An indexed wikilink target's visible name.
  * @property {ReadonlyMap<string, import("./roman-characters.mjs").RomanInventory>} [romanInventories] -
  *   Exact Roman source inventories by configured alias and BCP 47 tag.
  * @property {ReadonlyMap<string, import("./script-emphasis.mjs").Emphasis>} [emphases] -
@@ -164,12 +168,16 @@ const withEncodings = new WeakMap();
  *   resolved configuration.
  * @param {Iterable<Record<string, any>>} [records] - The content index's
  *   records, whose language notes supply lexical writings and script choices.
+ * @param {{referenceName?: (target: string) => string|undefined}} [options] -
+ *   The rendering or validation index's own target-name lookup.
  * @returns {RunContext} Its languages, the faces installed where it sits, and
  *   the encodings. A fonts package that cannot be read gives no faces; a run naming
  *   one is reported.
  */
-export function runContext(config, records) {
-    if (!config) return {};
+export function runContext(config, records, { referenceName: indexedName } = {}) {
+    const withReferences = (context) =>
+        indexedName ? Object.freeze({ ...context, referenceName: indexedName }) : context;
+    if (!config) return withReferences({});
     let base = contexts.get(config);
     if (!base) {
         let faces;
@@ -192,14 +200,41 @@ export function runContext(config, records) {
         });
         contexts.set(config, base);
     }
-    if (!records || typeof records !== "object") return base;
+    if (!records || typeof records !== "object") return withReferences(base);
     let byRecords = withEncodings.get(config);
     if (!byRecords) withEncodings.set(config, (byRecords = new WeakMap()));
     const known = byRecords.get(records);
-    if (known) return known;
+    if (known) return withReferences(known);
     const loaded = encodingsFromRecords(records, config, base.fonts);
     const encodings = loaded.encodings;
     const languageRecords = languageRecordsByName(records, config);
+    const referenceNames = new Map();
+    for (const record of records) {
+        if (!isNoteRecord(record)) continue;
+        const name = record.name?.full ?? record.name;
+        if (typeof name !== "string") continue;
+        const note = noteAddressOf(record);
+        if (note) referenceNames.set(note, name);
+        const canonical = record.address?.canonical;
+        if (canonical)
+            referenceNames.set(
+                isAddressTuple(canonical) ? renderAddress(canonical) : canonical,
+                name,
+            );
+    }
+    const referenceTypes = new Set([...records].map((record) => record.type));
+    const referenceName = (target) => {
+        const address = parseAddress(
+            target,
+            {
+                package: config.contentPackage,
+                system: "note",
+                types: referenceTypes,
+            },
+            { declared: true },
+        );
+        return isAddressTuple(address) ? referenceNames.get(renderAddress(address)) : undefined;
+    };
     const context = Object.freeze({
         ...base,
         encodings,
@@ -211,12 +246,13 @@ export function runContext(config, records) {
         wordBooks: wordBooksFromRecords(records, config),
         metres: metresFromRecords(records),
         metreBooks: metreBooksFromRecords(records, config),
+        referenceName,
         emphases: emphasesFromRecords(records),
         languageEmphases: languageEmphasesOf(languageRecords),
         directions: directionsFromRecords(records),
     });
     byRecords.set(records, context);
-    return context;
+    return withReferences(context);
 }
 
 /**
@@ -2056,6 +2092,7 @@ export function scanRuns(source, ctx = {}, syntax) {
         languages: ctx.languages,
         metreBooks: ctx.metreBooks,
         lexicons: ctx.lexicons,
+        referenceName: ctx.referenceName,
         attributeColumns,
     });
     const merged = (found, extra) =>
@@ -2715,7 +2752,8 @@ export function renderRuns(source, ctx = {}, syntax, options = {}) {
             ...(detail.face?.direction === "rtl" ? { dir: "rtl" } : {}),
             ...(search ? { "data-pagefind-ignore": "true" } : {}),
         };
-        const marker = `<!--verse-pair:${verses.size + 1}-->${poem.inline ? "" : "\n"}`;
+        const prefix = poem.inline ? "" : block.body.slice(0, block.bodyOffsets[0]);
+        const marker = `${prefix}<!--verse-pair:${verses.size + 1}-->${poem.inline ? "" : "\n"}`;
         const body = marker + block.body;
         verses.set(body, { model, classes, attributes, inline: poem.inline });
         pairedEdits.push({ from: block.bodyStart, to: block.bodyStart, text: marker });

package/engine/content-session.mjs

@@ -25,6 +25,7 @@ import { captureContentSources } from "./content-sources.mjs";
 import { buildLinkIndex } from "./content-links.mjs";
 import { buildContentLinkIndex } from "./helpers.mjs";
 import { runContext } from "./content-scripts.mjs";
+import { resolveReference } from "./wikilinks.mjs";
 import { loadForeignIndexes } from "./metadata-index.mjs";
 import { loadPackConfig } from "./pack-config.mjs";
 import { routerFor } from "./pack-router.mjs";
@@ -273,19 +274,22 @@ export async function createContentSession({
         async compileCorpus() {
             return memo("compile", async () => {
                 const sqlTables = await session.sqlTables("all");
+                const linkIndex = buildContentLinkIndex(tree, router, {
+                    config,
+                    records,
+                    sqlTables,
+                    foreign,
+                });
                 return {
-                    runs: runContext(config, records),
+                    runs: runContext(config, records, {
+                        referenceName: (target) => resolveReference(linkIndex, target)?.name,
+                    }),
                     records,
                     parsed,
                     problems,
                     sqlTables,
                     syntax,
-                    linkIndex: buildContentLinkIndex(tree, router, {
-                        config,
-                        records,
-                        sqlTables,
-                        foreign,
-                    }),
+                    linkIndex,
                 };
             });
         },

package/engine/content-spans.mjs

@@ -318,12 +318,11 @@ export function scanSpans(source) {
             return mapping.absolute + pos - mapping.local;
         });
     }
-    // Verse fences preserve inline Markdown even though the block parser
-    // normally treats every code fence as literal text.
+    // Verse divs retain inline syntax while their container prefixes stay layout.
     for (const poem of scanVerse(text, { checkWorks: false }).blocks) {
         const children = [];
-        parser.inline.parse(poem.body, parser, env, children);
-        collect(children, (pos) => poem.bodyStart + pos);
+        parser.inline.parse(poem.logicalBody, parser, env, children);
+        collect(children, (pos) => poem.bodyStart + poem.bodyOffsets[pos]);
     }
     const raw = text.split("");
     for (const region of codeRegions(text))

package/engine/content-tables.mjs

@@ -14,6 +14,7 @@
 import { FENCE_LINE } from "./code-fences.mjs";
 import { PAGE_LIST_LANGUAGE } from "./page-lists.mjs";
 import { appendGeneratedSections } from "./generated-sections.mjs";
+import { insertDeclaredSections } from "./declared-sections.mjs";
 import { insertLexicalSections } from "./lexical-sections.mjs";
 
 /**
@@ -129,8 +130,8 @@ export function expandContentTables(markdown, { source = "", sqlTables, pageList
                 source,
                 directive: block.join("\n"),
                 reason: failure,
-                line: i,
-                column: indent.length + 1,
+                line: prepared?.line ?? i,
+                column: prepared?.column ?? indent.length + 1,
             });
             block.forEach((value, offset) => emit(value, i + offset));
             i = close;
@@ -149,11 +150,17 @@ export function expandContentTables(markdown, { source = "", sqlTables, pageList
         if (close + 1 < lines.length && lines[close + 1].trim()) emit("", i, true);
         i = close;
     }
+    const declared = insertDeclaredSections(out.join("\n"), sqlTables?.declared, {
+        authored,
+        lineMap,
+        generatedFrom,
+        syntax: sqlTables?.syntax,
+    });
     return {
-        ...insertLexicalSections(out.join("\n"), sqlTables?.lexical, {
+        ...insertLexicalSections(declared.markdown, sqlTables?.lexical, {
             authored,
-            lineMap,
-            generatedFrom,
+            lineMap: declared.lineMap,
+            generatedFrom: declared.generatedFrom,
             syntax: sqlTables?.syntax,
         }),
         errors,

package/engine/content-verse.mjs

@@ -140,7 +140,7 @@ export function scanVerse(source, { checkWorks = true } = {}) {
         for (const message of [...region.problems, ...refusedAttributes(region.attributes)])
             errors.push({ ...at, message });
         if (!region.closed) errors.push({ ...at, message: "verse div needs a closing ::: line" });
-        if (!region.body.trim()) errors.push({ ...at, message: "verse div is empty" });
+        if (!region.logicalBody.trim()) errors.push({ ...at, message: "verse div is empty" });
         for (const key of Object.keys(region.attributes))
             if (!VERSE_KEYS.includes(key))
                 errors.push({
@@ -150,7 +150,10 @@ export function scanVerse(source, { checkWorks = true } = {}) {
                 });
         if (region.attributes.work !== undefined && !region.attributes.work.trim())
             errors.push({ ...at, message: "work= needs a nonempty page-local key" });
-        const model = parseVerse(region.body, { footnotes: definedFootnotes });
+        const model = parseVerse(region.logicalBody, {
+            footnotes: definedFootnotes,
+            sourceOffsets: region.bodyOffsets,
+        });
         for (const finding of model.errors) {
             const preceding = text.slice(0, region.bodyStart + finding.offset);
             errors.push({
@@ -254,6 +257,8 @@ function keyColumn(opening, key) {
  * @property {string[]} classes - Authored presentation classes.
  * @property {string} indent - Opening div's leading spaces.
  * @property {string} body - Authored verse body.
+ * @property {string} logicalBody - Body without Markdown container prefixes.
+ * @property {number[]} bodyOffsets - Logical UTF-16 offsets mapped to authored body offsets, including the end.
  * @property {VerseModel} model - Logical structure relative to the body.
  */
 
@@ -291,10 +296,10 @@ function cantoLine(line) {
  * Offsets are UTF-16 positions relative to body. Delimiters and indentation are
  * layout ranges; source newlines inside a logical line contribute one space.
  * @param {string} body - Authored verse body.
- * @param {{inline?: boolean, footnotes?: ReadonlySet<string>}} [options] - Inline quotations have no cantos; footnotes are same-note definition labels.
+ * @param {{inline?: boolean, footnotes?: ReadonlySet<string>, sourceOffsets?: number[]}} [options] - Inline quotations have no cantos; footnotes are same-note definition labels; sourceOffsets maps projected body positions to authored offsets, including the end.
  * @returns {VerseModel} The shared structure with offsets relative to the body.
  */
-export function parseVerse(body, { inline = false, footnotes = new Set() } = {}) {
+export function parseVerse(body, { inline = false, footnotes = new Set(), sourceOffsets } = {}) {
     const source = String(body ?? "");
     const groups = [],
         boundaries = [],
@@ -594,6 +599,35 @@ export function parseVerse(body, { inline = false, footnotes = new Set() } = {})
     for (const group of groups)
         if (!group.cantoBreak)
             group.label = multi ? `${group.canto}:${group.stanza}` : String(group.stanza);
+    if (sourceOffsets) {
+        const position = (offset) => sourceOffsets[offset];
+        const bounds = (item) => {
+            item.from = position(item.from);
+            item.to = position(item.to);
+        };
+        for (const line of new Set([
+            ...cantos.flatMap((canto) => canto.stanzas.flatMap((stanza) => stanza.lines)),
+            ...pendingNotes,
+        ])) {
+            bounds(line);
+            line.offsets = line.offsets.map(position);
+        }
+        for (const canto of cantos) for (const stanza of canto.stanzas) bounds(stanza);
+        for (const group of groups) bounds(group);
+        for (const boundary of boundaries) boundary.sourceOffset = position(boundary.sourceOffset);
+        for (const range of layout) {
+            range[0] = position(range[0]);
+            range[1] = position(range[1]);
+        }
+        for (const finding of errors) finding.offset = position(finding.offset);
+        // Container bytes remain layout in projections that read the authored body.
+        let previous = 0;
+        for (const offset of sourceOffsets) {
+            if (offset > previous) layout.push([previous, offset]);
+            previous = offset + 1;
+        }
+        layout.sort((a, b) => a[0] - b[0] || b[1] - a[1]);
+    }
     return { cantos, groups, boundaries, layout, errors, notes: pendingNotes };
 }
 
@@ -816,16 +850,24 @@ export function renderVerse(source, { verses = new Map() } = {}) {
             !lines.slice(0, block.start).some((line) => /^ *(?:[-+*]|\d+[.)]) +/.test(line))
         )
             indent = "";
+        const openingPrefix = lines[block.start].slice(0, block.column - 1);
+        // A list marker belongs only to the opening line; its continuation is spaces.
+        const prefix = openingPrefix.replace(/(?:[-+*]|\d+[.)])[ \t]+/g, (mark) =>
+            " ".repeat(mark.length),
+        );
+        const container = prefix.includes(">") || openingPrefix !== prefix;
+        const continuation = container ? prefix : indent;
+        const blank = continuation.trimEnd();
         output.push(
             "",
-            `${indent}<div ${attrs.join(" ")}>`,
-            "",
+            `${container ? openingPrefix : indent}<div ${attrs.join(" ")}>`,
+            blank,
             ...verseMarkdown(block.body, { labelled, model, presentation: transported })
                 .split("\n")
-                .map((line) => (line ? indent + line : line)),
-            "",
-            `${indent}</div>`,
-            "",
+                .map((line) => (line ? continuation + line : blank)),
+            blank,
+            `${continuation}</div>`,
+            blank,
         );
         cursor = block.end + 1;
     }