metanorma-itu 2.2.4 → 2.2.6

data/lib/isodoc/itu/metadata.rb

@@ -21,11 +21,11 @@ module IsoDoc
 
       def title(isoxml, _out)
         { doctitle: "//bibdata/title[@language='#{@lang}'][@type = 'main']",
-          docsubtitle: "//bibdata/title[@language='#{@lang}']"\
+          docsubtitle: "//bibdata/title[@language='#{@lang}']" \
                        "[@type = 'subtitle']",
-          amendmenttitle: "//bibdata/title[@language='#{@lang}']"\
+          amendmenttitle: "//bibdata/title[@language='#{@lang}']" \
                           "[@type = 'amendment']",
-          corrigendumtitle: "//bibdata/title[@language='#{@lang}']"\
+          corrigendumtitle: "//bibdata/title[@language='#{@lang}']" \
                             "[@type = 'corrigendum']",
           series: "//bibdata/series[@type='main']/title",
           series1: "//bibdata/series[@type='secondary']/title",
@@ -62,7 +62,7 @@ module IsoDoc
         tc = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/name"))
         set(:workgroup, tc.text) if tc
         super
-        authors = xml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
+        authors = xml.xpath(ns("//bibdata/contributor[role/@type = 'author' " \
                                "or xmlns:role/@type = 'editor']/person"))
         person_attributes(authors) unless authors.empty?
       end
@@ -76,7 +76,7 @@ module IsoDoc
         authors.each do |a|
           append(:affiliations,
                  a&.at(ns("./affiliation/organization/name"))&.text)
-          append(:addresses, a&.at(ns("./affiliation/organization/address/"\
+          append(:addresses, a&.at(ns("./affiliation/organization/address/" \
                                       "formattedAddress"))&.text)
           append(:emails, a&.at(ns("./email"))&.text)
           append(:faxes, a&.at(ns("./phone[@type = 'fax']"))&.text)
@@ -85,21 +85,22 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ITU']"))
-        set(:docnumber, dn&.text)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ITU-Recommendation']"))
-        dn and set(:recommendationnumber, dn&.text)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ITU-lang']"))
-        dn and set(:docnumber_lang, dn&.text)
+        { docnumber: "ITU", recommendationnumber: "ITU-Recommendation",
+          docnumber_lang: "ITU-lang", docnumber_td: "ITU-TemporaryDocument",
+          docnumber_provisional: "ITU-provisional" }
+          .each do |k, v|
+            dn = isoxml.at(ns("//bibdata/docidentifier[@type = '#{v}']")) and
+              set(k, dn.text)
+          end
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
-        oblig = isoxml&.at(ns("//annex/@obligation"))&.text
+        oblig = isoxml.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
-        dn and set(:annexid, @i18n.l10n("#{lbl} #{dn&.text}"))
+        dn and set(:annexid, @i18n.l10n("#{lbl} #{dn.text}"))
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
-          set(:amendmentid, @i18n.l10n("#{@labels['amendment']} #{dn&.text}"))
+          set(:amendmentid, @i18n.l10n("#{@labels['amendment']} #{dn.text}"))
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
           set(:corrigendumid,
-              @i18n.l10n("#{@labels['corrigendum']} #{dn&.text}"))
+              @i18n.l10n("#{@labels['corrigendum']} #{dn.text}"))
       end
 
       def unpublished(status)
@@ -170,11 +171,11 @@ module IsoDoc
               if m1[:mo] == m2[:mo]
                 @i18n.l10n("#{dd1}–#{dd2} #{months[m1[:mo].to_sym]} #{m1[:yr]}")
               else
-                @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} – "\
+                @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} – " \
                            "#{dd2} #{months[m2[:mo].to_sym]} #{m1[:yr]}")
               end
             else
-              @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]} – "\
+              @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]} – " \
                          "#{dd2} #{months[m2[:mo].to_sym]} #{m2[:yr]}")
             end
           else

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/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

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

@@ -3,18 +3,25 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_id(node, xml)
         provisional_id(node, xml)
+        td_id(node, xml)
         itu_id(node, xml)
         recommendation_id(node, xml)
       end
 
       def provisional_id(node, xml)
-        return unless node.attr("provisional-name")
-
-        xml.docidentifier **{ type: "ITU-provisional" } do |i|
+        node.attr("provisional-name") or return
+        xml.docidentifier type: "ITU-provisional" do |i|
           i << node.attr("provisional-name")
         end
       end
 
+      def td_id(node, xml)
+        node.attr("td-number") or return
+        xml.docidentifier type: "ITU-TemporaryDocument" do |i|
+          i << node.attr("td-number")
+        end
+      end
+
       ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
                   "zh" => "C", "ru" => "R" }.freeze
 
@@ -30,12 +37,12 @@ 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)
+        xml.docidentifier type: "ITU" do |i|
+          i << (node.attr("docidentifier") || itu_id1(node, false))
         end
-        xml.docidentifier **{ type: "ITU-lang" } do |i|
+        xml.docidentifier type: "ITU-lang" do |i|
           i << itu_id1(node, true)
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
@@ -45,7 +52,7 @@ module Metanorma
         return unless node.attr("recommendationnumber")
 
         node.attr("recommendationnumber").split("/").each do |s|
-          xml.docidentifier **{ type: "ITU-Recommendation" } do |i|
+          xml.docidentifier type: "ITU-Recommendation" do |i|
             i << s
           end
         end

data/lib/metanorma/itu/isodoc.rng

@@ -66,6 +66,7 @@
         <value>caution</value>
         <value>statement</value>
         <value>editorial</value>
+        <value>box</value>
       </choice>
     </define>
     <define name="index">
@@ -1577,6 +1578,9 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1599,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/validate.rb

@@ -98,8 +98,8 @@ module Metanorma
 
       def itu_identifier_validate(xmldoc)
         xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
-          /^ITU-[RTD] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
-            @log.add("Style", nil, "#{x.text} does not match ITU document "\
+          /^ITU-[RTD] [AD-VX-Z]\.\d+(\.\d+)?$/.match(x.text) or
+            @log.add("Style", nil, "#{x.text} does not match ITU document " \
                                    "identifier conventions")
         end
       end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.4".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.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities