@baiyibai-antora/extensions 1.18.4 → 1.19.0

package/CHANGELOG.adoc

@@ -3,6 +3,31 @@
 
 All notable changes to this project will be documented in this file.
 
+== [1.19.0] - 2026-08-31
+
+=== Added
+
+* cite-it: a new `author-date` `style`, a real, complete, unmodified APA 7th edition CSL style (`resources/cite-it/author-date.csl`, fetched from the official `citation-style-language/styles` repository, same CC-BY-SA licensing convention `ieee-bracket.csl` already carries), alongside the existing `ieee-bracket` (numeric). `csl.ts` exposes `citationFormatFor(style)`, reading each bundled style's own real CSL `<category citation-format="...">` metadata rather than a hand-maintained parallel table.
+* cite-it: the citation-format `style` selects now drives the inline `cite:[key]` marker's own shape in BOTH ordinary HTML and PDF/assembled output, not just the bibliography list. `ieee-bracket` (numeric, the default) means true first-appearance `[N]` markers, linked, on HTML too now, reusing the exact same real, navigation-order numbering PDF output has always used, not a fresh per-page count: a key cited from page to page carries one consistent number everywhere. `author-date` is new for PDF/assembled output: Ruby's `asciidoctor-pdf` subprocess never loads this package's live macro, so its markers, and the bibliography partial's own row label, get the same pre-rewrite-before-parse treatment numeric markers always needed.
+* cite-it: the generated bibliography partial's row order now matches what each citation-format's reader actually needs to look an entry up: ascending citation-number order for `numeric` (unchanged), first-author-name alphabetical order for `author-date` (previously always sorted by internal citation key, an identifier a reader never sees).
+
+=== Changed
+
+* cite-it: `style` is now a playbook-wide setting only, applied identically to every participating component version's HTML, PDF, and Confluence/ADF output. It is no longer overridable per component version: a component version's own `ext.cite_it.style`, if still present, is ignored, with a build warning naming the ignored value. The inline citation marker and the bibliography entry it points at must share one citation-format convention for a reader to look an entry up at all (a numeric marker needs a numerically ordered list; an author-date marker needs an author-ordered one), a constraint that holds site-wide, not per component version.
+* cite-it: with the playbook-wide default (`ieee-bracket`, unchanged), ordinary HTML output now renders `[N]` citation markers by default, matching PDF output, instead of the previous `(Author, Year)` fallback. This changes default rendered HTML output for every existing site using cite-it with no `style` configured; set `style: 'author-date'` to keep the previous look.
+* cite-it: the generated bibliography partial's row-label rewrite for a `numeric`-style citation is no longer restored before the next ordinary (HTML, or Confluence/ADF export) `loadAsciiDoc` call reads it. `style` being playbook-wide means every consumer wants the identical rewritten partial now; the restore mechanism 1.18.4 added specifically because PDF and ordinary output used to want different content for the same partial no longer has a scenario to guard against.
+* cite-it: `formatBibliographyEntries`'s underlying citeproc `Engine` is now constructed once per style and reused for every later call, instead of being rebuilt (recompiling the whole CSL style document) on every call. Confirmed to be the entire real cost of a `formatBibliographyEntries` call, independent of item count: ~76ms to construct for `ieee-bracket.csl`, ~1.3s for the real, complete `author-date.csl` (99 macros, 252 conditional branches against `ieee-bracket.csl`'s 15 and 36), profiled directly to `CSL.XmlJSON.getNodesByName`, citeproc-js's own unindexed full-tree-rescan on every macro-name lookup, not the actual formatting work (`updateItems`/`makeBibliography` alone are consistently single-digit milliseconds regardless of style). Reuse safety (no disambiguation-state leakage between two component-versions sharing one cached engine) verified directly, not assumed, and locked in with a test.
+
+=== Fixed
+
+* cite-it: `loadAsciiDocWrapper`'s own assembled-output detection checked only whether `asciidocConfig.attributes` carried the key `'loader-assembler'`, not its value, unlike `registerCiteMacro`'s equivalent, correct `doc.hasAttribute('loader-assembler')` check, which treats an attribute explicitly set to `false` as unset. A toolchain that declares `loader-assembler` as a default `asciidoc.attributes` entry, even set to `false`, satisfied the old check on every single page load, assembled or not, independent of whether Antora Assembler ever actually ran, reported directly with a reproduction.
+
+== [1.18.5] - 2026-08-31
+
+=== Fixed
+
+* cite-it: bibliography text pulled verbatim from a `.bib` file (a title, an author name, a publisher) is embedded into generated AsciiDoc source that a real Asciidoctor conversion later re-parses, the same "generated text embedded as literal source" shape as every other cite-it rewrite. That conversion runs Asciidoctor's own `REPLACEMENTS` substitution, meant for hand-typed prose, unconditionally: a title genuinely containing `--` silently became an em dash, `...` an ellipsis, `(TM)` a trademark sign, a straight apostrophe in an author name a typographic one, and so on for every other REPLACEMENTS trigger, none of it requested by the `.bib` data's own author. New `lib/asciidoc-replacements.ts` escapes every such trigger the same way Asciidoctor's own documented convention does (a leading backslash), applied at the one function all bibliography entry text funnels through (`csl.ts`'s `htmlEntryToAsciiDoc`) and at the two `index.ts` call sites that splice an author/year fallback into raw page source for cross-component citation linking, so `.bib` data now renders exactly as written
+
 == [1.18.4] - 2026-08-30
 
 === Fixed

package/dist/extensions/cite-it/assembly-numbering.d.ts

@@ -182,8 +182,7 @@ export declare function reorderBibliographyRows(text: string, numbers: Map<strin
 /**
  * Rewrites the generated bibliography partial's OWN `cite:[key]` row
  * labels to their final `[N]` numbers, mutating the file directly in the
- * content catalog, and returns one restore function per partial actually
- * changed.
+ * content catalog.
  *
  * Needed for a reason distinct from rewriteCiteMarkers' normal call site:
  * Antora's own include processor resolves an `include::partial$...[]`
@@ -194,31 +193,49 @@ export declare function reorderBibliographyRows(text: string, numbers: Map<strin
  * rewrite text that arrives via an include inside that parse; a citing
  * page's own `cite:[key]` usage rewrites correctly, but the generated
  * partial's own row labels, pulled in during the same parse, would
- * otherwise reach Ruby unrewritten. Called once per component-version,
- * before any assembly-time loadAsciiDoc call can run (synchronous within
- * the same navigationBuilt handler that computes `numbers`), so the
- * partial is already correct by the time anything tries to include it.
+ * otherwise reach Ruby unrewritten (for PDF) or reach registerCiteMacro's
+ * own live rendering, which has no reliable way to know the true,
+ * cross-page-computed number a per-document counter alone would not
+ * necessarily match. Called once per component-version, before any
+ * loadAsciiDoc call that needs `numbers` can run (synchronous, from
+ * ensureAssemblyDataComputed), so the partial is already correct by the
+ * time anything tries to include it.
  *
- * The mutation MUST be undone before anything outside this one assembly
- * pass reads the same partial: it is a genuinely shared, site-wide catalog
- * object, not a private copy. Antora's own event lifecycle guarantees
- * navigationBuilt (which drives @antora/assembler, hence this function)
- * fully completes before beforePublish (which drives Confluence export,
- * and any future single-page HTML or other exporter reading the same
- * catalog after assembly) begins, so a caller that restores at the start
- * of the next ordinary, non-assembled loadAsciiDoc call is always in time.
- * Confirmed live: without a restore, the demo site's own published
- * Confluence page showed this partial's assembled `[1]` label instead of
- * its ordinary-HTML `(Author, Year)` one, since the mutation this function
- * makes had already happened by the time Confluence export read it, no
- * later than the caller's own restore made it into a release.
+ * The mutation is never restored, deliberately, as of the `style`-is-
+ * playbook-wide-only redesign: `style` (and therefore, via
+ * citationFormatFor, whether numeric numbering applies at all) is now the
+ * SAME single value for every consumer of this partial, ordinary HTML,
+ * PDF/assembled, and Confluence/ADF export alike, so there is no longer a
+ * competing "the next reader wants something different" case to guard
+ * against. An EARLIER version of this function returned a restore
+ * function per changed partial, undone at the start of the next ordinary
+ * loadAsciiDoc call specifically because PDF assembly used to always want
+ * `[N]` while ordinary/Confluence output always wanted `(Author, Year)`
+ * for the exact same partial; confirmed live, without that restore, the
+ * demo site's own published Confluence page once showed the assembled
+ * `[1]` label instead. That divergence cannot happen anymore: whichever
+ * citation-format `style` resolves to, every consumer wants the identical
+ * rewritten (or, for a non-numeric style, entirely untouched, since this
+ * function is only ever called when numeric numbering applies) partial
+ * content.
  *
- * Also reorders the partial's rows into ascending citation-number order
- * (reorderBibliographyRows) before rewriting labels: the order the partial
- * was generated in has no relationship to citation number (Node does not
- * know numbers yet at generation time), and a numbered bibliography listed
- * out of number order reads as broken to anyone looking at it.
+ * For the `numeric` citation-format only, also reorders the partial's rows
+ * into ascending citation-number order (reorderBibliographyRows) before
+ * rewriting labels: the order the partial was generated in has no
+ * relationship to citation number (Node does not know numbers yet at
+ * generation time), and a numbered bibliography listed out of number order
+ * reads as broken to anyone looking at it. A non-numeric citation-format
+ * needs no second reorder pass here: index.ts's own row-generation already
+ * sorts by author for that case, a real ordering known at generation time,
+ * unlike citation number.
+ *
+ * `labelFor` decouples this function from numeric numbering specifically:
+ * the caller supplies whichever label shape the active `style`'s citation-
+ * format implies (numberLabels for `numeric`, formatHtmlLabels-shaped
+ * author/year text for `author-date`), the same function it uses to
+ * rewrite the CITING page's own markers, so the row label and the marker
+ * pointing at it always agree.
  */
-export declare function rewritePartialForAssembly(ctx: ScanContext, numbers: Map<string, number>): Array<() => void>;
+export declare function rewritePartialForAssembly(ctx: ScanContext, numbers: Map<string, number>, reorderByNumber: boolean, labelFor: (key: string) => string | undefined): void;
 export {};
 //# sourceMappingURL=assembly-numbering.d.ts.map

package/dist/extensions/cite-it/assembly-numbering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assembly-numbering.d.ts","sourceRoot":"","sources":["../../../src/extensions/cite-it/assembly-numbering.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assembly-numbering.d.ts","sourceRoot":"","sources":["../../../src/extensions/cite-it/assembly-numbering.ts"],"names":[],"mappings":"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"}

package/dist/extensions/cite-it/assembly-numbering.js

@@ -365,8 +365,7 @@ function reorderBibliographyRows(text, numbers) {
 /**
  * Rewrites the generated bibliography partial's OWN `cite:[key]` row
  * labels to their final `[N]` numbers, mutating the file directly in the
- * content catalog, and returns one restore function per partial actually
- * changed.
+ * content catalog.
  *
  * Needed for a reason distinct from rewriteCiteMarkers' normal call site:
  * Antora's own include processor resolves an `include::partial$...[]`
@@ -377,35 +376,50 @@ function reorderBibliographyRows(text, numbers) {
  * rewrite text that arrives via an include inside that parse; a citing
  * page's own `cite:[key]` usage rewrites correctly, but the generated
  * partial's own row labels, pulled in during the same parse, would
- * otherwise reach Ruby unrewritten. Called once per component-version,
- * before any assembly-time loadAsciiDoc call can run (synchronous within
- * the same navigationBuilt handler that computes `numbers`), so the
- * partial is already correct by the time anything tries to include it.
+ * otherwise reach Ruby unrewritten (for PDF) or reach registerCiteMacro's
+ * own live rendering, which has no reliable way to know the true,
+ * cross-page-computed number a per-document counter alone would not
+ * necessarily match. Called once per component-version, before any
+ * loadAsciiDoc call that needs `numbers` can run (synchronous, from
+ * ensureAssemblyDataComputed), so the partial is already correct by the
+ * time anything tries to include it.
  *
- * The mutation MUST be undone before anything outside this one assembly
- * pass reads the same partial: it is a genuinely shared, site-wide catalog
- * object, not a private copy. Antora's own event lifecycle guarantees
- * navigationBuilt (which drives @antora/assembler, hence this function)
- * fully completes before beforePublish (which drives Confluence export,
- * and any future single-page HTML or other exporter reading the same
- * catalog after assembly) begins, so a caller that restores at the start
- * of the next ordinary, non-assembled loadAsciiDoc call is always in time.
- * Confirmed live: without a restore, the demo site's own published
- * Confluence page showed this partial's assembled `[1]` label instead of
- * its ordinary-HTML `(Author, Year)` one, since the mutation this function
- * makes had already happened by the time Confluence export read it, no
- * later than the caller's own restore made it into a release.
+ * The mutation is never restored, deliberately, as of the `style`-is-
+ * playbook-wide-only redesign: `style` (and therefore, via
+ * citationFormatFor, whether numeric numbering applies at all) is now the
+ * SAME single value for every consumer of this partial, ordinary HTML,
+ * PDF/assembled, and Confluence/ADF export alike, so there is no longer a
+ * competing "the next reader wants something different" case to guard
+ * against. An EARLIER version of this function returned a restore
+ * function per changed partial, undone at the start of the next ordinary
+ * loadAsciiDoc call specifically because PDF assembly used to always want
+ * `[N]` while ordinary/Confluence output always wanted `(Author, Year)`
+ * for the exact same partial; confirmed live, without that restore, the
+ * demo site's own published Confluence page once showed the assembled
+ * `[1]` label instead. That divergence cannot happen anymore: whichever
+ * citation-format `style` resolves to, every consumer wants the identical
+ * rewritten (or, for a non-numeric style, entirely untouched, since this
+ * function is only ever called when numeric numbering applies) partial
+ * content.
  *
- * Also reorders the partial's rows into ascending citation-number order
- * (reorderBibliographyRows) before rewriting labels: the order the partial
- * was generated in has no relationship to citation number (Node does not
- * know numbers yet at generation time), and a numbered bibliography listed
- * out of number order reads as broken to anyone looking at it.
+ * For the `numeric` citation-format only, also reorders the partial's rows
+ * into ascending citation-number order (reorderBibliographyRows) before
+ * rewriting labels: the order the partial was generated in has no
+ * relationship to citation number (Node does not know numbers yet at
+ * generation time), and a numbered bibliography listed out of number order
+ * reads as broken to anyone looking at it. A non-numeric citation-format
+ * needs no second reorder pass here: index.ts's own row-generation already
+ * sorts by author for that case, a real ordering known at generation time,
+ * unlike citation number.
+ *
+ * `labelFor` decouples this function from numeric numbering specifically:
+ * the caller supplies whichever label shape the active `style`'s citation-
+ * format implies (numberLabels for `numeric`, formatHtmlLabels-shaped
+ * author/year text for `author-date`), the same function it uses to
+ * rewrite the CITING page's own markers, so the row label and the marker
+ * pointing at it always agree.
  */
-function rewritePartialForAssembly(ctx, numbers) {
-    const restores = [];
-    if (numbers.size === 0)
-        return restores;
+function rewritePartialForAssembly(ctx, numbers, reorderByNumber, labelFor) {
     for (const cp of ctx.categoryPartials) {
         const partial = ctx.contentCatalog.getFiles().find((f) => f.src.component === ctx.component &&
             f.src.version === ctx.version &&
@@ -415,13 +429,11 @@ function rewritePartialForAssembly(ctx, numbers) {
         if (!partial)
             continue;
         const before = partial.contents.toString('utf8');
-        const reordered = reorderBibliographyRows(before, numbers);
-        const after = rewriteCiteMarkers(reordered, numberLabels(numbers), false);
+        const reordered = reorderByNumber ? reorderBibliographyRows(before, numbers) : before;
+        const after = rewriteCiteMarkers(reordered, labelFor, false);
         if (after === before)
             continue;
         partial.contents = Buffer.from(after, 'utf8');
-        restores.push(() => { partial.contents = Buffer.from(before, 'utf8'); });
     }
-    return restores;
 }
 //# sourceMappingURL=assembly-numbering.js.map

package/dist/extensions/cite-it/assembly-numbering.js.map

@@ -1 +1 @@
-{"version":3,"file":"assembly-numbering.js","sourceRoot":"","sources":["../../../src/extensions/cite-it/assembly-numbering.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assembly-numbering.js","sourceRoot":"","sources":["../../../src/extensions/cite-it/assembly-numbering.ts"],"names":[],"mappings":"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"}

package/dist/extensions/cite-it/csl.d.ts

@@ -13,16 +13,44 @@
  * partial's row label (macro.ts), so the two numbering sources agree by
  * construction rather than by cross-checking two independent counters.
  *
- * `STYLES` currently bundles one entry, `ieee-bracket`. This is a scope
- * limit, not an architectural one: `loadEngine` takes any CSL style/locale
- * pair placed under `resources/cite-it/` and registered in `STYLES` below,
- * so adding a style is a matter of shipping its `.csl`/`.xml` files and one
- * new `STYLES` entry, not a design change. A `style` value not present in
- * `STYLES` is rejected with a clear error rather than silently falling
- * back, since a silently wrong citation style is a worse failure than a
- * build error naming the actual gap.
+ * `STYLES` bundles two real, unmodified, standard CSL styles fetched from
+ * the official citation-style-language/styles repository, the same CC-BY-SA
+ * licensing convention both files carry in their own `<info><rights>`:
+ * `ieee-bracket` (numeric) and `author-date` (a real, complete APA 7th
+ * edition style, not a hand-authored approximation of "an author-date
+ * style" - CSL's own `author-date` category covers several genuinely
+ * different concrete conventions, APA chosen as the most broadly
+ * recognized one). Adding a style is a matter of shipping its `.csl` file
+ * under `resources/cite-it/` and one new `STYLES` entry (`citationFormat`
+ * included, see `CitationFormat`/`citationFormatFor` below), not a design
+ * change. A `style` value not present in `STYLES` is rejected with a clear
+ * error rather than silently falling back, since a silently wrong citation
+ * style is a worse failure than a build error naming the actual gap.
  */
 import type { CslJsonItem } from './registry';
+/**
+ * `citationFormat` mirrors each style's own real CSL `<category
+ * citation-format="...">` metadata (confirmed directly in both bundled
+ * files: `ieee-bracket.csl` declares `numeric`, `author-date.csl` declares
+ * `author-date`), declared here rather than parsed from the XML at load
+ * time: the value drives real branching elsewhere in cite-it (which inline
+ * marker shape a style produces, how the generated bibliography partial's
+ * own rows are ordered), so it needs to be known synchronously, cheaply,
+ * and without adding an XML-attribute-extraction dependency for one field.
+ * A style bundled here always keeps its own XML `<category>` tag in sync,
+ * the normal CSL-authoring convention, but that tag itself is descriptive
+ * metadata only; this declaration is what code actually reads.
+ */
+export type CitationFormat = 'numeric' | 'author-date';
+/**
+ * The citation-format a `style` config value resolves to, for callers that
+ * need to know which inline-marker/bibliography-ordering rules to apply
+ * without loading the full citeproc Engine. Throws the same clear,
+ * unsupported-style error `loadEngine` does, rather than defaulting
+ * silently: an unrecognized style name is a real misconfiguration either
+ * way, whichever entry point first notices it.
+ */
+export declare function citationFormatFor(styleName: string): CitationFormat;
 /**
  * Convert one citeproc bibliography entry's raw HTML fragment into AsciiDoc
  * inline text. citeproc's output shape is two sibling <div>s per entry:
@@ -41,6 +69,17 @@ import type { CslJsonItem } from './registry';
  * "TM"/"SM" text; there is no real case where citeproc's own <sup> should
  * be discarded rather than carried through, so this needs no option of
  * its own the way ®/© (never wrapped by citeproc at all) genuinely do.
+ *
+ * The returned text is escaped against Asciidoctor's own REPLACEMENTS
+ * substitution (escapeAsciidocReplacements, ../../lib/asciidoc-replacements)
+ * before it comes back: this text is `.bib` DATA (a title, an author name,
+ * a publisher) that generateCategoryPartial (index.ts) embeds verbatim as
+ * real AsciiDoc source, later re-parsed by a real Asciidoctor conversion
+ * that would otherwise "typographically improve" it, silently turning a
+ * literal "--" into an em dash, "..." into an ellipsis, "(TM)" into a
+ * trademark sign, and so on. Escaping here, once, at the one function every
+ * bibliography entry's text funnels through, covers every caller rather
+ * than needing the same fix repeated at each embedding site.
  */
 export declare function htmlEntryToAsciiDoc(entryHtml: string): string;
 export declare function formatBibliographyEntries(styleName: string, items: Map<string, CslJsonItem>, keys: string[], blanketPubstate?: boolean, superscriptSymbols?: boolean, dateFormat?: string): Map<string, string>;

package/dist/extensions/cite-it/csl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csl.d.ts","sourceRoot":"","sources":["../../../src/extensions/cite-it/csl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA4C9C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAW7D;AA4GD,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAC/B,IAAI,EAAE,MAAM,EAAE,EACd,eAAe,UAAQ,EACvB,kBAAkB,UAAQ,EAC1B,UAAU,SAAK,GACd,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAuCrB"}
+{"version":3,"file":"csl.d.ts","sourceRoot":"","sources":["../../../src/extensions/cite-it/csl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAK9C;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,aAAa,CAAC;AAOvD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAQnE;AAqFD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAY7D;AA4GD,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAC/B,IAAI,EAAE,MAAM,EAAE,EACd,eAAe,UAAQ,EACvB,kBAAkB,UAAQ,EAC1B,UAAU,SAAK,GACd,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CA2CrB"}

package/dist/extensions/cite-it/csl.js

@@ -14,14 +14,19 @@
  * partial's row label (macro.ts), so the two numbering sources agree by
  * construction rather than by cross-checking two independent counters.
  *
- * `STYLES` currently bundles one entry, `ieee-bracket`. This is a scope
- * limit, not an architectural one: `loadEngine` takes any CSL style/locale
- * pair placed under `resources/cite-it/` and registered in `STYLES` below,
- * so adding a style is a matter of shipping its `.csl`/`.xml` files and one
- * new `STYLES` entry, not a design change. A `style` value not present in
- * `STYLES` is rejected with a clear error rather than silently falling
- * back, since a silently wrong citation style is a worse failure than a
- * build error naming the actual gap.
+ * `STYLES` bundles two real, unmodified, standard CSL styles fetched from
+ * the official citation-style-language/styles repository, the same CC-BY-SA
+ * licensing convention both files carry in their own `<info><rights>`:
+ * `ieee-bracket` (numeric) and `author-date` (a real, complete APA 7th
+ * edition style, not a hand-authored approximation of "an author-date
+ * style" - CSL's own `author-date` category covers several genuinely
+ * different concrete conventions, APA chosen as the most broadly
+ * recognized one). Adding a style is a matter of shipping its `.csl` file
+ * under `resources/cite-it/` and one new `STYLES` entry (`citationFormat`
+ * included, see `CitationFormat`/`citationFormatFor` below), not a design
+ * change. A `style` value not present in `STYLES` is rejected with a clear
+ * error rather than silently falling back, since a silently wrong citation
+ * style is a worse failure than a build error naming the actual gap.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -57,35 +62,97 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.citationFormatFor = citationFormatFor;
 exports.htmlEntryToAsciiDoc = htmlEntryToAsciiDoc;
 exports.formatBibliographyEntries = formatBibliographyEntries;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const citeproc_1 = require("citeproc");
 const date_fns_1 = require("date-fns");
+const asciidoc_replacements_1 = require("../../lib/asciidoc-replacements");
 const RESOURCES_DIR = path.join(__dirname, '..', '..', '..', 'resources', 'cite-it');
 const STYLES = {
-    'ieee-bracket': { style: 'ieee-bracket.csl', locale: 'locale-en-US.xml' },
+    'ieee-bracket': { style: 'ieee-bracket.csl', locale: 'locale-en-US.xml', citationFormat: 'numeric' },
+    'author-date': { style: 'author-date.csl', locale: 'locale-en-US.xml', citationFormat: 'author-date' },
 };
+/**
+ * The citation-format a `style` config value resolves to, for callers that
+ * need to know which inline-marker/bibliography-ordering rules to apply
+ * without loading the full citeproc Engine. Throws the same clear,
+ * unsupported-style error `loadEngine` does, rather than defaulting
+ * silently: an unrecognized style name is a real misconfiguration either
+ * way, whichever entry point first notices it.
+ */
+function citationFormatFor(styleName) {
+    const spec = STYLES[styleName];
+    if (!spec) {
+        throw new Error(`cite-it: unknown style "${styleName}"; supported styles: ${Object.keys(STYLES).join(', ')}`);
+    }
+    return spec.citationFormat;
+}
+/**
+ * One real `Engine` per style, constructed once and reused for every
+ * subsequent `formatBibliographyEntries` call in the same process,
+ * regardless of which component-version or item set is being formatted.
+ * `new Engine(sys, styleXml)` is where citeproc-js actually compiles the
+ * CSL style document into its own internal execution form, confirmed
+ * directly to be the entire real cost (timed independently of
+ * `updateItems`/`makeBibliography`, both consistently single-digit
+ * milliseconds regardless of style): ~76ms for `ieee-bracket.csl` (18KB),
+ * ~1.3s for the real, complete `author-date.csl` (86KB, over 100 macros).
+ * Reconstructing that from scratch per call, once per participating
+ * component-version, was real, avoidable per-build cost.
+ *
+ * Reuse is safe, not just fast, confirmed directly against citeproc-js's
+ * own real behavior, not assumed from its documentation: `engine.
+ * updateItems(keys)` fully replaces the engine's active item set on every
+ * call, including its disambiguation/registry state, byte-for-byte
+ * identical output to a fresh `Engine` given the same keys, verified by
+ * alternating between two different, independently colliding item sets on
+ * one shared engine and diffing against two separate fresh engines (no
+ * leakage of one component-version's disambiguation suffixes into
+ * another's, in either order). `itemsRef` exists only so each cached
+ * engine's own `retrieveItem` closure can be redirected to the CURRENT
+ * caller's items map on every call, since the closure itself is fixed at
+ * construction time but the underlying data is not.
+ */
+const engineCache = new Map();
 function loadEngine(styleName, items) {
     const spec = STYLES[styleName];
     if (!spec) {
         throw new Error(`cite-it: unknown style "${styleName}"; supported styles: ${Object.keys(STYLES).join(', ')}`);
     }
+    const cached = engineCache.get(styleName);
+    if (cached) {
+        cached.itemsRef.current = items;
+        return cached.engine;
+    }
     const styleXml = fs.readFileSync(path.join(RESOURCES_DIR, spec.style), 'utf8');
     const localeXml = fs.readFileSync(path.join(RESOURCES_DIR, spec.locale), 'utf8');
+    const itemsRef = { current: items };
     const sys = {
         retrieveLocale: () => localeXml,
-        retrieveItem: (id) => items.get(id),
+        retrieveItem: (id) => itemsRef.current.get(id),
     };
-    return new citeproc_1.Engine(sys, styleXml);
+    const engine = new citeproc_1.Engine(sys, styleXml);
+    engineCache.set(styleName, { engine, itemsRef });
+    return engine;
 }
 /**
- * Decode the small set of HTML entities citeproc's own output uses.
- * citeproc escapes text it renders (author names, titles) as HTML, since
- * its native output target is a browser DOM; the generated partial is
- * AsciiDoc, not HTML, so entities are decoded back to literal characters
- * rather than left for AsciiDoc to interpret as markup.
+ * Decode the HTML entities citeproc's own output uses. citeproc escapes
+ * text it renders (author names, titles) as HTML, since its native output
+ * target is a browser DOM; the generated partial is AsciiDoc, not HTML, so
+ * entities are decoded back to literal characters rather than left for
+ * AsciiDoc to interpret as markup.
+ *
+ * The small named-entity list was sufficient for `ieee-bracket.csl` alone
+ * (`and="text"` between co-authors, never a literal "&"), but a style using
+ * `and="symbol"` renders "&" as the NUMERIC entity `&#38;`, not `&amp;`
+ * (confirmed directly loading a real APA-style bibliography entry through
+ * citeproc: "Smith, J. A., &#38; Nakamura, K."). Decimal and hex numeric
+ * character references are decoded generically, not just the one citeproc
+ * happens to emit today, so a future style choosing a different one still
+ * works without another silent gap.
  */
 function decodeEntities(s) {
     return s
@@ -93,8 +160,9 @@ function decodeEntities(s) {
         .replace(/&lt;/g, '<')
         .replace(/&gt;/g, '>')
         .replace(/&quot;/g, '"')
-        .replace(/&#39;/g, "'")
-        .replace(/&nbsp;/g, ' ');
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&#(\d+);/g, (_, dec) => String.fromCodePoint(Number(dec)))
+        .replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => String.fromCodePoint(Number.parseInt(hex, 16)));
 }
 /**
  * Convert one citeproc bibliography entry's raw HTML fragment into AsciiDoc
@@ -114,6 +182,17 @@ function decodeEntities(s) {
  * "TM"/"SM" text; there is no real case where citeproc's own <sup> should
  * be discarded rather than carried through, so this needs no option of
  * its own the way ®/© (never wrapped by citeproc at all) genuinely do.
+ *
+ * The returned text is escaped against Asciidoctor's own REPLACEMENTS
+ * substitution (escapeAsciidocReplacements, ../../lib/asciidoc-replacements)
+ * before it comes back: this text is `.bib` DATA (a title, an author name,
+ * a publisher) that generateCategoryPartial (index.ts) embeds verbatim as
+ * real AsciiDoc source, later re-parsed by a real Asciidoctor conversion
+ * that would otherwise "typographically improve" it, silently turning a
+ * literal "--" into an em dash, "..." into an ellipsis, "(TM)" into a
+ * trademark sign, and so on. Escaping here, once, at the one function every
+ * bibliography entry's text funnels through, covers every caller rather
+ * than needing the same fix repeated at each embedding site.
  */
 function htmlEntryToAsciiDoc(entryHtml) {
     const rightMatch = entryHtml.match(/csl-right-inline">([\s\S]*?)<\/div>\s*<\/div>\s*$/);
@@ -123,7 +202,8 @@ function htmlEntryToAsciiDoc(entryHtml) {
         .replace(/<b>([\s\S]*?)<\/b>/g, '*$1*')
         .replace(/<sup>([\s\S]*?)<\/sup>/g, '^$1^')
         .replace(/<[^>]+>/g, '');
-    return decodeEntities(withAsciidocMarkup).replace(/\s+/g, ' ').trim();
+    const plain = decodeEntities(withAsciidocMarkup).replace(/\s+/g, ' ').trim();
+    return (0, asciidoc_replacements_1.escapeAsciidocReplacements)(plain);
 }
 /**
  * Wraps each trademark (™), registered (®), service mark (℠), and
@@ -259,7 +339,11 @@ function formatBibliographyEntries(styleName, items, keys, blanketPubstate = fal
         if (blanketPubstate) {
             const status = items.get(key)?.['status'];
             if (typeof status === 'string' && status) {
-                const display = capitalizeFirst(status);
+                // status is raw `.bib` data too (BibLaTeX pubstate), appended here
+                // as literal AsciiDoc source the same as the rest of this entry's
+                // text; escaped for the same reason (see htmlEntryToAsciiDoc's own
+                // docblock).
+                const display = (0, asciidoc_replacements_1.escapeAsciidocReplacements)(capitalizeFirst(status));
                 if (!text.toLowerCase().includes(status.toLowerCase())) {
                     text = `${text} ${display}.`;
                 }

package/dist/extensions/cite-it/csl.js.map

@@ -1 +1 @@
-{"version":3,"file":"csl.js","sourceRoot":"","sources":["../../../src/extensions/cite-it/csl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"csl.js","sourceRoot":"","sources":["../../../src/extensions/cite-it/csl.ts"],"names":[],"mappings":"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"}