metanorma-itu 2.2.3 → 2.2.5

data/lib/metanorma/itu/cleanup.rb

@@ -46,7 +46,7 @@ module Metanorma
         ins = xml.at("//sections").elements.first
         xml.at("//sections/clause[@type = 'scope']") or
           ins.previous =
-            "<clause type='scope' #{add_id}><title>#{@i18n.scope}</title><p>"\
+            "<clause type='scope' #{add_id}><title>#{@i18n.scope}</title><p>" \
             "#{@i18n.clause_empty}</p></clause>"
         xml&.at("//sentinel")&.remove
       end
@@ -57,7 +57,7 @@ module Metanorma
             "<bibliography><sentinel/></bibliography>"
         ins = xml.at("//bibliography").elements.first
         xml.at("//bibliography/references[@normative = 'true']") or
-          ins.previous = "<references #{add_id} normative='true'>"\
+          ins.previous = "<references #{add_id} normative='true'>" \
                          "<title>#{@i18n.normref}</title></references>"
         xml&.at("//sentinel")&.remove
       end
@@ -72,7 +72,7 @@ module Metanorma
         ins =  xml.at("//sections/terms") ||
           xml.at("//sections/clause[descendant::terms]")
         unless xml.at("//sections//definitions")
-          ins.next = "<definitions #{add_id}>"\
+          ins.next = "<definitions #{add_id}>" \
                      "<title>#{@i18n.symbolsabbrev}</title></definitions>"
         end
       end
@@ -81,8 +81,8 @@ module Metanorma
         ins =  xml.at("//sections//definitions") ||
           xml.at("//sections/clause[descendant::definitions]")
         unless xml.at("//sections/clause[@type = 'conventions']")
-          ins.next = "<clause #{add_id} type='conventions'>"\
-                     "<title>#{@i18n.conventions}</title><p>"\
+          ins.next = "<clause #{add_id} type='conventions'>" \
+                     "<title>#{@i18n.conventions}</title><p>" \
                      "#{@i18n.clause_empty}</p></clause>"
         end
       end
@@ -149,14 +149,14 @@ module Metanorma
       def section_names_terms_cleanup(xml)
         super
         replace_title(
-          xml, "//terms[@type = 'internal'] | "\
-               "//clause[./terms[@type = 'internal']]"\
+          xml, "//terms[@type = 'internal'] | " \
+               "//clause[./terms[@type = 'internal']]" \
                "[not(./terms[@type = 'external'])]",
           @i18n&.internal_termsdef
         )
         replace_title(
-          xml, "//terms[@type = 'external'] | "\
-               "//clause[./terms[@type = 'external']]"\
+          xml, "//terms[@type = 'external'] | " \
+               "//clause[./terms[@type = 'external']]" \
                "[not(./terms[@type = 'internal'])]",
           @i18n&.external_termsdef
         )
@@ -172,17 +172,16 @@ module Metanorma
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ITU']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Telecommunication Union']")
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization " \
                            "for Standardization']")
         return 3 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-        return 3 if bib.at("#{PUBLISHER}[name = 'International "\
+        return 3 if bib.at("#{PUBLISHER}[name = 'International " \
                            "Electrotechnical Commission']")
-        return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
-                           "@type = 'metanorma' or @type = 'ISSN' or @type = "\
-                           "'ISBN')]")
+        return 4 if bib.at("./docidentifier[@type][not(#{skip_docid} or " \
+                           "@type = 'metanorma')]")
 
         5
       end
@@ -199,8 +198,8 @@ module Metanorma
       # then title
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
-        id = bib&.at("./docidentifier[not(@type = 'DOI' or @type = "\
-                     "'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        id = bib&.at("./docidentifier[not(#{skip_docid} or @type = " \
+                     "'metanorma')]")
         metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         type = id["type"] if id

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
 
@@ -32,10 +39,10 @@ module Metanorma
       def itu_id(node, xml)
         return unless node.attr("docnumber")
 
-        xml.docidentifier **{ type: "ITU" } do |i|
+        xml.docidentifier type: "ITU" do |i|
           i << 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">
@@ -571,6 +572,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1575,7 +1581,7 @@
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>

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.3".freeze
+    VERSION = "2.2.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities