metanorma-itu 2.4.2 → 2.4.3

data/lib/isodoc/itu/presentation_ref.rb

@@ -0,0 +1,92 @@
+require_relative "init"
+require "roman-numerals"
+require "isodoc"
+require_relative "../../relaton/render/general"
+require_relative "presentation_bibdata"
+require_relative "presentation_preface"
+
+module IsoDoc
+  module ITU
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def bibrender_formattedref(formattedref, _xml)
+        formattedref << "." unless /\.$/.match?(formattedref.text)
+        id = reference_format_start(formattedref.parent) and
+          formattedref.children.first.previous = id
+      end
+
+      def bibrender_relaton(xml, renderings)
+        f = renderings[xml["id"]][:formattedref]
+        ids = reference_format_start(xml)
+        f &&= "<formattedref>#{ids}#{f}</formattedref>"
+        # retain date in order to generate reference tag
+        keep = "./docidentifier | ./uri | ./note | ./date | ./biblio-tag"
+        xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
+      end
+
+      def multi_bibitem_ref_code(bib)
+        skip = IsoDoc::Function::References::SKIP_DOCID
+        skip1 = "@type = 'metanorma' or @type = 'metanorma-ordinal'"
+        prim = "[@primary = 'true']"
+        id = bib.xpath(ns("./docidentifier#{prim}[not(#{skip} or #{skip1})]"))
+        id.empty? and id = bib.xpath(ns("./docidentifier#{prim}[not(#{skip1})]"))
+        id.empty? and id = bib.xpath(ns("./docidentifier[not(#{skip} or #{skip1})]"))
+        id.empty? and id = bib.xpath(ns("./docidentifier[not(#{skip1})]"))
+        id.empty? and return id
+        id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
+      end
+
+      def render_multi_identifiers(ids)
+        ids.map do |id|
+          if id["type"] == "ITU" then doctype_title(id)
+          else
+            docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
+          end
+        end.join("&#xA0;| ")
+      end
+
+      def reference_format_start(bib)
+        id = multi_bibitem_ref_code(bib)
+        id1 = render_multi_identifiers(id)
+        out = id1
+        date = bib.at(ns("./date[@type = 'published']/on | " \
+          "./date[@type = 'published']/from")) and
+          out << " (#{date.text.sub(/-.*$/, '')})"
+        out += ", " if date || !id1.empty?
+        out
+      end
+
+      def bibliography_bibitem_number1(bib, idx)
+        mn = bib.at(ns(".//docidentifier[@type = 'metanorma']")) and
+          /^\[?\d+\]?$/.match?(mn.text) and
+          mn["type"] = "metanorma-ordinal"
+        if (mn = bib.at(ns(".//docidentifier[@type = 'metanorma-ordinal']"))) &&
+            !bibliography_bibitem_number_skip(bib)
+          idx += 1
+          mn.children = "[#{idx}]"
+        end
+        idx
+      end
+
+      def bibliography_bibitem_number_skip(bibitem)
+        @xrefs.klass.implicit_reference(bibitem) ||
+          bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
+      end
+
+      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
+        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
+        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret += datefn
+        ret.empty? and return ret
+        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
+      end
+
+      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
+        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
+        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret += datefn
+        ret.empty? and return ret
+        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
+      end
+    end
+  end
+end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -4,6 +4,18 @@ require "isodoc"
 require_relative "../../relaton/render/general"
 require_relative "presentation_bibdata"
 require_relative "presentation_preface"
+require_relative "presentation_ref"
+
+module Nokogiri
+  module XML
+    class Node
+      def traverse_topdown(&block)
+        yield(self)
+        children.each { |j| j.traverse_topdown(&block) }
+      end
+    end
+  end
+end
 
 module IsoDoc
   module ITU
@@ -39,6 +51,25 @@ module IsoDoc
         super
       end
 
+      def table1(elem)
+        elem.xpath(ns("./name | ./thead/tr/th")).each do |n|
+          capitalise_unless_text_transform(n)
+        end
+        super
+      end
+
+      def capitalise_unless_text_transform(elem)
+        css = nil
+        elem.traverse_topdown do |n|
+          n.name == "span" && /text-transform:/.match?(n["style"]) and
+            css = n
+          n.text? && /\S/.match?(n.text) or next
+          css && n.ancestors.include?(css) or
+            n.replace(::Metanorma::Utils.strict_capitalize_first(n.text))
+          break
+        end
+      end
+
       def get_eref_linkend(node)
         non_locality_elems(node).select do |c|
           !c.text? || /\S/.match(c)
@@ -52,57 +83,6 @@ module IsoDoc
         node.add_child(link)
       end
 
-      def bibrenderer
-        ::Relaton::Render::ITU::General.new(language: @lang)
-      end
-
-      def bibrender_formattedref(formattedref, _xml)
-        formattedref << "." unless /\.$/.match?(formattedref.text)
-        id = reference_format_start(formattedref.parent) and
-          formattedref.children.first.previous = id
-      end
-
-      def bibrender_relaton(xml, renderings)
-        f = renderings[xml["id"]][:formattedref]
-        ids = reference_format_start(xml)
-        f &&= "<formattedref>#{ids}#{f}</formattedref>"
-        # retain date in order to generate reference tag
-        keep = "./docidentifier | ./uri | ./note | ./date | ./biblio-tag"
-        xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
-      end
-
-      def multi_bibitem_ref_code(bib)
-        skip = IsoDoc::Function::References::SKIP_DOCID
-        skip1 = "@type = 'metanorma' or @type = 'metanorma-ordinal'"
-        prim = "[@primary = 'true']"
-        id = bib.xpath(ns("./docidentifier#{prim}[not(#{skip} or #{skip1})]"))
-        id.empty? and id = bib.xpath(ns("./docidentifier#{prim}[not(#{skip1})]"))
-        id.empty? and id = bib.xpath(ns("./docidentifier[not(#{skip} or #{skip1})]"))
-        id.empty? and id = bib.xpath(ns("./docidentifier[not(#{skip1})]"))
-        id.empty? and return id
-        id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
-      end
-
-      def render_multi_identifiers(ids)
-        ids.map do |id|
-          if id["type"] == "ITU" then doctype_title(id)
-          else
-            docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
-          end
-        end.join("&#xA0;| ")
-      end
-
-      def reference_format_start(bib)
-        id = multi_bibitem_ref_code(bib)
-        id1 = render_multi_identifiers(id)
-        out = id1
-        date = bib.at(ns("./date[@type = 'published']/on | " \
-          "./date[@type = 'published']/from")) and
-          out << " (#{date.text.sub(/-.*$/, '')})"
-        out += ", " if date || !id1.empty?
-        out
-      end
-
       def titlecase(str)
         str.gsub(/ |_|-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
@@ -165,39 +145,6 @@ module IsoDoc
         super
       end
 
-      def bibliography_bibitem_number1(bib, idx)
-        mn = bib.at(ns(".//docidentifier[@type = 'metanorma']")) and
-          /^\[?\d+\]?$/.match?(mn.text) and
-          mn["type"] = "metanorma-ordinal"
-        if (mn = bib.at(ns(".//docidentifier[@type = 'metanorma-ordinal']"))) &&
-            !bibliography_bibitem_number_skip(bib)
-          idx += 1
-          mn.children = "[#{idx}]"
-        end
-        idx
-      end
-
-      def bibliography_bibitem_number_skip(bibitem)
-        @xrefs.klass.implicit_reference(bibitem) ||
-          bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
-      end
-
-      def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
-        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
-        ret += datefn
-        ret.empty? and return ret
-        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
-      end
-
-      def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
-        ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
-        ret += datefn
-        ret.empty? and return ret
-        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
-      end
-
       def toc_title(docxml)
         @doctype == "resolution" and return
         super
@@ -261,6 +208,24 @@ module IsoDoc
         ret
       end
 
+      def block(docxml)
+        super
+        dl docxml
+      end
+
+      def dl(xml)
+        (xml.xpath(ns("//dl")) -
+         xml.xpath(ns("//table//dl | //figure//dl | //formula//dl")))
+          .each do |d|
+            dl1(d)
+          end
+      end
+
+      def dl1(dlist)
+        ins = dlist.at(ns("./dt"))
+        ins.previous = '<colgroup><col width="20%"/><col width="80%"/></colgroup>'
+      end
+
       include Init
     end
   end

data/lib/metanorma/itu/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

data/lib/metanorma/itu/cleanup.rb

@@ -24,6 +24,13 @@ module Metanorma
         end
       end
 
+      def header_rows_cleanup(xmldoc)
+        super
+        xmldoc.xpath("//table/thead/tr/th").each do |x|
+          x["align"] = "center"
+        end
+      end
+
       def insert_missing_sections(xml)
         xml.at("//metanorma-extension/semantic-metadata/" \
               "headless[text() = 'true']") and return nil

data/lib/metanorma/itu/converter.rb

@@ -36,7 +36,8 @@ module Metanorma
       end
 
       def doctype(node)
-        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase || "recommendation"
+        ret = node.attr("doctype")&.gsub(/\s+/, "-")&.downcase ||
+          "recommendation"
         ret = "recommendation" if ret == "article"
         ret
       end
@@ -87,7 +88,7 @@ module Metanorma
 
       def sectiontype(node, level = true)
         ret = super
-        hdr = sectiontype_streamline(node&.attr("heading")&.downcase)
+        hdr = sectiontype_streamline(node.attr("heading")&.downcase)
         return nil if ret == "terms and definitions" &&
           hdr != "terms and definitions" && node.level > 1
         return nil if ret == "symbols and abbreviated terms" &&
@@ -120,10 +121,8 @@ module Metanorma
         node.option?("unnumbered") and attrs[:unnumbered] = true
         case sectiontype1(node)
         when "conventions" then attrs = attrs.merge(type: "conventions")
-        when "history"
-          attrs[:preface] and attrs = attrs.merge(type: "history")
-        when "source"
-          attrs[:preface] and attrs = attrs.merge(type: "source")
+        when "history", "source"
+          attrs[:preface] and attrs = attrs.merge(type: sectiontype1(node))
         end
         super
       end
@@ -141,7 +140,8 @@ module Metanorma
       def presentation_xml_converter(node)
         IsoDoc::ITU::PresentationXMLConvert
           .new(html_extract_attributes(node)
-          .merge(output_formats: ::Metanorma::ITU::Processor.new.output_formats))
+          .merge(output_formats: ::Metanorma::ITU::Processor.new
+          .output_formats))
       end
 
       def html_converter(node)

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.4.2".freeze
+    VERSION = "2.4.3".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.8.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
+  spec.add_dependency "pubid-itu"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
+- !ruby/object:Gem::Dependency
+  name: pubid-itu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +296,7 @@ files:
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/presentation_bibdata.rb
 - lib/isodoc/itu/presentation_preface.rb
+- lib/isodoc/itu/presentation_ref.rb
 - lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb