pubid 2.0.0.pre.alpha.5 → 2.0.0.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b24e82967e02c1a0a641c5adc3ad9a77e563f0b7e6f69a59aa4f02971db3d2
-  data.tar.gz: c206002602026012406fa8ebe4339ff6ca0f02db7aa0b00ba49796a034cb697c
+  metadata.gz: 28589e7efce00bb93f0cabd35bb4169210a69396e1da6e1869c51fec7dd80450
+  data.tar.gz: 181f33478261d666dc3bf93488326f0c88d999da0d958822bc49b5e9b113b5bd
 SHA512:
-  metadata.gz: f74a26e175164470260014a2d492eadfc2f396b0b56bc9f5848fc79168c1ec1d627380bb64c83126bd0eeb2841da40828e336cf263b785b4c2c1959a712b95c5
-  data.tar.gz: b450a0f2343231dff1174c01cec84fdacda74279134fed4c913a552fcd3c7a82e662e1fba5e52018462c295de1df9ba5c78af5a62a1ebde09974fbcd8270f7d6
+  metadata.gz: 23924b813af8f851b79fcb39ff90133df69f9219559d4bbc15f6bd46540c63ef4bcd5ba5eccf1ba013a774b7c8e4b0bfdb11d9fb308db0ac1a2c1df8f005a0b6
+  data.tar.gz: 38d8b970836cfb889c4b1bef346daac97b340656e652ab4d1cd687e7ff7436c73c976404204be54ac2e18ab37cd6982d634e4b5d9a08255ae400d5418b2023e3

data/README.adoc

@@ -292,6 +292,46 @@ base.root.equal?(base) # => true
 * ✅ **Works with supplements** - Traverses supplement chains correctly
 
 
+== Flavor Prefix Routing
+
+Every flavor exposes a static `prefixes` method returning the *leading
+identifier prefix tokens* it recognizes — the tokens a printed identifier can
+start with such that the string belongs to that SDO. This is the routing key a
+consumer (such as relaton) uses to dispatch a reference string to the right
+backend, without parsing.
+
+[source,ruby]
+----
+require 'pubid'
+
+Pubid::Iso.prefixes
+# => ["ISO", "ISO/IEC", "IEC/ISO", "ISO/IEC/IEEE"]
+
+Pubid::Bsi.prefixes
+# => ["BS", "BSI", "DD", "PD", "PAS", "NA", "TS", "HB", ... , "BS EN ISO"]
+
+# Look up a single flavor by name
+Pubid.prefixes(:iec)
+# => ["IEC", "CISPR", "IECEE", "IECEx", "IECQ", "ISO/IEC", "IEC/ISO", "ISO/IEC/IEEE"]
+
+# Reverse index: prefix token => owning flavor(s)
+Pubid.prefix_flavors["ISO/IEC"]       # => [:iec, :iso]
+Pubid.prefix_flavors["ISO/IEC/IEEE"]  # => [:iec, :ieee, :iso]
+Pubid.prefix_flavors["DD"]            # => [:bsi]
+----
+
+**Semantics** (see `Pubid::PrefixesSupport` for the full contract):
+
+* **Static** — no identifier string is parsed; callable at startup.
+* **Uniform** — every registered flavor returns a plain `Array<String>`.
+* **Symmetric joints** — a co-published prefix is listed by every co-publisher
+  (`"ISO/IEC"` is in both `Pubid::Iso.prefixes` and `Pubid::Iec.prefixes`).
+* **Inclusion** — publisher prefixes (`ISO`, `NIST`, `BS`…) and leading
+  series/type tokens that can *begin* a reference (BSI `DD`/`PD`, NIST `FIPS`).
+* **Exclusion** — pure sub-series that never lead a reference and
+  dangerously-ambiguous single letters (e.g. BSI aerospace `A`/`B`/`C`).
+
+
 == Advanced Rendering Styles
 
 ISO and IEC identifiers support multiple abbreviation forms for supplements to maintain round-trip fidelity with different official formats.

data/lib/pubid/amca.rb

@@ -2,6 +2,12 @@
 
 module Pubid
   module Amca
+    extend Pubid::PrefixesSupport
+
+    # AMCA publisher token; the ANSI/AMCA joint form comes from
+    # Pubid::JOINT_PREFIXES.
+    PREFIXES = ["AMCA"].freeze
+
     autoload :Identifier, "#{__dir__}/amca/identifier"
     autoload :Identifiers, "#{__dir__}/amca/identifiers"
     autoload :Builder, "#{__dir__}/amca/builder"

data/lib/pubid/ansi.rb

@@ -2,6 +2,13 @@
 
 module Pubid
   module Ansi
+    extend Pubid::PrefixesSupport
+
+    # ANSI publisher token; ANSI/ASHRAE and ANSI/AMCA joint forms come from
+    # Pubid::JOINT_PREFIXES. Parser::ORGANIZATIONS are co-publishers, not
+    # leading ANSI tokens, so they are excluded.
+    PREFIXES = ["ANSI"].freeze
+
     autoload :Builder, "#{__dir__}/ansi/builder"
     autoload :Identifier, "#{__dir__}/ansi/identifier"
     autoload :Identifiers, "#{__dir__}/ansi/identifiers"

data/lib/pubid/api.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Api
+    extend Pubid::PrefixesSupport
+
+    # Sole API publisher token (see the parser's `publisher` rule).
+    PREFIXES = ["API"].freeze
+
     autoload :Builder, "#{__dir__}/api/builder"
     autoload :Identifier, "#{__dir__}/api/identifier"
     autoload :Identifiers, "#{__dir__}/api/identifiers"

data/lib/pubid/ashrae.rb

@@ -2,6 +2,12 @@
 
 module Pubid
   module Ashrae
+    extend Pubid::PrefixesSupport
+
+    # ASHRAE publisher token; the ANSI/ASHRAE joint form comes from
+    # Pubid::JOINT_PREFIXES.
+    PREFIXES = ["ASHRAE"].freeze
+
     autoload :Builder, "#{__dir__}/ashrae/builder"
     autoload :Identifier, "#{__dir__}/ashrae/identifier"
     autoload :Identifiers, "#{__dir__}/ashrae/identifiers"

data/lib/pubid/asme.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Asme
+    extend Pubid::PrefixesSupport
+
+    # Sole ASME publisher token (see the parser's `asme_publisher` rule).
+    PREFIXES = ["ASME"].freeze
+
     autoload :Builder, "#{__dir__}/asme/builder"
     autoload :Components, "#{__dir__}/asme/components/code"
     autoload :Identifier, "#{__dir__}/asme/identifier"

data/lib/pubid/astm.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Astm
+    extend Pubid::PrefixesSupport
+
+    # Sole ASTM publisher token (see the parser's `publisher` rule).
+    PREFIXES = ["ASTM"].freeze
+
     autoload :Components, "#{__dir__}/astm/components"
     autoload :Identifier, "#{__dir__}/astm/identifier"
     autoload :Identifiers, "#{__dir__}/astm/identifiers"

data/lib/pubid/bsi/builder.rb

@@ -114,19 +114,11 @@ module Pubid
         if data[:na_prefix]
           return build_national_annex(data, supplements_data)
         elsif data[:adopted_string]
-          # Check for multi-level adoptions
-          identifier = build_adopted_identifier(data)
-
-          # Wrap with consolidated if supplements present
-          if supplements_data.any?
-            identifier = wrap_with_consolidated(identifier,
-                                                supplements_data)
-          end
-
-          # Wrap with ExpertCommentary if needed
-          identifier = wrap_with_expert_commentary(identifier) if data[:expert_commentary]
-
-          return identifier
+          # Adopted identifiers carry their supplements and Expert-commentary
+          # suffix *inside* the adopted string, so build_adopted_identifier does
+          # all the wrapping. Wrapping again here would double-wrap (a second
+          # ExpertCommentary around the first) and break #base_document.
+          return build_adopted_identifier(data)
         end
 
         # Determine identifier class using the module's lookup helpers
@@ -139,8 +131,11 @@ module Pubid
                                               supplements_data)
         end
 
-        # Wrap with ExpertCommentary if needed
-        identifier = wrap_with_expert_commentary(identifier) if data[:expert_commentary]
+        # Wrap with ExpertCommentary if needed (full "Expert Commentary" form
+        # arrives as the standalone :expert_commentary_full token)
+        if data[:expert_commentary] || data[:expert_commentary_full]
+          identifier = wrap_with_expert_commentary(identifier)
+        end
 
         identifier
       end
@@ -922,6 +917,7 @@ module Pubid
             number: (supp_data[:amd_number] || supp_data[:cor_number])&.to_s,
             year: (supp_data[:amd_year] || supp_data[:cor_year])&.to_s,
             separator: separator,
+            amd_suffix_form: !(supp_data[:amd_sep_plus] || supp_data[:amd_sep_slash]),
           }
         end
       end
@@ -1157,8 +1153,10 @@ module Pubid
         # Extract ExComm suffix before parsing (it should be preserved in data[:expert_commentary])
         # Remove it from adopted_string so ISO/IEC parsers don't choke on it
         # Handle all three formats: "Expert Commentary", "ExComm", "ExComm (Fire)"
-        if adopted_str.end_with?("Expert Commentary")
-          adopted_str = adopted_str.sub(/Expert Commentary$/, "")
+        # Expert-commentary suffix matching is case-insensitive; output is always
+        # canonicalised to "Expert Commentary" / "ExComm".
+        if adopted_str.match?(/expert commentary$/i)
+          adopted_str = adopted_str.sub(/expert commentary$/i, "")
           data[:expert_commentary_full] = "Expert Commentary"
           data[:expert_commentary] = true unless data.key?(:expert_commentary)
           # Update @original_data so wrap_with_expert_commentary can access it
@@ -1167,8 +1165,8 @@ module Pubid
             @original_data[:expert_commentary] =
               true
           end
-        elsif adopted_str.end_with?("ExComm (")
-          adopted_str = adopted_str.sub(/ExComm \(.*\)$/, "")
+        elsif adopted_str.match?(/excomm \($/i)
+          adopted_str = adopted_str.sub(/excomm \(.*\)$/i, "")
           data[:expert_commentary_full] = "Expert Commentary"
           data[:expert_commentary] = true unless data.key?(:expert_commentary)
           @original_data[:expert_commentary_full] = "Expert Commentary"
@@ -1176,10 +1174,10 @@ module Pubid
             @original_data[:expert_commentary] =
               true
           end
-        elsif adopted_str.include?("ExComm (")
+        elsif adopted_str.match?(/excomm \(/i)
           # Extract topic from "ExComm (Fire)"
-          topic_match = adopted_str.match(/ExComm\s*\(([^)]+)\)/)
-          adopted_str = adopted_str.sub(/ExComm\s*\(.*\)$/, "")
+          topic_match = adopted_str.match(/excomm\s*\(([^)]+)\)/i)
+          adopted_str = adopted_str.sub(/excomm\s*\(.*\)$/i, "")
           data[:expert_commentary_topic] = topic_match[1] if topic_match
           data[:expert_commentary] = true unless data.key?(:expert_commentary)
           if topic_match
@@ -1190,9 +1188,9 @@ module Pubid
             @original_data[:expert_commentary] =
               true
           end
-        elsif adopted_str.match?(/ExComm\s*$/)
+        elsif adopted_str.match?(/excomm\s*$/i)
           # Abbreviated form "ExComm" at the end
-          adopted_str = adopted_str.sub(/ExComm\s*$/, "")
+          adopted_str = adopted_str.sub(/excomm\s*$/i, "")
           data[:expert_commentary] = true unless data.key?(:expert_commentary)
           unless @original_data.key?(:expert_commentary)
             @original_data[:expert_commentary] =
@@ -1258,9 +1256,10 @@ module Pubid
         # BSI uses +A1:2020 format, but ISO/IEC parsers can't handle this
         # Patterns: +A1:2020, +A11:2021, +AMD1:2001, +C1:2020
         extracted_supplements = []
-        # Match patterns like: +A1:2020, +A11:2021, +AMD1:2001, +C1:2020, +COR1:2020
+        # Match patterns like: +A1:2020, +A11:2021, +AMD1:2001, +C1:2020, +COR1:2020,
+        # and the year-less compact forms +A2 / +C1 (the ":YYYY" is optional).
         # Must be at end of string or followed by space (not colon, which is part of date)
-        adopted_str_clean = adopted_str_clean.gsub(/([+])(A(\d+)|AMD(\d+)|C(\d+)|COR(\d+)):(\d{4})(?:\s|$)/) do |_match|
+        adopted_str_clean = adopted_str_clean.gsub(/([+])(A(\d+)|AMD(\d+)|C(\d+)|COR(\d+))(?::(\d{4}))?(?:\s|$)/) do |_match|
           separator = $1 # "+" or "/"
           type_code = $2 || $3 || $4 || $5 || $6
           $2 || $3 || $4 || $5 || $6
@@ -1285,6 +1284,8 @@ module Pubid
             number: supp_number,
             year: year,
             separator: separator,
+            # compact "+A"/"/A" join form (not the trailing " AMD5" suffix form)
+            amd_suffix_form: false,
           }
 
           "" # Remove from adopted_string
@@ -1300,6 +1301,7 @@ module Pubid
             number: amd_number,
             year: nil,
             separator: nil, # No separator for AMD without year
+            amd_suffix_form: true, # trailing " AMD5" suffix form
           }
           "" # Remove from adopted_string
         end.strip
@@ -1365,6 +1367,9 @@ module Pubid
         # Return appropriate wrapper based on adoption type
         if adopted_id
           # If adopted_id is a CEN identifier (in Cen module), use AdoptedEuropeanNorm
+          # The Expert-commentary suffix is represented uniformly by an outer
+          # ExpertCommentary wrapper (below), never a boolean on the inner norm,
+          # so that #base_document peels cleanly to the bare standard.
           identifier = if adopted_id.class.name.start_with?("Pubid::CenCenelec::")
                          Identifiers::AdoptedEuropeanNorm.new(
                            publisher: Components::Publisher.new(body: bsi_prefix),
@@ -1372,10 +1377,6 @@ module Pubid
                            edition: final_edition&.to_s,
                            translation_lang: data[:translation_lang]&.to_s,
                            translation_upper: data[:translation_upper]&.to_s,
-                           # Pass expert_commentary data so ConsolidatedIdentifier can render it
-                           expert_commentary: data[:expert_commentary],
-                           # Pass expert_commentary_topic if present
-                           expert_commentary_topic: data[:expert_commentary_topic],
                            # Pass translation_suffix_type for rendering
                            translation_suffix_type: data[:translation_suffix_type]&.to_s,
                            # Pass reaffirmation_year for rendering
@@ -1389,11 +1390,6 @@ module Pubid
                            edition: final_edition&.to_s,
                            translation_lang: data[:translation_lang]&.to_s,
                            translation_upper: data[:translation_upper]&.to_s,
-                           # Pass expert_commentary data ONLY if no supplements
-                           # When supplements are present, ConsolidatedIdentifier will add ExComm later
-                           expert_commentary: data[:expert_commentary] && extracted_supplements.none?,
-                           # Pass expert_commentary_topic if present and no supplements
-                           expert_commentary_topic: (data[:expert_commentary_topic] if extracted_supplements.none?),
                            # Pass translation_suffix_type for rendering
                            translation_suffix_type: data[:translation_suffix_type]&.to_s,
                            # Pass reaffirmation_year for rendering
@@ -1401,20 +1397,13 @@ module Pubid
                          )
                        end
 
-          # NEW: Wrap with supplements if any were extracted from adopted_string
-          # This must happen BEFORE wrapping with ExpertCommentary so that supplements
-          # render before ExComm suffix
+          # Wrap supplements first (they render before the ExComm suffix), then
+          # wrap the whole thing in a single ExpertCommentary — same shape as the
+          # pure-BSI path, keeping #base_document uniform.
           if extracted_supplements.any?
-            # When supplements are present, wrap with ConsolidatedIdentifier
-            # Pass expert_commentary data so ConsolidatedIdentifier can render it later
-            identifier = wrap_with_consolidated(
-              identifier,
-              extracted_supplements,
-              expert_commentary: data[:expert_commentary],
-              expert_commentary_topic: data[:expert_commentary_topic],
-            )
-          elsif data[:expert_commentary]
-            # When no supplements but ExComm present, wrap with ExpertCommentary
+            identifier = wrap_with_consolidated(identifier, extracted_supplements)
+          end
+          if data[:expert_commentary] || data[:expert_commentary_full]
             identifier = wrap_with_expert_commentary(identifier)
           end
 
@@ -1451,6 +1440,7 @@ expert_commentary: nil, expert_commentary_topic: nil)
               amendment_number: supp[:number],
               amendment_year: year_val&.to_i,
               separator: supp[:separator] || "+",
+              amd_suffix_form: supp[:amd_suffix_form] ? true : false,
             )
           else
             Identifiers::Corrigendum.new(
@@ -1484,6 +1474,9 @@ expert_commentary: nil, expert_commentary_topic: nil)
             number: (supp_data[:amd_number] || supp_data[:cor_number])&.to_s,
             year: (supp_data[:amd_year] || supp_data[:cor_year])&.to_s,
             separator: separator,
+            # The compact "+A"/"/A" amendment rule captures an explicit separator;
+            # the trailing " AMD5" suffix form does not.
+            amd_suffix_form: !(supp_data[:amd_sep_plus] || supp_data[:amd_sep_slash]),
           }
         end
       end

data/lib/pubid/bsi/identifiers/amendment.rb

@@ -10,10 +10,38 @@ module Pubid
         attribute :amendment_number, :string
         attribute :amendment_year, :integer
         attribute :separator, :string, default: -> { "+" }
+        # true for the trailing " AMD5" / " AMD AA" suffix form, false for the
+        # compact "+A5" / "/A5" join form. Distinguishes the two when no year is
+        # present (previously the presence of a year was a reliable proxy).
+        attribute :amd_suffix_form, :boolean, default: -> { false }
 
         def publisher
           base_identifier&.publisher
         end
+
+        # Base document = the standard this amendment applies to, fully peeled.
+        def base_document
+          base_identifier&.base_document || self
+        end
+
+        # Dropping the supplement layer yields the base standard.
+        def drop_supplements
+          base_identifier || self
+        end
+
+        # Uniform supplement interface (shared with Corrigendum) so callers need
+        # not special-case the class.
+        def supplement_type
+          :amendment
+        end
+
+        def supplement_number
+          amendment_number
+        end
+
+        def supplement_year
+          amendment_year
+        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/consolidated_identifier.rb

@@ -6,7 +6,7 @@ module Pubid
       # Consolidated Identifier - contains base document plus supplements
       # Example: "BS 4592-0:2006+A1:2012" = [BS 4592-0:2006, Amendment 1:2012]
       class ConsolidatedIdentifier < SingleIdentifier
-        attribute :identifiers, ::Pubid::Identifier, polymorphic: true, 
+        attribute :identifiers, ::Pubid::Identifier, polymorphic: true,
                                                      collection: true
 
         def to_urn
@@ -62,6 +62,16 @@ module Pubid
           base = identifiers&.first
           base.type if base&.class&.attributes&.key?(:type)
         end
+
+        # Base document = the wrapped standard (first entry), fully peeled.
+        def base_document
+          identifiers&.first&.base_document || self
+        end
+
+        # Dropping the supplement layer yields the base standard alone.
+        def drop_supplements
+          identifiers&.first || self
+        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/corrigendum.rb

@@ -14,6 +14,30 @@ module Pubid
         def publisher
           base_identifier&.publisher
         end
+
+        # Base document = the standard this corrigendum applies to, fully peeled.
+        def base_document
+          base_identifier&.base_document || self
+        end
+
+        # Dropping the supplement layer yields the base standard.
+        def drop_supplements
+          base_identifier || self
+        end
+
+        # Uniform supplement interface (shared with Amendment) so callers need
+        # not special-case the class.
+        def supplement_type
+          :corrigendum
+        end
+
+        def supplement_number
+          corrigendum_number
+        end
+
+        def supplement_year
+          corrigendum_year
+        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/expert_commentary.rb

@@ -25,6 +25,11 @@ module Pubid
         def year
           base_identifier&.year
         end
+
+        # Base document = the commented standard, fully peeled.
+        def base_document
+          base_identifier&.base_document || self
+        end
       end
     end
   end

data/lib/pubid/bsi/identifiers/flex.rb

@@ -20,6 +20,10 @@ module Pubid
           { key: :flex, title: "BSI Flex", short: "BSI Flex" }
         end
 
+        # Base document = the Flex standard without its version (edition).
+        def base_document
+          exclude(:edition)
+        end
       end
     end
   end

data/lib/pubid/bsi/parser.rb

@@ -5,6 +5,19 @@ require "parslet"
 module Pubid
   module Bsi
     class Parser < Parslet::Parser
+      # Case-insensitive string match (Parslet 2.0 has no built-in `stri`).
+      # Each character becomes a two-case character class; other characters
+      # (spaces, punctuation) match verbatim.
+      def stri(string)
+        string.each_char.map do |char|
+          if char =~ /[a-z]/i
+            match["#{char.upcase}#{char.downcase}"]
+          else
+            str(char)
+          end
+        end.reduce(:>>)
+      end
+
       rule(:digit) { match["0-9"] }
       rule(:digits) { digit.repeat(1) }
       rule(:space) { str(" ") }
@@ -296,14 +309,15 @@ module Pubid
       # Single letter (a-z or A-Z) that comes immediately after number or part
       rule(:letter_edition) { match["a-zA-Z"].as(:letter_edition) }
 
-      # Amendment (+A1:2008 or /A2:2019 or /Amd 1:2020 or +A1:15 for short year)
+      # Amendment (+A1:2008 or /A2:2019 or /Amd 1:2020 or +A1:15 for short year,
+      # or +A2 / /A2 without a year — mirrors the optional-year corrigendum rule)
       rule(:amendment) do
         ((plus.as(:amd_sep_plus) | slash.as(:amd_sep_slash)) >>
           str("A") >> digits.as(:amd_number) >>
-          colon >> digit.repeat(2, 4).as(:amd_year)) |
+          (colon >> digit.repeat(2, 4).as(:amd_year)).maybe) |
           ((plus.as(:amd_sep_plus) | slash.as(:amd_sep_slash)) >>
             str("Amd") >> space >> digits.as(:amd_number) >>
-            colon >> digit.repeat(4, 4).as(:amd_year))
+            (colon >> digit.repeat(4, 4).as(:amd_year)).maybe)
       end
 
       # Corrigendum (+AC:2009 or +AC1:2008 or /AC1:2005 or +C1:2018 or +C1 without year)
@@ -518,8 +532,8 @@ module Pubid
       # 3. "ExComm (Fire)" (with optional topic suffix)
       rule(:expert_commentary) do
         space >> (
-          str("Expert Commentary").as(:expert_commentary_full) |
-          (str("ExComm") >> (space >> str("(") >> match["A-Za-z"].repeat(1).as(:expert_commentary_topic) >> str(")")).maybe).as(:expert_commentary)
+          stri("Expert Commentary").as(:expert_commentary_full) |
+          (stri("ExComm") >> (space >> str("(") >> match["A-Za-z"].repeat(1).as(:expert_commentary_topic) >> str(")")).maybe).as(:expert_commentary)
         )
       end
 

data/lib/pubid/bsi/renderer.rb

@@ -289,20 +289,21 @@ module Pubid
       end
 
       def render_amendment(id)
-        if id.base_identifier
-          if id.amendment_year
-            "#{id.base_identifier}#{id.separator}A#{id.amendment_number}:#{id.amendment_year}"
-          elsif id.amendment_number&.match?(/^[A-Z]+$/)
-            "#{id.base_identifier} AMD #{id.amendment_number}"
-          else
-            "#{id.base_identifier} AMD#{id.amendment_number}"
-          end
-        elsif id.amendment_year
-          "#{id.separator}A#{id.amendment_number}:#{id.amendment_year}"
-        elsif id.amendment_number&.match?(/^[A-Z]+$/)
-          "AMD #{id.amendment_number}"
+        base = id.base_identifier ? id.base_identifier.to_s : ""
+
+        if id.amd_suffix_form
+          # Trailing " AMD5" / " AMD AA" suffix form
+          suffix = if id.amendment_number&.match?(/^[A-Z]+$/)
+                     " AMD #{id.amendment_number}"
+                   else
+                     " AMD#{id.amendment_number}"
+                   end
+          base.empty? ? suffix.lstrip : "#{base}#{suffix}"
         else
-          "AMD#{id.amendment_number}"
+          # Compact "+A5" / "/A5" join form, with an optional ":year"
+          compact = "#{id.separator}A#{id.amendment_number}"
+          compact += ":#{id.amendment_year}" if id.amendment_year
+          "#{base}#{compact}"
         end
       end
 
@@ -408,15 +409,16 @@ module Pubid
 
         id.identifiers[1..].each do |idd|
           if idd.is_a?(Identifiers::Amendment)
-            if idd.amendment_year
-              sep = idd.separator || "+"
-              result += "#{sep}A#{idd.amendment_number}:#{idd.amendment_year}"
-            else
+            if idd.amd_suffix_form
               result += if idd.amendment_number&.match?(/^[A-Z]+$/)
                           " AMD #{idd.amendment_number}"
                         else
                           " AMD#{idd.amendment_number}"
                         end
+            else
+              sep = idd.separator || "+"
+              result += "#{sep}A#{idd.amendment_number}"
+              result += ":#{idd.amendment_year}" if idd.amendment_year
             end
           elsif idd.is_a?(Identifiers::Corrigendum)
             sep = idd.separator || "+"

data/lib/pubid/bsi.rb

@@ -2,6 +2,21 @@
 
 module Pubid
   module Bsi
+    extend Pubid::PrefixesSupport
+
+    # Leading tokens a printed BSI reference can start with, curated from the
+    # parser grammar (lib/pubid/bsi/parser.rb): the publisher (`bs` => BS/BSI),
+    # the native series/type rules that begin references (dd, pd, pas, na, ts,
+    # handbook => HB, pp, bip, ep_type), and the "BS <adopted-org>" combos the
+    # grammar builds from `bs` + `adopted_org_prefix`. Deliberately EXCLUDES the
+    # aerospace single/multi-letter prefixes (see
+    # identifiers/aerospace_standard.rb SINGLE_LETTER_PREFIXES / the parser's
+    # `single_letter_prefix` rule — A/B/C/S/X ...) because they are dangerously
+    # ambiguous and never lead a routable reference on their own; and the bare
+    # adopted forms (ISO/IEC/EN alone), which route to their own SDOs.
+    PREFIXES = (%w[BS BSI DD PD PAS NA TS HB PP BIP EP] +
+      ["BS EN", "BS ISO", "BS IEC", "BS EN ISO", "BS EN IEC"]).freeze
+
     module Components
       autoload :Code, "#{__dir__}/bsi/components/code"
       autoload :Date, "#{__dir__}/bsi/components/date"

data/lib/pubid/ccsds.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Ccsds
+    extend Pubid::PrefixesSupport
+
+    # Sole CCSDS publisher token (see the parser's `ccsds_prefix` rule).
+    PREFIXES = ["CCSDS"].freeze
+
     autoload :Builder, "#{__dir__}/ccsds/builder"
     autoload :Identifier, "#{__dir__}/ccsds/identifier"
     autoload :Identifiers, "#{__dir__}/ccsds/identifiers"

data/lib/pubid/cen_cenelec.rb

@@ -2,6 +2,13 @@
 
 module Pubid
   module CenCenelec
+    extend Pubid::PrefixesSupport
+
+    # CEN/CENELEC publisher tokens, mirroring the parser's publisher rules
+    # (lib/pubid/cen_cenelec/parser.rb). Adopted-org prefixes (ISO/IEC/CISPR)
+    # are excluded — they route to their own SDOs, not to CEN.
+    PREFIXES = %w[EN CEN CLC CWA HD ES CR ENV].freeze
+
     autoload :Builder, "#{__dir__}/cen_cenelec/builder"
     autoload :Identifier, "#{__dir__}/cen_cenelec/identifier"
     autoload :Identifiers, "#{__dir__}/cen_cenelec/identifiers"

data/lib/pubid/cie.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Cie
+    extend Pubid::PrefixesSupport
+
+    # Sole CIE publisher token (see the parser grammar).
+    PREFIXES = ["CIE"].freeze
+
     module Components
       autoload :Code, "#{__dir__}/cie/components/code"
       autoload :Language, "#{__dir__}/cie/components/language"

data/lib/pubid/csa.rb

@@ -2,6 +2,11 @@
 
 module Pubid
   module Csa
+    extend Pubid::PrefixesSupport
+
+    # Sole CSA publisher token (see the parser's `publisher` rule).
+    PREFIXES = ["CSA"].freeze
+
     autoload :Builder, "#{__dir__}/csa/builder"
     autoload :Identifier, "#{__dir__}/csa/identifier"
     autoload :Identifiers, "#{__dir__}/csa/identifiers"