@pubid/pubid 0.1.14 → 0.1.16

package/dist/flavors/ieee/index.js

@@ -576,7 +576,10 @@ class IeeeBuilder {
                 if (version !== undefined)
                     version = version.replace(/^-/, "").replace(/^0(?=\d+\.\d)/, "");
             }
-            revision = extractValue(draftData["revision"]);
+            // The revision capture carries its own leading dot (".1" — the
+            // #471 separator-in-capture rule); Draft#to_s prints the dot
+            // itself, so keep only the tail or "D6..1" renders doubled.
+            revision = extractValue(draftData["revision"])?.replace(/^\./, "");
             isoStage = extractValue(draftData["draft_iso_stage"]);
             isoIteration = extractValue(draftData["draft_iso_iteration"]);
             // FDIS/CDV/… are ISO/IEC stage tokens, not draft ordinals (C1
@@ -1231,9 +1234,16 @@ class IeeeBuilder {
         }
         // A stage word with a glued year tail ("/D=CD2-201802") rides the
         // D= designator with the IEEE lead (the reference's builder, the
-        // pubid#203 class) — the tail's capture carries its separator.
-        if (parsed["iso_stage"] !== undefined && parsed["draft_stage_year"] !== undefined) {
-            const stageWord = extractValue(parsed["iso_stage"]) ?? "";
+        // pubid#203 class) — the tail's capture carries its separator. The
+        // date-less form ("/D=CD1") elects the same face only when the input
+        // spells the designator (the reference's original_input gate) — the
+        // stage-first rows keep their ISO rendering.
+        const dEqInput = this.originalInput.includes("/D=");
+        const stageWordForGate = extractValue(parsed["iso_stage"]) ?? "";
+        if (parsed["iso_stage"] !== undefined &&
+            (parsed["draft_stage_year"] !== undefined ||
+                (dEqInput && /\d$/.test(stageWordForGate)))) {
+            const stageWord = stageWordForGate;
             const pubs = (attributes["publishers"] ?? []);
             if (pubs.length === 0) {
                 attributes["publishers"] = ["IEEE"];

package/dist/flavors/ieee/model.js

@@ -190,13 +190,16 @@ export class IeeeDraft {
         // ordinal stays short (one or two digits): a glued D= date
         // ("-201908", the pubid#203 convention) must ride the version body
         // verbatim, not fold into the iteration slot.
-        const compound = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(?:[.-]?(\d{1,2}[a-z]?))?$/;
+        const compound = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(\d{1,2}[a-z]?)?(?:[.-](\d{1,2}[a-z]?))?$/;
         let isoStage;
         let isoIteration;
         const cm = compound.exec(body);
         if (cm !== null) {
-            isoStage = cm[1];
-            isoIteration = cm[2];
+            // The glued digits ride the STAGE ("D=CD1", matching the reference's
+            // "D=#{stage}" composition); only an explicit separator opens the
+            // ".iter" slot ("=DIS.3").
+            isoStage = cm[1] + (cm[2] ?? "");
+            isoIteration = cm[3];
             body = body.slice(0, cm.index);
         }
         const monthAlt = Object.keys(DRAFT_MONTH_NAMES)

package/dist/flavors/ieee/preprocessor.js

@@ -312,7 +312,10 @@ function normalizeJointStageSpellings(input) {
     const stage = "(FDIS|FCD|CDV|DIS\\d?|CD\\d?|WD|PWI|NP)";
     const num = "(P?\\d+(?:[.-]\\d+)?)";
     const tail = "(,? (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Sept|Oct|Nov|Dec)[a-z]* \\d{4}|$|-\\d{4}(?:-\\d\\d)?)";
-    cleaned = cleaned.replace(/(\d)_D(\d)/g, "$1/D$2");
+    // The "(\d)_D(\d)" underscore rewrite is NOT here: the reference's
+    // Fix 2G/2S are ANCHORED to their publisher shapes and cannot span a
+    // slash ("PC37.60/DP62271-111_D6.1" keeps its underscore) — the
+    // unscoped rule rewrote rows the reference leaves verbatim.
     cleaned = cleaned.replace(new RegExp(`^${pubs}${num}/(D[\\d.]+)/ ?${stage}\\b`), "$1$4 $2/$3");
     cleaned = cleaned.replace(new RegExp(`^${pubs}${num}/ ${stage}${tail}`), "$1$3 $2$4");
     cleaned = cleaned.replace(new RegExp(`^${pubs}${num}/${stage} (\\d{4})\\b`), "$1$3 $2-$4");

package/dist/flavors/nist/grammar.js

@@ -116,7 +116,10 @@ function buildRules() {
         .then(str("r"), letter.as("letter"))
         .as("revision_letter"), str("r").then(letter).as("revision_letter_suffix"), str("r")
         .then(digits.then(dot.then(digits).maybe()).as("edition_id"))
-        .as("revision_simple"), str("NCNR"), str("PERMIS"), str("BFRL"), upperLetter.repeat(1, 3), rules["digits_with_suffix"]
+        .as("revision_simple"), str("NCNR"), str("PERMIS"), str("BFRL"), 
+    // A trailing lowercase means a capitalized word ("Suppl"),
+    // not a second number.
+    upperLetter.repeat(1, 3).then(lowerLetter.absent()), rules["digits_with_suffix"]
         .then(dash.then(monthAbbrev(), digits, slash).absent()), lowerLetter.then(digit.absent()))).as("second_number")));
     const dottedDigits = () => digits.then(dot.then(digits).maybe());
     const editionInner = () => space
@@ -241,9 +244,15 @@ function buildRules() {
     rule("addendum", () => (str("-add").or(str(".add")).or(str(" Add.")))
         .then((space.or(dash)).maybe(), digits.or(str("")).as("addendum_number"))
         .as("addendum"));
+    // The capitalized supplement words a letter slot must yield to.
+    rule("supplement_word", () => str("Suppl").or(str("Supp")).or(str("Sup")));
     rule("supplement", () => space
         .maybe()
-        .then(str("supp").or(str("sup")))
+        .then(dot.maybe())
+        .then(
+    // The capitalized catalogue spellings ("NIST.SP.955.Suppl") ride
+    // the same slot; longest-first so "Suppl" is not "Sup"+"p".
+    str("Suppl").or(str("Supp")).or(str("Sup")).or(str("supp")).or(str("sup")))
         .then(str("rev")
         .as("supplement_with_rev")
         .or(monthAbbrev()
@@ -271,7 +280,9 @@ function buildRules() {
         .then(rules["publisher"], dot, rules["simple_series"], 
     // The catalogue also lists bare series identities with no
     // report number ("NBS.CIRC").
-    dot.maybe(), rules["report_number"].maybe(), str("_").then(digits.as("edition_year")).maybe(), upperLetter.maybe(), rules["edition"].maybe(), rules["update"].maybe(), dot.then(digits.or(upperLetter)).repeat(0, 3), rules["parts"].repeat(0, Infinity), rules["draft"].maybe()));
+    dot.maybe(), rules["report_number"].maybe(), str("_").then(digits.as("edition_year")).maybe(), rules["supplement_word"].absent().then(upperLetter.maybe()), rules["edition"].maybe(), rules["update"].maybe(), dot
+        .then(digits.or(rules["supplement_word"].absent().then(upperLetter)))
+        .repeat(0, 3), rules["parts"].repeat(0, Infinity), rules["draft"].maybe()));
     rule("identifier", () => ref(rules, "circ_supplement_identifier").or(rules["dated_identifier"], rules["mr_identifier"], rules["research_library_identifier"], rules["compound_series"]
         .then(space.or(dot), rules["old_stage"].maybe(), rules["report_number"].maybe(), rules["fips_date"].maybe(), rules["parts"].repeat(0, Infinity), rules["draft"].maybe(), rules["translation"].maybe(), rules["new_stage"].maybe()), rules["publisher"]
         .then(space.or(dot), rules["simple_series"], rules["old_stage"].maybe(), space.or(dot), rules["report_number"].maybe(), rules["fips_date"].maybe(), rules["parts"].repeat(0, Infinity), rules["draft"].maybe(), rules["translation"].maybe(), rules["new_stage"].maybe()), rules["simple_series"]

package/dist/flavors/nist/index.js

@@ -627,6 +627,16 @@ function castNumber(type, value, h, policy) {
         if (type === "second_number" && value["number_only"] !== undefined && value["edition_id"] !== undefined) {
             return { second_number: value };
         }
+        // The dotted revision spelling ("8278.r1"): fold to the edition,
+        // matching the glued "8278r1" canonical — the raw hash must not
+        // stringify into the number.
+        if (type === "second_number" && value["revision_simple"] !== undefined) {
+            const simple = value["revision_simple"];
+            const editionId = s(simple["edition_id"]) ?? "";
+            return {
+                edition: new NistEdition({ type: "r", id: editionId }),
+            };
+        }
         if (type === "second_number" && value["revision_letter"] !== undefined) {
             const revisionData = value["revision_letter"];
             const numberOnly = s(revisionData["number_only"]) ?? "";

package/dist/flavors/nist/preprocessor.js

@@ -49,7 +49,6 @@ const UPDATE_CODE_LINES = {
     "NBS.CIRC.supJun1925-Jun1926": "NBS CIRC 24e7sup2",
     "NBS.CIRC.supJun1925-Jun1927": "NBS CIRC 24e7sup3",
     "NIST.TN.2150-upd": "NIST.TN.2150-upd1-202102",
-    "NIST.SP.955.Suppl": "NIST.SP.955-S.uppl",
     "NIST SP 782-1995-96": "NIST SP 782-1995",
     "NIST FIPS 54-Jan15": "NIST FIPS 54",
     "NBS report ;": "NBS RPT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubid/pubid",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "TypeScript PubID identifiers: resolution, normalization and canonical hashes for every identifier in the pubid-testsuite corpus (41 standards bodies), with a conformance runner mirroring the Ruby reference",
   "type": "module",
   "license": "MIT",