pubid 2.0.1 → 2.0.3

data/lib/pubid/asme/builder.rb

@@ -24,7 +24,7 @@ module Pubid
         # The code is stored as flat index columns on the leaf (see
         # Identifiers::Standard) — `number` is what relaton-index keys on — so
         # the Code built below is unpacked rather than assigned.
-        if parsed_hash[:designator]
+        if parsed_hash[:designator] || parsed_hash[:designator_code]
           identifier.number = build_code(parsed_hash).to_s
         elsif parsed_hash[:number]
           # A joint-published reference ("ISO/ASME 14414-2015") parses to a bare
@@ -94,9 +94,11 @@ module Pubid
       private
 
       def build_code(parsed_hash)
-        # Handle BPVC subdivision
-        if parsed_hash[:designator].is_a?(Hash) && parsed_hash[:designator][:bpvc_code]
-          bpvc_data = parsed_hash[:designator][:bpvc_code]
+        # Handle BPVC subdivision — the composite designator arrives under
+        # :designator_code ((raw) wrapper); :designator is the plain
+        # (string) form, so the composite cannot collide with it.
+        if parsed_hash[:designator_code].is_a?(Hash) && parsed_hash[:designator_code][:bpvc_code]
+          bpvc_data = parsed_hash[:designator_code][:bpvc_code]
 
           # Build BPVC designator string
           designator_str = "BPVC"

data/lib/pubid/asme/identifier.rb

@@ -13,10 +13,9 @@ module Pubid
           raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
-        parser = Parser.new
         builder = Builder.new
 
-        parsed = Pubid::Parg::Backend.parse(:asme, str)
+        parsed = Pubid::Parg::Model.bound(:asme, str)
         builder.build(parsed)
       end
     end

data/lib/pubid/asme/parser.rb

@@ -1,335 +1,8 @@
 # frozen_string_literal: true
 
-require "parslet"
-
 module Pubid
   module Asme
-    class Parser < ::Pubid::Parser::Grammar
-      # Basic building blocks
-      rule(:space) { str(" ") }
-      # Regular dash, en-dash, em-dash
-      rule(:dash) do
-        str("-") | str("–") | str("—")
-      end
-      rule(:slash) { str("/") }
-      rule(:dot) { str(".") }
-      rule(:digit) { match("[0-9]") }
-      rule(:digits) { digit.repeat(1) }
-      rule(:letter) { match("[A-Z]") }
-      rule(:letters) { letter.repeat(1) }
-      rule(:underscore) { str("_") }
-
-      # Roman numerals (longest first for proper matching - added X)
-      rule(:roman_numeral) do
-        str("XIII") | str("XII") | str("XI") | str("VIII") |
-          str("VII") | str("VI") | str("IV") | str("IX") | str("X") |
-          str("III") | str("II") | str("V") | str("I")
-      end
-
-      # BPVC special letter codes
-      rule(:bpvc_letter_code) do
-        str("NCA") | str("NCD") | str("SSC") | str("BPV") | str("NUC") |
-          str("NB") | str("NC") | str("ND") | str("NE") | str("NF") | str("NG") |
-          letter # Single letter for A, B, C, D, M
-      end
-
-      # BPVC complete subdivision
-      rule(:bpvc_subdivision) do
-        str("BPVC") >>
-          (
-            # Special: COMPLETE CODE BIND
-            (space >> str("COMPLETE CODE BIND")).as(:special) |
-            # Dash notation: BPVC-CC-BPV
-            (dash >> str("CC") >> dash >> bpvc_letter_code.as(:case_code)) |
-            # Standard dotted notation
-            (
-              dot >>
-              (
-                # SSC with complex subdivision: BPVC.SSC.XI.II.V.IX,
-                # or the bare catalogue form BPVC.SSC.
-                (str("SSC") >>
-                 (dot >>
-                  (roman_numeral >> (dot >> roman_numeral).repeat)
-                    .as(:ssc_sections)).maybe >>
-                 dot.maybe).as(:ssc_code) |
-                # CC = Case Code: BPVC.CC.BPV or BPVC.CC.NC.XI; the
-                # catalogue prints the sub-code with its own leading dot
-                # (BPVC.CC.BPV..I)
-                (str("CC") >> dot >> bpvc_letter_code.as(:case_code) >>
-                 (dot >> dot.maybe >>
-                  (roman_numeral | bpvc_letter_code).as(:case_sub)).maybe) |
-                # Standard roman numeral subdivision: BPVC.I or BPVC.III.1.NB
-                (roman_numeral.as(:section) >>
-                 (dot >> (digits | bpvc_letter_code).as(:subsection)).maybe >>
-                 (dot >> bpvc_letter_code.as(:sub_subsection)).maybe >>
-                 # Language suffix with underscore: _ES
-                 (underscore >> letters.as(:lang_suffix)).maybe)
-              )
-            ).as(:subdivision)
-          ).as(:bpvc_code)
-      end
-
-      # Multi-character designator codes (updated with EA)
-      rule(:multi_char_code) do
-        str("PVHO") | str("PASE") | str("PTC") | str("PTB") | str("PDS") | str("PCC") |
-          str("V&V") | str("V V") | # Both ampersand and space variants
-          str("VVUQ") |  # Additional V&V variant
-          str("TDP") | str("RTP") | str("RT") |
-          str("RA-S") |  # New: RA-S with dash
-          str("RA") |
-          str("QME") | str("QAI") | str("QEI") |
-          str("NUM") | str("NQA") | str("NML") |
-          str("OM") |
-          str("HST") | str("HRT") |
-          str("FFS") |
-          str("TES") |
-          str("TR") | # Keep TR separate for space-separated pattern
-          str("STS") | # New: STS-1
-          str("CSD") | str("CA") |
-          str("BTH") | str("BPE") |
-          str("ANDE") | str("AED") |
-          str("AG") |
-          str("NM") |  # New: NM.1, NM.2, NM.3
-          str("EA")    # New: EA-3
-      end
-
-      # Publisher patterns
-      rule(:asme_publisher) { str("ASME") }
-      rule(:csa_publisher) { str("CSA") }
-      rule(:api_publisher) { str("API") }
-      rule(:iso_publisher) { str("ISO") }
-      rule(:ans_publisher) { str("ANS") }
-
-      # Joint publisher patterns
-      rule(:iso_asme_publisher) do
-        str("ISO/ASME").as(:joint_publisher) >> space.maybe
-      end
-
-      rule(:asme_ans_publisher) do
-        str("ASME/ANS").as(:joint_publisher) >> space
-      end
-
-      rule(:csa_asme_publisher) do
-        csa_publisher.as(:first_publisher) >> space >>
-          match("[A-Z0-9.]").repeat(1).as(:first_code) >>
-          space.maybe >> slash >> asme_publisher.as(:second_publisher) >> space
-      end
-
-      rule(:api_asme_publisher) do
-        api_publisher.as(:first_publisher) >> space >>
-          match("[0-9-]").repeat(1).as(:first_code) >>
-          space.maybe >> slash >> asme_publisher.as(:second_publisher) >> space
-      end
-
-      # Standard ASME publisher
-      rule(:publisher) { asme_publisher >> space }
-
-      # Designator (longest match first!)
-      rule(:designator) do
-        (
-          bpvc_subdivision |      # Try BPVC patterns first
-          multi_char_code |       # Multi-char codes BEFORE letters
-          str("ISO") |
-          str("CSA") |
-          str("API") |
-          str("ANS") |
-          letters                 # Fallback for single-letter
-        ).as(:designator)
-      end
-
-      # A trailing edition year ("-2021", "-20XX") and nothing after it.
-      # `number_part` must not read it as a dash-separated number: a
-      # designator with no number ("BPVC.I-2021", "BPE-2012") then stored the
-      # year as its number, and the year itself was lost.
-      #
-      # The grammar cannot tell a year from a final 4-digit number: a code
-      # whose whole number is "-1234" would parse as year 1234. No ASME
-      # corpus id has that shape; spec/pubid/asme/root_number_spec.rb pins
-      # the choice.
-      rule(:trailing_year) do
-        dash >> (str("20XX") | str("202X") | (str("20") >> digit >> str("X")) |
-          digit.repeat(4, 4)) >> match("[0-9A-Z.]").absent?
-      end
-
-      # Number part - can start with dot (NM.1), be dotted (16.5), OR dash-separated (BTH-1)
-      rule(:number_part) do
-        (
-          # Starting with dot (for NM.1, VVUQ 20.1, etc.)
-          (dot >> match("[0-9A-Z]").repeat(1) >>
-           (dot >> match("[0-9A-Z]").repeat(1)).repeat) |
-          # Dash-separated first (for BTH-1, CA-1 patterns)
-          (trailing_year.absent? >> dash >> match("[0-9A-Z]").repeat(1) >>
-           (dot >> match("[0-9A-Z]").repeat(1)).repeat) |
-          # Regular dotted numbers
-          (match("[0-9A-Z]").repeat(1) >>
-           (dot >> match("[0-9A-Z]").repeat(1)).repeat)
-        ).as(:number)
-      end
-
-      # PTC special: space-separated number with optional suffix; the
-      # renderer glues the designator to the number (PTC 19.3 TW and
-      # PTC19.3 TW are the same document)
-      rule(:ptc_number) do
-        space.maybe >>
-          (
-            match("[0-9]").repeat(1) >>
-            (dot >> match("[0-9]").repeat(1)).repeat
-          ).as(:number) >>
-          # Optional space + suffix (like "TW" or "PM")
-          (space >> letters.as(:ptc_suffix)).maybe
-      end
-
-      # TR special: space-separated number (like "ASME TR A17.1-8.4-2013");
-      # the rendered form glues the designator (TRA17.1-8.4)
-      rule(:tr_number) do
-        space.maybe >>
-          (
-            match("[A-Z0-9]").repeat(1) >>
-            (dot >> match("[0-9A-Z]").repeat(1)).repeat >>
-            # Allow dash for patterns like A17.1-8.4
-            (dash >> match("[0-9]").repeat(1) >>
-             (dot >> match("[0-9]").repeat(1)).repeat).maybe
-          ).as(:number)
-      end
-
-      # Number with optional preceding space (for V V 10, V&V 10, VVUQ 20.1, etc.)
-      rule(:spaced_number_part) do
-        space.maybe >> number_part
-      end
-
-      # Year (4-digit)
-      rule(:year_4digit) { digit.repeat(4, 4).as(:year) }
-
-      # Draft year patterns: 20XX, 202X
-      rule(:draft_year) do
-        (str("20XX") | str("202X") | (str("20") >> digit >> str("X"))).as(:draft_year)
-      end
-
-      # Reaffirmation notation
-      rule(:reaffirmation) do
-        space >> str("(R") >> year_4digit.as(:reaffirmation) >> str(")")
-      end
-
-      # CSA dual-published number (for ASME/CSA format)
-      rule(:csa_portion) do
-        slash >> str("CSA") >> space >>
-          (letter >> match("[0-9.]").repeat(1)).as(:csa_number)
-      end
-
-      # Parenthetical revision note after year - different from [Draft ...] notation
-      rule(:parenthetical_revision) do
-        space >> str("(") >>
-          (str("Proposed revision of") | str("Revision of")) >>
-          space >> match("[^)]").repeat(1).as(:ref_standard) >>
-          str(")")
-      end
-
-      # Revision note [Draft Proposed Revision of ...]
-      rule(:revision_note) do
-        space >> str("[") >> match("[^\\]]").repeat(1).as(:revision_note) >> str("]")
-      end
-
-      # Language notation - support both before and after year
-      rule(:language) do
-        space >> str("(") >> letters.as(:language) >> str(")")
-      end
-
-      # Handbook keyword
-      rule(:handbook_keyword) do
-        (space >> str("Handbook")).as(:handbook)
-      end
-
-      # Standard identifier components
-      rule(:standard_components) do
-        publisher >>
-          designator >>
-          number_part.maybe >>
-          (csa_portion | handbook_keyword).maybe >>
-          # Language can come before or after year
-          language.maybe >>
-          (
-            dash >> (draft_year | year_4digit)
-          ).maybe >>
-          language.maybe >>
-          reaffirmation.maybe >>
-          revision_note.maybe
-      end
-
-      # Joint published identifier - CSA first
-      rule(:csa_asme_identifier) do
-        csa_asme_publisher >>
-          designator >>
-          number_part.maybe >>
-          (dash >> (draft_year | year_4digit)).maybe >>
-          language.maybe >>
-          reaffirmation.maybe
-      end
-
-      # Joint published identifier - API first
-      rule(:api_asme_identifier) do
-        api_asme_publisher >>
-          designator >>
-          number_part.maybe >>
-          (dash >> (draft_year | year_4digit)).maybe >>
-          language.maybe >>
-          reaffirmation.maybe
-      end
-
-      # Joint published identifier - ISO/ASME. The catalogue also lists
-      # the numberless series identity "ISO/ASME-2015" beside the
-      # numbered adoptions.
-      rule(:iso_asme_identifier) do
-        iso_asme_publisher >>
-          number_part.maybe >>
-          (dash >> (draft_year | year_4digit)).maybe >>
-          language.maybe >>
-          reaffirmation.maybe
-      end
-
-      # Joint published identifier - ASME/ANS
-      rule(:asme_ans_identifier) do
-        asme_ans_publisher >>
-          designator >>
-          number_part.maybe >>
-          (dash >> (draft_year | year_4digit)).maybe >>
-          language.maybe >>
-          reaffirmation.maybe
-      end
-
-      # Standard ASME identifier
-      rule(:standard) do
-        publisher >>
-          (
-            # Special case for PTC with space-separated number
-            (str("PTC").as(:designator) >> ptc_number >>
-             (dash >> (draft_year | year_4digit)).maybe) |
-            # Special case for TR with space-separated number
-            (str("TR").as(:designator) >> tr_number >>
-             (dash >> (draft_year | year_4digit)).maybe) |
-            # Regular pattern with designator + optional spaced number
-            (designator >> spaced_number_part.maybe >>
-             # CSA portion can be followed by handbook keyword
-             ((csa_portion >> handbook_keyword.maybe) | handbook_keyword).maybe >>
-             # Language can come before or after year
-             language.maybe >>
-             (dash >> (draft_year | year_4digit)).maybe >>
-             language.maybe)
-          ) >>
-          # Parenthetical revision note (after year)
-          parenthetical_revision.maybe >>
-          reaffirmation.maybe >>
-          revision_note.maybe
-      end
-
-      rule(:identifier) do
-        csa_asme_identifier |
-          api_asme_identifier |
-          iso_asme_identifier |
-          asme_ans_identifier |
-          standard
-      end
-
-      root(:identifier)
+    class Parser
     end
   end
 end

data/lib/pubid/astm/builder.rb

@@ -109,14 +109,18 @@ module Pubid
 
         # Manual
         if identifier.is_a?(Identifiers::Manual)
-          identifier.edition = parsed_hash[:edition].to_s if parsed_hash[:edition]
+          identifier.edition = parsed_hash[:edition]&.to_s
+          identifier.edition ||= parsed_hash[:edition_ordinal].to_s if parsed_hash[:edition_ordinal]
+          identifier.edition ||= parsed_hash[:edition_number].to_s if parsed_hash[:edition_number]
           identifier.supplement = true if parsed_hash[:supplement]
           identifier.tp_designation = parsed_hash[:tp_designation].to_s if parsed_hash[:tp_designation]
         end
 
         # Monograph
-        if identifier.is_a?(Identifiers::Monograph) && parsed_hash[:edition]
-          identifier.edition = parsed_hash[:edition].to_s
+        if identifier.is_a?(Identifiers::Monograph)
+          identifier.edition = parsed_hash[:edition]&.to_s
+          identifier.edition ||= parsed_hash[:edition_ordinal].to_s if parsed_hash[:edition_ordinal]
+          identifier.edition ||= parsed_hash[:edition_number].to_s if parsed_hash[:edition_number]
         end
 
         # Data Series
@@ -146,6 +150,11 @@ module Pubid
               # Ordinal notation: "1ST"
               identifier.edition = edition_data.to_s
             end
+          elsif parsed_hash[:edition_number] || parsed_hash[:edition_ordinal]
+            # The bindings carry the edition flat: the e-notation form
+            # binds its digits (:edition_number) and the ordinals bind
+            # whole (:edition_ordinal); the :edition capture is gone.
+            identifier.edition = (parsed_hash[:edition_number] || parsed_hash[:edition_ordinal]).to_s
           end
         end
       end

data/lib/pubid/astm/identifier.rb

@@ -13,10 +13,9 @@ module Pubid
           raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
-        parser = Parser.new
         builder = Builder.new
 
-        parsed = Pubid::Parg::Backend.parse(:astm, str)
+        parsed = Pubid::Parg::Model.bound(:astm, str)
         builder.build(parsed)
       end
     end

data/lib/pubid/astm/parser.rb

@@ -1,186 +1,8 @@
 # frozen_string_literal: true
 
-require "parslet"
-
 module Pubid
   module Astm
-    class Parser < ::Pubid::Parser::Grammar
-      # Basic building blocks
-      rule(:space) { str(" ") }
-      rule(:dash) { str("-") }
-      rule(:slash) { str("/") }
-      rule(:colon) { str(":") }
-      rule(:dot) { str(".") }
-      rule(:digit) { match("[0-9]") }
-      rule(:digits) { digit.repeat(1) }
-      rule(:letter) { match("[A-Z]") }
-      rule(:letters) { letter.repeat(1) }
-
-      # Publisher
-      rule(:publisher) { str("ASTM").as(:publisher) >> space.maybe }
-
-      # Letters A-G for standard types
-      rule(:standard_letter) { match("[A-G]").as(:letter) }
-
-      # Year patterns (2-digit)
-      rule(:year_2digit) { digit.repeat(2, 2).as(:year) }
-
-      # Reapproval notation (may have comment after)
-      rule(:reapproval) do
-        str("(") >> digit.repeat(4, 4).as(:reapproval) >> str(")")
-      end
-
-      # Comment portion (anything after #)
-      rule(:comment) { space.maybe >> str("#") >> match("[^#]").repeat }
-
-      # Edition notations - supports both ordinal (1ST, 2ND) and e-notation (e1, e2)
-      # For e-notation, capture just the digits (not the 'e' prefix)
-      # For ordinal notation, capture the whole string
-      rule(:edition) do
-        (
-          (str("e") >> digits.as(:edition_number)) |
-          str("9TH") | str("8TH") | str("7TH") | str("6TH") |
-          str("5TH") | str("4TH") | str("3RD") | str("2ND") |
-          str("1ST")
-        ).as(:edition)
-      end
-
-      # Sub-year notation (a, b, c)
-      rule(:sub_year) { match("[a-c]").as(:sub_year) }
-
-      # Format suffix
-      rule(:format_suffix) { dash >> str("EB").as(:format_suffix) }
-
-      # Format suffix without dash (for use after supplement which ends with dash)
-      rule(:format_suffix_no_dash) { str("EB").as(:format_suffix) }
-
-      # Supplement notation (ends with dash)
-      rule(:supplement) { dash >> str("SUP").as(:supplement) >> dash }
-
-      # ========================================
-      # Research Report - MOST SPECIFIC (has colon)
-      # ========================================
-      rule(:research_report) do
-        publisher.maybe >>
-          str("RR").as(:type) >>
-          colon >>
-          (letter >> digit.repeat(2, 2)).as(:committee) >>
-          dash >>
-          digits.as(:number)
-      end
-
-      # ========================================
-      # Manual
-      # ========================================
-      rule(:manual) do
-        publisher.maybe >>
-          str("MNL").as(:type) >>
-          str("TP").as(:tp_designation).maybe >>
-          digits.as(:number) >>
-          (dash >> edition).maybe >>
-          (
-            (supplement >> format_suffix_no_dash.maybe) |
-            format_suffix.maybe
-          )
-      end
-
-      # ========================================
-      # Monograph
-      # ========================================
-      rule(:monograph) do
-        publisher.maybe >>
-          str("MONO").as(:type) >>
-          digits.as(:number) >>
-          (dash >> edition).maybe >>
-          format_suffix.maybe
-      end
-
-      # ========================================
-      # Data Series
-      # ========================================
-      rule(:data_series_suffix) { match("[A-Z]").as(:suffix) }
-      # Subseries can be: -S4 OR S4 (when following a letter suffix)
-      rule(:data_series_subseries_with_dash) do
-        dash >> str("S") >> digits.as(:subseries)
-      end
-      rule(:data_series_subseries_no_dash) do
-        digits.as(:subseries) # Directly after letter suffix
-      end
-      rule(:data_series_code) do
-        digits.as(:number) >>
-          (
-            str("HOL").as(:hol_suffix) |
-            # A letter suffix may carry its subseries with the dash
-            # spelled out too ("DS55S-S1"), not only glued ("DS55S1").
-            (data_series_suffix >>
-              (data_series_subseries_no_dash | data_series_subseries_with_dash).maybe) |
-            data_series_subseries_with_dash
-          ).maybe
-      end
-
-      rule(:data_series) do
-        publisher.maybe >>
-          str("DS").as(:type) >>
-          data_series_code >>
-          format_suffix.maybe
-      end
-
-      # ========================================
-      # Work in Progress
-      # ========================================
-      rule(:work_in_progress) do
-        publisher.maybe >>
-          str("WK").as(:type) >>
-          digits.as(:number)
-      end
-
-      # ========================================
-      # Adjunct
-      # ========================================
-      # SEMANTIC NOTE: Adjunct identifiers reference a base standard
-      # Structure: ADJ + base_standard_code + adjunct_designation
-      # Examples:
-      #   ADJF3504-EA: Adjunct to F3504, EA = Excel file format
-      #   ADJC033501: Adjunct "01" to C335
-      #   ADJC0450A: Adjunct format "A" to C450
-      #   ADJE11211T: Adjunct "11T" to E112
-      #   ADJDQCALC: Adjunct with text designation (not to numbered standard)
-      # Adjunct formats: EA (Excel), E-PDF, A1A2 (arbitrary identifiers)
-      # One standard can have multiple adjuncts
-      rule(:adjunct) do
-        publisher.maybe >>
-          str("ADJ").as(:type) >>
-          ((letter >> digits) | letters | digits).as(:designation) >>
-          (dash >> str("EA")).maybe.as(:ea_suffix) >>
-          str("DVD").maybe.as(:dvd_suffix)
-      end
-
-      # ========================================
-      # Technical Report
-      # ========================================
-      rule(:technical_report_iso_astm) do
-        str("ISO/ASTMTR").as(:type) >>
-          digits.as(:number) >>
-          format_suffix.maybe >>
-          comment.maybe
-      end
-
-      rule(:technical_report_simple) do
-        publisher.maybe >>
-          str("TR").as(:type) >>
-          digits.as(:number) >>
-          format_suffix.maybe >>
-          comment.maybe
-      end
-
-      rule(:technical_report) do
-        technical_report_iso_astm | technical_report_simple
-      end
-
-      # ========================================
-      # Standard (DEFAULT - handles A-G prefix AND digit-only E-standards)
-      # ========================================
-
+    class Parser
       # SEMANTIC NOTE: 5xxxx digit-only standards are ISO/ASTM dual-published
       # Examples:
       #   ASTM 52303-24e1: ASTM's version (e1 = edition 1, not "E" prefix)
@@ -194,54 +16,6 @@ module Pubid
       #   RRE015501: Reference radiograph, volume 1
       #   RRE2669CS: Adjunct to E2669 reference radiograph
       # These require separate ReferenceRadiograph identifier class
-
-      # Dual unit pattern: F1862/F1862M
-      rule(:dual_unit) do
-        slash >>
-          standard_letter >>
-          digits >>
-          str("M").as(:dual_m)
-      end
-
-      rule(:standard_code_with_letter) do
-        standard_letter >>
-          digits.as(:number) >>
-          dual_unit.maybe
-      end
-
-      # Digit-only standards (primarily 5xxxx ISO/ASTM dual-published)
-      # Parsed as digit-only, semantic meaning is dual-published with ISO
-      rule(:standard_code_digit_only) do
-        digits.as(:number) # Accept digit-only, no implicit E prefix
-      end
-
-      rule(:standard) do
-        publisher.maybe >>
-          (standard_code_with_letter | standard_code_digit_only) >>
-          (
-            dash >> year_2digit >>
-            sub_year.maybe >>
-            reapproval.maybe >>
-            edition.maybe
-          ).maybe >>
-          comment.maybe
-      end
-
-      # ========================================
-      # Main identifier rule - ORDER MATTERS!
-      # ========================================
-      rule(:identifier) do
-        research_report | # Most specific (has colon)
-          technical_report |      # Has TR prefix
-          manual |                # Has MNL prefix
-          monograph |             # Has MONO prefix
-          data_series |           # Has DS prefix
-          work_in_progress |      # Has WK prefix
-          adjunct |               # Has ADJ prefix
-          standard                # DEFAULT (A-G letter)
-      end
-
-      root(:identifier)
     end
   end
 end

data/lib/pubid/bipm/identifier.rb

@@ -185,6 +185,13 @@ module Pubid
         render(format: :human, **opts)
       end
 
+      # The SI Brochure and the full MEP / guide content forms print a leading
+      # `BIPM ` from the renderer; `with_publisher: false` drops it. Committee,
+      # meeting and Metrologia forms never print it, so they are unchanged.
+      def publisher_prefixes
+        [PUBLISHER]
+      end
+
       # --- MR string / slug -------------------------------------------------
       #
       # `to_slug` is what consumers use as an output FILENAME, so every BIPM
@@ -277,7 +284,7 @@ module Pubid
         # Normalize legacy/docnumber-style spellings before parsing
         # (data/bipm/update_codes.yaml), mirroring Pubid::Ccsds / Pubid::Plateau.
         normalized = Core::UpdateCodes.apply(identifier, :bipm)
-        parsed = Pubid::Parg::Backend.parse(:bipm, normalized)
+        parsed = Pubid::Parg::Model.bound(:bipm, normalized)
         Builder.build(parsed)
       end
     end