metanorma-iso 2.3.4 → 2.3.6

data/lib/metanorma/iso/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">

data/lib/metanorma/iso/cleanup.rb

@@ -44,18 +44,8 @@ module Metanorma
       # ISO as a prefix goes first
       def docidentifier_cleanup(xmldoc)
         prefix = get_id_prefix(xmldoc)
-=begin
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
-        id.content = id_prefix(prefix, id)
-=end
         id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
           id.content = id_prefix(prefix, id)
-=begin
-        %w(iso-with-lang iso-reference iso-undated).each do |t|
-          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
-            id.content = id_prefix(prefix, id)
-        end
-=end
       end
 
       def format_ref(ref, type)

data/lib/metanorma/iso/front_id.rb

@@ -46,11 +46,14 @@ module Metanorma
       end
 
       def metadata_id(node, xml)
-        iso_id(node, xml)
+        if id = node.attr("docidentifier")
+          xml.docidentifier id, **attr_code(type: "ISO")
+        else iso_id(node, xml)
+        end
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
           xml.docidentifier(n, **attr_code(type: "iso-tc"))
         end
-        xml.docnumber node&.attr("docnumber")
+        xml.docnumber node.attr("docnumber")
       end
 
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type]
@@ -62,6 +65,7 @@ module Metanorma
         when "directive" then :dir
         when "technical-report" then :tr
         when "technical-specification" then :ts
+        when "publicly-available-specification" then :pas
         when "guide" then :guide
         end
       end
@@ -138,7 +142,7 @@ module Metanorma
         xml.docidentifier iso_id_default(params).to_s(with_prf: with_prf),
                           **attr_code(type: "ISO")
         xml.docidentifier iso_id_reference(params)
-          .to_s(format: :ref_num_long, with_prf: with_prf),
+          .to_s(format: :ref_num_short, with_prf: with_prf),
                           **attr_code(type: "iso-reference")
         xml.docidentifier iso_id_reference(params).urn, **attr_code(type: "URN")
         return if @amd
@@ -146,7 +150,7 @@ module Metanorma
         xml.docidentifier iso_id_undated(params).to_s(with_prf: with_prf),
                           **attr_code(type: "iso-undated")
         xml.docidentifier iso_id_with_lang(params)
-          .to_s(format: :ref_num_short, with_prf: with_prf),
+          .to_s(format: :ref_num_long, with_prf: with_prf),
                           **attr_code(type: "iso-with-lang")
       rescue StandardError => e
         clean_abort("Document identifier: #{e}", xml)

data/lib/metanorma/iso/isodoc.rng

@@ -1578,6 +1578,9 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1600,6 +1603,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="colophon">
+    <element name="colophon">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Content-Section"/>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.3.4".freeze
+    VERSION = "2.3.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc