feat(core/render-biblio): render pages field from bibliography entries

Closes #4067

Author: marcoscaceres

src/core/render-biblio.js

@@ -2,7 +2,7 @@
 // Module core/render-biblio
 // renders the biblio data pre-processed in core/biblio
 
-import { addId, getIntlData, showError, toId } from "./utils.js";
+import { addId, getIntlData, showError, toId, xmlEscape } from "./utils.js";
 import { biblio } from "./biblio.js";
 import { html } from "./import-maps.js";
 
@@ -34,6 +34,12 @@ const localizationStrings = {
     references: "Referencias",
     reference_not_found: "Referencia no encontrada.",
   },
+  fr: {
+    info_references: "Références informatives",
+    norm_references: "Références normatives",
+    references: "Références",
+    reference_not_found: "Référence non trouvée.",
+  },
   ja: {
     info_references: "参照用参考文献",
     norm_references: "規範的参考文献",
@@ -69,8 +75,6 @@ const REF_STATUSES = new Map([
   ["WD", "W3C Working Draft"],
 ]);
 
-const endWithDot = endNormalizer(".");
-
 /** @param {Conf} conf */
 export function run(conf) {
   const informs = Array.from(conf.informativeReferences);
@@ -225,19 +229,6 @@ function showRef(reference) {
   return result;
 }
 
-/**
- * @param {string} endStr
- * @returns {(str: string) => string}
- */
-function endNormalizer(endStr) {
-  return str => {
-    const trimmed = str.trim();
-    const result =
-      !trimmed || trimmed.endsWith(endStr) ? trimmed : trimmed + endStr;
-    return result;
-  };
-}
-
 /** @param {BiblioData|string} ref */
 function stringifyReference(ref) {
   if (typeof ref === "string") return ref;
@@ -259,7 +250,13 @@ function stringifyReference(ref) {
     }
   }
   if (ref.publisher) {
-    output = `${output} ${endWithDot(ref.publisher)} `;
+    const pub = ref.publisher.trim().replace(/\.$/, "");
+    output += ` ${pub}`;
+    if (ref.pages) output += `, pp. ${xmlEscape(ref.pages)}`;
+    if (!output.endsWith(".")) output += ".";
+    output += " ";
+  } else if (ref.pages) {
+    output += `pp. ${xmlEscape(ref.pages)}. `;
   }
   if (ref.date) output += `${ref.date}. `;
   if (ref.status) output += `${REF_STATUSES.get(ref.status) || ref.status}. `;

src/type-helper.d.ts

@@ -78,6 +78,7 @@ interface BiblioData {
   href?: string;
   authors?: string[];
   publisher?: string;
+  pages?: string;
   date?: string;
   rawDate?: string;
   isbn?: string;

tests/spec/core/biblio-spec.js

@@ -32,6 +32,12 @@ describe("W3C — Bibliographic References", () => {
       href: "http://test.com",
       publisher: "Publisher Here",
     },
+    TestRef4: {
+      title: "Fourth test",
+      href: "http://test.com",
+      publisher: "Publisher Pages",
+      pages: "369-384",
+    },
     FOOBARGLOP: {
       aliasOf: "BARBAR",
     },
@@ -48,7 +54,7 @@ describe("W3C — Bibliographic References", () => {
   const body = `
     <section id='sotd'>
       <p>[[DOM]] [[dom]] [[fetch]] [[?FeTcH]] [[FETCh]] [[fetCH]]
-      <p>foo [[TestRef1]] [[TestRef2]] [[TestRef3]]</p>
+      <p>foo [[TestRef1]] [[TestRef2]] [[TestRef3]] [[TestRef4]]</p>
       <p>[[EVERCOOKIE]]</p>
     </section>
     <section id='sample'>
@@ -144,6 +150,12 @@ describe("W3C — Bibliographic References", () => {
     expect(ref.textContent).toMatch(/Publisher Here\.\s/);
   });
 
+  it("displays the pages field when present", () => {
+    const ref = doc.querySelector("#bib-testref4 + dd");
+    expect(ref).toBeTruthy();
+    expect(ref.textContent).toContain("pp. 369-384");
+  });
+
   it("resolves a localy-aliased spec", () => {
     const ref = doc.querySelector("#bib-foobarglop + dd");
     expect(ref).toBeTruthy();