@pubid/pubid 0.1.9 → 0.1.11

package/dist/flavors/ieee/index.js

@@ -119,7 +119,7 @@ class IeeeBuilder {
         }
         const dash = drafts.find((e) => isObj(e) && e["dash_year"] !== undefined) ??
             (d["dash_year"] !== undefined ? d : undefined);
-        if (dash === undefined || d["year"] !== undefined)
+        if (dash === undefined)
             return;
         const objs = drafts.filter(isObj);
         const joined = objs
@@ -151,7 +151,7 @@ class IeeeBuilder {
                 delete dash["dash_year"];
                 delete dash["dash_month"];
             }
-            else {
+            else if (d["year"] === undefined) {
                 d["year"] = dashYear;
                 d["month"] = dm;
             }
@@ -163,7 +163,7 @@ class IeeeBuilder {
                 delete dash["dash_year"];
                 delete dash["dash_month"];
             }
-            else {
+            else if (d["year"] === undefined) {
                 d["year"] = dashYear;
                 d["month"] = extractValue(dashMonth);
             }
@@ -339,6 +339,10 @@ class IeeeBuilder {
         }
         if (typeValue === undefined && this.originalInput !== "" && /ANSI\s+P/.test(this.originalInput)) {
             typeValue = "P";
+            // The P is identity on a non-IEEE-led publisher too (the C1
+            // ruling): record the marker so the render prepends it —
+            // "ANSI PN42.34/D9a, 2015" round-trips.
+            attributes["project_marker"] = true;
         }
         if (codeStr !== undefined && codeStr.startsWith("P") && this.originalInput.includes("/CSA")) {
             const pubData = parsed["publishers"] !== undefined ? asHash(parsed["publishers"]) : undefined;
@@ -480,7 +484,10 @@ class IeeeBuilder {
                 const dv = draftData["draft_version"];
                 const version = Array.isArray(dv) ? dv.map((v) => extractValue(v) ?? "").join("") : extractValue(dv);
                 if (version !== undefined) {
-                    const draftAbbr = `D${version}`;
+                    // relaton's hyphenated "/D-2" spelling captures the dash inside
+                    // draft_version; the stage registry keys on "D2". A date-embedded
+                    // version ("3-2017-07") keys on its leading ordinal.
+                    const draftAbbr = `D${version.replace(/^-/, "").replace(/-\d{4}(-\d{2})?$/, "")}`;
                     const stage = locateStage(draftAbbr);
                     if (stage !== undefined && stage.abbr.includes(draftAbbr))
                         return draftAbbr;
@@ -532,6 +539,15 @@ class IeeeBuilder {
             revision = extractValue(draftData["revision"]);
             isoStage = extractValue(draftData["draft_iso_stage"]);
             isoIteration = extractValue(draftData["draft_iso_iteration"]);
+            // FDIS/CDV/… are ISO/IEC stage tokens, not draft ordinals (C1
+            // ruling, testsuite#2). "/DDIS" and "/DFDIS" are hallucinated
+            // concatenations — the designator D does not merge onto a stage
+            // word. The draft of a stage rides the iso_stage slot, which
+            // Draft#to_s renders as the D= designator face ("…/D=DIS-2020").
+            if (version !== undefined && /^(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP)$/.test(version)) {
+                isoStage = version;
+                version = undefined;
+            }
             month = extractValue(draftData["month"]);
             year = extractValue(draftData["year"]);
             // The apostrophe-year catalogue convention ("P1484.20.1/D7,
@@ -567,7 +583,8 @@ class IeeeBuilder {
                 month = year = day = undefined;
             }
         }
-        if (version !== undefined || (isObj(draftData) && draftData["draft_iso_stage"] !== undefined)) {
+        if (version !== undefined || isoStage !== undefined ||
+            (isObj(draftData) && draftData["draft_iso_stage"] !== undefined)) {
             const draftObj = new IeeeDraft({
                 version,
                 revision,
@@ -821,6 +838,15 @@ class IeeeBuilder {
         const codeParts = [];
         if (parsed["part"] !== undefined)
             codeParts.push(extractValue(parsed["part"]) ?? "");
+        // The part/subpart captures carry their printed separator
+        // (separator-in-capture); the subpart rides after the part
+        // ("P65700.19.03", "60079-30-2" — the reference's joint code
+        // assembly).
+        if (parsed["subpart"] !== undefined) {
+            const subs = Array.isArray(parsed["subpart"]) ? parsed["subpart"] : [parsed["subpart"]];
+            for (const sp of subs)
+                codeParts.push(extractValue(sp) ?? "");
+        }
         let codeStr = extractValue(parsed["number"]);
         if (codeStr !== undefined && codeParts.length > 0) {
             // The ISO/IEC label's part may be dash-joined ("8802-9") - keep the
@@ -859,6 +885,39 @@ class IeeeBuilder {
             if (attributes["month"] === undefined)
                 attributes["month"] = extractValue(parsed["draft_month"]);
         }
+        // The IEEE-led tail word-stage ("IEEE/ISO/IEC P15026-3/CD,
+        // December 2021") composes the D= designator with the glued
+        // 6-digit date — the identity its D= twin spelling parses to (the
+        // corpus canonical: joint-development, lead IEEE, stage P). The
+        // ISO-led lists converge to the published-Std identity (the issue
+        // #216 semantics). The zero-width printed_month_year capture
+        // carries "" — truthy in the reference (nil-check), falsy in JS:
+        // test presence, not truth.
+        if (parsed["tail_iso_stage"] !== undefined &&
+            parsed["printed_month_year"] !== undefined &&
+            parsed["part"] !== undefined) {
+            const stage = extractValue(parsed["tail_iso_stage"]);
+            const year = extractValue(parsed["year"]) ?? "";
+            const monthName = (extractValue(parsed["month"]) ?? "").replace(/\.$/, "");
+            const monthNum = DRAFT_MONTH_NAMES[monthName];
+            if (stage !== undefined && monthNum !== undefined) {
+                attributes["ieee_draft"] = `D=${stage}-${year}${monthNum.padStart(2, "0")}`;
+                parsed["year"] = undefined;
+                parsed["month"] = undefined;
+                parsed["printed_month_year"] = undefined;
+                delete attributes["year"];
+                delete attributes["month"];
+                // The ISO-led lists converge to the published-Std identity; the
+                // IEEE-led lists stay the live project draft (stage P).
+                if (attributes["publisher"] !== "IEEE") {
+                    parsed["iso_published"] = { value: "" };
+                    const stdRecord = locateStage("Std");
+                    if (stdRecord !== undefined) {
+                        attributes["typed_stage"] = new IeeeTypedStage(stdRecord);
+                    }
+                }
+            }
+        }
         if (parsed["edition"] !== undefined)
             attributes["edition"] = extractValue(parsed["edition"]);
         if (parsed["edition_month"] !== undefined) {
@@ -874,13 +933,28 @@ class IeeeBuilder {
                 // the ISO face, which prints the date from the identity slots
                 // (", March 2017", pubid#216).
                 if (parsed["draft_month"] !== undefined && parsed["iso_stage"] === undefined) {
-                    const draftObj = new IeeeDraft({
-                        version: draftVer,
-                        month: extractValue(parsed["draft_month"]),
-                        year: extractValue(parsed["draft_year"]),
-                        comma_before_month: true,
-                    });
-                    attributes["draft"] = draftObj.render();
+                    const dm = extractValue(parsed["draft_month"]) ?? "";
+                    const dy = extractValue(parsed["draft_year"]) ?? "";
+                    const monthNum = DRAFT_MONTH_NAMES[dm.replace(/\.$/, "")];
+                    if (JSON.stringify(attributes["publishers"]) === JSON.stringify(["IEEE", "CSA"]) &&
+                        monthNum !== undefined && dy !== "") {
+                        // The joint IEEE/CSA drafts glue their date into the
+                        // designator with the month numeric (pubid ruling
+                        // 2026-10-14: no comma dates on these rows).
+                        const glued = new IeeeDraft({
+                            version: `${draftVer}-${dy}-${monthNum.padStart(2, "0")}`,
+                        });
+                        attributes["draft"] = glued.render();
+                    }
+                    else {
+                        const draftObj = new IeeeDraft({
+                            version: draftVer,
+                            month: dm === "" ? undefined : dm,
+                            year: dy === "" ? undefined : dy,
+                            comma_before_month: true,
+                        });
+                        attributes["draft"] = draftObj.render();
+                    }
                     if (parsed["year"] === undefined)
                         delete attributes["year"];
                     if (parsed["month"] === undefined)
@@ -895,6 +969,21 @@ class IeeeBuilder {
                     if (parsed["year"] === undefined)
                         delete attributes["year"];
                 }
+                else if (JSON.stringify(attributes["publishers"]) === JSON.stringify(["IEEE", "CSA"]) &&
+                    parsed["iso_stage"] === undefined &&
+                    /^(19|20)\d\d$/.test(extractValue(parsed["year"]) ?? "") &&
+                    /^\d{1,2}$/.test(extractValue(parsed["month"]) ?? "")) {
+                    // The glued face re-parses with the date in the identity
+                    // slots ("D2-2016-09" -> year/month + a bare D2): it
+                    // normalizes back onto the draft-embedded date so the
+                    // round trip closes on the CSA canonical.
+                    const glued = new IeeeDraft({
+                        version: `${draftVer}-${extractValue(parsed["year"])}-${extractValue(parsed["month"])}`,
+                    });
+                    attributes["draft"] = glued.render();
+                    delete attributes["year"];
+                    delete attributes["month"];
+                }
                 else {
                     attributes["ieee_draft"] = `D${draftVer}`;
                 }
@@ -941,9 +1030,10 @@ class IeeeBuilder {
                 jointDraft += `.${extractValue(parsed["draft_iso_iteration"])}`;
             }
             if (parsed["draft_stage_year"] !== undefined) {
-                // The capture carries its separator (":2020") — strip it (the
-                // #471 separator-in-capture rule).
-                jointDraft += `:${(extractValue(parsed["draft_stage_year"]) ?? "").replace(/^[\-:]/, "")}`;
+                // The capture carries its separator verbatim (":2020" /
+                // "-201112" - the #471 separator-in-capture rule): the ruby
+                // builder appends it raw, so the face keeps the printed form.
+                jointDraft += extractValue(parsed["draft_stage_year"]) ?? "";
             }
             attributes["ieee_draft"] = jointDraft;
         }
@@ -1035,9 +1125,22 @@ class IeeeBuilder {
         else {
             attributes["lead_party"] = "IEEE";
             attributes["type"] = "P";
-            const record = locateStage("P");
-            if (record !== undefined)
-                attributes["typed_stage"] = new IeeeTypedStage(record);
+            if ((parsed["draft_iso_stage"] !== undefined ||
+                parsed["tail_iso_stage"] !== undefined) &&
+                attributes["publisher"] === "ISO") {
+                // The ISO-led D= designator (the issue #216 convergence) is
+                // the stage-tracked draft of a published standard - the typed
+                // stage reads Std/published.
+                const stdRecord = locateStage("Std");
+                if (stdRecord !== undefined) {
+                    attributes["typed_stage"] = new IeeeTypedStage(stdRecord);
+                }
+            }
+            else {
+                const record = locateStage("P");
+                if (record !== undefined)
+                    attributes["typed_stage"] = new IeeeTypedStage(record);
+            }
         }
         // A plain IEEE-designator draft on joint publishers ("/D8, June
         // 2010") carries no ISO stage machinery: it builds as the project
@@ -1049,9 +1152,23 @@ class IeeeBuilder {
             parsed["amd_number"] === undefined) {
             const pubs = (attributes["publishers"] ?? []);
             const projectAttrs = {
-                code: attributes["code"],
                 draft: attributes["draft"],
             };
+            // The comma-year tail rides the draft verbatim ("D4, 2019" — the
+            // reference keeps the comma face on the joint project drafts; the
+            // year never promotes to the identity slots).
+            // The code columns (number/parts/separator/prefix) are the
+            // ProjectDraft render/hash face; the spelled P is the project
+            // marker (identity), whatever the lead publisher.
+            for (const k of ["number", "prefix", "parts", "separator"]) {
+                // A "P" prefix is the project marker itself (the generic path
+                // deletes it on the strip) - it must not ride the code columns.
+                if (attributes[k] !== undefined && !(k === "prefix" && attributes[k] === "P")) {
+                    projectAttrs[k] = attributes[k];
+                }
+            }
+            if (parsed["project_marker"] !== undefined)
+                projectAttrs["project_marker"] = true;
             if (pubs.length > 0) {
                 projectAttrs["publisher"] = pubs[0];
                 if (pubs.length > 1)

package/dist/flavors/ieee/model.js

@@ -186,8 +186,11 @@ export class IeeeDraft {
         // The compound stage suffix (docs/IEEE-DRAFT-STAGES.md §1.3):
         // "=DIS.3" is canonical - D (draft) = DIS (the stage), iteration 3.
         // "=DDIS.3", "=DDIS3", "=DDIS-3" (the stage echoed with its own D)
-        // are accepted aliases. Captures [stage, iteration].
-        const compound = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(?:[.-]?(\d+))?$/;
+        // are accepted aliases. Captures [stage, iteration]. The iteration
+        // 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]?))?$/;
         let isoStage;
         let isoIteration;
         const cm = compound.exec(body);
@@ -200,7 +203,7 @@ export class IeeeDraft {
             .sort((a, b) => b.length - a.length)
             .map((m) => `${m.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\.?`)
             .join("|");
-        const suffix = new RegExp(`(?:(, | )(${monthAlt})(?: (\\d{1,2}))?(?:, | )| )((?:19|20)\\d{2}[a-z]{0,2})$`);
+        const suffix = new RegExp(`(?:(, | )(${monthAlt})(?: (\\d{1,2}))?(?:, | )|, | )((?:19|20)\\d{2}[a-z]{0,2})$`);
         const m = suffix.exec(body);
         if (m === null) {
             return new IeeeDraft({ version: body, iso_stage: isoStage, iso_iteration: isoIteration });
@@ -216,7 +219,7 @@ export class IeeeDraft {
         });
     }
     render() {
-        let result = `/D${this.version}`;
+        let result = `/D${this.version ?? ""}`;
         if (this.isoStage !== undefined)
             result += `=${this.isoStage}`;
         if (this.isoStage !== undefined && this.isoIteration !== undefined) {
@@ -225,6 +228,15 @@ export class IeeeDraft {
         if (this.revision !== undefined)
             result += `.${this.revision}`;
         if (this.year !== undefined) {
+            if (this.isoStage !== undefined) {
+                // The D= designator face dash-joins its date in IEEE's
+                // convention: the year, and a draft month rides the
+                // designator zero-padded ("D=FDIS-201008", pubid#203).
+                result += `-${this.year}`;
+                if (this.month !== undefined)
+                    result += this.month.padStart(2, "0");
+                return result;
+            }
             const displayMonth = this.originalMonth;
             if (displayMonth !== undefined) {
                 const useCommaBefore = this.commaBeforeMonthSet
@@ -236,7 +248,10 @@ export class IeeeDraft {
                 result += displayMonth.length <= 4 || displayMonth === "Sept" ? ` ${this.year}` : `, ${this.year}`;
             }
             else {
-                result += ` ${this.year}`;
+                // The year-only date joins with its comma - the grammar's
+                // comma-year draft tail (pubid-grammar 17244fc) - so the
+                // render re-parses through the same clause.
+                result += `, ${this.year}`;
             }
         }
         return result;
@@ -515,7 +530,8 @@ export function renderIeeeBase(id) {
         // spelling ("IEEE P15026.1, 05 2014" renders "P15026.1-2014-05").
         const yearOnCode = id.year !== undefined && id.edition === undefined &&
             (id.month === undefined || gluedMonth) &&
-            (draftObj === undefined || draftObj.year !== undefined);
+            (draftObj === undefined || draftObj.year !== undefined ||
+                (draftObj.version ?? "").match(/-\d{4}-\d{2}$/) !== null);
         if (yearOnCode) {
             result += `-${id.year}`;
         }
@@ -575,7 +591,8 @@ export function renderIeeeBase(id) {
             result += ` ${id.year}`;
     }
     else if (id.year !== undefined && draftObj !== undefined && id.edition === undefined &&
-        draftObj?.year === undefined && !iecIeeOnly) {
+        draftObj?.year === undefined &&
+        (draftObj.version ?? "").match(/-\d{4}-\d{2}$/) === null && !iecIeeOnly) {
         // A year-only date trailing the draft ("ANSI N42.34/D9a, 2015")
         // keeps its comma form instead of being silently dropped; a year
         // whose draft carries its own date dash-attached to the code above
@@ -882,8 +899,12 @@ export const ProjectDraftIdentifierClass = ieeeClass({ kind: "project-draft-iden
     codeColumns: true,
     extraDefs: {
         project_marker: { type: "boolean", default: false },
+        // The ISO-led joint project drafts carry the designator as the
+        // stage ("ISO/IEC/IEEE P42010/D4, 2019" - stage D4), the same
+        // key the ruby identity serializes.
+        stage: { type: "string" },
     },
-    extraMappings: keyValue({ wire: "project_marker", to: "project_marker" }),
+    extraMappings: keyValue({ wire: "project_marker", to: "project_marker" }, { wire: "stage", to: "stage" }),
 });
 export const SiStandardClass = ieeeClass({ kind: "si-standard" }, {
     codeColumns: true,
@@ -1102,28 +1123,35 @@ export const JointDevelopmentClass = ieeeClass({ kind: "joint-development" }, {
         const isoStage = id["iso_stage"];
         const ieeeDraft = id["ieee_draft"];
         const codeObj = id.codeObj;
-        // ISO-led renders the ISO format ALWAYS (the stage-less published
+        // ISO-led renders the ISO format (the stage-less published
         // form "ISO/IEC/IEEE 12207.2:2020" prints colon-year, no stage).
         // IEEE semantics: P = project (a draft); no P = a standard. The
         // P-state is identity-bearing and prints as spelled - it is never
         // added or stripped here.
-        if (leadParty === "ISO") {
-            // A D= designator row ("P26511/D8=DDIS.3") prints the designator
-            // after the code, not the stage as a word; only genuine stage
-            // rows print the stage position.
-            const designatorDraft = id["ieee_draft"];
-            const printsDesignator = designatorDraft !== undefined && /^D\d*=/.test(designatorDraft);
+        // A stage-tracked D= designator is IEEE draft notation — its
+        // canonical face is the designator spelling (§1.3 spelling 7),
+        // whatever the lead party (the reference's canonical_format).
+        if (leadParty === "ISO" && !(ieeeDraft ?? "").startsWith("D=")) {
+            // The stage word is the ISO format's own position convention —
+            // it prints whenever the identifier carries one, as stored,
+            // iteration included ("DIS2", "CD4" — the lossless face,
+            // pubid#477). A stage-tracked D= designator decomposes into its
+            // stage word and date ("D=CD-2020" → "CD", 2020); the P project
+            // stage is IEEE convention and never prints here.
+            let stageWord = isoStage ?? "";
+            let draftYear;
+            if (stageWord === "" && ieeeDraft !== undefined) {
+                const decomposed = /^D=([A-Z]+)(?:\.(\d+[a-z]?))?(?:[-:](\d{4}))?$/.exec(ieeeDraft);
+                if (decomposed !== null) {
+                    stageWord = decomposed[1] ?? "";
+                    draftYear = decomposed[3];
+                }
+            }
             const parts = [];
             if (publishers !== undefined && publishers.length > 0)
                 parts.push(publishers.join("/"));
-            if (!printsDesignator) {
-                if (id.typed_stage !== undefined) {
-                    parts.push(id.typed_stage.record.iso_stage_equivalent ?? id.typed_stage.render());
-                }
-                else if (isoStage !== undefined) {
-                    parts.push(isoStage);
-                }
-            }
+            if (stageWord !== "")
+                parts.push(stageWord);
             let codeStr = codeObj?.render() ?? "";
             // A P-prefixed joint project prints its parts dot-joined on the
             // ISO face ("ISO/IEEE DIS P15500.1"), whatever separator the
@@ -1132,15 +1160,23 @@ export const JointDevelopmentClass = ieeeClass({ kind: "joint-development" }, {
                 codeStr = codeStr.replaceAll("-", ".");
             if (codeStr !== "")
                 parts.push(codeStr);
+            // The ISO-face date, in the spelling that parses back to the
+            // same year and month: the colon year (":2018"); a numeric
+            // month glued with dashes ("-2018-05"); a text month as
+            // ", February 2015".
             let result = parts.join(" ");
-            if (id.year !== undefined)
-                result += `:${id.year}`;
-            // The joint stage-draft clause ("D=WD.5") rides after the year in
-            // the ISO-led print; only the bare language/edition marker ("(E)")
-            // prints - a relationship narrative is metadata, not identity.
-            const jointDraft = id["ieee_draft"];
-            if (jointDraft !== undefined && /^D\d*=/.test(jointDraft))
-                result += `/${jointDraft}`;
+            const dateYear = id.year ?? draftYear;
+            if (dateYear !== undefined) {
+                if (id.month === undefined) {
+                    result += `:${dateYear}`;
+                }
+                else if (/^\d+$/.test(id.month)) {
+                    result += `-${dateYear}-${id.month.padStart(2, "0")}`;
+                }
+                else {
+                    result += `, ${id.month} ${dateYear}`;
+                }
+            }
             const marker = id["parenthetical_content"];
             if (marker !== undefined && /^[A-Z](?:\s*[/&]\s*[A-Z])*$/.test(marker)) {
                 result += ` (${marker})`;
@@ -1158,16 +1194,36 @@ export const JointDevelopmentClass = ieeeClass({ kind: "joint-development" }, {
         // The P-state prints as spelled (P = project draft; no P =
         // standard). Never added or stripped.
         let codeStr = codeObj?.render() ?? "";
-        if (ieeeDraft !== undefined)
+        let designatorCarriesYear = false;
+        if (ieeeDraft !== undefined && ieeeDraft.startsWith("D=") && id.year !== undefined) {
+            // The ordinal-less stage draft's canonical face (the
+            // UpdateCodes rewrite): the publication year colon-joins the
+            // code and the designator trails — "P16326:2017/D=WD.5".
+            codeStr += `:${id.year}`;
+            codeStr += `/${ieeeDraft}`;
+            designatorCarriesYear = true;
+        }
+        else if (ieeeDraft !== undefined) {
             codeStr += `/${ieeeDraft}`;
-        else if (id.typed_stage?.ieeeDraftEquivalent !== undefined) {
+        }
+        else if (isoStage !== undefined) {
+            // The ordinal-less stage draft: an iteration glued onto the
+            // printed word ("CD2") renders in the doctrine's ".iter" slot
+            // ("D=CD.2" — docs/IEEE-DRAFT-STAGES.md §1.3).
+            const glued = /([A-Z]+?)(\d+)/.exec(isoStage);
+            codeStr += glued !== null ? `/D=${glued[1]}.${glued[2]}` : `/D=${isoStage}`;
+        }
+        else if (id.typed_stage?.ieeeDraftEquivalent !== undefined &&
+            !codeStr.startsWith(id.typed_stage.ieeeDraftEquivalent)) {
             codeStr += `/${id.typed_stage.ieeeDraftEquivalent}`;
         }
         if (codeStr !== "")
             parts.push(codeStr);
         let result = parts.join(" ");
-        if (id.year !== undefined)
+        if (id.year !== undefined && !designatorCarriesYear &&
+            !(ieeeDraft ?? "").endsWith(`-${id.year}`)) {
             result += `-${id.year}`;
+        }
         if (id.redline === true)
             result += " - Redline";
         return result;

package/dist/flavors/ieee/preprocessor.js

@@ -259,6 +259,47 @@ function normalizeRevisionNotation(input) {
     cleaned = cleaned.replace(/(\/D-?[0-9A-Za-z.]+)\s+[Rr][Ee][Vv]\s*(\d+)/, "$1/R-$2");
     cleaned = cleaned.replace(/[-/_.]?\s?[Rr][Ee][Vv][-\s]?(\d+)(\/D-?[0-9A-Za-z.]+)/, "$2/R-$1");
     cleaned = cleaned.replace(/(\d)[-._]?\s?[Rr][Ee][Vv]\s*(\d+)\s*$/, "$1/R-$2");
+    // The joint IEEE/CSA catalogue spells the type word before the
+    // project number ("IEEE/CSA Draft P844.1/D2, Sept, 2016"): the P
+    // already carries the project semantics (docs/IEEE-DRAFT-STAGES.md
+    // §1.1), so the redundant word drops and the joint route parses.
+    cleaned = cleaned.replace(/IEEE\/CSA Draft (P[A-Z0-9])/g, "IEEE/CSA $1");
+    // The same redundant word rides the wider joint lists
+    // ("IEEE//ISO/IEC Draft P29119-2/D=DIS-201112"); the crawl also
+    // doubles the publisher slash (the 2026-10-14 ruling: the list
+    // normalizes to single slashes). Drop the word and collapse the
+    // slash before the joint route sees either - scoped to the D=
+    // stage-draft tail (the doubled-D and stage-month tails route
+    // elsewhere until the grammar carries them).
+    cleaned = cleaned.replace(/((?:IEEE|ISO|IEC)(?:\/(?:IEEE|ISO|IEC|CSA))+)\s+Draft\s+(P[A-Z0-9][A-Z0-9.-]*\/D=[A-Z])/g, "$1 $2");
+    cleaned = cleaned.replace(/(IEEE|ISO|IEC)\/\//g, "$1/");
+    // The lettered REV spellings glue to the number ("P1310Rev3") or
+    // carry an after-word separator ("REV.ma", "REV-ma"); the rev rules
+    // read a space or a bare word, so the boundary normalizes (the
+    // render keeps the glued face). The before-word separator the Rev
+    // doctrine carries ("-REVmc") is untouched.
+    cleaned = cleaned.replace(/(REV|Rev|rev)[.\-](?=[A-Za-z])/g, "$1");
+    cleaned = cleaned.replace(/(\d)(REV|Rev|rev)/g, "$1 $2");
+    // The corrigendum's own draft rides before the ordinal in the house
+    // order ("PC37.101-2006/D2, 2007/Cor. 1"): the catalogue spellings
+    // ".../Cor 1, D4, July 2015" and ".../Cor 1-201x/D5, April 2012"
+    // re-order into it, with the draft's date glued -YYYY-MM (pubid
+    // ruling 2026-10-14: no comma dates).
+    const COR_MONTHS = {
+        January: "01", February: "02", March: "03", April: "04", May: "05",
+        June: "06", July: "07", August: "08", September: "09", Sept: "09",
+        October: "10", November: "11", December: "12", Jan: "01", Feb: "02",
+        Mar: "03", Apr: "04", Jun: "06", Jul: "07", Aug: "08", Sep: "09",
+        Oct: "10", Nov: "11", Dec: "12",
+    };
+    cleaned = cleaned.replace(/\/Cor(?:rigendum)? (\d+(?:-[0-9xX]{4})?)\/(D[A-Z0-9][^,]*), ([A-Za-z]+) (\d{4})/g, (_m, cor, draft, mon, year) => {
+        const month = COR_MONTHS[mon.charAt(0).toUpperCase() + mon.slice(1).toLowerCase()];
+        return month === undefined ? _m : `/${draft}-${year}-${month}/Cor. ${cor}`;
+    });
+    cleaned = cleaned.replace(/\/Cor(?:rigendum)? (\d+), (D[A-Z0-9][^,]*), ([A-Za-z]+) (\d{4})/g, (_m, cor, draft, mon, year) => {
+        const month = COR_MONTHS[mon.charAt(0).toUpperCase() + mon.slice(1).toLowerCase()];
+        return month === undefined ? _m : `/${draft}-${year}-${month}/Cor. ${cor}`;
+    });
     // Lettered inline revisions are IDENTITY (pubid ruling 2026-10-14):
     // the grammar captures them natively with their separator; the former
     // strip rewrite here dropped the letters and is gone.
@@ -376,7 +417,11 @@ export function preprocessIeee(input) {
     cleaned = cleaned.replace(/^(ISO\/IEC \d+[-.]\d*)\s*:\s*(\d{4})/, "$1:$2");
     cleaned = cleaned.replace(/^(ISO\/IEC \d+)\s*:\s*(\d{4})/, "$1:$2");
     cleaned = cleaned.replace(/^(IEC\/IEEE P[\w.-]+)_D/, "$1/D");
-    cleaned = cleaned.replace(/^IEEE\/ISO\/IEC\s+(P[\w.-]+)/, "ISO/IEC/IEEE $1");
+    // Scoped: the D= stage-draft rows keep the IEEE-led list (the ruby
+    // ieee_format routes them with the input publisher order and lead
+    // IEEE - "IEEE/ISO/IEC P29119-2/D=DIS-201112"); the other IEEE/ISO/IEC
+    // spellings print the ISO-led face.
+    cleaned = cleaned.replace(/^IEEE\/ISO\/IEC\s+(?!P[\w.-]+\/D=)(P[\w.-]+)/, "ISO/IEC/IEEE $1");
     cleaned = cleaned.replace(/^IEEE\/IEC\/ISO\s+(P[\w.-]+)/, "IEC/ISO/IEEE $1");
     cleaned = cleaned.replace(/^(IEEE\/IEC P[\w.-]+)\s+D(\d)/, "$1/D$2");
     cleaned = cleaned.replace(/^(IEEE\/IEC P[\w.-]+)\s+(CDV|FDIS|CD|DIS|ED\d)/, "$1/$2");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubid/pubid",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "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",
@@ -17,7 +17,7 @@
     "artifact": "tsc -p tsconfig.json && node scripts/build-artifact.mjs"
   },
   "dependencies": {
-    "parsanol": "^0.10.3",
+    "parsanol": "^0.10.4",
     "yaml": "^2.5.0"
   },
   "devDependencies": {

package/vendor/parg/adobe.json

@@ -1 +1 @@
-{"bindings":null,"version":"0.1.0","grammar":"PubidAdobe","shape":"parsanol-tree/v2","binding_version":1,"entries":{"identifier":{"root":"identifier","grammar":{"atoms":[{"Entity":{"atom":48}},{"Entity":{"atom":30}},{"Entity":{"atom":9}},{"Str":{"pattern":"Adobe"}},{"Entity":{"atom":5}},{"Str":{"pattern":" "}},{"Str":{"pattern":"TN"}},{"Entity":{"atom":5}},{"Repetition":{"atom":7,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[3,4,6,8]}},{"Entity":{"atom":24}},{"Str":{"pattern":"Adobe"}},{"Entity":{"atom":5}},{"Str":{"pattern":"Technical"}},{"Entity":{"atom":5}},{"Str":{"pattern":"Note"}},{"Entity":{"atom":5}},{"Repetition":{"atom":16,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":"#"}},{"Repetition":{"atom":18,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":5}},{"Repetition":{"atom":20,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[17,19,21]}},{"Repetition":{"atom":22,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[11,12,13,14,15,23]}},{"Entity":{"atom":29}},{"Str":{"pattern":"ATN"}},{"Entity":{"atom":5}},{"Repetition":{"atom":27,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[26,28]}},{"Alternative":{"atoms":[2,10,25]}},{"Entity":{"atom":32}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Repetition":{"atom":31,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"number","atom":33}},{"Entity":{"atom":36}},{"Str":{"pattern":"."}},{"Entity":{"atom":42}},{"Re":{"pattern":"[\\x41-\\x5a]"}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Re":{"pattern":"[_]"}},{"Alternative":{"atoms":[38,39,40,41]}},{"Repetition":{"atom":37,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"slug","atom":43}},{"Sequence":{"atoms":[35,44]}},{"Repetition":{"atom":45,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[1,34,46]}},{"Named":{"name":"tech_note","atom":47}},{"Entity":{"atom":53}},{"Entity":{"atom":32}},{"Repetition":{"atom":50,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"number","atom":51}},{"Named":{"name":"tech_note_bare","atom":52}},{"Entity":{"atom":87}},{"Str":{"pattern":"Adobe Publication "}},{"Repetition":{"atom":55,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":86}},{"Entity":{"atom":82}},{"Entity":{"atom":75}},{"Entity":{"atom":69}},{"Entity":{"atom":62}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Repetition":{"atom":61,"min":1,"max":null,"tag":"Repetition"}},{"Entity":{"atom":67}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Alternative":{"atoms":[65,66]}},{"Repetition":{"atom":64,"min":0,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[63,68]}},{"Entity":{"atom":71}},{"Str":{"pattern":"-"}},{"Entity":{"atom":69}},{"Sequence":{"atoms":[70,72]}},{"Repetition":{"atom":73,"min":0,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[60,74]}},{"Named":{"name":"slug","atom":59}},{"Entity":{"atom":71}},{"Entity":{"atom":32}},{"Repetition":{"atom":78,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"version","atom":79}},{"Sequence":{"atoms":[76,77,80]}},{"Named":{"name":"publication_version","atom":81}},{"Entity":{"atom":85}},{"Entity":{"atom":75}},{"Named":{"name":"slug","atom":84}},{"Alternative":{"atoms":[58,83]}},{"Sequence":{"atoms":[56,57]}},{"Alternative":{"atoms":[0,49,54]}}],"root":88},"bindings":[]}},"preprocess":{},"tables":{},"lint":{"order_warnings":["rule tech_note_prefix: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)","rule tech_note_prefix: branches 1 and 3 are order-dependent (shared first bytes; ordered choice is decisive)","rule tech_note_prefix: branches 2 and 3 are order-dependent (shared first bytes; ordered choice is decisive)","rule publication_slug_or_version: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)","rule identifier: branches 1 and 3 are order-dependent (shared first bytes; ordered choice is decisive)"]},"default_entry":"identifier","render":{},"derive":{},"tests":[{"entry":"identifier","kind":"accept","input":"Adobe TN 15","expect":{}},{"entry":"identifier","kind":"accept","input":"ATN 30","expect":{}},{"entry":"identifier","kind":"accept","input":"Adobe Technical Note #12","expect":{}},{"entry":"identifier","kind":"reject","input":"###","expect":{}}],"docs":{},"source":"# Port of lib/pubid/adobe/parser.rb: tech notes (Adobe TN 5014, legacy\n# \"Adobe Technical Note #5014\", ATN5014, bare 5014) and publications\n# (adobe-glyph-list, adobe-japan1-7 with the version split tried first).\n\ngrammar PubidAdobe version \"0.1.0\" {\n  tech_note_tn_prefix = \"Adobe\" space \"TN\" [space]\n  tech_note_long_prefix = \"Adobe\" space \"Technical\" space \"Note\" [[space] [\"#\"] [space]]\n  tech_note_atn_prefix = \"ATN\" [space]\n  tech_note_prefix = tech_note_tn_prefix / tech_note_long_prefix / tech_note_atn_prefix\n  # Capture precedence: (*rep) as name wraps the whole repetition, so a\n  # digit run joins to one string instead of re-keying every character;\n  # slug is captured exactly once (the bare form) or as a sibling of\n  # version inside the publication_version capture.\n  tech_note = (tech_note_prefix (1*digit) as number [(dot (1*slug_char) as slug)]) as tech_note\n  bare_number = ((1*digit) as number) as tech_note_bare\n  slug_segment = 1*lower1 *lowerd\n  slug_text = slug_segment *(dash slug_segment)\n  slug_inner = (slug_text) as slug\n  publication_with_version = ((slug_text) as slug dash (1*digit) as version) as publication_version\n  publication_slug_or_version = publication_with_version / slug_inner\n  publication = [\"Adobe Publication \"] publication_slug_or_version\n  identifier = tech_note / bare_number / publication\n  slug_char = %x41-5A / %x61-7A / %x30-39 / %x5F\n  lower1 = %x61-7A\n  lowerd = %x61-7A / %x30-39\n  digit = %x30-39\n  space = \" \"\n  dot = \".\"\n  dash = \"-\"\n  entry identifier: identifier\n\n  test {\n    accept \"Adobe TN 15\"\n    accept \"ATN 30\"\n    accept \"Adobe Technical Note #12\"\n    reject \"###\"\n  }\n}\n","checksum":"sha256:38e8488c3da1c0f4a36fe2f63d87fee551d9317c5dae62f56972da1efe842a52"}
+{"bindings":null,"version":"0.1.0","grammar":"PubidAdobe","shape":"parsanol-tree/v2","binding_version":1,"entries":{"identifier":{"root":"identifier","grammar":{"atoms":[{"Entity":{"atom":48}},{"Entity":{"atom":30}},{"Entity":{"atom":9}},{"Str":{"pattern":"Adobe"}},{"Entity":{"atom":5}},{"Str":{"pattern":" "}},{"Str":{"pattern":"TN"}},{"Entity":{"atom":5}},{"Repetition":{"atom":7,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[3,4,6,8]}},{"Entity":{"atom":24}},{"Str":{"pattern":"Adobe"}},{"Entity":{"atom":5}},{"Str":{"pattern":"Technical"}},{"Entity":{"atom":5}},{"Str":{"pattern":"Note"}},{"Entity":{"atom":5}},{"Repetition":{"atom":16,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":"#"}},{"Repetition":{"atom":18,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":5}},{"Repetition":{"atom":20,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[17,19,21]}},{"Repetition":{"atom":22,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[11,12,13,14,15,23]}},{"Entity":{"atom":29}},{"Str":{"pattern":"ATN"}},{"Entity":{"atom":5}},{"Repetition":{"atom":27,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[26,28]}},{"Alternative":{"atoms":[2,10,25]}},{"Entity":{"atom":32}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Repetition":{"atom":31,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"number","atom":33}},{"Entity":{"atom":36}},{"Str":{"pattern":"."}},{"Entity":{"atom":42}},{"Re":{"pattern":"[\\x41-\\x5a]"}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Re":{"pattern":"[_]"}},{"Alternative":{"atoms":[38,39,40,41]}},{"Repetition":{"atom":37,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"slug","atom":43}},{"Sequence":{"atoms":[35,44]}},{"Repetition":{"atom":45,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[1,34,46]}},{"Named":{"name":"tech_note","atom":47}},{"Entity":{"atom":53}},{"Entity":{"atom":32}},{"Repetition":{"atom":50,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"number","atom":51}},{"Named":{"name":"tech_note_bare","atom":52}},{"Entity":{"atom":87}},{"Str":{"pattern":"Adobe Publication "}},{"Repetition":{"atom":55,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":86}},{"Entity":{"atom":82}},{"Entity":{"atom":75}},{"Entity":{"atom":69}},{"Entity":{"atom":62}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Repetition":{"atom":61,"min":1,"max":null,"tag":"Repetition"}},{"Entity":{"atom":67}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Alternative":{"atoms":[65,66]}},{"Repetition":{"atom":64,"min":0,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[63,68]}},{"Entity":{"atom":71}},{"Str":{"pattern":"-"}},{"Entity":{"atom":69}},{"Sequence":{"atoms":[70,72]}},{"Repetition":{"atom":73,"min":0,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[60,74]}},{"Named":{"name":"slug","atom":59}},{"Entity":{"atom":71}},{"Entity":{"atom":32}},{"Repetition":{"atom":78,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"version","atom":79}},{"Sequence":{"atoms":[76,77,80]}},{"Named":{"name":"publication_version","atom":81}},{"Entity":{"atom":85}},{"Entity":{"atom":75}},{"Named":{"name":"slug","atom":84}},{"Alternative":{"atoms":[58,83]}},{"Sequence":{"atoms":[56,57]}},{"Alternative":{"atoms":[0,49,54]}}],"root":88},"bindings":[]}},"preprocess":{},"tables":{},"lint":{"order_warnings":["rule tech_note_prefix: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)","rule tech_note_prefix: branches 1 and 3 are order-dependent (shared first bytes; ordered choice is decisive)","rule tech_note_prefix: branches 2 and 3 are order-dependent (shared first bytes; ordered choice is decisive)","rule publication_slug_or_version: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)","rule identifier: branches 1 and 3 are order-dependent (shared first bytes; ordered choice is decisive)"]},"default_entry":"identifier","render":{},"derive":{},"tests":[{"entry":"identifier","kind":"accept","input":"Adobe TN 15","expect":{}},{"entry":"identifier","kind":"accept","input":"ATN 30","expect":{}},{"entry":"identifier","kind":"accept","input":"Adobe Technical Note #12","expect":{}},{"entry":"identifier","kind":"reject","input":"###","expect":{}}],"docs":{},"source":"# Port of lib/pubid/adobe/parser.rb: tech notes (Adobe TN 5014, legacy\n# \"Adobe Technical Note #5014\", ATN5014, bare 5014) and publications\n# (adobe-glyph-list, adobe-japan1-7 with the version split tried first).\n\ngrammar PubidAdobe version \"0.1.0\" {\n  tech_note_tn_prefix = \"Adobe\" space \"TN\" [space]\n  tech_note_long_prefix = \"Adobe\" space \"Technical\" space \"Note\" [[space] [\"#\"] [space]]\n  tech_note_atn_prefix = \"ATN\" [space]\n  tech_note_prefix = tech_note_tn_prefix / tech_note_long_prefix / tech_note_atn_prefix\n  # Capture precedence: (*rep) as name wraps the whole repetition, so a\n  # digit run joins to one string instead of re-keying every character;\n  # slug is captured exactly once (the bare form) or as a sibling of\n  # version inside the publication_version capture.\n  tech_note = (tech_note_prefix (1*digit) as number [(dot (1*slug_char) as slug)]) as tech_note\n  bare_number = ((1*digit) as number) as tech_note_bare\n  slug_segment = 1*lower1 *lowerd\n  slug_text = slug_segment *(dash slug_segment)\n  slug_inner = (slug_text) as slug\n  publication_with_version = ((slug_text) as slug dash (1*digit) as version) as publication_version\n  publication_slug_or_version = publication_with_version / slug_inner\n  publication = [\"Adobe Publication \"] publication_slug_or_version\n  identifier = tech_note / bare_number / publication\n  slug_char = %x41-5A / %x61-7A / %x30-39 / %x5F\n  lower1 = %x61-7A\n  lowerd = %x61-7A / %x30-39\n  digit = %x30-39\n  space = \" \"\n  dot = \".\"\n  dash = \"-\"\n  entry identifier: identifier\n\n  test {\n    accept \"Adobe TN 15\"\n    accept \"ATN 30\"\n    accept \"Adobe Technical Note #12\"\n    reject \"###\"\n  }\n}\n","source_hash":"bba8ad76fa85bcbf6363b8bfa1502a76a050fa4ca87bcf5a8bfd14a19cab9f5e","compiler_version":"1.3.93","checksum":"sha256:cef9c127759ddb05f7bd725d9bc923b6207c099dbd8a8e73ec4ae84101040361"}