pubid 2.0.0.pre.alpha.9 → 2.0.0.pre.alpha.12

data/lib/pubid/bsi/renderer.rb

@@ -94,6 +94,16 @@ module Pubid
 
       private
 
+      # Read a value that may be a component or a bare scalar. BSI's own
+      # `number`/`part`/`subpart` are plain strings, but a bundle member or an
+      # adopted identifier can be a foreign one (ISO, IEC, CEN/CENELEC) whose
+      # equivalents are still a Components::Code.
+      def component_str(value)
+        return "" if value.nil?
+
+        (value.respond_to?(:render) ? value.render(context: @context) : value).to_s
+      end
+
       # ------------------------------------------------------------------
       # SingleIdentifier (base BSI identifier)
       # ------------------------------------------------------------------
@@ -109,7 +119,7 @@ module Pubid
         end
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.second_number
             second_val = id.second_number.render(context: @context)
@@ -118,13 +128,13 @@ module Pubid
 
           space_separated = id.space_separated_part
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             part_str = part_val.to_s.strip
             separator = space_separated ? " " : "-"
             number_str += "#{separator}#{part_str}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             subpart_str = subpart_val.to_s.strip
             number_str += "-#{subpart_str}"
           end
@@ -202,7 +212,7 @@ module Pubid
                  end
 
         result = prefix
-        result += " #{id.adopted_identifier}" if id.adopted_identifier
+        result += " #{id.adopted}" if id.adopted
         result += " ED#{id.edition}" if id.edition
 
         result += " (R#{id.reaffirmation_year})" if id.reaffirmation_year
@@ -227,7 +237,7 @@ module Pubid
                  end
 
         result = prefix
-        result += " #{id.adopted_identifier}" if id.adopted_identifier
+        result += " #{id.adopted}" if id.adopted
         result += " ED#{id.edition}" if id.edition
 
         result += " (R#{id.reaffirmation_year})" if id.reaffirmation_year
@@ -249,14 +259,14 @@ module Pubid
         parts << id.prefix if id.prefix
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val}"
           end
 
@@ -321,8 +331,10 @@ module Pubid
           parts_list = id.identifiers[1..].map do |idd|
             part_val = idd.class.attributes.key?(:part) ? idd.part : nil
             if part_val
-              pv = part_val.render(context: @context)
-              pv.to_s
+              # A bundle member may be a foreign identifier (ISO, CEN/CENELEC),
+              # whose `part` is still a Components::Code, so read through
+              # whichever shape it holds.
+              component_str(part_val)
             else
               idd.to_s
             end
@@ -350,23 +362,23 @@ module Pubid
               abbrev_str = prefix.to_s
             end
             if idd.number
-              number_val = idd.number.render(context: @context)
+              number_val = idd.number
               abbrev_str += " " if !abbrev_str.empty?
               abbrev_str += number_val.to_s
             end
             if idd.part
-              part_val = idd.part.render(context: @context)
+              part_val = idd.part
               abbrev_str += "-#{part_val}"
             end
             parts << abbrev_str
           else
             abbrev_str = ""
             if idd.number
-              number_val = idd.number.render(context: @context)
+              number_val = idd.number
               abbrev_str = number_val.to_s
             end
             if idd.part
-              part_val = idd.part.render(context: @context)
+              part_val = idd.part
               abbrev_str += "-#{part_val}"
             end
             parts << abbrev_str
@@ -394,7 +406,7 @@ module Pubid
                      "00"
                    end
 
-        "#{year_str}/#{id.document_number} DC"
+        "#{year_str}/#{id.number} DC"
       end
 
       def render_consolidated_identifier(id, opts)
@@ -483,7 +495,7 @@ module Pubid
         parts << "BS"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           parts << number_str
         end
 
@@ -507,9 +519,9 @@ module Pubid
         parts << "DISC"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val.to_s.strip}"
           end
           parts << "PD #{number_str}"
@@ -529,14 +541,14 @@ module Pubid
         parts << type_abbr
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val.to_s.strip}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val.to_s.strip}"
           end
 
@@ -562,14 +574,14 @@ module Pubid
         parts << "EP"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val.to_s.strip}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val.to_s.strip}"
           end
 
@@ -607,14 +619,14 @@ module Pubid
         parts << "BS"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val}"
           end
 
@@ -637,13 +649,13 @@ module Pubid
         parts << "BSI Flex"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val}"
           end
           parts << number_str
@@ -665,9 +677,9 @@ module Pubid
       def render_handbook(id)
         abbr = id.original_abbr || "Handbook"
 
-        number_str = id.number.render(context: @context)
+        number_str = id.number
         if id.part
-          part_val = id.part.render(context: @context)
+          part_val = id.part
           number_str += "-#{part_val.to_s.strip}"
         end
 
@@ -681,7 +693,7 @@ module Pubid
         parts << id.publisher.to_s if id.publisher
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           parts << number_str
         end
 
@@ -708,9 +720,9 @@ module Pubid
         parts << id.publisher.to_s if id.publisher
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           parts << number_str
@@ -771,7 +783,7 @@ module Pubid
         parts << type_abbr
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.second_number
             second_val = id.second_number.render(context: @context)
@@ -779,11 +791,11 @@ module Pubid
           end
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val.to_s.strip}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val.to_s.strip}"
           end
 
@@ -811,7 +823,7 @@ module Pubid
         parts << type_abbr
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.second_number
             second_val = id.second_number.render(context: @context)
@@ -819,11 +831,11 @@ module Pubid
           end
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val.to_s.strip}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val.to_s.strip}"
           end
 
@@ -850,7 +862,7 @@ module Pubid
         parts << id.publisher.to_s if id.publisher
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           parts << number_str
         end
 
@@ -886,9 +898,9 @@ module Pubid
 
       def render_standalone_amendment(id)
         base = if id.corrigendum
-                 "AMD Corrigendum #{id.amendment_number}"
+                 "AMD Corrigendum #{id.number}"
                else
-                 "AMD #{id.amendment_number}"
+                 "AMD #{id.number}"
                end
 
         id.parenthesized ? "(#{base})" : base
@@ -919,14 +931,14 @@ module Pubid
         parts << "BS"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val}"
           end
 
@@ -949,14 +961,14 @@ module Pubid
         parts << "TS"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
 
           if id.part
-            part_val = id.part.render(context: @context)
+            part_val = id.part
             number_str += "-#{part_val}"
           end
           if id.subpart
-            subpart_val = id.subpart.render(context: @context)
+            subpart_val = id.subpart
             number_str += "-#{subpart_val}"
           end
 
@@ -979,7 +991,7 @@ module Pubid
         parts << "BS"
 
         if id.number
-          number_str = id.number.render(context: @context)
+          number_str = id.number
           parts << number_str
         end
 

data/lib/pubid/bsi/single_identifier.rb

@@ -9,8 +9,13 @@ module Pubid
     # `from_hash` (no facade needed).
     class Identifier < ::Pubid::Identifier
       def self.parse(string)
+        unless string.is_a?(String)
+          raise Pubid::Errors::InvalidInputError,
+                Pubid::INPUT_NOT_A_STRING_MESSAGE
+        end
+
         if string.length > Pubid::MAX_INPUT_LENGTH
-          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+          raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
         # Delegate to IEC for bare IEC identifiers. This handles IEC-specific
@@ -27,8 +32,6 @@ module Pubid
 
         parsed = parser.parse(string)
         Builder.build(parsed)
-      rescue Parslet::ParseFailed => e
-        raise StandardError, "Failed to parse '#{string}': #{e.message}"
       end
 
       attribute :publisher, Bsi::Components::Publisher, default: -> {
@@ -36,14 +39,29 @@ module Pubid
       }
       attribute :prefix, :string # Specialized prefix (A, AU, C, M, 2A, etc.)
       attribute :flex_prefix, :string # Flex type prefix (CECC, E9111, M, etc.)
-      attribute :number, Bsi::Components::Code
+      # `number`/`part`/`subpart` are plain strings, not Bsi::Components::Code:
+      # BSI never populates a field of that component beyond `value`. This class
+      # body is the sole home of Pubid::Bsi::Identifier (bsi/identifier.rb is a
+      # comment-only load stub), so declaring here is safe - every subclass body
+      # opens after it has run. `second_number` keeps the component type: it is
+      # not one of the three attributes the shared base declares.
+      attribute :number, :string
       attribute :iteration, :string # For bracket notation like 1000[9]
-      attribute :part, Bsi::Components::Code
-      attribute :subpart, Bsi::Components::Code
+      attribute :part, :string
+      attribute :subpart, :string
       attribute :second_number, Bsi::Components::Code # For collections like PAS 2035/2030
-      attribute :date, Bsi::Components::Date
+      # The shared component, not Bsi::Components::Date: the adoption wrappers
+      # (AdoptedEuropeanNorm, AdoptedInternationalStandard) delegate `date` to
+      # the foreign identifier they wrap, whose date is a plain
+      # ::Pubid::Components::Date — the empty BSI subclass rejected it and
+      # to_hash/from_hash raised on every "BS EN …"/"BS ISO …" (pubid#379,
+      # the same shape as the bsi-set-cross-flavor-type fix).
+      attribute :date, ::Pubid::Components::Date
       attribute :stage, Pubid::Components::Stage
-      attribute :type, Bsi::Components::Type
+      # Shared Type too: the leaf builders reach for ::Pubid::Components::Type
+      # (e.g. a default materialized from self.type), which the empty BSI
+      # subclass rejected — "BIP 2225:2022" et al. failed to_hash on `type`.
+      attribute :type, ::Pubid::Components::Type
       attribute :typed_stage, Pubid::Components::TypedStage
       attribute :edition, :string
       attribute :month, :integer
@@ -61,7 +79,7 @@ module Pubid
         return num_cmp unless num_cmp.zero?
 
         # Then by part
-        part_cmp = (part || Components::Code.new(value: "0")).to_s <=> (other.part || Components::Code.new(value: "0")).to_s
+        part_cmp = (part || "0").to_s <=> (other.part || "0").to_s
         return part_cmp unless part_cmp.zero?
 
         # Then by date

data/lib/pubid/bsi/urn_generator.rb

@@ -21,8 +21,17 @@ module Pubid
           parts << identifier.flex_prefix.to_s.downcase
         end
 
-        if identifier.number
-          number = identifier.number.to_s
+        # Fall back to the wrapped document's number. A wrapper — an adopted
+        # European norm, a bundle, a set — carries no number of its own, and
+        # `AdoptedEuropeanNorm#number` only delegates ONE level, so a
+        # "DD ENV ISO 11079:1999" (which adopts a CEN prestandard that is
+        # itself a wrapper around the ISO standard) emitted the identity-free
+        # `urn:bsi:dd` — the same URN as every other DD adoption. `#root`
+        # recurses to the origin document, and for a non-wrapper it is `self`,
+        # so this changes nothing for an ordinary identifier.
+        urn_number = identifier.number || identifier.root.number
+        if urn_number
+          number = urn_number.to_s
           if identifier.iteration && !identifier.iteration.empty?
             number += "[#{identifier.iteration}]"
           end

data/lib/pubid/bsi.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pubid"
 module Pubid
   module Bsi
     extend Pubid::PrefixesSupport
@@ -221,8 +222,13 @@ module Pubid
     ].freeze
 
     def self.parse(string)
+      unless string.is_a?(String)
+        raise Pubid::Errors::InvalidInputError,
+              Pubid::INPUT_NOT_A_STRING_MESSAGE
+      end
+
       if string.length > Pubid::MAX_INPUT_LENGTH
-        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
       end
 
       Identifier.parse(string)

data/lib/pubid/builder/base.rb

@@ -137,11 +137,14 @@ module Pubid
         end
       end
 
-      # Splits a compound document number ("1234", "1234-1", "1234-1-2")
-      # into number/part/subpart Code components. Flavor-specific dash/slash
-      # normalization lives in +normalize_number_with_part+; legacy year
-      # extraction (e.g. ISO "4037-1979") lives in +extract_legacy_year+.
-      def parse_number_with_part(value, code_class:)
+      # Splits a compound document number ("1234", "1234-1", "1234-1-2") into
+      # number/part/subpart. Each piece is wrapped in +code_class+ when the
+      # flavor declares those attributes as a Components::Code (ISO), and kept
+      # as a plain string when +code_class+ is nil (IEC and the other retyped
+      # flavors). Flavor-specific dash/slash normalization lives in
+      # +normalize_number_with_part+; legacy year extraction (e.g. ISO
+      # "4037-1979") lives in +extract_legacy_year+.
+      def parse_number_with_part(value, code_class: nil)
         normalized = normalize_number_with_part(value)
         parts = normalized.split("-").reject(&:empty?)
         number = parts.shift
@@ -153,12 +156,19 @@ module Pubid
 
         part = convert_roman_to_integer(part) if part
 
-        code_hash = { number: code_class.new(value: number) }
-        code_hash[:part] = code_class.new(value: part) if part
-        code_hash[:subpart] = code_class.new(value: subpart) if subpart
+        code_hash = { number: wrap_component(number, code_class) }
+        code_hash[:part] = wrap_component(part, code_class) if part
+        code_hash[:subpart] = wrap_component(subpart, code_class) if subpart
         code_hash
       end
 
+      # A nil +code_class+ means the flavor holds number/part/subpart as plain
+      # strings — the `number` retype tranches — so keep the raw scalar. ISO
+      # still passes its Components::Code and is unaffected.
+      def wrap_component(value, code_class)
+        code_class ? code_class.new(value: value) : value
+      end
+
       # Hook: normalize the raw number_with_part string before splitting.
       # Override in subclasses for flavor-specific dash/slash/space handling.
       def normalize_number_with_part(value)

data/lib/pubid/bundled_identifier.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pubid"
 module Pubid
   # Identifier that represents a combined bundle of documents using the + operator.
   # Examples:
@@ -45,10 +46,15 @@ module Pubid
       base_document&.typed_stage
     end
 
+    # `**opts` carries render flags this method does not name — `annotated:`
+    # above all. Without it the closed keyword list raised
+    # `ArgumentError: unknown keyword: :annotated` for every bundled
+    # identifier, which is worse than a missing span: a wrapper is exactly the
+    # shape a consumer renders.
     def to_s(lang: :en, lang_single: false, with_edition: false, format: nil,
-stage_format_long: nil, with_date: nil)
+stage_format_long: nil, with_date: nil, **opts)
       result = base_document.to_s(lang: lang, lang_single: lang_single,
-                                  with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date)
+                                  with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date, **opts)
 
       supplements.each do |supplement|
         # ISO DirectivesSupplement always uses " + " (space before)
@@ -57,10 +63,10 @@ stage_format_long: nil, with_date: nil)
         if supplement.class.name&.include?("DirectivesSupplement") ||
             (supplement.class.attributes.key?(:base) && !supplement.base.nil?)
           result += " + #{supplement.to_s(lang: lang, lang_single: lang_single,
-                                          with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date)}"
+                                          with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date, **opts)}"
         else
           result += "+#{supplement.to_s(lang: lang, lang_single: lang_single,
-                                        with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date)}"
+                                        with_edition: with_edition, format: format, stage_format_long: stage_format_long, with_date: with_date, **opts)}"
         end
       end
 
@@ -102,9 +108,13 @@ stage_format_long: nil, with_date: nil)
             parts << supplement.date.year.to_s
           end
 
-          # Add supplement number if present
+          # Add supplement number if present. `supplement` is polymorphic and
+          # `number` is a Components::Code on ::Pubid::Identifier but a plain
+          # :string in a growing number of flavors, so read through either.
           if supplement.number
-            parts << "v#{supplement.number.value}"
+            number = supplement.number
+            value = number.respond_to?(:value) ? number.value : number
+            parts << "v#{value}"
           end
         end
       end

data/lib/pubid/calconnect/identifier.rb

@@ -101,16 +101,20 @@ module Pubid
       # Parse a CalConnect identifier string into an identifier object.
       # @param identifier [String] The CalConnect identifier string to parse
       # @return [Identifier] The appropriate identifier object
-      # @raise [ArgumentError] If the input exceeds the maximum length
-      # @raise [RuntimeError] If parsing fails
+      # @raise [Pubid::Errors::InvalidInputError]
+      #   If the input exceeds the maximum length
+      # @raise [Pubid::Errors::ParseError] If parsing fails
       def self.parse(identifier)
+        unless identifier.is_a?(String)
+          raise Pubid::Errors::InvalidInputError,
+                Pubid::INPUT_NOT_A_STRING_MESSAGE
+        end
+
         if identifier.length > Pubid::MAX_INPUT_LENGTH
-          raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+          raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
         Builder.build(Parser.parse(identifier))
-      rescue Parslet::ParseFailed => e
-        raise "Failed to parse CalConnect '#{identifier}': #{e.message}"
       end
     end
   end

data/lib/pubid/calconnect/parser.rb

@@ -12,7 +12,7 @@ module Pubid
     #   CC/Adv 0707.1:2007        (dot sub-part)
     #   CC/A 0812-1:2008          (dash sub-part)
     #   CC/WD 51017:2024-07-23    (full ISO date)
-    class Parser < Parslet::Parser
+    class Parser < ::Pubid::Parser::Grammar
       rule(:digit) { match["0-9"] }
       rule(:digits) { digit.repeat(1) }
 

data/lib/pubid/calconnect.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "pubid"
 module Pubid
   # CalConnect (The Calendaring and Scheduling Consortium) flavor.
   #
@@ -24,8 +25,13 @@ module Pubid
 
     # Parse a CalConnect identifier string
     def self.parse(identifier)
+      unless identifier.is_a?(String)
+        raise Pubid::Errors::InvalidInputError,
+              Pubid::INPUT_NOT_A_STRING_MESSAGE
+      end
+
       if identifier.length > Pubid::MAX_INPUT_LENGTH
-        raise ArgumentError, Pubid::INPUT_TOO_LONG_MESSAGE
+        raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
       end
 
       Identifier.parse(identifier)

data/lib/pubid/ccsds/identifier.rb

@@ -22,6 +22,10 @@ module Pubid
       # are likewise CCSDS-specific plain strings.
       attribute :number, :string
       attribute :part, :string
+      # CCSDS never populates `subpart`, but the inherited declaration is a
+      # Components::Code, and a parent that disagrees with its leaves is the
+      # determinism landmine. Declare it here, like every converted flavor.
+      attribute :subpart, :string
       attribute :edition, :string
       attribute :type, :string
       attribute :suffix, :string
@@ -54,12 +58,19 @@ module Pubid
 
       # Parse a CCSDS identifier string into the appropriate identifier object.
       def self.parse(identifier)
+        unless identifier.is_a?(String)
+          raise Pubid::Errors::InvalidInputError,
+                Pubid::INPUT_NOT_A_STRING_MESSAGE
+        end
+
+        if identifier.length > Pubid::MAX_INPUT_LENGTH
+          raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
+
         # Apply legacy update_codes normalization first
         normalized = Core::UpdateCodes.apply(identifier, :ccsds)
         parsed = Pubid::Ccsds::Parser.parse(normalized)
         Pubid::Ccsds::Builder.build(parsed)
-      rescue Parslet::ParseFailed => e
-        raise "Failed to parse CCSDS identifier '#{identifier}': #{e.message}"
       end
 
       # from_hash is the shared polymorphic dispatch on Pubid::Identifier.

data/lib/pubid/ccsds/identifiers/base.rb

@@ -24,14 +24,16 @@ module Pubid
           { key: :base, web: :base, title: "Base Standard", short: nil }
         end
 
-        def to_s(**_opts)
+        # Composes its string by hand rather than going through `render`, so
+        # the annotation hook has to be applied on the way out.
+        def to_s(**opts)
           result = "#{publisher} #{number}"
           result += ".#{part}" if part
           result += "-#{type}" if type
           result += "-#{edition}" if edition
           result += "-#{suffix}" if suffix
           result += " - #{language} Translated" if language
-          result
+          annotate_plain_render(result, **opts)
         end
       end
     end