@heroiclands/package-build 23.8.0 → 23.10.0

package/engine/pdf-build.mjs

@@ -1013,7 +1013,15 @@ async function prepareWorld(resolved, { contentBase, findings, resolveReplacemen
         scheme,
     };
     const collected = collectContentPages(contentBase, ctx);
-    const gates = siteGates(collected.pages, collected, { config: resolved, records });
+    const sqlTables = await prepareTreeSqlTables(contentBase, {
+        config: resolved,
+        skipDirectories: resolved.skipDirectories,
+        records,
+        parsed,
+        database: db,
+        audience: "public",
+    });
+    const gates = siteGates(collected.pages, collected, { config: resolved, records, sqlTables });
     if (gatesFailed(gates)) {
         for (const [name, list] of Object.entries(gates)) {
             if (!Array.isArray(list)) continue;
@@ -1030,14 +1038,6 @@ async function prepareWorld(resolved, { contentBase, findings, resolveReplacemen
 
     const byFile = new Map(collected.pages.map((page) => [page.file, page]));
     const universe = tableUniverse(collected.pages);
-    const sqlTables = await prepareTreeSqlTables(contentBase, {
-        config: resolved,
-        skipDirectories: resolved.skipDirectories,
-        records,
-        parsed,
-        database: db,
-        audience: "public",
-    });
     // The address space an `![[…]]` embed resolves against — the same one the
     // site builds, so one authored picture reaches both surfaces or neither.
     const assets = assetAddressIndex(records, {

package/engine/pdf-render.mjs

@@ -1210,7 +1210,15 @@ function renderInline(token, ctx) {
                 out.push(inlineRaw(child.content));
                 break;
             case "span_open": {
-                out.push("#box[");
+                const classes = (child.attrGet?.("class") ?? "").split(/\s+/).filter(Boolean);
+                const values = classes
+                    .map((value) => '"' + escapeTypstString(value) + '"')
+                    .join(", ");
+                out.push(
+                    classes.length ?
+                        "#book-span(classes: (" + values + (classes.length === 1 ? "," : "") + "))["
+                    :   "#box[",
+                );
                 break;
             }
             case "span_close": {
@@ -1618,6 +1626,12 @@ export function bookTypstPreamble() {
         "#let book-page-height = 11in",
         "#let book-text-width = book-page-width - 2 * book-margin",
         "#let book-text-height = book-page-height - 2 * book-margin",
+        // Span classes reach the book intact; name styling sets an absolute
+        // weight so it remains bold inside an ordinary strong phrase.
+        "#let book-span(body, classes: ()) = {\n" +
+            '  let styled = if classes.contains("name") { text(weight: "bold", body) } else { body }\n' +
+            "  box(styled)\n" +
+            "}",
         // Use the file's natural measure for auto. Every requested width is
         // bounded by the available measure and by the height of a page.
         "#let book-image(path, requested: auto, caption: none) = layout(size => {\n" +

package/engine/site-build.mjs

@@ -430,9 +430,11 @@ export function writeHomepages(outRoot, pages, config, { related, records, forei
  * @param {object} options
  * @param {object} options.config - The resolved build configuration.
  * @param {object[]} options.records - Content-index records.
+ * @param {Map<string, object[]>} [options.sqlTables] - Prepared directives,
+ *   whose emitted anchors belong to the pages they expand in.
  * @returns {object} The gate results and, when they pass, the built index.
  */
-export function siteGates(pages, findings, { config, records }) {
+export function siteGates(pages, findings, { config, records, sqlTables }) {
     const out = {
         // Always empty here: the homepage count is decided in `buildSite`
         // before the content walk, and a failing count returns without ever
@@ -464,7 +466,18 @@ export function siteGates(pages, findings, { config, records }) {
     out.unaddressable = unaddressableForeignPackages(foreign.index);
     if (out.unaddressable.length) return out;
 
-    out.index = buildSiteIndex(pages, {
+    const expanded =
+        sqlTables ?
+            pages.map((page) => ({
+                ...page,
+                body: expandContentTables(page.body ?? "", {
+                    source: page.file,
+                    sqlTables: sqlTables.get(page.file),
+                    pageLists: sqlTables.pageLists?.get(page.file),
+                }).markdown,
+            }))
+        :   pages;
+    out.index = buildSiteIndex(expanded, {
         package: config.contentPackage,
         foreignIndex: foreign.index,
         foreignReferences: foreign.references,
@@ -1367,6 +1380,7 @@ export function buildSite({ config, sqlTables } = {}) {
     const gates = siteGates([...pages, ...homepageEntries], content, {
         config: resolved,
         records: ctx.records,
+        sqlTables,
     });
     if (gatesFailed(gates)) {
         return {

package/engine/site-index.mjs

@@ -174,6 +174,7 @@ function mergeForeign(index, foreignIndex) {
  *   ordinary dead address.
  * @param {object[]} [options.records] - Content-index records.
  * @param {Map<string, object>} [options.foreignReferences] - Foreign reference targets.
+ * @param {import("./content-session.mjs").ContentSyntax} [options.syntax] - Exact-text scanner projections.
  * @returns {SiteIndex} The index, and what could not be addressed unambiguously.
  */
 export function buildSiteIndex(
@@ -184,6 +185,7 @@ export function buildSiteIndex(
         package: builderPackage,
         records = [],
         foreignReferences = new Map(),
+        syntax,
     } = {},
 ) {
     const index = new Map();
@@ -241,7 +243,9 @@ export function buildSiteIndex(
             // written against it can be checked rather than joined onto the
             // URL unverified. A Set even when empty: a page that declares no
             // anchor still has a definite answer for one an author names.
-            anchors: new Set(collectAnchors(e.body ?? "").map((anchor) => anchor.slug)),
+            anchors: new Set(
+                collectAnchors(e.body ?? "", 1, undefined, syntax).map((anchor) => anchor.slug),
+            ),
             // The note's event ids, which a wikilink may not name.
             eventAnchors: new Set(eventAnchors(e.fm).map((anchor) => anchor.slug)),
         };