pubid 2.0.24 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd50bd4f50c75670cd2212192f3b267c7b246e0bd46b3d7c8a8d191c3d57ed2d
-  data.tar.gz: 99718c01c70282d9c28a62064c822b2c86f4856a9d3097f6ca7e67c930221789
+  metadata.gz: ef65c4cbf5afc5635f55300fc57894462ecc211d2dd51d2c2605dafda75a84a3
+  data.tar.gz: 89c5dccd912343c12ea157220089f7b1e0cf708abefe45e63c30c3bf712177e8
 SHA512:
-  metadata.gz: dd66c8243817ea77c54956e963cb1ea469c90728ea3e84336c18fb7c010beb961c069242a5acb439892b99d2ae1a4e44f4a6877cab56a986eefd6b0a5784907a
-  data.tar.gz: 74f3abb03d7785b95678b05ce0615fe16e21c2ebb67228014424c254e95ab3e37dc17dd86bbb71dcd6b8279152ed620ac386ecda4b3f2b429feb4acec8967b33
+  metadata.gz: 135acc1bf9bd56785e0c861db78c0cad0b5026527ca6798ba1e5df7f9d2a19124211cc2b3583db2b332bcd7fc29300736b28c44b0dbbbdd482742607df2f2ddc
+  data.tar.gz: ef9dc843feed906ae25c564839c6d710c30e3e4a3d7fb1e96fc4376ca73551deaade688e3bf7ceb825fd93292962a4db722f7994b4036a73c61d99e91a4f5626

data/data/parg/etsi_pfs.json

@@ -1 +1 @@
-{"bindings":null,"version":"0.1.0","grammar":"PubidEtsiPfs","shape":"parsanol-tree/v2","binding_version":1,"entries":{"identifier":{"root":"identifier","grammar":{"atoms":[{"Str":{"pattern":"ETSI "}},{"Entity":{"atom":18}},{"Str":{"pattern":"I-ETS"}},{"Str":{"pattern":"TCRTR"}},{"Str":{"pattern":"GTS"}},{"Str":{"pattern":"ETR"}},{"Str":{"pattern":"ETS"}},{"Str":{"pattern":"TBR"}},{"Str":{"pattern":"NET"}},{"Str":{"pattern":"EN"}},{"Str":{"pattern":"ES"}},{"Str":{"pattern":"EG"}},{"Str":{"pattern":"TS"}},{"Str":{"pattern":"GR"}},{"Str":{"pattern":"GS"}},{"Str":{"pattern":"SR"}},{"Str":{"pattern":"TR"}},{"Alternative":{"atoms":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]}},{"Named":{"name":"type","atom":17}},{"Str":{"pattern":" "}},{"Entity":{"atom":54}},{"Str":{"pattern":"GSM"}},{"Str":{"pattern":" "}},{"Entity":{"atom":24}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Repetition":{"atom":23,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"."}},{"Entity":{"atom":24}},{"Repetition":{"atom":27,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[21,22,25,26,28]}},{"Entity":{"atom":24}},{"Repetition":{"atom":30,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"."}},{"Entity":{"atom":24}},{"Repetition":{"atom":33,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[31,32,34]}},{"Entity":{"atom":40}},{"Re":{"pattern":"[\\x41-\\x5a]"}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Alternative":{"atoms":[37,38,39]}},{"Repetition":{"atom":36,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"-"}},{"Entity":{"atom":40}},{"Repetition":{"atom":43,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[42,44]}},{"Repetition":{"atom":45,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" "}},{"Entity":{"atom":24}},{"Repetition":{"atom":48,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[41,46,47,49]}},{"Entity":{"atom":24}},{"Repetition":{"atom":51,"min":1,"max":null,"tag":"Repetition"}},{"Alternative":{"atoms":[29,35,50,52]}},{"Named":{"name":"number","atom":53}},{"Sequence":{"atoms":[0,1,19,20]}},{"Str":{"pattern":"ETSI "}},{"Entity":{"atom":18}},{"Str":{"pattern":" "}},{"Entity":{"atom":54}},{"Str":{"pattern":" "}},{"Entity":{"atom":64}},{"Entity":{"atom":24}},{"Repetition":{"atom":62,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"minor","atom":63}},{"Sequence":{"atoms":[60,61]}},{"Repetition":{"atom":65,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":73}},{"Str":{"pattern":"-"}},{"Entity":{"atom":40}},{"Repetition":{"atom":69,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[68,70]}},{"Repetition":{"atom":71,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"parts","atom":72}},{"Repetition":{"atom":67,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":83}},{"Str":{"pattern":"/A"}},{"Str":{"pattern":"/C"}},{"Alternative":{"atoms":[76,77]}},{"Entity":{"atom":24}},{"Repetition":{"atom":79,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[78,80]}},{"Repetition":{"atom":81,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"supplements","atom":82}},{"Repetition":{"atom":75,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" V"}},{"Entity":{"atom":92}},{"Entity":{"atom":90}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Re":{"pattern":"[.]"}},{"Alternative":{"atoms":[88,89]}},{"Repetition":{"atom":87,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"version","atom":91}},{"Sequence":{"atoms":[85,86]}},{"Str":{"pattern":" ed."}},{"Entity":{"atom":98}},{"Entity":{"atom":24}},{"Repetition":{"atom":96,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"edition","atom":97}},{"Sequence":{"atoms":[94,95]}},{"Alternative":{"atoms":[93,99]}},{"Repetition":{"atom":100,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" ("}},{"Entity":{"atom":106}},{"Entity":{"atom":24}},{"Repetition":{"atom":104,"min":4,"max":4,"tag":"Repetition"}},{"Named":{"name":"year","atom":105}},{"Str":{"pattern":"-"}},{"Entity":{"atom":111}},{"Entity":{"atom":24}},{"Repetition":{"atom":109,"min":2,"max":2,"tag":"Repetition"}},{"Named":{"name":"month","atom":110}},{"Str":{"pattern":")"}},{"Sequence":{"atoms":[102,103,107,108,112]}},{"Repetition":{"atom":113,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[56,57,58,59,66,74,84,101,114]}},{"Alternative":{"atoms":[55,115]}}],"root":116},"bindings":[{"capture":"type","path":"type","type":"string","card":null,"preprocess":null},{"capture":"number","path":"number","type":"string","card":null,"preprocess":null},{"capture":"minor","path":"minor","type":"string","card":null,"preprocess":null},{"capture":"parts","path":"parts","type":"string","card":null,"preprocess":null},{"capture":"supplements","path":"supplements","type":"string","card":null,"preprocess":null},{"capture":"version","path":"version","type":"string","card":null,"preprocess":null},{"capture":"edition","path":"edition","type":"string","card":null,"preprocess":null},{"capture":"year","path":"year","type":"string","card":null,"preprocess":null},{"capture":"month","path":"month","type":"string","card":null,"preprocess":null}]}},"preprocess":{},"tables":{},"lint":{"order_warnings":["rule identifier: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)"]},"default_entry":"identifier","render":{},"derive":{},"tests":[{"entry":"identifier","kind":"accept","input":"ETSI EG 200 053 V1.5.1 (2004-06)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 175","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 175-2","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 019-1-0 V2.1.2 (2003-09)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI TS 103 702","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EG 201 880 V1.2.1","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI GTS GSM 02.01 V5.5.0 (1999-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI I-ETS 300 003 ed.1 (1991-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI ETR 108/A1 ed.1 (1995-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)","expect":{}},{"entry":"identifier","kind":"reject","input":"nonsense","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI XX 100","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 V","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 V1.2.x","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 (","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 (2004-6)","expect":{}},{"entry":"identifier","kind":"example","input":"ETSI EG 200 053 V1.5.1 (2004-06)","expect":{"type":"EG","number":"200 053","version":"1.5.1","year":"2004","month":"06"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 175","expect":{"type":"EN","number":"300 175"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 175-2","expect":{"type":"EN","number":"300 175","parts":"-2"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 019-1-0 V2.1.2 (2003-09)","expect":{"type":"EN","number":"300 019","parts":"-1-0","version":"2.1.2","year":"2003","month":"09"}},{"entry":"identifier","kind":"example","input":"ETSI TS 103 702","expect":{"type":"TS","number":"103 702"}},{"entry":"identifier","kind":"example","input":"ETSI EG 201 880 V1.2.1","expect":{"type":"EG","number":"201 880","version":"1.2.1"}},{"entry":"identifier","kind":"example","input":"ETSI GTS GSM 02.01 V5.5.0 (1999-08)","expect":{"type":"GTS","number":"GSM 02.01","version":"5.5.0","year":"1999","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)","expect":{"type":"GR","number":"NFV-EVE 008","version":"3.1.1","year":"2017","month":"12"}},{"entry":"identifier","kind":"example","input":"ETSI I-ETS 300 003 ed.1 (1991-08)","expect":{"type":"I-ETS","number":"300 003","edition":"1","year":"1991","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI ETR 108/A1 ed.1 (1995-08)","expect":{"type":"ETR","number":"108","supplements":"/A1","edition":"1","year":"1995","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)","expect":{"type":"ETS","number":"300 092","parts":"-1","supplements":"/A1/C1","edition":"1","year":"1994","month":"04"}}],"docs":{},"source":"# PFS-generated grammar — DO NOT EDIT BY HAND.\n# Source: definitions/etsi.pfs (pfs:1) sha256:9343088bf087b55ea790057e6be0bbebe2272407ee81f035b52e5f9a4d5c7b76\n# Compiler: pubid/grammar/pfs 0.1.0\n# Flavor key: etsi_pfs (grammar PubidEtsiPfs)\n# Regenerate: ruby scripts/pfs compile definitions/etsi.pfs --as etsi_pfs\n\ngrammar PubidEtsiPfs version \"0.1.0\" edition 2 {\n\n  # Grammar fragments: named lexical terms declared under `grammar:`.\n  digit = %x30-39\n  alnum_char = %x41-5A / %x61-7A / %x30-39\n  version_char = %x30-39 / %x2E\n\n  # Fields: one capture rule per declared field; the whole pattern\n  # is the capture.\n  etsi_type = (\"I-ETS\" / \"TCRTR\" / \"GTS\" / \"ETR\" / \"ETS\" / \"TBR\" / \"NET\" / \"EN\" / \"ES\" / \"EG\" / \"TS\" / \"GR\" / \"GS\" / \"SR\" / \"TR\") as type\n  etsi_number = ((\"GSM\" \" \" 1*digit \".\" 1*digit) / (1*digit \".\" 1*digit) / (1*alnum_char [(\"-\" 1*alnum_char)] \" \" 1*digit) / (1*digit)) as number\n  etsi_minor = (1*digit) as minor\n  etsi_parts = (1*(\"-\" 1*alnum_char)) as parts\n  etsi_supplements = (1*((\"/A\" / \"/C\") 1*digit)) as supplements\n  etsi_version = (1*version_char) as version\n  etsi_edition = (1*digit) as edition\n  etsi_year = (4digit) as year\n  etsi_month = (2digit) as month\n\n  # Identifier rule: the canonical template first, then the\n  # declared alternates (parse-in spellings; they normalize to the\n  # canonical render face).\n  identifier = {\n    \"ETSI \" etsi_type \" \" etsi_number\n    / \"ETSI \" etsi_type \" \" etsi_number [\" \" etsi_minor] [etsi_parts] [etsi_supplements] [( \" V\" etsi_version / \" ed.\" etsi_edition )] [\" (\" etsi_year \"-\" etsi_month \")\"]\n  }\n  entry identifier: identifier\n\n  # Typed model bindings: every bound capture lands on the\n  # consumer model's field of the same name.\n  bindings identifier {\n    type -> type (string)\n    number -> number (string)\n    minor -> minor (string)\n    parts -> parts (string)\n    supplements -> supplements (string)\n    version -> version (string)\n    edition -> edition (string)\n    year -> year (string)\n    month -> month (string)\n  }\n\n  # REQUIRED examples from the definition — accepts, rejects, and\n  # the capture expectations the compiler replayed at compile time.\n  test {\n    accept \"ETSI EG 200 053 V1.5.1 (2004-06)\"\n    accept \"ETSI EN 300 175\"\n    accept \"ETSI EN 300 175-2\"\n    accept \"ETSI EN 300 019-1-0 V2.1.2 (2003-09)\"\n    accept \"ETSI TS 103 702\"\n    accept \"ETSI EG 201 880 V1.2.1\"\n    accept \"ETSI GTS GSM 02.01 V5.5.0 (1999-08)\"\n    accept \"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)\"\n    accept \"ETSI I-ETS 300 003 ed.1 (1991-08)\"\n    accept \"ETSI ETR 108/A1 ed.1 (1995-08)\"\n    accept \"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)\"\n    reject \"nonsense\"\n    reject \"ETSI\"\n    reject \"ETSI EN\"\n    reject \"ETSI XX 100\"\n    reject \"ETSI EN 300 175 V\"\n    reject \"ETSI EN 300 175 V1.2.x\"\n    reject \"ETSI EN 300 175 (\"\n    reject \"ETSI EN 300 175 (2004-6)\"\n    example \"ETSI EG 200 053 V1.5.1 (2004-06)\" { type: \"EG\" number: \"200 053\" version: \"1.5.1\" year: \"2004\" month: \"06\" }\n    example \"ETSI EN 300 175\" { type: \"EN\" number: \"300 175\" }\n    example \"ETSI EN 300 175-2\" { type: \"EN\" number: \"300 175\" parts: \"-2\" }\n    example \"ETSI EN 300 019-1-0 V2.1.2 (2003-09)\" { type: \"EN\" number: \"300 019\" parts: \"-1-0\" version: \"2.1.2\" year: \"2003\" month: \"09\" }\n    example \"ETSI TS 103 702\" { type: \"TS\" number: \"103 702\" }\n    example \"ETSI EG 201 880 V1.2.1\" { type: \"EG\" number: \"201 880\" version: \"1.2.1\" }\n    example \"ETSI GTS GSM 02.01 V5.5.0 (1999-08)\" { type: \"GTS\" number: \"GSM 02.01\" version: \"5.5.0\" year: \"1999\" month: \"08\" }\n    example \"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)\" { type: \"GR\" number: \"NFV-EVE 008\" version: \"3.1.1\" year: \"2017\" month: \"12\" }\n    example \"ETSI I-ETS 300 003 ed.1 (1991-08)\" { type: \"I-ETS\" number: \"300 003\" edition: \"1\" year: \"1991\" month: \"08\" }\n    example \"ETSI ETR 108/A1 ed.1 (1995-08)\" { type: \"ETR\" number: \"108\" supplements: \"/A1\" edition: \"1\" year: \"1995\" month: \"08\" }\n    example \"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)\" { type: \"ETS\" number: \"300 092\" parts: \"-1\" supplements: \"/A1/C1\" edition: \"1\" year: \"1994\" month: \"04\" }\n  }\n}\n","source_hash":"f5e47bb403d9bff4737d8a200f08c71f8029df12f96c56e9774b722908bfa853","unicode_tables":"onigmo (Ruby 3.4.8)","compiler_version":"1.3.126","edition":2,"semantics_hash":"sha256:204a90b72aa2ea5fc2249622bd61c052b4ba5d1ebf732a2c2b57669c8de24393","checksum":"sha256:d861e040f36868dcef43c6547c5791979d4832d1ec1ca6bc310bdad82ea0e930"}
+{"bindings":null,"version":"0.1.0","grammar":"PubidEtsiPfs","shape":"parsanol-tree/v2","binding_version":1,"entries":{"identifier":{"root":"identifier","grammar":{"atoms":[{"Str":{"pattern":"ETSI "}},{"Entity":{"atom":18}},{"Str":{"pattern":"I-ETS"}},{"Str":{"pattern":"TCRTR"}},{"Str":{"pattern":"GTS"}},{"Str":{"pattern":"ETR"}},{"Str":{"pattern":"ETS"}},{"Str":{"pattern":"TBR"}},{"Str":{"pattern":"NET"}},{"Str":{"pattern":"EN"}},{"Str":{"pattern":"ES"}},{"Str":{"pattern":"EG"}},{"Str":{"pattern":"TS"}},{"Str":{"pattern":"GR"}},{"Str":{"pattern":"GS"}},{"Str":{"pattern":"SR"}},{"Str":{"pattern":"TR"}},{"Alternative":{"atoms":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]}},{"Named":{"name":"type","atom":17}},{"Str":{"pattern":" "}},{"Entity":{"atom":54}},{"Str":{"pattern":"GSM"}},{"Str":{"pattern":" "}},{"Entity":{"atom":24}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Repetition":{"atom":23,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"."}},{"Entity":{"atom":24}},{"Repetition":{"atom":27,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[21,22,25,26,28]}},{"Entity":{"atom":24}},{"Repetition":{"atom":30,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"."}},{"Entity":{"atom":24}},{"Repetition":{"atom":33,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[31,32,34]}},{"Entity":{"atom":40}},{"Re":{"pattern":"[\\x41-\\x5a]"}},{"Re":{"pattern":"[\\x61-\\x7a]"}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Alternative":{"atoms":[37,38,39]}},{"Repetition":{"atom":36,"min":1,"max":null,"tag":"Repetition"}},{"Str":{"pattern":"-"}},{"Entity":{"atom":40}},{"Repetition":{"atom":43,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[42,44]}},{"Repetition":{"atom":45,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" "}},{"Entity":{"atom":24}},{"Repetition":{"atom":48,"min":1,"max":null,"tag":"Repetition"}},{"Sequence":{"atoms":[41,46,47,49]}},{"Entity":{"atom":24}},{"Repetition":{"atom":51,"min":1,"max":null,"tag":"Repetition"}},{"Alternative":{"atoms":[29,35,50,52]}},{"Named":{"name":"number","atom":53}},{"Str":{"pattern":" "}},{"Entity":{"atom":59}},{"Entity":{"atom":24}},{"Repetition":{"atom":57,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"minor","atom":58}},{"Sequence":{"atoms":[55,56]}},{"Repetition":{"atom":60,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":70}},{"Str":{"pattern":"-"}},{"Entity":{"atom":67}},{"Entity":{"atom":40}},{"Repetition":{"atom":65,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"part","atom":66}},{"Sequence":{"atoms":[63,64]}},{"Repetition":{"atom":68,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"parts","atom":69}},{"Repetition":{"atom":62,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":87}},{"Entity":{"atom":85}},{"Str":{"pattern":"/"}},{"Entity":{"atom":79}},{"Str":{"pattern":"A"}},{"Str":{"pattern":"C"}},{"Alternative":{"atoms":[76,77]}},{"Named":{"name":"supplement_kind","atom":78}},{"Entity":{"atom":83}},{"Entity":{"atom":24}},{"Repetition":{"atom":81,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"supplement_number","atom":82}},{"Sequence":{"atoms":[74,75,80]}},{"Named":{"name":"supplement","atom":84}},{"Repetition":{"atom":73,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"supplements","atom":86}},{"Str":{"pattern":" V"}},{"Entity":{"atom":95}},{"Entity":{"atom":93}},{"Re":{"pattern":"[\\x30-\\x39]"}},{"Re":{"pattern":"[.]"}},{"Alternative":{"atoms":[91,92]}},{"Repetition":{"atom":90,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"version","atom":94}},{"Sequence":{"atoms":[88,89]}},{"Str":{"pattern":" ed."}},{"Entity":{"atom":101}},{"Entity":{"atom":24}},{"Repetition":{"atom":99,"min":1,"max":null,"tag":"Repetition"}},{"Named":{"name":"edition","atom":100}},{"Sequence":{"atoms":[97,98]}},{"Alternative":{"atoms":[96,102]}},{"Repetition":{"atom":103,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" ("}},{"Entity":{"atom":109}},{"Entity":{"atom":24}},{"Repetition":{"atom":107,"min":4,"max":4,"tag":"Repetition"}},{"Named":{"name":"year","atom":108}},{"Str":{"pattern":"-"}},{"Entity":{"atom":114}},{"Entity":{"atom":24}},{"Repetition":{"atom":112,"min":2,"max":2,"tag":"Repetition"}},{"Named":{"name":"month","atom":113}},{"Str":{"pattern":")"}},{"Sequence":{"atoms":[105,106,110,111,115]}},{"Repetition":{"atom":116,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[0,1,19,20,61,71,72,104,117]}},{"Str":{"pattern":"ETSI "}},{"Entity":{"atom":18}},{"Str":{"pattern":" "}},{"Entity":{"atom":54}},{"Str":{"pattern":" "}},{"Entity":{"atom":59}},{"Sequence":{"atoms":[123,124]}},{"Repetition":{"atom":125,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":70}},{"Repetition":{"atom":127,"min":0,"max":1,"tag":"Maybe"}},{"Entity":{"atom":87}},{"Repetition":{"atom":129,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" V"}},{"Entity":{"atom":95}},{"Sequence":{"atoms":[131,132]}},{"Str":{"pattern":" ed."}},{"Entity":{"atom":101}},{"Sequence":{"atoms":[134,135]}},{"Alternative":{"atoms":[133,136]}},{"Repetition":{"atom":137,"min":0,"max":1,"tag":"Maybe"}},{"Str":{"pattern":" ("}},{"Entity":{"atom":109}},{"Str":{"pattern":"-"}},{"Entity":{"atom":114}},{"Str":{"pattern":")"}},{"Sequence":{"atoms":[139,140,141,142,143]}},{"Repetition":{"atom":144,"min":0,"max":1,"tag":"Maybe"}},{"Sequence":{"atoms":[119,120,121,122,126,128,130,138,145]}},{"Alternative":{"atoms":[118,146]}}],"root":147},"bindings":[{"capture":"type","path":"type","type":"string","card":null,"preprocess":null},{"capture":"number","path":"number","type":"string","card":null,"preprocess":null},{"capture":"minor","path":"minor","type":"string","card":null,"preprocess":null},{"capture":"part","path":"part","type":"string","card":null,"preprocess":null},{"capture":"part","path":"parts[].part","type":"string","card":null,"preprocess":null},{"capture":"version","path":"version","type":"string","card":null,"preprocess":null},{"capture":"edition","path":"edition","type":"string","card":null,"preprocess":null},{"capture":"year","path":"year","type":"string","card":null,"preprocess":null},{"capture":"month","path":"month","type":"string","card":null,"preprocess":null},{"capture":"supplement","path":"supplements[].supplement","type":"raw","card":null,"preprocess":null}]}},"preprocess":{},"tables":{},"lint":{"order_warnings":["rule identifier: branches 1 and 2 are order-dependent (shared first bytes; ordered choice is decisive)"]},"default_entry":"identifier","render":{},"derive":{},"tests":[{"entry":"identifier","kind":"accept","input":"ETSI EG 200 053 V1.5.1 (2004-06)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 175","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 175-2","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EN 300 019-1-0 V2.1.2 (2003-09)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI TS 103 702","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI EG 201 880 V1.2.1","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI GTS GSM 02.01 V5.5.0 (1999-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI I-ETS 300 003 ed.1 (1991-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI ETR 108/A1 ed.1 (1995-08)","expect":{}},{"entry":"identifier","kind":"accept","input":"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)","expect":{}},{"entry":"identifier","kind":"reject","input":"nonsense","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI XX 100","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 V","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 V1.2.x","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 (","expect":{}},{"entry":"identifier","kind":"reject","input":"ETSI EN 300 175 (2004-6)","expect":{}},{"entry":"identifier","kind":"example","input":"ETSI EG 200 053 V1.5.1 (2004-06)","expect":{"type":"EG","number":"200 053","version":"1.5.1","year":"2004","month":"06"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 175","expect":{"type":"EN","number":"300 175"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 175-2","expect":{"type":"EN","number":"300 175","part":"2"}},{"entry":"identifier","kind":"example","input":"ETSI EN 300 019-1-0 V2.1.2 (2003-09)","expect":{"type":"EN","number":"300 019","part":"1","version":"2.1.2","year":"2003","month":"09"}},{"entry":"identifier","kind":"example","input":"ETSI TS 103 702","expect":{"type":"TS","number":"103 702"}},{"entry":"identifier","kind":"example","input":"ETSI EG 201 880 V1.2.1","expect":{"type":"EG","number":"201 880","version":"1.2.1"}},{"entry":"identifier","kind":"example","input":"ETSI GTS GSM 02.01 V5.5.0 (1999-08)","expect":{"type":"GTS","number":"GSM 02.01","version":"5.5.0","year":"1999","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)","expect":{"type":"GR","number":"NFV-EVE 008","version":"3.1.1","year":"2017","month":"12"}},{"entry":"identifier","kind":"example","input":"ETSI I-ETS 300 003 ed.1 (1991-08)","expect":{"type":"I-ETS","number":"300 003","edition":"1","year":"1991","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI ETR 108/A1 ed.1 (1995-08)","expect":{"type":"ETR","number":"108","edition":"1","year":"1995","month":"08"}},{"entry":"identifier","kind":"example","input":"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)","expect":{"type":"ETS","number":"300 092","part":"1","edition":"1","year":"1994","month":"04"}}],"docs":{},"source":"# PFS-generated grammar — DO NOT EDIT BY HAND.\n# Source: definitions/etsi.pfs (pfs:1) sha256:490ba9435f44dbd2d59429ae6d9527909c39444f19fec5a33a8cad91e89e3581\n# Compiler: pubid/grammar/pfs 0.1.0\n# Flavor key: etsi_pfs (grammar PubidEtsiPfs)\n# Regenerate: ruby scripts/pfs compile definitions/etsi.pfs --as etsi_pfs\n\ngrammar PubidEtsiPfs version \"0.1.0\" edition 2 {\n\n  # Grammar fragments: named lexical terms declared under `grammar:`.\n  digit = %x30-39\n  alnum_char = %x41-5A / %x61-7A / %x30-39\n  version_char = %x30-39 / %x2E\n\n  # Fields: one capture rule per declared field; the whole pattern\n  # is the capture.\n  etsi_type = (\"I-ETS\" / \"TCRTR\" / \"GTS\" / \"ETR\" / \"ETS\" / \"TBR\" / \"NET\" / \"EN\" / \"ES\" / \"EG\" / \"TS\" / \"GR\" / \"GS\" / \"SR\" / \"TR\") as type\n  etsi_number = ((\"GSM\" \" \" 1*digit \".\" 1*digit) / (1*digit \".\" 1*digit) / (1*alnum_char [(\"-\" 1*alnum_char)] \" \" 1*digit) / (1*digit)) as number\n  etsi_minor = (1*digit) as minor\n  etsi_part = (1*alnum_char) as part\n  etsi_parts = (1*(\"-\" etsi_part)) as parts\n  etsi_version = (1*version_char) as version\n  etsi_edition = (1*digit) as edition\n  etsi_year = (4digit) as year\n  etsi_month = (2digit) as month\n\n  # Supplement run (compiled from the supplements declaration):\n  # each item binds its kind face and ordinal; the builder folds\n  # the run into the declared wrapper classes.\n  etsi_supplement_kind = (\"A\" / \"C\") as supplement_kind\n  etsi_supplement_number = (1*digit) as supplement_number\n  etsi_supplement = ( \"/\" etsi_supplement_kind etsi_supplement_number ) as supplement\n  etsi_supplements = (1*etsi_supplement) as supplements\n\n  # Identifier rule: the canonical template first, then the\n  # declared alternates (parse-in spellings; they normalize to the\n  # canonical render face).\n  identifier = {\n    \"ETSI \" etsi_type \" \" etsi_number [\" \" etsi_minor] [etsi_parts] etsi_supplements [( \" V\" etsi_version / \" ed.\" etsi_edition )] [\" (\" etsi_year \"-\" etsi_month \")\"]\n    / \"ETSI \" etsi_type \" \" etsi_number [\" \" etsi_minor] [etsi_parts] [etsi_supplements] [( \" V\" etsi_version / \" ed.\" etsi_edition )] [\" (\" etsi_year \"-\" etsi_month \")\"]\n  }\n  entry identifier: identifier\n\n  # Typed model bindings: every bound capture lands on the\n  # consumer model's field of the same name.\n  bindings identifier {\n    type -> type (string)\n    number -> number (string)\n    minor -> minor (string)\n    part -> part (string)\n    part -> parts[].part (string)\n    version -> version (string)\n    edition -> edition (string)\n    year -> year (string)\n    month -> month (string)\n    supplement -> supplements[].supplement (raw)\n  }\n\n  # REQUIRED examples from the definition — accepts, rejects, and\n  # the capture expectations the compiler replayed at compile time.\n  test {\n    accept \"ETSI EG 200 053 V1.5.1 (2004-06)\"\n    accept \"ETSI EN 300 175\"\n    accept \"ETSI EN 300 175-2\"\n    accept \"ETSI EN 300 019-1-0 V2.1.2 (2003-09)\"\n    accept \"ETSI TS 103 702\"\n    accept \"ETSI EG 201 880 V1.2.1\"\n    accept \"ETSI GTS GSM 02.01 V5.5.0 (1999-08)\"\n    accept \"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)\"\n    accept \"ETSI I-ETS 300 003 ed.1 (1991-08)\"\n    accept \"ETSI ETR 108/A1 ed.1 (1995-08)\"\n    accept \"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)\"\n    reject \"nonsense\"\n    reject \"ETSI\"\n    reject \"ETSI EN\"\n    reject \"ETSI XX 100\"\n    reject \"ETSI EN 300 175 V\"\n    reject \"ETSI EN 300 175 V1.2.x\"\n    reject \"ETSI EN 300 175 (\"\n    reject \"ETSI EN 300 175 (2004-6)\"\n    example \"ETSI EG 200 053 V1.5.1 (2004-06)\" { type: \"EG\" number: \"200 053\" version: \"1.5.1\" year: \"2004\" month: \"06\" }\n    example \"ETSI EN 300 175\" { type: \"EN\" number: \"300 175\" }\n    example \"ETSI EN 300 175-2\" { type: \"EN\" number: \"300 175\" part: \"2\" }\n    example \"ETSI EN 300 019-1-0 V2.1.2 (2003-09)\" { type: \"EN\" number: \"300 019\" part: \"1\" version: \"2.1.2\" year: \"2003\" month: \"09\" }\n    example \"ETSI TS 103 702\" { type: \"TS\" number: \"103 702\" }\n    example \"ETSI EG 201 880 V1.2.1\" { type: \"EG\" number: \"201 880\" version: \"1.2.1\" }\n    example \"ETSI GTS GSM 02.01 V5.5.0 (1999-08)\" { type: \"GTS\" number: \"GSM 02.01\" version: \"5.5.0\" year: \"1999\" month: \"08\" }\n    example \"ETSI GR NFV-EVE 008 V3.1.1 (2017-12)\" { type: \"GR\" number: \"NFV-EVE 008\" version: \"3.1.1\" year: \"2017\" month: \"12\" }\n    example \"ETSI I-ETS 300 003 ed.1 (1991-08)\" { type: \"I-ETS\" number: \"300 003\" edition: \"1\" year: \"1991\" month: \"08\" }\n    example \"ETSI ETR 108/A1 ed.1 (1995-08)\" { type: \"ETR\" number: \"108\" edition: \"1\" year: \"1995\" month: \"08\" }\n    example \"ETSI ETS 300 092-1/A1/C1 ed.1 (1994-04)\" { type: \"ETS\" number: \"300 092\" part: \"1\" edition: \"1\" year: \"1994\" month: \"04\" }\n  }\n}\n","source_hash":"12923bc0c9d666d9c01feb4667bce45e7a3acb7b221bcdc59b4886ecbeda8f92","unicode_tables":"onigmo (Ruby 3.4.8)","compiler_version":"1.3.126","edition":2,"semantics_hash":"sha256:1078102d9883a5c7906a15119592a43447800ee5aaca2bbf060ac6394a089aa3","checksum":"sha256:bea8fc40624aa907dd59befc802bf84ee56591ed0130437c2d0fe6065ebaf3d6"}

data/lib/pubid/doi_pfs/builder.rb

@@ -7,8 +7,8 @@
 
         def build(data)
           Identifiers::Resource.new(
-            prefix: data[:prefix],
-            suffix: data[:suffix],
+          prefix: data[:prefix],
+          suffix: data[:suffix],
           )
         end
       end

data/lib/pubid/etsi_pfs/CLAUDE.md

@@ -39,57 +39,65 @@ Measured surface (see the spec header for the numbers and their meaning):
   (all 15 type tokens; the four number shapes GSM/dotted/complex/simple;
   minor; the parts run; the /A//C supplement runs; `V`-versions and
   `ed.N`; the `(YYYY-MM)` date).
-- **to_hash and to_pubid_urn byte parity: 18,945/24,718** — exactly the
-  rows carrying none of the three constructs pfs:1 cannot declare. Each
-  gap is pinned per construct in the spec, so compiler progress turns the
-  pin red:
-  1. **collection bindings** — the coded model stores `["1","0"]` (the
-     `part -> parts[].part` binding); the compiled capture is the printed
-     dash run `"-1-0"`.
-  2. **the edition face** — the coded model folds `ed.N` into
-     `Version(version: "N", is_edition: true)`; the compiled hash carries
-     `edition: "N"`.
-  3. **supplement wrappers** — the coded model wraps `/A1` `/C1` as
-     Amendment/Corrigendum classes with an Integer ordinal delegating to
-     their base; the compiled row stays a flat etsi-standard carrying the
-     printed run `"/A1"`.
-- **to_s** renders the canonical CORE face (`ETSI <type> <number>`) —
-  pfs:1 render faces cannot render optionals, so every corpus row (all of
-  which carry version/ed + date) renders shorter; bare ids agree
-  byte-for-byte.
-- **to_urn** is a compiler gap (the coded generator is hand-written Ruby
-  composing `urn:etsi:{type}:{code}:{version}:{date}`; the generated
-  generator pins the namespace only). Note the CODED generator raises
-  `ArgumentError` on months 08/09 (`format('%02d', "08")` — the zero-padded
-  string reads as an invalid octal); pre-existing on main, pinned by the
-  parity spec.
-- **to_mr_string** is a compiler gap (the coded slug reads the flavor's
-  `mr_*` hooks — type/parts/edition/date segments; the base hooks find
-  none of them on the compiled columns).
+- **to_hash and to_pubid_urn byte parity: 24,718/24,718** (phase 3
+  closed all three constructs; the former per-construct pins are now
+  parity rows):
+  1. **collection bindings** (3,772 rows) — `parts` is a `kind: list`
+     field binding its `part` item per repetition; the compiled model
+     stores the coded `["1","0"]` array, dropped when empty.
+  2. **the edition face** (1,833 rows) — the `ed.N` capture folds onto
+     `version` + `is_edition: true` (the coded Version component shape).
+  3. **supplement wrappers** (168 rows) — the `supplements:` declaration
+     folds the printed run into SYNTHESIZED Amendment/Corrigendum classes
+     over the base standard, outermost last ("/A1/C1" is Corrigendum over
+     Amendment over the standard).
+  Trajectory: 18,945 → 22,717 (collections) → 24,718 (fold + wrappers).
+- **to_s** renders the full printed face — the canonical template's
+  presence-guarded optionals and the V/ed alternated tail render what
+  the input carried (the conditional-render segment feature).
+- **to_urn** is DECLARED (`urn.official`): type lowercased, the composed
+  code (number + minor + prefix-glued parts), the v/ed version face
+  (the edition affix under the fold flag), the year-month date group —
+  byte-identical with the coded generator everywhere the coded one
+  renders at all. The CODED generator raises `ArgumentError` on months
+  08/09 (`format('%02d', "08")` — the zero-padded string reads as an
+  invalid octal); pre-existing on main, pinned by the parity spec — the
+  compiled generator renders the captured month verbatim and does not
+  share the defect.
+- **to_mr_string** is DECLARED (`mr:`): the coded mr_type /
+  mr_number_with_part / mr_year / mr_edition hooks over the columns,
+  byte-identical slugs (`etsi.eg.200-053.2004-06.1-5-1`), with the
+  wrapper's supplement suffix (`…_a1.1`) carried by the synthesized
+  classes.
 
 ## Non-obvious facts, learned the hard way
 
 - The generated `--ruby-out` lands at `lib/etsi_pfs.rb`; the autoload and
   the `#{__dir__}` paths require it at `lib/pubid/etsi_pfs.rb` — move both
   the file and the directory (commands above).
-- `core: ["number"]` in a `.pfs` urn type row would generate
-  `core: [:number]`, which crashes `PubidUrn.define` at load time (the
-  generator emits `core.map(&:to_sym)`); only `core: []` round-trips.
-  The instance's URNs resolve through the CODED schema anyway (the flavor
-  segment of the canonical tag is `etsi`), so the alias rows are the
-  future-cutover shape.
+- The instance's URNs resolve through the CODED schema anyway (the
+  flavor segment of the canonical tag is `etsi`), so the alias's schema
+  rows are the future-cutover shape; the wrapper rows now carry the
+  coded `core: [["number", :int]]` ordinals (the phase-3 int-kind
+  cores).
 - `V1..1` parses in BOTH flavors (`.` is a version_char) and `GS` is a
   real type token — neither is a parity negative.
 - `Pubid::EtsiPfs.parse("ETSI …")` never hijacks `Pubid.parse` (registry
   keys sort `"etsi"` first), and `Pubid.from_hash` of an alias hash
   resolves the coded `EtsiStandard` (one scheme, one `_type`).
 - The corpus inventory (`spec/fixtures/etsi/identifiers/full/`) is the
-  parity source; its bucket split is pinned: plain 18,945 / parts 3,772 /
-  edition 1,833 / supplement 168.
+  parity source; its former bucket split (plain 18,945 / parts 3,772 /
+  edition 1,833 / supplement 168) is now the per-gap parity trajectory —
+  all 24,718 rows agree on to_hash, to_pubid_urn, to_s, to_urn and
+  to_mr_string.
+- The run's internal captures (`supplement_kind` / `supplement_number`)
+  bind only through the run's item rows, and unbound captures arrive as
+  raw `Parsanol::Slice` leaves — the generated builder unwraps
+  `Slice#content` (the cen_cenelec precedent).
 
-## v1 boundaries
+## v1 boundaries (still)
 
-Single-type schemes only, `kind: string` fields only, no free-standing
-`stages:`/`supplements:` sections, no semantic decode rules — see
-`pubid-grammar`'s `definitions/README.md` for the language reference and
-the fail-closed validation rules.
+Single declared type per scheme (the `supplements:` wrappers are the one
+multi-class shape), no free-standing `stages:` maps, no semantic decode
+rules — see `pubid-grammar`'s `definitions/README.md` for the language
+reference and the fail-closed validation rules.

data/lib/pubid/etsi_pfs/builder.rb

@@ -1,25 +1,58 @@
-  module Pubid
-    module EtsiPfs
-      class Builder
-        def self.build(parsed_data)
-          new.build(parsed_data)
-        end
+module Pubid
+  module EtsiPfs
+    class Builder
+      # The wrapper classes by kind face: the run's dispatch.
+      SUPPLEMENT_WRAPPERS = {
+        "A" => Identifiers::Amendment,
+        "C" => Identifiers::Corrigendum,
+      }.freeze
+
+      def self.build(parsed_data)
+        new.build(parsed_data)
+      end
 
-        def build(data)
-          Identifiers::Standard.new(
+      def build(data)
+        identifier = Identifiers::Standard.new(
           type: data[:type],
           number: data[:number],
           minor: data[:minor],
-          parts: data[:parts],
-          supplements: data[:supplements],
-          version: data[:version],
-          edition: data[:edition],
+          parts: build_parts(data),
+          version: data[:version] || data[:edition],
+          is_edition: !data[:edition].nil?,
           year: data[:year],
           month: data[:month],
+        )
+        run = Array(data[:supplements])
+        run.each do |row|
+          item = row[:supplement] || row["supplement"] || {}
+          kind = unwrap(item[:supplement_kind] || item["supplement_kind"])
+          identifier = SUPPLEMENT_WRAPPERS.fetch(kind).new(
+            number: unwrap(item[:supplement_number] || item["supplement_number"]).to_i,
+            base: identifier,
           )
         end
+        identifier
+      end
+
+      # The run's internal captures bind only through the item row
+      # (the cen_cenelec precedent), so unbound ones arrive as raw
+      # leaves — a Parsanol::Slice or a {value:, offset: ...} span.
+      # Unwrap the captured value.
+      def unwrap(capture)
+        return capture.content if capture.is_a?(Parsanol::Slice)
+        return capture[:value] if capture.is_a?(Hash) && capture.key?(:value)
+
+        capture
+      end
+
+      # The parts column from its bound item rows.
+      def build_parts(data)
+        Array(data[:parts]).map do |row|
+          row[:part] || row["part"]
+        end.compact
       end
     end
   end
 
   Pubid::EtsiPfs::Builder.prepend(Pubid::Builder::AllPartsWrap)
+end

data/lib/pubid/etsi_pfs/identifier.rb

@@ -1,50 +1,32 @@
-  module Pubid
-    module EtsiPfs
-      class Identifier < ::Pubid::Identifier
-        attribute :type, :string
-        attribute :number, :string
-        attribute :minor, :string
-        attribute :parts, :string
-        attribute :supplements, :string
-        attribute :version, :string
-        attribute :edition, :string
-        attribute :year, :string
-        attribute :month, :string
+module Pubid
+  module EtsiPfs
+    class Identifier < ::Pubid::Identifier
+      attribute :publisher, :string, default: -> { "ETSI" }
 
-        ETSI_TYPE_MAP = {
-          "pubid:etsi:etsi-standard" => "Pubid::EtsiPfs::Identifiers::Standard",
-        }.freeze
+      PUBLISHER = "ETSI"
 
-        key_value do
-          map "_type", to: :_type, polymorphic_map: ETSI_TYPE_MAP
-          map "type", to: :type
-          map "number", to: :number
-          map "minor", to: :minor
-          map "parts", to: :parts
-          map "supplements", to: :supplements
-          map "version", to: :version
-          map "edition", to: :edition
-          map "year", to: :year
-          map "month", to: :month
-        end
-
-        PUBLISHER = "ETSI"
+      # The scheme's declared publisher token: the internal-form
+      # cut (to_s(with_publisher: false)) strips it from the
+      # rendered face.
+      def publisher_prefixes
+        [PUBLISHER]
+      end
 
-        def self.parse(identifier)
-          unless identifier.is_a?(String)
-            raise Pubid::Errors::InvalidInputError,
-                  Pubid::INPUT_NOT_A_STRING_MESSAGE
-          end
+      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
+        if identifier.length > Pubid::MAX_INPUT_LENGTH
+          raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
+        end
 
-          identifier = ::Pubid.utf8_input(identifier)
+        identifier = ::Pubid.utf8_input(identifier)
 
-          parsed = Pubid::Parg::Model.bound(:etsi_pfs, identifier)
-          Builder.build(parsed)
-        end
+        parsed = Pubid::Parg::Model.bound(:etsi_pfs, identifier)
+        Builder.build(parsed)
       end
     end
   end
+end

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

@@ -0,0 +1,20 @@
+module Pubid
+  module EtsiPfs
+    module Identifiers
+      # The synthesized Amendment wrapper (PFS supplements
+      # declaration): the kind face "A" is the run's
+      # dispatch token and the printed notation's face.
+      class Amendment < Supplement
+        FACE = "A".freeze
+
+        def self.face
+          FACE
+        end
+
+        def self.polymorphic_name
+          "pubid:etsi:amendment"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Pubid
+  module EtsiPfs
+    module Identifiers
+      # The synthesized Corrigendum wrapper (PFS supplements
+      # declaration): the kind face "C" is the run's
+      # dispatch token and the printed notation's face.
+      class Corrigendum < Supplement
+        FACE = "C".freeze
+
+        def self.face
+          FACE
+        end
+
+        def self.polymorphic_name
+          "pubid:etsi:corrigendum"
+        end
+      end
+    end
+  end
+end

data/lib/pubid/etsi_pfs/identifiers/standard.rb

@@ -1,22 +1,71 @@
-  module Pubid
-    module EtsiPfs
-      module Identifiers
-        # Concrete ETSI Standard identifier type (PFS type `standard`).
-        class Standard < Identifier
+module Pubid
+  module EtsiPfs
+    module Identifiers
+      # Concrete ETSI Standard identifier type (PFS type `standard`).
+      class Standard < Identifier
           TYPED_STAGES = [].freeze
 
-          def self.type
-            { key: :etsi, web: :etsi, title: "ETSI Standard", short: "ETSI" }
-          end
+      attribute :type, :string
+      attribute :number, :string
+      attribute :minor, :string
+      attribute :parts, :string, collection: true, initialize_empty: true
+      attribute :version, :string
+      attribute :year, :string
+      attribute :month, :string
+      attribute :is_edition, :boolean, default: -> { false }
 
-          # The scheme-canonical wire tag declared in the definition:
-          # to_hash stays byte-identical with the scheme's coded
-          # flavor, and this flavor's own from_hash routes the tag
-          # to this class.
-          def self.polymorphic_name
-            "pubid:etsi:etsi-standard"
-          end
+        key_value do
+          map "_type", to: :_type
+          map "type", to: :type
+          map "number", to: :number
+          map "minor", to: :minor
+          map "parts", to: :parts
+          map "version", to: :version
+          map "year", to: :year
+          map "month", to: :month
+          map "is_edition", to: :is_edition
+        end
+
+        def self.type
+          { key: :etsi, web: :etsi, title: "ETSI Standard", short: "ETSI" }
+        end
+
+        # The scheme-canonical wire tag declared in the definition:
+        # to_hash stays byte-identical with the scheme's coded
+        # flavor, and this flavor's own from_hash routes the tag
+        # to this class.
+        def self.polymorphic_name
+          "pubid:etsi:etsi-standard"
+        end
+
+        def mr_type
+          mr_sanitize(type)
+        end
+
+        def mr_number_with_part
+          mr_sanitize([number, minor, *Array(parts)].compact.join("-"))
+        end
+
+        def mr_year
+          mr_sanitize([year, month].compact.join("-"))
+        end
+
+        def mr_edition
+          mr_sanitize(version)
+        end
+
+        # The MR charset rule (the coded flavors' mr_sanitize):
+        # lowercase, [a-z0-9-], non-charset runs collapsed to one
+        # dash; empty answers nil so the joined slug never gains a
+        # blank segment.
+        def mr_sanitize(value)
+          return nil if value.nil? || value.to_s.empty?
+
+          sanitized = value.to_s.downcase
+            .gsub(/[^a-z0-9-]+/, "-").gsub(/\A-+|-+\z/, "")
+          sanitized.empty? ? nil : sanitized
         end
       end
     end
   end
+end

data/lib/pubid/etsi_pfs/identifiers/supplement.rb

@@ -0,0 +1,72 @@
+module Pubid
+  module EtsiPfs
+    module Identifiers
+      # The supplement wrapper base (pubid#706 phase 3): the
+      # wrapper owns its ordinal and the base identifier; every
+      # delegated attribute reads through.
+      class Supplement < ::Pubid::EtsiPfs::Identifier
+        attribute :base, ::Pubid::EtsiPfs::Identifier
+        attribute :number, :integer
+
+        key_value do
+          map "_type", to: :_type
+          map "number", to: :number
+          map "base", with: { to: :base_to_kv, from: :base_from_kv }
+        end
+
+        # Serialize the base via its own to_hash so it collapses
+        # to the leaf standard shape (the coded converters'
+        # rule).
+        def base_to_kv(model, doc)
+          return unless model.base
+
+          doc.add_child(
+            Lutaml::KeyValue::DataModel::Element.new("base", model.base.to_hash),
+          )
+        end
+
+        # Re-dispatch through the flavor base so _type resolves
+        # to the concrete Standard (the coded JCGM/ETSI rule).
+        def base_from_kv(model, value)
+          return unless value
+
+          model.base = ::Pubid::EtsiPfs::Identifier.from_hash(value)
+        end
+
+        # Delegations: the wrapper reads through to the wrapped
+        # standard (the coded SupplementIdentifier shape).
+        def type
+          base&.type
+        end
+
+        def version
+          base&.version
+        end
+
+        def year
+          base&.year
+        end
+
+        def month
+          base&.month
+        end
+
+        def is_edition
+          base&.is_edition
+        end
+
+        # The printed notation: the kind face + the ordinal.
+        def supplement_notation
+          "#{self.class.face}#{number}"
+        end
+
+        # The MR slug's supplement suffix: the shared MrString
+        # recurses into base and appends this (the coded
+        # mr_supplement_suffix rule).
+        def mr_supplement_suffix
+          [supplement_notation.to_s.downcase, number].compact.join(".")
+        end
+      end
+    end
+  end
+end

data/lib/pubid/etsi_pfs/identifiers.rb

@@ -1,7 +1,10 @@
 module Pubid
   module EtsiPfs
     module Identifiers
-      autoload :Standard, "#{__dir__}/identifiers/standard"
+            autoload :Standard, "#{__dir__}/identifiers/standard"
+            autoload :Supplement, "#{__dir__}/identifiers/supplement"
+            autoload :Amendment, "#{__dir__}/identifiers/amendment"
+            autoload :Corrigendum, "#{__dir__}/identifiers/corrigendum"
     end
   end
 end

data/lib/pubid/etsi_pfs/pubid_urn_schema.rb

@@ -12,8 +12,10 @@
         atom "year", "year"
         atom "month", "month"
         atom "version", "v"
-        type "pubid:etsi_pfs:identifier", "id", core: []
-        type "pubid:etsi_pfs:standard", "es", core: []
+        type "pubid:etsi:etsi-standard", "es", core: []
+        type "pubid:etsi:amendment", "amd", core: [["number", :int]]
+        type "pubid:etsi:corrigendum", "cor", core: [["number", :int]]
+        type "pubid:etsi:identifier", "id", core: []
       end
     end
   end

data/lib/pubid/etsi_pfs/renderer.rb

@@ -3,7 +3,35 @@ module Pubid
     # Human renderer, generated from the canonical template.
     class Renderer < ::Pubid::Renderers::Base
       def render(**_opts)
-        "ETSI #{@id.type} #{@id.number}"
+        f = render_fields(@id)
+        "ETSI #{f[:type]} #{f[:number]}#{(" #{f[:minor]}") if f[:minor]}#{("#{f[:parts]}") if f[:parts]}#{f[:supplements]}#{if f[:version]; " V#{f[:version]}" elsif f[:edition]; " ed.#{f[:edition]}"; end}#{(" (#{f[:year]}-#{f[:month]})") if f[:year] && f[:month]}"
+      end
+
+      private
+
+      # The field view: a supplement wrapper reads through to
+      # the wrapped standard and carries the notation run
+      # ("/A1/C1", outermost last); the fold's target renders
+      # only outside the fold flag (the V/ed faces are mutually
+      # exclusive by grammar).
+      def render_fields(id)
+        root = id
+        run = +""
+        while root.is_a?(Identifiers::Supplement)
+          run.prepend("/#{root.supplement_notation}")
+          root = root.base
+        end
+        {
+          type: root.type,
+          number: root.number,
+          minor: root.minor,
+          parts: root.parts.any? ? root.parts.map { |item| "-#{item}" }.join : nil,
+          version: root.is_edition ? nil : root.version,
+          edition: root.is_edition ? root.version : nil,
+          year: root.year,
+          month: root.month,
+          supplements: run.empty? ? nil : run,
+        }
       end
     end
   end

data/lib/pubid/etsi_pfs/urn_generator.rb

@@ -1,12 +1,49 @@
 module Pubid
   module EtsiPfs
-    # The official URN generator, pinned to the scheme's declared
-    # namespace ("etsi") so to_urn stays
-    # scheme-canonical under the compiled flavor key.
+    # The official URN generator: the scheme's declared namespace
+    # ("etsi") and the ordered segments the
+    # definition's urn.official declares — an absent field leaves no
+    # segment, a date group joins its fields with "-", a compose
+    # slots its fields with the declared glue, and a fold target
+    # switches to its edition affix while the flag holds.
     class UrnGenerator < ::Pubid::UrnGenerator::Base
       def urn_namespace
         "etsi"
       end
+
+      def generate
+        parts = ["urn", urn_namespace]
+        parts.concat(official_segments)
+        parts.join(":")
+      end
+
+      private
+
+      # A supplement wrapper reads through to the wrapped
+      # standard (the coded generator's own delegation shape).
+      def subject
+        current = @identifier
+        current = current.base while current.is_a?(Identifiers::Supplement)
+        current
+      end
+
+      def official_segments
+        segments = []
+        segments << subject.type.to_s.downcase if subject.type
+        code = []
+        code << subject.number.to_s if subject.number
+        code << " " + subject.minor.to_s if subject.minor
+        subject.parts.each { |item| code << "-" + item } if subject.parts.any?
+        segments << code.join unless code.empty?
+        if subject.is_edition
+          segments << "ed." + subject.version.to_s.downcase
+        elsif subject.version
+          segments << "v" + subject.version.to_s.downcase
+        end
+        date = [subject.year, subject.month].compact
+        segments << date.join("-") unless date.empty?
+        segments
+      end
     end
   end
 end

data/lib/pubid/etsi_pfs.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # PFS-generated flavor — DO NOT EDIT BY HAND.
-# Source: definitions/etsi.pfs (pfs:1) sha256:9343088bf087b55ea790057e6be0bbebe2272407ee81f035b52e5f9a4d5c7b76
+# Source: definitions/etsi.pfs (pfs:1) sha256:490ba9435f44dbd2d59429ae6d9527909c39444f19fec5a33a8cad91e89e3581
 # Compiler: pubid/grammar/pfs 0.1.0 (baked with parsanol 1.3.126)
 # Regenerate: ruby scripts/pfs compile definitions/etsi.pfs --as etsi_pfs --ruby-out <dir>
 
@@ -16,6 +16,7 @@ module Pubid
     extend Pubid::PrefixesSupport
 
     PREFIXES = ["ETSI"].freeze
+    
 
     autoload :Builder, "#{__dir__}/etsi_pfs/builder"
     autoload :Identifier, "#{__dir__}/etsi_pfs/identifier"

data/lib/pubid/jis/CLAUDE.md

@@ -29,6 +29,41 @@
   `UrnParser` does not prepend `JIS ` to a code that starts with `WES `.
 - `PREFIXES` includes `"WES"`, so `Pubid.parse("WES …")` routes to JIS.
 
+## WES `(E)` before the year, `WES TR`, `WES TS` (relaton-jis#18)
+
+- JSA Webdesk lists 14 WES ids that the grammar does not read:
+  `WES 1112(E):2022`, `WES TR 2032:2024`, `WES TS 2816(E):2015`.
+- **A Ruby shim reads them, not the grammar.** `Parser.ingest` cuts
+  the `TR`/`TS` token and a `(E)`/`(J)` that comes before `:year`, and
+  binds them as `wes_type` and `wes_language`. Other input passes unchanged.
+  The hand-off `pubid__pubid-grammar__jis-wes-language-tr-ts` asks
+  pubid-grammar to bind the same two captures. After that lands, re-vendor
+  `jis.json`, re-pin `parg_reaffirmed_spec.rb`, and delete the shim. The
+  builder does not change.
+- **`WES TR`/`WES TS` are classes**: `WeldingEngineeringTechnicalReport`
+  and `…TechnicalSpecification` < `WeldingEngineeringStandard`, with
+  `WES_TYPE` in `code` (`WES TR 2032`) and in `mr_type`. Class-strict `==`
+  keeps them apart from `WES 2032` and `JIS TR Z 2032`.
+- **`language_before_year`** records where the source put the language. It
+  is spelling only (`equality_ignored`, a `langfirst` facet in the pubid
+  URN): `WES 1112(E):2022 == WES 1112:2022(E)`, and each renders as written.
+  The language itself is identity, so the `(E)` edition is not the Japanese
+  one. JIS ids never set the flag; `JIS X 0208(E):1997` still fails.
+- The pubid URN schema now places `language` and the supplement ordinal
+  (`core: [["number", :int]]`; an `EXPL` number is the atom `n`). Before,
+  every `(E)` id and every supplement raised in `to_pubid_urn`, and no
+  supplement was in the fixture corpus to show it.
+- **`Builder` reads both parse shapes.** The typed bindings
+  (`Parg::Model.bound`) carry a supplement flat (`amd_type`, …); the raw
+  tree (`Parg::Backend.parse`) nests it under `:amendment`/`:explanation`/
+  `:corrigendum`. `flatten_supplement` folds the nested form. Before, the
+  tree path dropped every supplement silently (`…/AMD 1:2000` built as the
+  bare base). `typed_binding_parity_spec.rb` found it when the first
+  supplement entered the pass corpus.
+- **The shim lives in `Parser.ingest`** and returns `[face, bindings]`.
+  `typed_binding_parity_spec.rb` calls it on the tree path too and merges
+  the bindings, as `Identifier.parse` does.
+
 ## Equality includes the class
 
 - `Identifier#==` requires `other.instance_of?(self.class)`: `JIS TR X

data/lib/pubid/jis/builder.rb

@@ -8,6 +8,7 @@ module Pubid
       end
 
       def build(data)
+        data = flatten_supplement(data)
         # Handle supplement case first; the SYMBOL clause (if any) attaches to
         # the outermost identifier, be it the base or the supplement. The
         # bindings bind the supplement's fields flat (amd_type/amd_number/…),
@@ -29,6 +30,19 @@ module Pubid
 
       private
 
+      SUPPLEMENT_KEYS = %i[amendment explanation corrigendum].freeze
+
+      # The typed bindings carry a supplement's fields flat (amd_type, …).
+      # The raw parse tree nests them under :amendment, :explanation or
+      # :corrigendum. Read both shapes, or the tree path drops the
+      # supplement.
+      def flatten_supplement(data)
+        key = SUPPLEMENT_KEYS.find { |k| data[k].is_a?(Hash) }
+        return data unless key
+
+        data.except(key).merge(data[key].compact)
+      end
+
       # nil => no SYMBOL clause; "" => bare "SYMBOL" keyword; otherwise value.
       def attach_symbol(identifier, data)
         identifier.symbol = data[:symbol_value].to_s if data[:symbol_present]
@@ -44,13 +58,30 @@ module Pubid
           reaffirmed: (true if data[:reaffirmed]),
         }
         # A WES id carries no series letter, so its series stays nil.
-        wes = Identifiers::WeldingEngineeringStandard
-        return wes.new(**attrs) if data[:wes]
+        return build_wes(data, attrs) if data[:wes]
 
         jis_class_for_type(data[:type]&.to_s)
           .new(series: data[:series].to_s, **attrs)
       end
 
+      # `wes_type` ("TR"/"TS") picks the WES class. `wes_language` is a
+      # language printed before the year ("WES 1112(E):2022").
+      def build_wes(data, attrs)
+        attrs = attrs.merge(wes_language_attrs(data)) if data[:wes_language]
+        Identifiers::WeldingEngineeringStandard
+          .class_for_type(data[:wes_type]&.to_s).new(**attrs)
+      end
+
+      def wes_language_attrs(data)
+        if data[:language]
+          raise Pubid::Errors::ParseError.new(
+            "a WES id carries one language, not two", nil
+          )
+        end
+
+        { language: data[:wes_language].to_s, language_before_year: true }
+      end
+
       def jis_class_for_type(type)
         case type
         when "TR" then Identifiers::TechnicalReport

data/lib/pubid/jis/identifier.rb

@@ -21,6 +21,11 @@ module Pubid
       attribute :parts, :string, collection: true # Optional multi-level parts
       attribute :year, :integer
       attribute :language, :string # "E" or "J"
+      # A WES id can print its language before the year ("WES 1112(E):2022")
+      # or after it ("WES 1112:2022(E)"). This records the source position.
+      # It is spelling only, so `==` does not read it.
+      attribute :language_before_year, :boolean
+      equality_ignored :language_before_year
       # Reaffirmation (再確認): a trailing "R" on the year marks an edition
       # that was reaffirmed without revision (e.g. ":2019R").
       attribute :reaffirmed, :boolean
@@ -45,6 +50,10 @@ module Pubid
         "pubid:jis:explanation" => "Pubid::Jis::Identifiers::Explanation",
         "pubid:jis:welding-engineering-standard" =>
           "Pubid::Jis::Identifiers::WeldingEngineeringStandard",
+        "pubid:jis:welding-engineering-technical-report" =>
+          "Pubid::Jis::Identifiers::WeldingEngineeringTechnicalReport",
+        "pubid:jis:welding-engineering-technical-specification" =>
+          "Pubid::Jis::Identifiers::WeldingEngineeringTechnicalSpecification",
       }.freeze
 
       key_value do
@@ -54,6 +63,7 @@ module Pubid
         map "parts", to: :parts
         map "year", to: :year
         map "language", to: :language
+        map "language_before_year", to: :language_before_year
         map "reaffirmed", to: :reaffirmed
         # render_empty keeps a bare "SYMBOL" (empty-string value) in the hash so
         # it round-trips distinctly from "no symbol" (nil).
@@ -75,6 +85,17 @@ module Pubid
         reaffirmed == true
       end
 
+      def language_before_year?
+        language_before_year == true
+      end
+
+      # The ":year[R]" and "(lang)" tail, in the order the source used.
+      def year_and_language
+        year_part = year ? ":#{year_with_reaffirmation}" : ""
+        lang_part = language ? "(#{language})" : ""
+        language_before_year? ? lang_part + year_part : year_part + lang_part
+      end
+
       # Render a year with its reaffirmation marker, e.g. "2019R".
       def year_with_reaffirmation
         "#{year}#{'R' if reaffirmed?}"
@@ -184,10 +205,9 @@ module Pubid
           raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
-        identifier = ::Pubid.utf8_input(identifier)
-
-        parsed = Pubid::Parg::Model.bound(:jis, identifier)
-        Builder.build(parsed)
+        face, bindings = Parser.ingest(::Pubid.utf8_input(identifier))
+        parsed = Pubid::Parg::Model.bound(:jis, face)
+        Builder.build(parsed.merge(bindings))
       end
     end
   end

data/lib/pubid/jis/identifiers/welding_engineering_standard.rb

@@ -6,9 +6,20 @@ module Pubid
       # Japan Welding Engineering Society standard. JSA sells WES next to JIS,
       # so it parses through the JIS flavor, but the id carries no series
       # letter and no JIS prefix.
-      # Examples: WES 7700-1:2019, WES 7301:2020R
+      # Examples: WES 7700-1:2019, WES 7301:2020R, WES 1112(E):2022
       class WeldingEngineeringStandard < SingleIdentifier
         PUBLISHER = "WES"
+        # The type token after the WES root: "TR", "TS", or nil.
+        WES_TYPE = nil
+
+        # The WES class for a type token ("TR", "TS" or nil).
+        def self.class_for_type(type)
+          case type
+          when "TR" then WeldingEngineeringTechnicalReport
+          when "TS" then WeldingEngineeringTechnicalSpecification
+          else WeldingEngineeringStandard
+          end
+        end
 
         def type_prefix
           nil
@@ -20,8 +31,12 @@ module Pubid
           nil
         end
 
+        def wes_type
+          self.class::WES_TYPE
+        end
+
         def code
-          result = "#{PUBLISHER} #{number}"
+          result = [PUBLISHER, wes_type, number].compact.join(" ")
           result += parts.map { |p| "-#{p}" }.join if parts&.any?
           result
         end
@@ -29,6 +44,10 @@ module Pubid
         def mr_publisher
           PUBLISHER.downcase
         end
+
+        def mr_type
+          wes_type&.downcase
+        end
       end
     end
   end

data/lib/pubid/jis/identifiers/welding_engineering_technical_report.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Jis
+    module Identifiers
+      # WES technical report. The type token follows the WES root.
+      # Example: WES TR 2032:2024
+      class WeldingEngineeringTechnicalReport < WeldingEngineeringStandard
+        WES_TYPE = "TR"
+      end
+    end
+  end
+end

data/lib/pubid/jis/identifiers/welding_engineering_technical_specification.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Jis
+    module Identifiers
+      # WES technical specification. The type token follows the WES root.
+      # Examples: WES TS 2816:2015, WES TS 2816(E):2015
+      class WeldingEngineeringTechnicalSpecification <
+            WeldingEngineeringStandard
+        WES_TYPE = "TS"
+      end
+    end
+  end
+end

data/lib/pubid/jis/identifiers.rb

@@ -15,6 +15,11 @@ module Pubid
                "#{__dir__}/identifiers/technical_specification"
       autoload :WeldingEngineeringStandard,
                "#{__dir__}/identifiers/welding_engineering_standard"
+      autoload :WeldingEngineeringTechnicalReport,
+               "#{__dir__}/identifiers/welding_engineering_technical_report"
+      autoload :WeldingEngineeringTechnicalSpecification,
+               "#{__dir__}/identifiers/" \
+               "welding_engineering_technical_specification"
     end
   end
 end

data/lib/pubid/jis/parser.rb

@@ -2,7 +2,37 @@
 
 module Pubid
   module Jis
+    # The JIS grammar is the vendored artifact data/parg/jis.json. This class
+    # holds only the Ruby ingestion in front of it.
     class Parser
+      # A WES type token or a language before the year. Full-width forms
+      # are accepted, as in the grammar.
+      WES_SHIM = /
+        \A(?<root>WES[ 　])
+        (?:(?<type>TR|TS)[ 　])?
+        (?<number>\d+(?:[-ｰ]\d+)*)
+        (?:[(（](?<lang>[EJ])[)）](?=[:：]))?
+      /x
+
+      # The vendored grammar (pubid-grammar artifacts/jis.json) reads neither
+      # "WES TR 2032" nor "WES 1112(E):2022". Until it does, cut those tokens
+      # from the input and bind them as `wes_type` and `wes_language`, the
+      # captures the grammar is to bind (hand-off
+      # pubid__pubid-grammar__jis-wes-language-tr-ts). Other input passes
+      # unchanged.
+      # @param input [String]
+      # @return [Array(String, Hash)] the input for the grammar, the bindings
+      #   to merge into what the grammar binds
+      def self.ingest(input)
+        match = WES_SHIM.match(input)
+        return [input, {}] unless match && (match[:type] || match[:lang])
+
+        bindings = {}
+        bindings[:wes_type] = match[:type] if match[:type]
+        bindings[:wes_language] = match[:lang] if match[:lang]
+        rest = input[match.end(0)..]
+        ["#{match[:root]}#{match[:number]}#{rest}", bindings]
+      end
     end
   end
 end

data/lib/pubid/jis/pubid_urn_schema.rb

@@ -13,17 +13,28 @@ module Pubid
       atom "parts", "part", kind: :list
       atom "year", "year", kind: :int
       atom "reaffirmed", "reaffirmed", kind: :bool
+      atom "language", "lang"
+      # Where a WES id prints its language: "WES 1112(E):2022" against
+      # "WES 1112:2022(E)". Spelling only.
+      facet "language_before_year", "langfirst", kind: :bool
 
       type "pubid:jis:all-parts", "all"
-      type "pubid:jis:amendment", "amd"
-      type "pubid:jis:corrigendum", "cor"
-      type "pubid:jis:explanation", "e"
+      # A supplement's number is its Integer ordinal. The document it
+      # supplements comes first, along +base+. An explanation can have no
+      # number ("…/EXPL"), so its number is an atom.
+      supplement = [["number", :int]]
+      type "pubid:jis:amendment", "amd", core: supplement
+      type "pubid:jis:corrigendum", "cor", core: supplement
+      type "pubid:jis:explanation", "e", core: [],
+                                         atoms: [["number", "n", :int]]
       type "pubid:jis:identifier", "id"
       type "pubid:jis:japanese-industrial-standard", "jis"
       type "pubid:jis:standard", "std"
       type "pubid:jis:technical-report", "tr"
       type "pubid:jis:technical-specification", "ts"
       type "pubid:jis:welding-engineering-standard", "wes"
+      type "pubid:jis:welding-engineering-technical-report", "westr"
+      type "pubid:jis:welding-engineering-technical-specification", "wests"
     end
   end
 end

data/lib/pubid/jis/renderer.rb

@@ -49,8 +49,7 @@ module Pubid
         result = parts.join(" ")
         result += " " if result.length.positive?
         result += id.code.to_s
-        result += ":#{id.year_with_reaffirmation}" if id.year
-        result += "(#{id.language})" if id.language
+        result += id.year_and_language
         result += id.symbol_suffix
         result
       end

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.24"
+  VERSION = "2.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.26
 platform: ruby
 authors:
 - Ribose Inc.
@@ -551,7 +551,10 @@ files:
 - lib/pubid/etsi_pfs/builder.rb
 - lib/pubid/etsi_pfs/identifier.rb
 - lib/pubid/etsi_pfs/identifiers.rb
+- lib/pubid/etsi_pfs/identifiers/amendment.rb
+- lib/pubid/etsi_pfs/identifiers/corrigendum.rb
 - lib/pubid/etsi_pfs/identifiers/standard.rb
+- lib/pubid/etsi_pfs/identifiers/supplement.rb
 - lib/pubid/etsi_pfs/parser.rb
 - lib/pubid/etsi_pfs/pubid_urn_schema.rb
 - lib/pubid/etsi_pfs/renderer.rb
@@ -897,6 +900,8 @@ files:
 - lib/pubid/jis/identifiers/technical_report.rb
 - lib/pubid/jis/identifiers/technical_specification.rb
 - lib/pubid/jis/identifiers/welding_engineering_standard.rb
+- lib/pubid/jis/identifiers/welding_engineering_technical_report.rb
+- lib/pubid/jis/identifiers/welding_engineering_technical_specification.rb
 - lib/pubid/jis/parser.rb
 - lib/pubid/jis/pubid_urn_schema.rb
 - lib/pubid/jis/renderer.rb