metanorma-itu 2.2.5 → 2.2.6

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -179,7 +179,7 @@ module IsoDoc
         super
       end
 
-      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn)
+      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:sdo] || idents[:ordinal]).to_s
         !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
         ret += datefn
@@ -187,7 +187,7 @@ module IsoDoc
         ret.gsub(/-/, "‑").gsub(/ /, " ")
       end
 
-      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn)
+      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:sdo] || idents[:ordinal]).to_s
         !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
         ret += datefn

data/lib/isodoc/itu/xref.rb

@@ -97,10 +97,14 @@ module IsoDoc
         end
       end
 
+      def subfigure_label(subfignum)
+        subfignum.zero? and return ""
+        "-#{(subfignum + 96).chr}"
+      end
+
       def sequential_figure_body(subfignum, counter, block, klass)
         label = counter.print
-        label &&= label +
-          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
+        label &&= label + subfigure_label(subfignum)
         @anchors[block["id"]] = anchor_struct(
           label, nil, @labels[klass] || klass.capitalize, klass,
           block["unnumbered"]
@@ -108,9 +112,7 @@ module IsoDoc
       end
 
       def hierarchical_figure_body(num, subfignum, counter, block, klass)
-        label = "#{num}#{hiersep}#{counter.print}" +
-          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
-
+        label = "#{num}#{hiersep}#{counter.print}" + subfigure_label(subfignum)
         @anchors[block["id"]] = anchor_struct(
           label, nil, @labels[klass] || klass.capitalize,
           klass, block["unnumbered"]

data/lib/metanorma/itu/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/itu/front_id.rb

@@ -37,10 +37,10 @@ module Metanorma
       end
 
       def itu_id(node, xml)
-        return unless node.attr("docnumber")
+        return unless node.attr("docnumber") || node.attr("docidentifier")
 
         xml.docidentifier type: "ITU" do |i|
-          i << itu_id1(node, false)
+          i << (node.attr("docidentifier") || itu_id1(node, false))
         end
         xml.docidentifier type: "ITU-lang" do |i|
           i << itu_id1(node, true)

data/lib/metanorma/itu/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/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.5".freeze
+    VERSION = "2.2.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 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: htmlentities