pubid 2.0.0.pre.alpha.39 → 2.0.0.pre.alpha.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e53b03c87c2a04f877d8eba11d5689984de9c0af641258c68c8c03377d762f12
-  data.tar.gz: 5bdad1686cf8cd3709ea1494eef8c78dd7c6974bae2802ccc669db939f788731
+  metadata.gz: c1e4c5a6889f61e535b4d05517aff5798eb5307c79bf7e318ab21822ebfe73ae
+  data.tar.gz: f129c70c4c9c646318c58e12d7a5e1097299c5698a083a0710e2866a2e7ad692
 SHA512:
-  metadata.gz: 822faa7030a35d1e87901785b0d22bb0716c1b997985c6b9d616c1eb75f3e7fe3436ca61c427c4d8abd44d14fe2e173b7a8c5ab3bc26941bb68e75f308862965
-  data.tar.gz: e636567ecb22497f4cf0c0cafdfe68d06f83e593bc15483c168cbc25053a61221d6738ac16730f2bbe0e05c88ce6d91bb3166da7386ac1ca4004363fea390a5a
+  metadata.gz: d2e7e5cea5f0749a2aa5715521a2d6c192b43395bcb9f72470207629f6e7d1f0b9a7dbb089a1cc8e23c41a6ffc61a1e1424ce2546618249ed3eb074d611b3e4f
+  data.tar.gz: c4ee9f3166fa9caffb6f3b85d4684c11b6f08ac615ecf302af94831a9e7538a29264c2a862ffefa161fbeb4dbabc11b82405730c2435d5d666ab42c257fe2a61

data/lib/pubid/ieee/builder.rb

@@ -1762,6 +1762,7 @@ module Pubid
         end
 
         # Check for specific draft notation (D1, D2, etc.)
+        draft_version_present = false
         if parsed[:draft]
           draft_data = parsed[:draft]
           if draft_data.is_a?(Array)
@@ -1769,8 +1770,12 @@ module Pubid
               r.merge(e)
             end
           end
+          # A verbatim draft designator ("/D2.1.1") is a version in itself;
+          # only an attribute-less date hash ("{month:, year:}") lacks one.
+          draft_version_present = true unless draft_data.is_a?(Hash)
 
           if draft_data.is_a?(Hash) && draft_data[:draft_version]
+            draft_version_present = true
             dv = draft_data[:draft_version]
             version = if dv.is_a?(Array)
                         dv.map do |v|
@@ -1781,6 +1786,21 @@ module Pubid
                       end
 
             if version
+              # A draft version that IS an ISO stage token ("/DCD1" and
+              # "/CD1" both capture version "CD1") takes that stage on a
+              # PLAIN IEEE document: the stage token outranks the ordinal
+              # ladder (docs/IEEE-DRAFT-STAGES.md §1.3, "DDIS" = DIS), so
+              # the render drops the Draft word. A joint ISO-led
+              # stage-word draft keeps its generic project stage — its
+              # publishers block composes the same face through the
+              # typed-stage project branch.
+              copubs = parsed[:publishers].is_a?(Hash) ? parsed[:publishers][:copublishers] : nil
+              joint = copubs && !(copubs.respond_to?(:empty?) ? copubs.empty? : copubs.nil?)
+              if !joint &&
+                  (m = version.to_s.match(/\A(FDIS|FCD|CDV|DIS|CD|WD|PWI|NP)\d*\z/))
+                return m[1]
+              end
+
               # relaton's hyphenated "/D-2" spelling captures the dash inside
               # draft_version; the stage registry keys on "D2". A date-embedded
               # version ("3-2017-07") keys on its leading ordinal.
@@ -1802,13 +1822,17 @@ module Pubid
             return "P"
           elsif type_value == "Std"
             return "Std"
-          elsif type_value == "Draft Std" && parsed[:draft].nil? && parsed[:digit_draft].nil?
+          elsif type_value == "Draft Std" && !draft_version_present && parsed[:digit_draft].nil?
             # A version-less "Draft Std" fabricates /D1 (issue #205);
             # deriving the stage from that fabricated version renders the
             # same P-prefixed form as an explicit "/D1" spelling, so the
             # render reaches its fixed point in one round (pubid#318).
-            # Gated on no-draft: a dotted version ("D2.0") fails the registry
-            # lookup above and must fall through, keeping "Draft Std".
+            # Gated on no captured VERSION: a dotted version ("D2.0")
+            # fails the registry lookup above and must fall through,
+            # keeping "Draft Std". A draft-version-less tree that carries
+            # only a date ("IEEE Draft Std P754/D1.2.6 Nov 2006") takes
+            # the same fabricated D1, the version the render already
+            # implies.
             return "D1"
           elsif type_value.match?(/^No\.?$/)
             return type_value

data/lib/pubid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.39
+  version: 2.0.0.pre.alpha.40
 platform: ruby
 authors:
 - Ribose Inc.