metanorma-itu 1.2.5 → 1.2.10

data/lib/isodoc/itu/metadata.rb

@@ -1,4 +1,5 @@
 require "isodoc"
+require "twitter_cldr"
 
 module IsoDoc
   module ITU
@@ -14,6 +15,8 @@ module IsoDoc
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
         set(:logo_word,
             File.expand_path(File.join(here, "html", n)))
+        set(:logo_sp,
+            File.expand_path(File.join(here, "html", "logo-sp.png")))
       end
 
       def title(isoxml, _out)
@@ -39,23 +42,55 @@ module IsoDoc
         set(:series2, series2)
         annext = isoxml&.at(ns("//bibdata/title[@type='annex']"))&.text
         set(:annextitle, annext)
+        annext = isoxml&.at(ns("//bibdata/title[@type='position-sp']"))&.text
+        set(:positiontitle, annext)
       end
 
       def subtitle(_isoxml, _out)
         nil
       end
 
-      def author(isoxml, _out)
-        bureau = isoxml.at(ns("//bibdata/ext/editorialgroup/bureau"))
+      def author(xml, _out)
+        bureau = xml.at(ns("//bibdata/ext/editorialgroup/bureau"))
         set(:bureau, bureau.text) if bureau
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/group/name"))
+        set(:group, tc.text) if tc
+        tc = xml.at(ns("//bibdata/ext/editorialgroup/subgroup/name"))
+        set(:subgroup, tc.text) if tc
+        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' "\
+                               "or xmlns:role/@type = 'editor']/person"))
+        person_attributes(authors) unless authors.empty?
+      end
+
+      def append(key, value)
+        @metadata[key] << value
+      end
+
+      def person_attributes(authors)
+        %i(affiliations addresses emails faxes phones).each { |i| set(i, []) }
+        authors.each do |a|
+          append(:affiliations, 
+                 a&.at(ns("./affiliation/organization/name"))&.text)
+          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)
+          append(:phones, a&.at(ns("./phone[not(@type = 'fax')]"))&.text)
+        end
       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)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
         oblig = isoxml&.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
@@ -63,7 +98,8 @@ module IsoDoc
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
           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}"))
+          set(:corrigendumid,
+              @i18n.l10n("#{@labels["corrigendum"]} #{dn&.text}"))
       end
 
       def unpublished(status)
@@ -71,8 +107,14 @@ module IsoDoc
       end
 
       def bibdate(isoxml, _out)
-        pubdate = isoxml.xpath(ns("//bibdata/date[@type = 'published']"))
+        pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
         pubdate and set(:pubdate_monthyear, monthyr(pubdate.text))
+        pubdate = isoxml.at(ns("//bibdata/date[@format = 'ddMMMyyyy'][@type = 'published']"))
+        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")))
       end
 
       def monthyr(isodate)
@@ -89,8 +131,10 @@ module IsoDoc
       def doctype(isoxml, _out)
         d = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
         set(:doctype_original, d)
+        set(:doctype_abbreviated, @labels["doctype_abbrev"][d])
         if d == "recommendation-annex"
           set(:doctype, "Recommendation")
+          set(:doctype_display, "Recommendation")
         else
           super
         end
@@ -101,6 +145,27 @@ module IsoDoc
           "false"
         set(:ip_notice_received, received)
       end
+
+      def ddMMMYYYY(isodate)
+        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).#with_timezone("UCT").
+          to_additional_s("MMM")
+        @i18n.l10n("#{m[:dd]} #{mmm} #{m[:yr]}")
+      end
+
+      def techreport(isoxml, _out)
+        a = isoxml&.at(ns("//bibdata/ext/meeting"))&.text and set(:meeting, 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)
+        if o = isoxml&.at(ns("//bibdata/ext/meeting-date/on"))&.text
+          set(:meeting_date, ddMMMYYYY(o))
+        elsif f = isoxml&.at(ns("//bibdata/ext/meeting-date/from"))&.text
+          t = isoxml&.at(ns("//bibdata/ext/meeting-date/to"))&.text
+          set(:meeting_date, "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
+        end
+      end
     end
   end
 end

data/lib/isodoc/itu/pdf_convert.rb

@@ -16,6 +16,8 @@ module IsoDoc
         case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
         when "resolution" then "itu.resolution.xsl"
         when "recommendation-annex" then "itu.recommendation-annex.xsl"
+        when "technical-report" then "itu.technical-report.xsl"
+        when "technical-paper" then "itu.technical-paper.xsl"
         else
           "itu.recommendation.xsl"
         end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "init"
+require "roman-numerals"
 require "isodoc"
 
 module IsoDoc
@@ -50,10 +51,69 @@ module IsoDoc
 
       def bibdata_i18n(b)
         super
-        dn = b.at(ns("./ext/structuredidentifier/amendment")) and
-          dn.children = @i18n.l10n("#{@i18n.get["amendment"]} #{dn&.text}")
-        dn = b.at(ns("./ext/structuredidentifier/corrigendum")) and
-          dn.children = @i18n.l10n("#{@i18n.get["corrigendum"]} #{dn&.text}")
+        bibdata_dates(b)
+        bibdata_title(b)
+        amendment_id(b)
+      end
+
+      def bibdata_dates(b)
+        b.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)
+        b&.at(ns("./ext/doctype"))&.text == "service-publication" or return
+        date = b&.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
+      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.join(".")
+        else
+          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d.dig(1)
+          d.reverse.join(".")
+        end
+      end
+
+      def ddmmmmyyyy(date)
+        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)
+          l10n(d.reverse.join(" "))
+        end
+      end
+
+      def amendment_id(b)
+        %w(amendment corrigendum).each do |w|
+          if dn = b.at(ns("./ext/structuredidentifier/#{w}"))
+            dn["language"] = ""
+            dn.next = dn.dup
+            dn.next["language"] = @lang
+            dn.next.children = @i18n.l10n("#{@i18n.get[w]} #{dn&.text}")
+          end
+        end
+      end
+
+      def twitter_cldr_localiser_symbols
+        {group: "'"}
       end
 
       include Init

data/lib/isodoc/itu/ref.rb

@@ -5,19 +5,6 @@ require "fileutils"
 module IsoDoc
   module ITU
     module BaseConvert
-=begin
-      def norm_ref(isoxml, out, num)
-        q = "//bibliography/references[@normative = 'true']"
-        f = isoxml.at(ns(q)) or return num
-        out.div do |div|
-          num = num + 1
-          clause_name(num, f.at(ns("./title")), div, nil)
-          biblio_list(f, div, false)
-        end
-        num
-      end
-=end
-
       def nonstd_bibitem(list, b, ordinal, biblio)
         list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
           id = render_identifier(bibitem_ref_code(b))

data/lib/isodoc/itu/terms.rb

@@ -1,35 +1,6 @@
 module IsoDoc
   module ITU
     module BaseConvert
-=begin
-      def terms_defs(node, out, num)
-        f = node.at(ns(IsoDoc::Convert::TERM_CLAUSE)) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(num, f.at(ns("./title")), div, nil)
-          if f.at(ns("./clause | ./terms | ./term")).nil? then out.p "None."
-          else
-            f.children.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, div)
-            end
-          end
-        end
-        num
-      end
-
-      def terms_parse(node, out)
-        out.div **attr_code(id: node["id"]) do |div|
-          clause_parse_title(node, div, node.at(ns("./title")), out)
-          if node.at(ns("./clause | ./term")).nil? then out.p "None."
-          else
-            node.children.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, div)
-            end
-          end
-        end
-      end
-=end
-
       def termdef_parse1(node, div, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|
           p.b do |b|
@@ -37,8 +8,8 @@ module IsoDoc
             insert_tab(b, 1)
             node&.at(ns("./preferred"))&.children&.each { |n| parse(n, b) }
           end
-          source and p << " #{bracket_opt(source.value)}"
           p << ": "
+          source and p << "#{bracket_opt(source.value)} "
         end
         defn and defn.children.each { |n| parse(n, div) }
       end
@@ -56,6 +27,12 @@ module IsoDoc
         end
       end
 
+      def bracket_opt(b)
+        return b if b.nil?
+        return b if /^\[.+\]$/.match(b)
+        "[#{b}]"
+      end
+
       def termnote_delim
         " &ndash; "
       end

data/lib/isodoc/itu/word_cleanup.rb

@@ -55,14 +55,17 @@ module IsoDoc
         historybox = docxml.at("//div[@id='historybox']")
         sourcebox = docxml.at("//div[@id='sourcebox']")
         keywordsbox = docxml.at("//div[@id='keywordsbox']")
+        changelogbox = docxml.at("//div[@id='change_logbox']")
         abstract = docxml.at("//div[@class = 'Abstract']")
         history = docxml.at("//div[@class = 'history']")
         source = docxml.at("//div[@class = 'source']")
-        keywords = docxml.at("//div[@class = 'Keywords']")
+        keywords = docxml.at("//div[@class = 'Keyword']")
+        changelog = docxml.at("//div[@id = 'change_log']")
         abstract.parent = abstractbox if abstract && abstractbox
         history.parent = historybox if history && historybox
         source.parent = sourcebox if source && sourcebox
         keywords.parent = keywordsbox if keywords && keywordsbox
+        changelog.parent = changelogbox if changelog && changelogbox
       end
 
       def toWord(result, filename, dir, header)
@@ -109,6 +112,7 @@ module IsoDoc
         %w(copyright license legal).each do |t|
           dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
           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"

data/lib/isodoc/itu/word_convert.rb

@@ -64,12 +64,26 @@ module IsoDoc
         end
       end
 
+      def convert1(docxml, filename, dir)
+        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "service-publication"
+          @wordcoverpage = html_doc_path("word_itu_titlepage_sp.html")
+          options[:bodyfont] = "Arial"
+          options[:headerfont] = "Arial"
+        end
+        super
+      end
+
       def default_fonts(options)
         { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
                      headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                                   '"Times New Roman",serif'),
-                                  monospacefont: '"Courier New",monospace' }
+                                  monospacefont: '"Courier New",monospace',
+                                  normalfontsize: "12.0pt",
+                                  footnotefontsize: "11.0pt",
+                                  smallerfontsize: "11.0pt",
+                                  monospacefontsize: "10.0pt",
+        }
       end
 
       def default_file_locations(options)

data/lib/isodoc/itu/xref.rb

@@ -20,7 +20,7 @@ module IsoDoc
           @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
-            xref: "#{lbl} #{num}", level: 1, value: num }
+            xref: l10n("#{lbl} #{num}"), level: 1, value: num }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -51,7 +51,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, xref: "#{@labels["annex_subclause"]} #{num}",
+          { label: num, xref: l10n("#{@labels["annex_subclause"]} #{num}"),
             level: level, type: "clause" }
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each_with_index do |c, i|

data/lib/metanorma/itu/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module ITU
-    def self.fonts_used
-      {
-        html: ["Arial", "Courier New", "Times New Roman"],
-        doc: ["Arial", "Courier New", "Times New Roman"],
-        pdf: ["Arial", "Courier New", "Times New Roman"]
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize
@@ -26,6 +18,16 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+          "Times New Roman" => nil,
+          "STIX Two Math" => nil,
+        }
+      end
+
       def version
         "Metanorma::ITU #{Metanorma::ITU::VERSION}"
       end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.2.5"
+    VERSION = "1.2.10"
   end
 end

data/metanorma-itu.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.7.0"
+  spec.add_dependency "isodoc", "~> 1.4.0"
+  spec.add_dependency "twitter_cldr"
+  spec.add_dependency "tzinfo-data" # we need this for windows only
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: twitter_cldr
+  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: tzinfo-data
+  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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -243,9 +271,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -283,10 +309,12 @@ files:
 - lib/isodoc/itu/html/itu-document-comb.png
 - lib/isodoc/itu/html/itu.css
 - lib/isodoc/itu/html/itu.scss
+- lib/isodoc/itu/html/logo-sp.png
 - lib/isodoc/itu/html/logo.png
 - lib/isodoc/itu/html/scripts.html
 - lib/isodoc/itu/html/word_itu_intro.html
 - lib/isodoc/itu/html/word_itu_titlepage.html
+- lib/isodoc/itu/html/word_itu_titlepage_sp.html
 - lib/isodoc/itu/html/wordstyle.css
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
@@ -296,6 +324,8 @@ files:
 - lib/isodoc/itu/itu.recommendation-annex.xsl
 - lib/isodoc/itu/itu.recommendation.xsl
 - lib/isodoc/itu/itu.resolution.xsl
+- lib/isodoc/itu/itu.technical-paper.xsl
+- lib/isodoc/itu/itu.technical-report.xsl
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/presentation_xml_convert.rb