pubid 2.0.0.pre.alpha.11 → 2.0.0.pre.alpha.13

data/lib/pubid/ieee/parser.rb

@@ -269,6 +269,10 @@ module Pubid
       rule(:draft_date) do
         # Enhanced to handle: ", Sept 2008" or " Sept 2008" or ", Month Year"
         ((comma | space) >> month_name.as(:month) >> space >> year_digits.as(:year)) |
+          # Space-separated bare year after the draft designator
+          # ("IEEE Draft Std P14764/D1 2004, Nov 2004" - the "D1 2004" draft
+          # carries its own year, with the print date still trailing).
+          (space >> year_digits.as(:year)) |
           # Numeric-month form ", 05 2007" / " 05 2007" — no text month name. The
           # year separator may be a dash: preprocessing (parser.rb ~1278) rewrites
           # a trailing " <digits> <year>" to "<digits>-<year>", so "05 2007"
@@ -302,6 +306,15 @@ module Pubid
       rule(:draft) do
         (draft_prefix >> draft_version.repeat(1, 2) >>
          (dot >> digits.as(:revision)).maybe >>
+         # The compound both-systems form (docs/IEEE-DRAFT-STAGES.md
+         # §1.3): "=DDIS.3" - IEEE draft ordinal = draft of the ISO/IEC
+         # stage, with its iteration. The glued "=DDIS3" / "=DDIS-3"
+         # spellings are accepted aliases of "=DDIS.3".
+         (str("=") >> (str("D") >> (str("FDIS") | str("CDV") | str("PWI") |
+            str("DIS") | str("WD") | str("NP") | str("CD")) |
+           (str("FDIS") | str("CDV") | str("PWI") | str("DIS") | str("WD") |
+            str("NP") | str("CD"))).as(:draft_iso_stage) >>
+           (dot | dash).maybe >> digits.as(:draft_iso_iteration).maybe).maybe >>
          draft_date.maybe).as(:draft)
       end
 
@@ -532,7 +545,9 @@ module Pubid
 
       # Additional parameters (inside parentheses)
       rule(:additional_parameters) do
-        (space.maybe >> str("(") >> # Make space before '(' optional
+        (space.maybe >> str("(") >> space.maybe >> # Space before/after '(' optional
+         # ("( Revision of …)" - a crawl space inside the paren must not push
+         # the narrative to the catch-all and into the render).
          (reaffirmed |
           # Handle "Revision of IEEE Std ..." with optional space after Std
           (str("Revision of IEEE Std ") >> space.maybe >> match("[^)]").repeat(1).as(:revision_of)) |
@@ -582,15 +597,32 @@ module Pubid
         # ALSO handle: IEEE/CSA P844.1/293.1/D2 (CSA dual numbering)
         (str("ISO/IEC/IEEE") | str("ISO/IEEE") | str("IEC/IEEE") | str("IEEE/CSA")).as(:joint_publishers) >>
           space >>
-          str("P") >> # P indicates IEEE-led
+          # P = project (the document is a draft): identity-bearing, so it
+          # is captured and preserved, never silently consumed.
+          str("P").as(:project_marker) >>
           digits.as(:number) >>
           ((dot | dash) >> digits.as(:part)).maybe >> # Optional part like .1 or -1
           # CSA dual numbering: /293.1 (second number)
           (slash >> digits >> (dot >> digits).maybe >> (dash >> digits.as(:draft_version)).maybe).maybe >>
           (
-            # Variant 1: /D8 notation (original)
-            (slash >> str("D") >> digits.as(:draft_version)) |
-            # Variant 2: , CDV1 notation (comma before stage code)
+            # Variant 1b: the ordinal-less stage draft "D=CDV[:2020]" -
+            # D (draft) = CDV (the IEC stage it drafts). The year rides in
+            # the draft clause (a distinct key, so the builder keeps the
+            # date inside the designator).
+            (slash >> str("D") >> str("=") >>
+              (str("CDV") | str("FDIS") | str("PWI") | str("WD") |
+               str("NP") | str("DIS") | str("CD")).as(:draft_iso_stage) >>
+              (str(":") >> year_digits.as(:draft_stage_year)).maybe) |
+            # Variant 1: /D8 notation (original), with the compound
+            # both-systems suffix "=DDIS.3" (docs/IEEE-DRAFT-STAGES.md §1.3)
+            (slash >> str("D") >> digits.as(:draft_version) >>
+              (str("=") >> (str("D") >> (str("FDIS") | str("CDV") | str("PWI") |
+                 str("DIS") | str("WD") | str("NP") | str("CD")) |
+               (str("FDIS") | str("CDV") | str("PWI") | str("DIS") | str("WD") |
+                str("NP") | str("CD"))).as(:draft_iso_stage) >>
+               (dot | dash).maybe >> digits.as(:draft_iso_iteration).maybe).maybe) |
+            # Variant 2: , CDV1 notation (comma before stage code) —
+            # the stage draft of the named ISO/IEC stage, its iteration
             (comma >> (str("CDV") | str("FDIS") | str("CD") | str("DIS")).as(:iec_stage) >> digits.maybe.as(:stage_iteration))
           ).maybe >>
           # Optional edition, from relaton's "/E-<n>" suffix normalized to
@@ -611,42 +643,101 @@ module Pubid
         # "-YYYY[-MM]" date (instead of ":YYYY"), multi-digit committee-draft
         # stage codes (CD1..CD4) plus CDV, and a wider set of joint publishers.
         # (roadmap items 2/3, phase 1). longest publisher token first.
-        (str("ISO/IEC/IEEE") | str("IEEE/ISO/IEC") | str("IEEE/IEC/ISO") |
-         str("ISO/IEEE") | str("IEC/IEEE") | str("IEEE/IEC") | str("ISO/IEC") |
-         str("IEEE")).as(:joint_publishers) >>
-          space >>
-          # ISO stage codes: FDIS, FCD, CDV; DIS/CD with an optional round digit
-          # (DIS2, CD1..CD4); WD/PWI/NP. (FCD before FDIS is fine — distinct.)
-          (str("FDIS") | str("FCD") | str("CDV") |
-           (str("DIS") >> digit.maybe) |
-           (str("CD") >> digit.maybe) |
-           str("WD") | str("PWI") | str("NP")).as(:iso_stage) >>
-          # optional " Std" noise word after the stage (e.g. "FDIS Std P15288")
-          (space >> str("Std")).maybe >>
-          space >>
-          str("P").maybe >> # optional project marker on the number
+        # The stage is OPTIONAL ONLY for ISO-led joint prefixes - the
+        # stage-less PUBLISHED form (pubid#317): "ISO/IEC/IEEE 26511:2018",
+        # "ISO/IEEE 11073-20101:2004(E)". Every other prefix keeps the
+        # stage REQUIREMENT so this rule cannot steal what belongs to
+        # iec_ieee_copublished ("IEC/IEEE 60076-2016"), the bare-IEEE
+        # project rules ("IEEE P802.16/D-3") or the ISO flavor
+        # ("ISO/IEC <n>:<year>").
+        iso_led = (str("ISO/IEC/IEEE") | str("IEEE/ISO/IEC") |
+                   str("IEEE/IEC/ISO") | str("ISO/IEEE"))
+        staged_only = (str("IEC/IEEE") | str("IEEE/IEC") |
+                       str("ISO/IEC") | str("IEEE"))
+        # ISO stage codes: FDIS, FCD, CDV; DIS/CD with an optional round
+        # digit (DIS2, CD1..CD4); WD/PWI/NP.
+        iso_stage = (str("FDIS") | str("FCD") | str("CDV") |
+                     (str("DIS") >> digit.maybe) |
+                     (str("CD") >> digit.maybe) |
+                     str("WD") | str("PWI") | str("NP")).as(:iso_stage)
+        std_noise = (space >> str("Std")).maybe
+        # The empty-string marker distinguishes the stage-less PUBLISHED
+        # tree in the builder (absence of :iso_stage alone means IEEE format).
+        ((iso_led.as(:joint_publishers) >> space >>
+           (iso_stage >> std_noise >> space |
+            str("").as(:iso_published) >> space.maybe)) |
+          (staged_only.as(:joint_publishers) >> space >>
+            iso_stage >> std_noise >> space)) >>
+          str("P").as(:project_marker).maybe >> # project marker (P =
+                                                # project/draft; its
+                                                # presence is identity)
           digits.as(:number) >>
-          # part must not swallow the trailing year (year_digits.absent?)
-          ((dot | dash) >> year_digits.absent? >> digits.as(:part)).maybe >>
+          # part must not swallow the trailing year (year_digits.absent?). A
+          # DASH-joined part is tagged (:part_dash) - the catalogue-printed
+          # joint form spells the part with a dash ("21451-7") where the ISO
+          # form uses the dot.
+          ((dot >> year_digits.absent? >> digits.as(:part)) |
+           (dash >> str("").as(:part_dash) >> year_digits.absent? >>
+             digits.as(:part))).maybe >>
           (
             (str(":") >> year_digits.as(:year)) |
+            # The dash-year (and ", Month YYYY" text date below) spellings are
+            # the catalogue-PRINTED joint form; tag them (:printed_form) so the
+            # builder routes to a Standard instead of the ISO joint reference.
             (dash >> year_digits.as(:year) >>
-             (dash >> month_numeric.as(:month)).maybe) |
+             (dash >> month_numeric.as(:month)).maybe >>
+             str("").as(:printed_dash_year)) |
             # Trailing text date ", April 2015" / " April 2015" (build_joint_development
             # already reads :month/:year). No :year collision — the iso rule has no
             # other :year capture (edition uses :edition_year).
-            ((comma | space) >> month_name.as(:month) >> space >> year_digits.as(:year))
+            ((comma | space) >> month_name.as(:month) >> space >>
+             year_digits.as(:year) >> str("").as(:printed_month_year))
           ).maybe >>
           # Optional /D<draft> tail. normalize_relaton_suffixes repositions the
           # historical "…/D-3-2017" onto the number as "…-2017/D3", so by the
           # time this rule runs the draft usually trails the date (bucket 5);
           # a date-less "/D-4" keeps its hyphen (bucket 7), hence dash.maybe.
+          # A text date may trail the DRAFT itself (pubid#216:
+          # "CD P26515/D1, March 2017", "FDIS P15289/D3, 2017") — distinct
+          # keys (:draft_month/:draft_year), because a plain :month/:year
+          # here collides with the date clause above and parslet drops the
+          # subtree with a "Duplicate subtrees" warning.
+          # The ISO/IEC edition marker may sit between the year and an
+          # amendment/draft tail: "8802.11:2012 (E)/Amd 1-2014". A distinct
+          # key - a second :parameters capture here collides with the
+          # trailing parenthetical slot (parslet drops duplicate subtrees).
+          (space.maybe >> str("(") >>
+           match("[^)]").repeat(1).as(:edition_marker) >> str(")")).maybe >>
+          # The stage-draft clause of the ISO-led print: "/D=WD.5" -
+          # D (draft) = the ISO/IEC stage it drafts, with its iteration
+          # (docs/IEEE-DRAFT-STAGES.md §1.2).
+          ((slash >> str("D") >> str("=") >>
+           (str("FDIS") | str("FCD") | str("CDV") |
+            (str("DIS") >> digit.maybe) |
+            (str("CD") >> digit.maybe) |
+            str("WD") | str("PWI") | str("NP")).as(:draft_iso_stage) >>
+           (dot >> (digits >> match("[A-Za-z]").repeat(0, 1)).as(:draft_iso_iteration)).maybe) |
           (slash >> str("D") >> dash.maybe >>
-           match('[0-9.]').repeat(1).as(:draft_version)).maybe >>
+           match('[0-9.]').repeat(1).as(:draft_version) >>
+           (((comma | space) >> month_name.as(:draft_month) >> space >>
+               year_digits.as(:draft_year)) |
+             (comma >> year_digits.as(:draft_year))).maybe).maybe).maybe >>
+          # Optional amendment tail (pubid#317:
+          # "8802-11:2012/Amd.1:2014(E)") - the flat tree keys reuse
+          # build_flat_amendment.
+          (slash >> str("Amd") >> (dot | space).maybe >>
+           digits.as(:amd_number) >>
+           ((str(":") | dash) >> year_digits.as(:amd_year)).maybe).maybe >>
           # Optional edition, from relaton's "/E-<n>" suffix normalized to
           # "Edition <n>.0[ YYYY]" (nil-residue hand-off item 1).
           edition.maybe >>
-          revision_suffix.maybe
+          revision_suffix.maybe >>
+          # Published joint docs print a language marker, after either the
+          # year or the amendment tail: "9945:2009(E)", "...Amd.1:2014(E)".
+          # The crawl sometimes spaces it ("…(E), January 2017" family,
+          # pubid#216), and a relationship parenthetical may follow
+          # ("…CD2 P15288-2013-09 (Revision of …)").
+          parenthetical.maybe
       end
 
       # Embedded (stage-LAST) ISO-led designations: the corpus writes the ISO
@@ -659,6 +750,28 @@ module Pubid
       # the trailing `.FDIS` is the ISO stage, NOT a second part. Routes through
       # the same build_joint_development (via :joint_publishers/:iso_stage), so the
       # stage is modeled correctly and the numeric part stays separate.
+      # The stage-less ISO/IEC label with a colon year and the ISO/IEC
+      # edition marker: "ISO/IEC 13210:1994 (E)" - the ISO/IEC portion of a
+      # double-labeled standard. The (E) parenthetical is REQUIRED: without
+      # it this spelling is the ISO flavor's own form and must not be
+      # stolen. Routes through build_joint_development like every ISO-led
+      # joint reference.
+      rule(:joint_development_iso_iec_edition) do
+        str("ISO/IEC").as(:joint_publishers) >> space >>
+          str("").as(:iso_published) >>
+          str("P").as(:project_marker).maybe >>
+          digits.as(:number) >>
+          # The part may be dot- or dash-joined ("8802-9"); a dash-year
+          # ("1234-2012") is not a part.
+          # A distinct key: the iso-format route's :part_dash prints as a
+          # dot in the joint code (the "P24748.2:2018" convention); only
+          # the ISO/IEC LABEL keeps its printed dash.
+          ((dot | (dash >> str("").as(:iec_label_dash) >> year_digits.absent?)) >>
+            digits.as(:part)).maybe >>
+          (str(":") >> space.maybe >> year_digits.as(:year)) >>
+          space.maybe >> parenthetical
+      end
+
       rule(:joint_development_embedded_stage) do
         # publisher set mirrors joint_development_iso_format (incl. bare IEEE);
         # longest token first.
@@ -666,7 +779,9 @@ module Pubid
          str("ISO/IEEE") | str("IEC/IEEE") | str("IEEE/IEC") | str("ISO/IEC") |
          str("IEEE")).as(:joint_publishers) >>
           space >>
-          str("P").maybe >> # optional project marker on the number
+          str("P").as(:project_marker).maybe >> # project marker (P =
+                                                # project/draft; its
+                                                # presence is identity)
           digits.as(:number) >>
           # optional numeric part (dot or dash); must not swallow a year
           ((dot | dash) >> year_digits.absent? >> digits.as(:part)).maybe >>
@@ -701,9 +816,13 @@ module Pubid
       end
 
       # IEEE P pattern (without Std): "IEEE P1003.1..." OR just "P1003.1..." (prefix optional)
+      # `P` is not consumed here: the `number` rule carries its own optional
+      # leading P and captures it into :number ("P1003.1"), so Code.parse
+      # peels it as code.prefix and the project marker survives the parse —
+      # a bare `str("P")` swallowed it and "P1201/D0.3" came back without
+      # its P at all (pubid#18's data-loss complaint).
       rule(:ieee_p_identifier) do
         (str("IEEE").as(:publisher) >> space).maybe >> # Make IEEE prefix optional
-          str("P") >> space.maybe >> # Make space after P optional
           number >>
           (part_subpart_year | edition).maybe >>
           # Pattern for /08 style drafts (digits without D prefix) - MUST come before corrigendum
@@ -759,15 +878,17 @@ module Pubid
       # status is captured (draft_status ends in a space, so "Approved Draft"
       # splits cleanly) and round-trips as the draft_status attribute; the literal
       # "Draft" stays a bare marker (dropped on render, like the plain form).
+      # `P` is not consumed here: the `number` rule carries its own optional
+      # leading P and captures it into :number ("P802.11"), so Code.parse peels
+      # it as code.prefix and the project marker round-trips (pubid#318) — a
+      # bare `str("P").maybe` here swallowed it and the render lost the P.
       rule(:ieee_draft_p_identifier) do
         (str("IEEE").as(:publisher) >> space).maybe >> # Make IEEE prefix optional
           draft_status.as(:draft_status).maybe >>
           str("Draft") >> space >>
-          # `P` is optional — a status-word draft may carry a bare number
-          # ("IEEE Unapproved Draft 802.1ah/D4.2"), mirroring
-          # ieee_approved_draft_identifier's str("P").maybe. The `number` rule
+          # A status-word draft may carry a bare number
+          # ("IEEE Unapproved Draft 802.1ah/D4.2"). The `number` rule
           # already accepts the bare forms (802.1ah, C57.15, 11073-10471).
-          str("P").maybe >>
           number >>
           (part_subpart_year | edition).maybe >>
           # Trailing "Month YYYY" date under distinct keys so it never collides
@@ -775,7 +896,17 @@ module Pubid
           ((space >> month_name.as(:trailing_month) >> space >> year_digits.as(:trailing_year)) |
            (space >> month_numeric.as(:trailing_month) >> (space | dash) >> year_digits.as(:trailing_year))).maybe >>
           draft.maybe >>
+          # A print date may trail a draft that carries its own date
+          # ("IEEE Unapproved Draft 24765/D1 2009, Oct 2009" - the draft's
+          # year is "2009", the print date is ", Oct 2009").
+          (comma >> space? >> month_name.as(:trailing_month) >> space >>
+            year_digits.as(:trailing_year)).maybe >>
           revision_suffix.maybe >>
+          # …and the print date may also trail the repositioned revision
+          # ("IEEE Unapproved Draft P802.16Rev2/D9a, March 2009" reaches the
+          # grammar as "…/D9a/R-2, March 2009" via normalize_revision_notation).
+          (comma >> space? >> month_name.as(:trailing_month) >> space >>
+            year_digits.as(:trailing_year)).maybe >>
           # Trailing corrigendum after the draft ("…/D2.0/Cor. 1", or
           # "…/D1.0, Dec 2007/Cor. 1" where the draft's own draft_date consumes
           # the date, leaving "/Cor. N"). The flat corrigendum+draft tree (no
@@ -836,6 +967,11 @@ module Pubid
           # Year-first pattern: "52 IRE 7.S2" or "60 IRE 28 PS7"
           ((match("[1-6]") >> digit >> space >> str("IRE")) | # 2-digit year format
            (str("19") >> digit.repeat(2, 2) >> space >> str("IRE"))) |
+          # Prefix-first pattern: "IRE 7.S2-1952" (pubid#316 family 2) —
+          # IRE then a designation (digits or a type word). Loose on
+          # purpose: the sub-parser is strict, and a failed delegation just
+          # falls through to the remaining alternatives.
+          (str("IRE") >> space >> (digits | str("Standard") | str("Std") | str("Trans"))) |
           # IEEE-IRE transitional pattern
           (str("IEEE-IRE") >> space)
         ).present? >>
@@ -855,29 +991,60 @@ module Pubid
           # Draft NESC pattern
           (str("Draft") >> space >> (str("NESC") | str("National Electrical Safety Code"))) |
           # Name-first pattern (NEW)
-          (str("National Electrical Safety Code") >> str(",") >> space >> str("C2-"))
+          (str("National Electrical Safety Code") >> str(",") >> space >> str("C2-")) |
+          # Catalogue form: "IEEE Std YYYY NESC ..." / "IEEE Std YYYY National
+          # Electrical Safety Code" - the prefix is consumed here (the NESC
+          # renderer prepends "IEEE Std" itself) but must not fall through to
+          # the generic standard grammar, which would read YYYY as a number.
+          (str("IEEE") >> space >> str("Std") >> space >> year_digits >> space >>
+            (str("NESC") | str("National Electrical Safety Code")))
         ).present? >>
           # Delegate to NESC parser if pattern detected
-          Nesc::Parser.new.nesc_identifier.as(:nesc)
+          ((str("IEEE") >> space >> str("Std") >> space).maybe >>
+            Nesc::Parser.new.nesc_identifier).as(:nesc)
+      end
+
+      # Draft notation for PSI (e.g., /D2, /D3, rawbib's /D-2)
+      rule(:psi_draft) do
+        slash >> str("D") >> dash.maybe >> digits.as(:draft_version)
+      end
+
+      # Date on an SI/PSI identifier: ", Month Year" or "-YEAR[-MM]". The
+      # comma branch also accepts a NUMERIC month and a DASH before the
+      # year — the renderer emits ", 05 2010" for a numeric-month draft,
+      # and the preprocessing gsub rewrites a trailing " <digits> <year>"
+      # to "<digits>-<year>" (the same load-bearing coupling draft_date
+      # documents), so the re-parse must read its own rendering back.
+      rule(:psi_date) do
+        (comma >> (month_name | month_numeric).as(:month) >> (space | dash) >>
+           year_digits.as(:year)) |
+          (dash >> year_digits.as(:year) >>
+            (dash >> digit.repeat(2, 2).as(:month)).maybe)
       end
 
       # IEEE/ASTM SI/PSI (Système International) patterns
       # SI = Published metric system standard
       # PSI = Proposed SI (draft)
+      # Rawbib spellings (pubid#316 family 3): a bare "IEEE" publisher, a dot
+      # separator after the type ("PSI.10", "SI 10.1997"), relaton's
+      # hyphenated "/D-<n>" draft, and a dash year-month ("-2010-05").
       rule(:ieee_astm_si_psi) do
-        str("IEEE/ASTM").as(:publishers) >>
+        (str("IEEE/ASTM") | str("IEEE")).as(:publishers) >>
           space >>
           (str("PSI") | str("SI")).as(:si_type) >>
-          space >>
+          (space | str(".")) >>
           digits.as(:number) >>
-          # Draft notation for PSI (e.g., /D2, /D3)
-          (slash >> str("D") >> digits.as(:draft_version)).maybe >>
-          # Year with optional month
+          # Glued ".YEAR" edition date ("IEEE/ASTM SI 10.1997")
+          (str(".") >> year_digits.as(:year)).maybe >>
+          # The date and the draft appear in EITHER order: the legacy
+          # spelling puts the draft first ("PSI 10/D2, October 2015"),
+          # while normalize_relaton_suffixes repositions the rawbib
+          # hyphenated form onto the number ("PSI 10/D-3-2010" →
+          # "PSI 10-2010/D3"). Draft-first is tried first so the legacy
+          # comma-date keeps its original match; each side is optional so
+          # a date-only or draft-less form still parses.
           (
-            # Format: ", Month Year"
-            (comma >> month_name.as(:month) >> space >> year_digits.as(:year)) |
-            # Format: "-YEAR"
-            (dash >> year_digits.as(:year))
+            (psi_draft >> psi_date.maybe) | (psi_date >> psi_draft.maybe)
           ).maybe >>
           # Optional parenthetical (revision relationships)
           parenthetical.maybe
@@ -988,13 +1155,13 @@ module Pubid
           str("CSA") >> space >>
           # CSA number formats (various patterns observed)
           (
-            # Format 1: C22.2 No. 293.1-17 (with NO.)
-            (str("C") >> digit.repeat(2) >> dot >> digit >> space >> str("No") >> dot >> space >>
+            # Format 1: C22.2 No. 293.1-17 (with NO., either case)
+            (str("C") >> digit.repeat(2) >> dot >> digit >> space >> (str("No") | str("NO")) >> dot >> space >>
              match("[0-9.]").repeat(1) >> (dash | str(":")) >> digit.repeat(2)) |
             # Format 2: C293.2-17 (without NO., dash year)
             (str("C") >> match("[0-9.]").repeat(1) >> dash >> digit.repeat(2)) |
-            # Format 3: C22.2 No. 293.3:19 (with NO., colon year)
-            (str("C") >> digit.repeat(2) >> dot >> digit >> space >> str("No") >> dot >> space >>
+            # Format 3: C22.2 No. 293.3:19 (with NO., either case, colon year)
+            (str("C") >> digit.repeat(2) >> dot >> digit >> space >> (str("No") | str("NO")) >> dot >> space >>
              match("[0-9.]").repeat(1) >> str(":") >> digit.repeat(2)) |
             # Format 4: C293.4:19 (without NO., colon year)
             (str("C") >> match("[0-9.]").repeat(1) >> str(":") >> digit.repeat(2))
@@ -1017,6 +1184,8 @@ module Pubid
           conformance_identifier | # NEW: Try conformance identifier before generic patterns
           joint_development_ieee_format |
           joint_development_iso_format |
+          joint_development_iso_iec_edition | # stage-less ISO/IEC label with (E) - double-label portion
+
           joint_development_embedded_stage | # stage-LAST embedded form (before generic)
           iec_ieee_copublished |
           number_first_identifier |
@@ -1042,6 +1211,15 @@ module Pubid
           # never collides with the base -YYYY identity year (see
           # ieee_p_identifier). The builder promotes it only when no base year.
           trailing_month_year.maybe >>
+          # The ASHRAE joint suffix may also trail a draft+date
+          # ("IEEE P1635/D13, December, 2017/ASHRAE Guideline 21"), so a
+          # second slot catches it after the date.
+          ashrae_copub.maybe >>
+          # A bracketed narrative may sit between the base and a trailing
+          # corrigendum: "IEEE Std 671-1985 [Corrigendum to IEEE Std 671-1985
+          # (Reaff 2008)]/Cor. 1-2010" captures the bracket as the base's
+          # nickname before the wrapper is parsed.
+          book_nickname.maybe >>
           # Trailing corrigendum after the draft+date ("IEEE Approved P1015/D1,
           # Jan 2007/Cor. 1"): the generic bucket is the only path a status-word
           # form reaches. Routes via build_flat_corrigendum (disjoint from the
@@ -1159,12 +1337,15 @@ module Pubid
         # A "\d+" right after "Rev" both selects the numbered subset and keeps
         # these off the English word "Revision". Three source positions:
         #   after a draft : "PC37.30.2/D043 Rev 18" -> ".../D043/R-18"
+        # The draft captures accept relaton's hyphenated "/D-<n>" spelling
+        # (pubid#316): without the "-?" the before-draft regex matched only
+        # "/D" of "/D-3" and emitted the garbage "/D/R-2-3-2008-02".
         cleaned = cleaned.sub(
-          %r{(/D[0-9A-Za-z.]*)\s+[Rr][Ee][Vv]\s*(\d+)}, '\1/R-\2'
+          %r{(/D-?[0-9A-Za-z.]+)\s+[Rr][Ee][Vv]\s*(\d+)}, '\1/R-\2'
         )
         #   before a draft: "P802.16Rev2/D3" -> "P802.16/D3/R-2"
         cleaned = cleaned.sub(
-          %r{[-/_.]?\s?[Rr][Ee][Vv][-\s]?(\d+)(/D[0-9A-Za-z.]*)}, '\2/R-\1'
+          %r{[-/_.]?\s?[Rr][Ee][Vv][-\s]?(\d+)(/D-?[0-9A-Za-z.]+)}, '\2/R-\1'
         )
         #   no draft, trailing: "P1722-rev1" -> "P1722/R-1"
         cleaned = cleaned.sub(
@@ -1176,7 +1357,7 @@ module Pubid
         # became "/R-<n>", so these regexes only see the lettered residue.
         # Revision token that PRECEDES a draft: drop it (keep the /D…).
         cleaned = cleaned.sub(
-          %r{[-/_.]?\s?[Rr][Ee][Vv][-\s]?[A-Za-z0-9]+(?=/D[0-9])},
+          %r{[-/_.]?\s?[Rr][Ee][Vv][-\s]?[A-Za-z0-9]+(?=/D-?[0-9A-Za-z])},
           "",
         )
         # Trailing revision glued to the number with no draft ("P802.11REVmb");
@@ -1185,6 +1366,108 @@ module Pubid
         cleaned.sub(%r{(\d)[Rr][Ee][Vv][A-Za-z0-9]+\s*\z}, '\1')
       end
 
+      # Rewrite the mechanical spellings of the joint ISO-stage forms that no
+      # grammar branch reaches (pubid#216 residuals). Two safety rules keep
+      # this from stealing inputs other rules already parse:
+      #   1. only BROKEN separators fire — underscore/space glue between
+      #      number, draft and stage, a slash-SPACE before the stage, a
+      #      dash/underscore month after it. A plain "/FDIS" tail is
+      #      natively accepted by ieee_p_identifier (fdraft) and the
+      #      stage-LAST embedded rule, so it is never rewritten.
+      #   2. the number carries at most ONE part — joint_development_iso_format
+      #      reads a single optional part, while ieee_p_identifier takes
+      #      multi-part numbers ("P62271-37-013"); a rewrite that moved a
+      #      multi-part number onto the joint rule would break it.
+      def self.normalize_joint_stage_spellings(cleaned)
+        # The separator (slash-optional-space or a space) is INSIDE the
+        # capture so a rewrite re-emits it — an uncaptured separator was
+        # silently eaten, gluing the publisher to the stage.
+        pubs = %r{((?:ISO/IEC/IEEE|IEEE/ISO/IEC|IEEE/IEC/ISO|ISO/IEEE|IEC/IEEE|IEEE/IEC|ISO/IEC|IEEE)(?:/ ?| ))}
+        stage = /(FDIS|FCD|CDV|DIS\d?|CD\d?|WD|PWI|NP)/
+        num = /(P?\d+(?:[.-]\d+)?)/
+        # What the joint grammar can finish reading AFTER the stage: the end
+        # of the string, a (comma-)month-year date, or a dash-year[-month].
+        # Captured and re-emitted so a rewrite never drops the date.
+        tail = /(,? (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Sept|Oct|Nov|Dec)[a-z]* \d{4}|\z|-\d{4}(?:-\d\d)?)/
+
+        # Draft glued to the number with an underscore: "P15289_D3" →
+        # "P15289/D3" (a digit must precede the underscore; "_FDIS" is the
+        # stage, not a draft, and is already slash-rewritten earlier).
+        cleaned = cleaned.gsub(%r{(\d)_D(\d)}, '\1/D\2')
+
+        # Crawl typo: a comma with no space before a month (",March 2021").
+        # In these identifiers a comma is always a date separator, so
+        # spacing it is safe.
+        cleaned = cleaned.sub(/,(?=[A-Za-z])/, ", ")
+
+        # Stage AFTER the draft, both glued with underscores (the early
+        # stage gsub already turned "_CD" into "/CD"):
+        # "…P24748-3/D3/FDIS, April 2020 (E)" → "…FDIS P24748-3/D3, …"
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num}/(D[\d.]+)/ ?#{stage}\b},
+          '\1\4 \2/\3',
+        )
+
+        # Slash-SPACE before the stage ("…P16085/ FDIS, August 2020" —
+        # ieee_p's fdraft has no inner space, so this spelling has no other
+        # home): → "…FDIS P16085, August 2020"
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num}/ #{stage}#{tail}},
+          '\1\3 \2\4',
+        )
+
+        # A space-year after a slash-stage ("…P26511.2/FDIS 2018" — no rule
+        # reads "/FDIS 2018"): → "…FDIS P26511.2-2018" (dash-year clause).
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num}/#{stage} (\d{4})\b},
+          '\1\3 \2-\4',
+        )
+
+        # Stage separated from the number by a SPACE ("IEC/IEEE P63113 CD4,
+        # April 2019"): → "IEC/IEEE CD4 P63113, April 2019". The tail guard
+        # keeps "…FDIS March 2019" (space-month-year, readable after the
+        # swap) while leaving prose suffixes alone.
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num} #{stage}#{tail}},
+          '\1\3 \2\4',
+        )
+
+        # The same space-stage with a space-DRAFT chained after it
+        # ("IEC/IEEE P60980-344 CDV D1, June 2019"): → stage-first with a
+        # slash draft ("…CDV P60980-344/D1, June 2019").
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num} #{stage} (D\d+)\b},
+          '\1\3 \2/\4',
+        )
+
+        # Slash-stage carrying a dash-date ("…P15288/CD2-2013-09 …" — the
+        # dash-year tail is what the joint grammar reads after the number, so
+        # this cannot steal the plain "/FDIS, June 2021" spellings
+        # ieee_p_identifier finishes): → "…CD2 P15288-2013-09 …". The date
+        # must be a plausible year — a 4-digit monthcode (YYMM, e.g.
+        # "…P24748-4/DIS-1404" = April 2014) is a DRAFT designator, not a
+        # dash-date, and rewriting it onto the number breaks the parse.
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{num}/ ?#{stage}(-(?:19|20)\d\d(?:-\d\d)?)},
+          '\1\3 \2\4',
+        )
+
+        # Draft separated from a stage-first number by a SPACE:
+        # "…DIS P11073-10418 D13, January 2011" → "…DIS P11073-10418/D13, …"
+        cleaned = cleaned.sub(
+          %r{\A#{pubs}#{stage} #{num}/? ?(D\d+)\b},
+          '\1\2 \3/\4',
+        )
+
+        # NOT rewritten: a month glued to the stage with a dash/underscore
+        # ("…/FDIS_Dec 2012", "…/FDIS-Dec 2015"). Even routed onto the joint
+        # grammar, the joint render of a month+draft is itself not yet
+        # idempotent, and the bare-IEEE fdraft path drops the stage and the
+        # date from to_hash — rewriting would trade a visible parse failure
+        # for silent garbage. Deferred with the pubid#216 semantic residue.
+        cleaned
+      end
+
       def self.parse(string)
         # Strip .pdf extension if present (Pattern 3: File Extensions)
         cleaned = string.sub(/\.pdf$/i, "")
@@ -1265,6 +1548,11 @@ module Pubid
           /\b(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Sept|Oct|Nov|Dec)(\d{4})\b/, '\1 \2'
         )
 
+        # Rewrite the joint ISO-stage glued spellings (pubid#216) AFTER the
+        # month unglue above, so "Dec2015" is already spaced when the
+        # dash-month rewrite looks for it.
+        cleaned = normalize_joint_stage_spellings(cleaned)
+
         # NEW: Convert IEC/IEEE space-separated to semicolon format
         # Pattern: "IEC 61523-3 First edition 2004-09; IEEE 1497" → already semicolon
         # Pattern: "IEC 62539 First Edition 2007-07 IEEE 930" → needs semicolon

data/lib/pubid/ieee/project_renderer.rb

@@ -0,0 +1,46 @@
+# frozen_string: true
+
+module Pubid
+  module Ieee
+    # Renders the IEEE PROJECT DESIGNATOR — the short form IEEE itself uses
+    # for draft documents ("P1201/D0.3", "P10000/D1.2"): the project marker,
+    # the number with its parts, and the draft. No publisher, no type word,
+    # no date (pubid#18: metanorma-ieee builds these for drafts and had to
+    # post-process the full rendering).
+    class ProjectRenderer
+      def initialize(id)
+        @id = id
+      end
+
+      def render(context: nil, **_opts)
+        id = @id
+        body = if id.respond_to?(:code_obj) && id.code_obj
+                 id.code_obj.to_s
+               else
+                 id.number.to_s
+               end
+        body = "P#{body}" if project?(id) && !body.start_with?("P")
+
+        draft = id.draft_obj if id.respond_to?(:draft_obj)
+        body += "/D#{draft.version}" if draft&.version
+
+        body
+      end
+
+      private
+
+      # A project identifier carries its marker in one of three places
+      # depending on which grammar path built it: the code prefix (the bare
+      # "P1201/D0.3" spelling), the "P" type code ("IEEE P802.16/D-3"), or a
+      # typed stage with project_status (the D1-D6 draft stages).
+      def project?(id)
+        return true if id.code_obj&.prefix.to_s == "P"
+        return true if id.type.to_s == "P"
+
+        id.respond_to?(:typed_stage) &&
+          id.typed_stage&.respond_to?(:project_status) &&
+          id.typed_stage.project_status
+      end
+    end
+  end
+end