pubid-iso 1.15.17 → 1.15.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cacdca9f11e7be5d1c4e3cd5c85fb851abece42c3b74fd3bade4af732c186296
-  data.tar.gz: 026fdc88fd9b3243707564262c68f446871c9b6d364a3e3442c13952c5daf069
+  metadata.gz: e9151e27432eab593cff08a03303fcdc23c81ac9c1ab93d9a2f125378dbe1bba
+  data.tar.gz: b014094046f3bf7a8dbbde5c5abf22cef38d5f654fac9635b4ba690199075b8f
 SHA512:
-  metadata.gz: 99d4e00507e95a5a6bce075dffe60f77b5295c136f08ee483ba3975e741fce605ebd75e4ed08a1dbec6ae7d3c6936e55304b44a15f637e0219adddc134c3b30d
-  data.tar.gz: 131419d340751b3aa2404c2043194b381774fd08cd103ab294493778f6b4f7389c0b0300b9162c24ab6f659f9f79cd3b63f9312b3bec2444e9d13fabf9181124
+  metadata.gz: cca0ed419663de09ec03fe57e733be53783010cc8565d79a7319d021ab0524b0ce0a1a7935b8e1d098430e3443da595c33f2c98fc96735b81744a9ae767b1267
+  data.tar.gz: 26a4dbf7df2b2212b27e5c83028966f2b3512c537b28a9b3e868ce70c9020acd24d8b42b7987a4bb7ffeb17389518cfba27056e9328aedb684ad067bb3ce77a7

data/lib/pubid/iso/parser.rb

@@ -98,7 +98,14 @@ module Pubid::Iso
     rule(:part_matcher) do
       year_digits.absent? >>
         supplements.absent? >>
-        staged_addenda.absent? >> ((roman_numerals >> digits.absent?) | match['[\dA-Z]'].repeat(1)).as(:part)
+        staged_supplement.absent? >>
+        staged_addenda.absent? >>
+        (str("Add") | str("ADD")).absent? >>
+        # Stage-prefixed supplements like `WD Amd`, `DIS Cor`, `PWI Add`
+        # must reach the supplement/addendum rules, not be greedily eaten
+        # here as a part code.
+        ((stage | typed_stage) >> space >> (supplements | str("Add") | str("ADD"))).absent? >>
+        ((roman_numerals >> digits.absent? >> match['[A-Z]'].absent?) | match['[\dA-Z]'].repeat(1)).as(:part)
     end
 
     rule(:part) do
@@ -130,7 +137,9 @@ module Pubid::Iso
 
     rule(:addendum) do
       (
-        (((str("/") >> (str("Add") | str("ADD")).as(:type)) | (str(" — ") >> str("Addendum").as(:type))) |
+        (((str("/") >> (stage.as(:typed_stage) >> space).maybe >>
+          (str("Add") | str("ADD")).as(:type)) |
+          (str(" — ") >> str("Addendum").as(:type))) |
          (str("/") >> staged_addenda.as(:typed_stage))) >>
           space >> digits.as(:number) >> (str(":") >> digits.as(:year)).maybe
       ).repeat(1).as(:supplements)
@@ -188,8 +197,11 @@ module Pubid::Iso
 
     rule(:std_document_body) do
       (type | (stage.as(:stage) >> digits.as(:iteration).maybe)).maybe >>
-        # for ISO/IEC WD TS 25025
-        space? >> ((stage.as(:stage) | typed_stage.as(:stage) | type) >> space).maybe >>
+        # for ISO/IEC WD TS 25025 and ISO/IEC DIS ISP 12060-6 — both shapes
+        # `<stage> <type>` and `<typed_stage> <type>` need to fit before the
+        # number, so allow an optional stage/typed_stage followed by an
+        # optional type.
+        space? >> (((stage.as(:stage) | typed_stage.as(:stage)) >> space).maybe >> (type >> space).maybe) >>
         digits.as(:number) >>
         # for identifiers like ISO 5537/IDF 26
         (str("|") >> (str("IDF").as(:publisher) >> space >> digits.as(:number)).as(:joint_document)).maybe >>

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "1.15.17".freeze
+    VERSION = "1.15.18".freeze
   end
 end

data/update_codes.yaml

@@ -2,3 +2,24 @@ ISO/R 657/IV: ISO/R 657-4:1969
 ISO/IEC/IEEE 8802-22.2:2015/Amd.2:2017(E): ISO/IEC/IEEE 8802-22:2015/Amd.2:2017(E)
 ISO/TR 17716.2: ISO/TR 17716
 ISO/TR 17716.2(E): ISO/TR 17716(E)
+ISO/NP 10303-5a: ISO/NP 10303-5A
+ISO/NP 10303-5b: ISO/NP 10303-5B
+ISO/NP 10303-1xx: ISO/NP 10303-1XX
+ISO/NP 10303-2xx: ISO/NP 10303-2XX
+# Long-form draft typed stages (DIS TR, FDIS PAS, ...) → canonical short
+# typed-stage abbrs (DTR, FDPAS, ...). Pattern matches at start of string
+# with the publisher prefix preserved.
+"/^(ISO[\\w/]*) DIS (TR|TS|PAS|ISP) /": '\1 D\2 '
+"/^(ISO[\\w/]*) FDIS (TR|TS|PAS|ISP) /": '\1 FD\2 '
+# Long-form draft supplements (DIS Amd → DAM, DIS Cor → DCOR, DIS Suppl →
+# DSuppl, DIS Add → DAD; FDIS Amd → FDAM, FDIS Cor → FDCOR). Applies in
+# supplement position (after `/`), so the prefix has already been parsed.
+"//DIS Amd /": '/DAM '
+"//FDIS Amd /": '/FDAM '
+"//DIS Cor /": '/DCOR '
+"//FDIS Cor /": '/FDCOR '
+"//DIS Suppl /": '/DSuppl '
+"//DIS Add /": '/DAD '
+# `DAdd` is a legacy long-form spelling of the canonical `DAD` (Draft
+# Addendum) staged-addendum token.
+"//DAdd /": '/DAD '

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 1.15.17
+  version: 1.15.18
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-01 00:00:00.000000000 Z
+date: 2026-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.17
+        version: 1.15.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.17
+        version: 1.15.18
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com