metanorma-itu 2.4.2 → 2.4.4

data/lib/isodoc/itu/metadata.rb

@@ -31,6 +31,8 @@ module IsoDoc
           series1: "//bibdata/series[@type='secondary']/title",
           series2: "//bibdata/series[@type='tertiary']/title",
           annextitle: "//bibdata/title[@type='annex']",
+          collectiontitle: "//bibdata/title[@type='collection']",
+          slogantitle: "//bibdata/title[@type='slogan']",
           positiontitle: "//bibdata/title[@type='position-sp']" }.each do |k, v|
           titleset(isoxml, k, v)
         end
@@ -51,6 +53,8 @@ module IsoDoc
       end
 
       def author(xml, _out)
+        sector = xml.at(ns("//bibdata/ext/editorialgroup/sector"))
+        set(:sector, sector.text) if sector
         bureau = xml.at(ns("//bibdata/ext/editorialgroup/bureau"))
         set(:bureau, bureau.text) if bureau
         tc = xml.at(ns("//bibdata/ext/editorialgroup/committee"))

data/lib/isodoc/itu/presentation_ref.rb

@@ -0,0 +1,97 @@
+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)
+        id = pref_ref_code_parse(bib)
+        id.nil? and return []
+        id.sort_by { |i| /^ITU/.match?(i) ? 0 : 1 }
+      end
+
+      def render_multi_identifiers(ids, bib)
+        ids.map do |id|
+          if /^ITU/.match?(id) then doctype_title(id, bib)
+          else
+            id.sub(/^\[/, "").sub(/\]$/, "")
+          end
+        end.join("&#xA0;| ")
+      end
+
+      def doctype_title(id, bib)
+        type = bib.at(ns("./ext/doctype"))&.text || "recommendation"
+        if type == "recommendation" &&
+            /^(?<prefix>ITU-[A-Z][  ][A-Z])[  .-]Sup[a-z]*\.[  ]?(?<num>\d+)$/ =~ id
+          "#{prefix}-series Recommendations – Supplement #{num}"
+        else
+          d = id.sub(/^\[/, "").sub(/\]$/, "")
+          "#{titlecase(type)} #{d}"
+        end
+      end
+
+      def reference_format_start(bib)
+        id = multi_bibitem_ref_code(bib)
+        id1 = render_multi_identifiers(id, bib)
+        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,72 +83,10 @@ 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
 
-      def doctype_title(id)
-        type = id.parent&.at(ns("./ext/doctype"))&.text || "recommendation"
-        if type == "recommendation" &&
-            /^(?<prefix>ITU-[A-Z][  ][A-Z])[  .-]Sup[a-z]*\.[  ]?(?<num>\d+)$/ =~ id.text
-          "#{prefix}-series Recommendations – Supplement #{num}"
-        else
-          d = docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
-          "#{titlecase(type)} #{d}"
-        end
-      end
-
       def twitter_cldr_localiser_symbols
         { group: "'" }
       end
@@ -165,39 +134,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 +197,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

@@ -1,21 +1,8 @@
+require_relative "cleanup_section"
+
 module Metanorma
   module ITU
     class Converter < Standoc::Converter
-      def sections_cleanup(xml)
-        super
-        insert_missing_sections(xml) unless @no_insert_missing_sections
-        insert_empty_clauses(xml)
-        resolution_inline_header(xml)
-      end
-
-      def resolution_inline_header(xml)
-        @doctype == "resolution" or return
-        xml.xpath("//clause//clause").each do |c|
-          (title = c.at("./title")) && !title.text&.empty? and next
-          c["inline-header"] = true
-        end
-      end
-
       def table_cleanup(xmldoc)
         super
         xmldoc.xpath("//thead/tr[1]/th | //thead/tr[1]/td").each do |t|
@@ -24,84 +11,13 @@ module Metanorma
         end
       end
 
-      def insert_missing_sections(xml)
-        xml.at("//metanorma-extension/semantic-metadata/" \
-              "headless[text() = 'true']") and return nil
-        insert_scope(xml)
-        insert_norm_ref(xml)
-        insert_terms(xml)
-        insert_symbols(xml)
-        insert_conventions(xml)
-      end
-
-      def add_id
-        %(id="_#{UUIDTools::UUID.random_create}")
-      end
-
-      def insert_scope(xml)
-        xml.at("./*/sections") or
-          xml.at("./*/preface | ./*/boilerplate | ./*/bibdata").next =
-            "<sections><sentinel/></sections>"
-        xml.at("./*/sections/*") or xml.at("./*/sections") << "<sentinel/>"
-        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>" \
-            "#{@i18n.clause_empty}</p></clause>"
-        xml.at("//sentinel")&.remove
-      end
-
-      def insert_norm_ref(xml)
-        xml.at("//bibliography") or
-          xml.at("./*/annex[last()] | ./*/sections").next =
-            "<bibliography><sentinel/></bibliography>"
-        ins = xml.at("//bibliography").elements.first
-        xml.at("//bibliography/references[@normative = 'true']") or
-          ins.previous = "<references #{add_id} normative='true'>" \
-                         "<title>#{@i18n.normref}</title></references>"
-        xml.at("//sentinel")&.remove
-      end
-
-      def insert_terms(xml)
-        ins = xml.at("//sections/clause[@type = 'scope']")
-        xml.at("//sections//terms") or
-          ins.next = "<terms #{add_id}><title>#{@i18n.termsdef}</title></terms>"
-      end
-
-      def insert_symbols(xml)
-        ins =  xml.at("//sections/terms") ||
-          xml.at("//sections/clause[descendant::terms]")
-        unless xml.at("//sections//definitions")
-          ins.next = "<definitions #{add_id}>" \
-                     "<title>#{@i18n.symbolsabbrev}</title></definitions>"
-        end
-      end
-
-      def insert_conventions(xml)
-        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>" \
-                     "#{@i18n.clause_empty}</p></clause>"
-        end
-      end
-
-      def insert_empty_clauses(xml)
-        xml.xpath("//terms[not(./term)][not(.//terms)]").each do |c|
-          insert_empty_clauses1(c, @i18n.clause_empty)
-        end
-        xml.xpath("//definitions[not(./dl)]").each do |c|
-          insert_empty_clauses1(c, @i18n.clause_empty)
+      def header_rows_cleanup(xmldoc)
+        super
+        xmldoc.xpath("//table/thead/tr/th").each do |x|
+          x["align"] = "center"
         end
       end
 
-      def insert_empty_clauses1(clause, text)
-        clause.at("./p") and return
-        ins = clause.at("./title") or return
-        ins.next = "<p>#{text}</p>"
-      end
-
       def cleanup(xmldoc)
         symbols_cleanup(xmldoc)
         super
@@ -110,11 +26,9 @@ module Metanorma
       end
 
       def smartquotes_cleanup(xmldoc)
-        return super if @smartquotes
-
+        @smartquotes and return super
         xmldoc.traverse do |n|
-          next unless n.text?
-
+          n.text? or next
           n.replace(HTMLEntities.new.encode(
                       n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'")
                       .gsub(/\u201c|\u201d|\u201e|\u201f/, '"'), :basic
@@ -123,51 +37,6 @@ module Metanorma
         xmldoc
       end
 
-      def termdef_boilerplate_cleanup(xmldoc); end
-
-      def terms_extract(div)
-        internal = div.at("./terms[@type = 'internal']/title")
-        external = div.at("./terms[@type = 'external']/title")
-        [internal, external]
-      end
-
-      def term_defs_boilerplate(div, _source, _term, _preface, _isodoc)
-        internal, external = terms_extract(div.parent)
-        internal&.next_element&.name == "term" and
-          internal.next = "<p>#{@i18n.internal_terms_boilerplate}</p>"
-        internal and internal&.next_element == nil and
-          internal.next = "<p>#{@i18n.no_terms_boilerplate}</p>"
-        external&.next_element&.name == "term" and
-          external.next = "<p>#{@i18n.external_terms_boilerplate}</p>"
-        external and external&.next_element == nil and
-          external.next = "<p>#{@i18n.no_terms_boilerplate}</p>"
-        !internal and !external and
-          %w(term terms).include? div&.next_element&.name and
-          div.next = "<p>#{@i18n.term_def_boilerplate}</p>"
-      end
-
-      def section_names_terms_cleanup(xml)
-        super
-        replace_title(
-          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']]" \
-               "[not(./terms[@type = 'internal'])]",
-          @i18n&.external_termsdef
-        )
-      end
-
-      def symbols_cleanup(xmldoc)
-        sym = xmldoc.at("//definitions/title")
-        sym and sym&.next_element&.name == "dl" and
-          sym.next = "<p>#{@i18n.symbols_boilerplate}</p>"
-      end
-
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
       def pub_class(bib)
@@ -214,11 +83,20 @@ module Metanorma
         end
       end
 
-      def sections_names_cleanup(xml)
+      def bibdata_cleanup(xmldoc)
         super
-        t = xml.at("//preface//abstract") or return
-        t["id"] == "_summary" and
-          replace_title(xml, "//preface//abstract", @i18n&.summary)
+        coverpage_images(xmldoc)
+      end
+
+      def coverpage_images(xmldoc)
+        %w(coverpage-image).each do |n|
+          xmldoc.xpath("//bibdata/ext/#{n}").each do |x|
+            ins = add_misc_container(xmldoc)
+            ins << "<presentation-metadata><name>#{n}</name>" \
+                   "<value>#{x.remove.children.to_xml}</value>" \
+                   "</presentation-metadata>"
+          end
+        end
       end
     end
   end