pubid 2.0.0.pre.alpha.53 → 2.0.0.pre.alpha.55

data/lib/pubid/ieee/builder.rb

@@ -1118,9 +1118,14 @@ module Pubid
             printed_attrs[:year] = attributes[:year]
             printed_attrs[:month] = attributes[:month]
           elsif parsed[:draft_month]
-            # The date trails the draft itself ("D8, June 2010"); keep it
-            # inside the draft so the code stays date-less.
-            printed_draft = "#{printed_draft}, #{extract_value(parsed[:draft_month])} "                             "#{extract_value(parsed[:draft_year])}"
+            # The date trails the draft itself ("D31, Aug 2010"): the
+            # normalization ledger strips the ordinal draft on the
+            # printed joint face and surfaces the date as the printed
+            # date ("11073-10418 D13, January 2011" ->
+            # "11073.10418, January 2011") -- composing it back into the
+            # draft emitted "/D, Aug 2010" remnants.
+            printed_attrs[:year] = extract_value(parsed[:draft_year])
+            printed_attrs[:month] = extract_value(parsed[:draft_month])
           end
           printed_attrs[:code] = printed_code
           printed_attrs[:draft] = printed_draft if printed_draft

data/lib/pubid/ieee/components/draft.rb

@@ -98,18 +98,33 @@ day: nil, iso_stage: nil, iso_iteration: nil)
         COMPOUND_SUFFIX = /=D?(PWI|NP|WD|CDV|FDIS|DIS|CD)(?:[.-]?(\d+))?\z/.freeze
         private_constant :COMPOUND_SUFFIX
 
+        # The D-echo aliases ("DDIS3" = D + DIS + iteration 3) normalize
+        # through the compound split; every other pure stage token
+        # ("CD1", "FCD", "CDV1") restores verbatim -- the compound split
+        # would degrade the glued iterations and drop the stages the
+        # alias list never knew, so from_hash(row) != parse(row).
+        ECHO_SUFFIX = /\AD(=?(PWI|NP|WD|CDV|FDIS|DIS|CD|FCD))(?:[.-]?\d+)?\z/.freeze
+        private_constant :ECHO_SUFFIX
+
         def self.parse(value)
           return value if value.is_a?(Draft)
 
           body = strip_prefix(value.to_s)
           iso_stage = nil
           iso_iteration = nil
-          if (m = body.match(COMPOUND_SUFFIX))
+          if body.start_with?("=") && body[1..].match?(/\A[A-Z][A-Z0-9]*\z/) &&
+             !body[1..].match?(ECHO_SUFFIX)
+            iso_stage = body[1..]
+            body = ""
+          elsif (m = body.match(COMPOUND_SUFFIX))
             iso_stage = m[1]
             iso_iteration = m[2]
             body = body[0...m.begin(0)]
           end
-          version, month, day, year, comma = split_date(body)
+          # a designator that consumed the whole body carries no date;
+          # split_date("") would leave version as "" where the parse
+          # path has nil (and != compares them)
+          version, month, day, year, comma = body.empty? ? [nil, nil, nil, nil, false] : split_date(body)
           draft = new(version: version, month: month, day: day, year: year,
                       iso_stage: iso_stage, iso_iteration: iso_iteration)
           draft.comma_before_month = comma

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.0.pre.alpha.53"
+  VERSION = "2.0.0.pre.alpha.55"
 end

data/schema/core/joint_prefixes.yaml

@@ -9,12 +9,16 @@ joint_prefixes:
     - ISO/IEC
     - IEC/ISO
     - ISO/IEC/IEEE
+    - ISO/IEEE
   iec:
     - ISO/IEC
     - IEC/ISO
     - ISO/IEC/IEEE
+    - IEC/IEEE
   ieee:
     - ISO/IEC/IEEE
+    - ISO/IEEE
+    - IEC/IEEE
   ansi:
     - ANSI/ASHRAE
     - ANSI/AMCA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.53
+  version: 2.0.0.pre.alpha.55
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-23 00:00:00.000000000 Z
+date: 2026-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model