metanorma-itu 1.3.9 → 1.3.10

data/lib/isodoc/itu/metadata.rb

@@ -112,11 +112,12 @@ module IsoDoc
         pubdate and set(:pubdate_ddMMMyyyy, monthyr(pubdate.text))
         pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']")) ||
           isoxml.at(ns("//bibdata/copyright/from"))
-        pubdate and set(:placedate_year,
-                        @labels["placedate"].sub(/%/,
-                                                 pubdate.text.sub(
-                                                   /^(\d\d\d\d).*$/, "\\1"
-                                                 )))
+        pubdate and
+          set(:placedate_year,
+              @labels["placedate"].sub(/%/,
+                                       pubdate.text.sub(
+                                         /^(\d\d\d\d).*$/, "\\1"
+                                       )))
       end
 
       def monthyr(isodate)
@@ -153,7 +154,8 @@ module IsoDoc
         m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match isodate
         return isodate unless m && m[:yr] && m[:mo] && m[:dd]
 
-        mmm = DateTime.parse(isodate).localize(@lang.to_sym).to_additional_s("MMM")
+        mmm = DateTime.parse(isodate).localize(@lang.to_sym)
+          .to_additional_s("MMM")
         @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
       end
 
@@ -188,21 +190,19 @@ module IsoDoc
           set(:meeting, a)
           set(:meeting_acronym, a)
         end
-        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and set(
-          :meeting_acronym, a
-        )
-        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and set(
-          :meeting_place, a
-        )
-        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and set(
-          :intended_type, a
-        )
+        a = isoxml&.at(ns("//bibdata/ext/meeting/@acronym"))&.text and
+          set(:meeting_acronym, a)
+        a = isoxml&.at(ns("//bibdata/ext/meeting-place"))&.text and
+          set(:meeting_place, a)
+        a = isoxml&.at(ns("//bibdata/ext/intended-type"))&.text and
+          set(:intended_type, a)
         a = isoxml&.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
         meeting(isoxml)
       end
 
       def meeting(isoxml)
-        resolution = isoxml&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
+        resolution =
+          isoxml&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
         if o = isoxml&.at(ns("//bibdata/ext/meeting-date/on"))&.text
           set(:meeting_date, resolution ? ddMMMMYYYY(o, nil) : ddMMMYYYY(o))
         elsif f = isoxml&.at(ns("//bibdata/ext/meeting-date/from"))&.text

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -11,7 +11,7 @@ module IsoDoc
       end
 
       def prefix_container(container, linkend, _target)
-        l10n("#{linkend} #{@i18n.get["in"]} #{@xrefs.anchor(container, :xref)}")
+        l10n("#{linkend} #{@i18n.get['in']} #{@xrefs.anchor(container, :xref)}")
       end
 
       def eref(docxml)
@@ -32,12 +32,13 @@ module IsoDoc
         end
       end
 
-      def eref1(f)
-        get_eref_linkend(f)
+      def eref1(elem)
+        get_eref_linkend(elem)
       end
 
-      def note1(f)
-        return if f["type"] == "title-footnote"
+      def note1(elem)
+        return if elem["type"] == "title-footnote"
+
         super
       end
 
@@ -46,71 +47,76 @@ module IsoDoc
           !c.text? || /\S/.match(c)
         end
         return unless contents.empty?
-        link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
+
+        link = anchor_linkend(node,
+                              docid_l10n(node["target"] || node["citeas"]))
         link && !/^\[.*\]$/.match(link) and link = "[#{link}]"
-        link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
-        non_locality_elems(node).each { |n| n.remove }
+        link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                                link, node)
+        non_locality_elems(node).each(&:remove)
         node.add_child(link)
       end
 
-      def bibdata_i18n(b)
+      def bibdata_i18n(bib)
         super
-        bibdata_dates(b)
-        bibdata_title(b)
-        amendment_id(b)
+        bibdata_dates(bib)
+        bibdata_title(bib)
+        amendment_id(bib)
       end
 
-      def bibdata_dates(b)
-        b.xpath(ns("./date")).each do |d|
+      def bibdata_dates(bib)
+        bib.xpath(ns("./date")).each do |d|
           d.next = d.dup
           d.next["format"] = "ddMMMyyyy"
           d.next.children = ddMMMyyyy(d.text)
         end
       end
 
-      def bibdata_title(b)
-        case b&.at(ns("./ext/doctype"))&.text 
-        when "service-publication" then bibdata_title_service_population(b)
-        when "resolution" then bibdata_title_resolution(b)
+      def bibdata_title(bib)
+        case bib&.at(ns("./ext/doctype"))&.text
+        when "service-publication" then bibdata_title_service_population(bib)
+        when "resolution" then bibdata_title_resolution(bib)
         end
       end
 
-      def bibdata_title_resolution(b)
-        num = b&.at(ns("./docnumber"))&.text
-        place = b&.at(ns("./ext/meeting-place"))&.text
-        ed = b&.at(ns("./edition"))&.text
-        rev = (ed && ed != "1")  ? "#{@i18n.get["revision_abbreviation"]} " : ""
-        year = b&.at(ns("./ext/meeting-date/from | ./ext/meeting-date/on"))&.text&.gsub(/-.*$/, "")
-        num = b&.at(ns("./docnumber"))&.text
-        text = @i18n.l10n("#{@i18n.get['doctype_dict']['resolution'].upcase} #{num} (#{rev}#{place}, #{year})")
-        ins = b.at(ns("./title"))
-        ins.next = <<~END
-        <title language="#{@lang}" format="text/plain" type="resolution">#{text}</title>
-        <title language="#{@lang}" format="text/plain" type="resolution-placedate">#{place}, #{year}</title>
-        END
-      end
-
-      def bibdata_title_service_population(b)
-        date = b&.at(ns("./date[@type = 'published']"))&.text or return
+      def bibdata_title_resolution(bib)
+        place = bib&.at(ns("./ext/meeting-place"))&.text
+        ed = bib&.at(ns("./edition"))&.text
+        rev = ed && ed != "1" ? "#{@i18n.get['revision_abbreviation']} " : ""
+        year = bib&.at(ns("./ext/meeting-date/from | ./ext/meeting-date/on"))
+          &.text&.gsub(/-.*$/, "")
+        num = bib&.at(ns("./docnumber"))&.text
+        text = @i18n.l10n("#{@i18n.get['doctype_dict']['resolution'].upcase} "\
+                          "#{num} (#{rev}#{place}, #{year})")
+        ins = bib.at(ns("./title"))
+        ins.next = <<~INS
+          <title language="#{@lang}" format="text/plain" type="resolution">#{text}</title>
+          <title language="#{@lang}" format="text/plain" type="resolution-placedate">#{place}, #{year}</title>
+        INS
+      end
+
+      def bibdata_title_service_population(bib)
+        date = bib&.at(ns("./date[@type = 'published']"))&.text or return
         text = l10n(@i18n.get["position_on"].sub(/%/, ddmmmmyyyy(date)))
-        ins = b.at(ns("./title"))
-        ins.next = <<~END
-        <title language="#{@lang}" format="text/plain" type="position-sp">#{text}</title>
-        END
+        ins = bib.at(ns("./title"))
+        ins.next = <<~INS
+          <title language="#{@lang}" format="text/plain" type="position-sp">#{text}</title>
+        INS
       end
 
       def ddMMMyyyy(date)
-        d = date.split(/-/).map { |x| x.sub(/^0/, "") }
-        if @lang == "zh"
-          d[0] += "年" if d.dig(0)
-          d[1] += "月" if d.dig(1)
-          d[2] += "日" if d.dig(2)
-          d.join("")
-        elsif @lang == "ar"
-          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d.dig(1)
+        d = date.split("-").map { |x| x.sub(/^0/, "") }
+        case @lang
+        when "zh"
+          d[0] += "年" if d[0]
+          d[1] += "月" if d[1]
+          d[2] += "日" if d[2]
+          d.join
+        when "ar"
+          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
           d.join(".")
         else
-          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d.dig(1)
+          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
           d.reverse.join(".")
         end
       end
@@ -119,16 +125,16 @@ module IsoDoc
         if @lang == "zh"
           ddMMMyyyy(date)
         else
-          d = date.split(/-/)
-          d[1] = @meta.months[d[1].to_sym] if d.dig(1)
-          d[2] = d[2].sub(/^0/, "") if d.dig(2)
+          d = date.split("-")
+          d[1] = @meta.months[d[1].to_sym] if d[1]
+          d[2] = d[2].sub(/^0/, "") if d[2]
           l10n(d.reverse.join(" "))
         end
       end
 
-      def amendment_id(b)
+      def amendment_id(bib)
         %w(amendment corrigendum).each do |w|
-          if dn = b.at(ns("./ext/structuredidentifier/#{w}"))
+          if dn = bib.at(ns("./ext/structuredidentifier/#{w}"))
             dn["language"] = ""
             dn.next = dn.dup
             dn.next["language"] = @lang
@@ -138,32 +144,37 @@ module IsoDoc
       end
 
       def twitter_cldr_localiser_symbols
-        {group: "'"}
-      end
-
-      def clause1(f)
-        return super unless f&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
-        return super unless %w(sections bibliography).include? f.parent.name
-        return if @suppressheadingnumbers || f["unnumbered"]
-        t = f.at(ns("./title")) and t["depth"] = "1"
-        lbl = @xrefs.anchor(f['id'], :label, false) or return
-        f.elements.first.previous =
-          "<p keep-with-next='true' class='supertitle'>#{@i18n.get['section'].upcase} #{lbl}</p>"
-      end
-
-      def annex1(f)
-        return super unless f&.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
-        lbl = @xrefs.anchor(f['id'], :label)
-        subhead = (@i18n.l10n("(#{@i18n.get['to']} ") + 
-                   f.at(ns("//bibdata/title[@type = 'resolution']")).children.to_xml + @i18n.l10n(")"))
-        f.elements.first.previous = "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
-        if t = f.at(ns("./title"))
+        { group: "'" }
+      end
+
+      def clause1(elem)
+        return super unless elem&.at(ns("//bibdata/ext/doctype"))&.text ==
+          "resolution"
+        return super unless %w(sections bibliography).include? elem.parent.name
+        return if @suppressheadingnumbers || elem["unnumbered"]
+
+        t = elem.at(ns("./title")) and t["depth"] = "1"
+        lbl = @xrefs.anchor(elem["id"], :label, false) or return
+        elem.elements.first.previous =
+          "<p keep-with-next='true' class='supertitle'>"\
+          "#{@i18n.get['section'].upcase} #{lbl}</p>"
+      end
+
+      def annex1(elem)
+        return super unless elem&.at(ns("//bibdata/ext/doctype"))&.text ==
+          "resolution"
+
+        lbl = @xrefs.anchor(elem["id"], :label)
+        subhead = (@i18n.l10n("(#{@i18n.get['to']} ") +
+                   elem.at(ns("//bibdata/title[@type = 'resolution']"))
+                     .children.to_xml + @i18n.l10n(")"))
+        elem.elements.first.previous =
+          "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
+        t = elem.at(ns("./title")) and
           t.children = "<strong>#{t.children.to_xml}</strong>"
-        end
       end
 
       include Init
     end
   end
 end
-

data/lib/isodoc/itu/word_cleanup.rb

@@ -9,8 +9,7 @@ module IsoDoc
         end
       end
 
-      def word_term_cleanup(docxml)
-      end
+      def word_term_cleanup(docxml); end
 
       def word_cleanup(docxml)
         word_footnote_cleanup(docxml)
@@ -77,26 +76,35 @@ module IsoDoc
           @wordstylesheet&.close
         end
         Html2Doc.process(
-          result, filename: filename, 
-          stylesheet: @wordstylesheet&.path,
-          header_file: header&.path, dir: dir,
-          asciimathdelims: [@openmathdelim, @closemathdelim],
-          liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+          result, filename: filename,
+                  stylesheet: @wordstylesheet&.path,
+                  header_file: header&.path, dir: dir,
+                  asciimathdelims: [@openmathdelim, @closemathdelim],
+                  liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" }
+        )
         header&.unlink
         @wordstylesheet&.unlink
       end
 
       def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
+        authority_hdr_cleanup1(docxml)
+        authority_hdr_cleanup2(docxml)
+      end
+
+      def authority_hdr_cleanup1(docxml)
+        docxml&.xpath("//div[@id = 'draft-warning']")&.each do |d|
           d.xpath(".//h1 | .//h2").each do |p|
             p.name = "p"
             p["class"] = "draftwarningHdr"
           end
         end
+      end
+
+      def authority_hdr_cleanup2(docxml)
         %w(copyright license legal).each do |t|
-          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
-            p = d&.at("./descendant::h1[2]") and
-              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+          docxml&.xpath("//div[@class = 'boilerplate-#{t}']")&.each do |d|
+            para = d&.at("./descendant::h1[2]") and
+              para.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
             d.xpath(".//h1 | .//h2").each do |p|
               p.name = "p"
               p["class"] = "boilerplateHdr"
@@ -114,14 +122,15 @@ module IsoDoc
           auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
           auth.remove if auth && !dest
           next unless auth && dest
-          t == "copyright" and p = auth&.at(".//p") and
-            p["class"] = "boilerplateHdr"
-          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, i|
+
+          t == "copyright" and para = auth&.at(".//p") and
+            para["class"] = "boilerplateHdr"
+          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, _i|
             p["class"] = "boilerplate"
-            #i == 0 && t == "copyright" and p["style"] = "text-align:center;"
+            # i == 0 && t == "copyright" and p["style"] = "text-align:center;"
           end
           t == "copyright" or
-            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" 
+            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
           dest.replace(auth.remove)
         end
       end
@@ -134,8 +143,8 @@ module IsoDoc
         end
       end
 
-      def table_list_style1(t, num)
-        (t.xpath(".//li") - t.xpath(".//ol//li | .//ul//li")).each do |t1|
+      def table_list_style1(tab, num)
+        (tab.xpath(".//li") - tab.xpath(".//ol//li | .//ul//li")).each do |t1|
           indent_list(t1, num)
           t1.xpath("./div | ./p").each { |p| indent_list(p, num) }
           (t1.xpath(".//ul") - t1.xpath(".//ul//ul | .//ol//ul")).each do |t2|
@@ -147,9 +156,9 @@ module IsoDoc
         end
       end
 
-      def indent_list(li, num)
-        li["style"] = (li["style"] ? li["style"] + ";" : "")
-        li["style"] += "margin-left: #{num * 0.5}cm;text-indent: -0.5cm;"
+      def indent_list(list, num)
+        list["style"] = (list["style"] ? "#{list['style']};" : "")
+        list["style"] += "margin-left: #{num * 0.5}cm;text-indent: -0.5cm;"
       end
     end
   end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.3.9".freeze
+    VERSION = "1.3.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities