metanorma-itu 1.0.12 → 1.0.17

data/lib/isodoc/itu/metadata.rb

@@ -11,12 +11,15 @@ module IsoDoc
             File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
         set(:logo_comb,
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
-        set(:logo_word, File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
+        set(:logo_word,
+            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'main']"))&.text
         set(:doctitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}'][@type = 'subtitle']"))&.text
+        set(:docsubtitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
         series1 =
@@ -66,11 +69,18 @@ module IsoDoc
       end
 
       def keywords(isoxml, _out)
-        keywords = []
-        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
-          keywords << kw.text
+        super
+        set(:keywords, get[:keywords].sort)
+      end
+
+      def doctype(isoxml, _out)
+        d = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
+        set(:doctype_original, d)
+        if d == "recommendation-annex"
+          set(:doctype, "Recommendation")
+        else
+          super
         end
-        set(:keywords, keywords.sort)
       end
 
       def ip_notice_received(isoxml, _out)

data/lib/isodoc/itu/pdf_convert.rb

@@ -6,61 +6,34 @@ module IsoDoc
   module ITU
     # A {Converter} implementation that generates PDF HTML output, and a
     # document schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         @hierarchical_assets = options[:hierarchical_assets]
         super
       end
 
-      def html_toc(docxml)
-        docxml
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Open Sans",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(_options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_itu_titlepage.html"),
-          htmlintropage: html_doc_path("html_itu_intro.html"),
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,800|Space+Mono:400,700" rel="stylesheet">
-        HEAD
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
+      def pdf_stylesheet(docxml)
+        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        when "resolution" then "itu.resolution.xsl"
+        when "recommendation-annex" then "itu.recommendation-annex.xsl"
+        else
+          "itu.recommendation.xsl"
         end
       end
 
-      def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
-          boilerplate docxml, div3
-          abstract docxml, div3
-          preface docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
+      def convert(filename, file = nil, debug = false)
+        file = File.read(filename, encoding: "utf-8") if file.nil?
+        docxml, outname_html, dir = convert_init(file, filename, debug)
+        /\.xml$/.match(filename) or
+          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
         end
+        FileUtils.rm_rf dir
+        ::Metanorma::Output::XslfoPdf.new.convert(
+          filename, outname_html + ".pdf", File.join(@libdir, pdf_stylesheet(docxml)))
       end
-
-      include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/ref.rb

@@ -6,7 +6,7 @@ module IsoDoc
   module ITU
     module BaseConvert
       def norm_ref(isoxml, out, num)
-        q = "//bibliography/references[title = 'References']"
+        q = "//bibliography/references[@normative = 'true']"
         f = isoxml.at(ns(q)) or return num
         out.div do |div|
           num = num + 1
@@ -17,11 +17,14 @@ module IsoDoc
       end
 
       def nonstd_bibitem(list, b, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-          ref << "[#{render_identifier(bibitem_ref_code(b))}]"
-          date_note_process(b, ref)
-          insert_tab(ref, 1)
-          reference_format(b, ref)
+        list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+          id = render_identifier(bibitem_ref_code(b))
+          ref.td **{style: "vertical-align:top"} do |td|
+            td << (id[0] || "[#{id[1]}]")&.
+              gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
+            date_note_process(b, td)
+          end
+          ref.td { |td| reference_format(b, td) }
         end
       end
 
@@ -29,6 +32,36 @@ module IsoDoc
         nonstd_bibitem(list, b, ordinal, biblio)
       end
 
+      def biblio_list(f, div, biblio)
+        div.table **{ class: "biblio", border: "0" } do |t|
+          i = 0
+          t.tbody do |tbody|
+            f.elements.each do |b|
+              if b.name == "bibitem"
+                next if implicit_reference(b)
+                i += 1
+                nonstd_bibitem(tbody, b, i, biblio)
+              else
+                unless %w(title clause references).include? b.name
+                  tbody.tx do |tx|
+                    parse(b, tx)
+                  end
+                end
+              end
+            end
+          end
+        end
+        f.xpath(ns("./clause | ./references")).each do |x|
+          parse(x, div)
+        end
+      end
+
+      def bracket_if_num(x)
+        return nil if x.nil?
+        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{x}]"
+      end
+
       def reference_format(b, r)
         reference_format_start(b, r)
         reference_format_title(b, r)
@@ -38,20 +71,13 @@ module IsoDoc
         s.gsub(/ |\_|\-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
 
+      def pref_ref_code(b)
+        b.at(ns("./docidentifier[@type = 'ITU']")) || super
+      end
+
       IGNORE_IDS =
         "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
 
-      def bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[@type = 'metanorma']"))
-        id ||= b.at(ns("./docidentifier[@type = 'ITU']"))
-        id ||= b.at(ns("./docidentifier[not(#{IGNORE_IDS})]"))
-        id ||= b.at(ns("./docidentifier"))
-        return id if id
-        id = Nokogiri::XML::Node.new("docidentifier", b.document)
-        id.text = "(NO ID)"
-        id
-      end
-
       def multi_bibitem_ref_code(b)
         id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or #{IGNORE_IDS})]"))
         id.empty? and id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
@@ -59,7 +85,7 @@ module IsoDoc
         id.sort_by { |i| i["type"] == "ITU" ? 0 : 1 }
       end
 
-      def render_identifiers(ids)
+      def render_multi_identifiers(ids)
         ids.map do |id|
           id["type"] == "ITU" ? doctype_title(id) : 
             docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
@@ -78,7 +104,7 @@ module IsoDoc
 
       def reference_format_start(b, r)
         id = multi_bibitem_ref_code(b)
-        id1 = render_identifiers(id)
+        id1 = render_multi_identifiers(id)
         r << id1
         date = b.at(ns("./date[@type = 'published']")) and
           r << " (#{date.text.sub(/-.*$/, '')})"
@@ -97,8 +123,9 @@ module IsoDoc
         end
       end
 
-      def format_ref(ref, prefix, isopub, date, allparts)
-        docid_prefix(prefix, ref).sub(/^\[/, "").sub(/\]$/, "")
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
       end
     end
   end

data/lib/isodoc/itu/terms.rb

@@ -1,16 +1,15 @@
 module IsoDoc
   module ITU
     module BaseConvert
-       def terms_defs_title(node)
-        t = node.at(ns("./title")) and return t.text
-        super
+       def term_def_title(node)
+         node
       end
 
       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, terms_defs_title(f), div, nil)
+          clause_name(num, term_def_title(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|
@@ -40,7 +39,7 @@ module IsoDoc
             insert_tab(b, 1)
             term.children.each { |n| parse(n, b) }
           end
-          source and p << " [#{source.value}]"
+          source and p << " #{bracket_opt(source.value)}"
           p << ": "
         end
         defn and defn.children.each { |n| parse(n, div) }

data/lib/isodoc/itu/word_convert.rb

@@ -48,7 +48,7 @@ module IsoDoc
         kw.nil? || kw.empty? and return
         out.div do |div|
           clause_name(nil, "Keywords", div,  class: "IntroTitle")
-          div.p kw.sort.join(", ") + "."
+          div.p kw.join(", ") + "."
         end
       end
 
@@ -105,19 +105,22 @@ module IsoDoc
         super
         abstractbox = docxml.at("//div[@id='abstractbox']")
         historybox = docxml.at("//div[@id='historybox']")
+        sourcebox = docxml.at("//div[@id='sourcebox']")
         keywordsbox = docxml.at("//div[@id='keywordsbox']")
         abstract = docxml.at("//p[@class = 'h1Preface' and text() = 'Summary']/..")
         history = docxml.at("//p[@class = 'h1Preface' and text() = 'History']/..")
+        source = docxml.at("//p[@class = 'h1Preface' and text() = 'Source']/..")
         keywords = docxml.at("//p[@class = 'h1Preface' and text() = 'Keywords']/..")
         abstract.parent = abstractbox if abstract && abstractbox
         history.parent = historybox if history && historybox
+        source.parent = sourcebox if source && sourcebox
         keywords.parent = keywordsbox if keywords && keywordsbox
       end
 
       def formula_parse1(node, out)
         out.div **attr_code(id: node["id"], class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
-            insert_tab(div, 2)
+            insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
             lbl = anchor(node['id'], :label, false)
             unless lbl.nil?
@@ -211,8 +214,9 @@ module IsoDoc
           next unless auth && dest
           t == "copyright" and p = auth&.at(".//p") and
             p["class"] = "boilerplateHdr"
-          auth&.xpath(".//p[not(@class)]")&.each do |p|
+          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, i|
             p["class"] = "boilerplate"
+            i == 0 && t == "copyright" and p["style"] = "text-align:center;"
           end
           auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
           dest.replace(auth.remove)

data/lib/isodoc/itu/xref.rb

@@ -15,9 +15,13 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
             xref: "#{lbl} #{num}", level: 1 }
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-          each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
+        if a = single_annex_special_section(clause)
+          annex_names1(a, "#{num}", 1)
+        else
+          clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
+            each_with_index do |c, i|
+            annex_names1(c, "#{num}.#{i + 1}", 2)
+          end
         end
         hierarchical_asset_names(clause, num)
       end
@@ -52,8 +56,8 @@ module IsoDoc
           hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
           sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
         n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
-        n = section_names(d.at(ns("//bibliography/clause[title = 'References'] | "\
-                                  "//bibliography/references[title = 'References']")), n, 1)
+        n = section_names(d.at(ns("//bibliography/clause[.//references[@normative = 'true']] | "\
+                                  "//bibliography/references[@normative = 'true']")), n, 1)
         n = section_names(d.at(ns("//sections/terms | "\
                                   "//sections/clause[descendant::terms]")), n, 1)
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -63,15 +67,11 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-      def hiersep
-        "-"
-      end
-
       MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
-          "//foreword | //introduction | //acknowledgements | "\
-          "//references[title = 'References' or title = 'references'] | "\
-          "//sections/terms | //preface/clause | "\
-          "//sections/definitions | //clause[parent::sections]".freeze
+        "//foreword | //introduction | //acknowledgements | "\
+        "//references[@normative = 'true'] | "\
+        "//sections/terms | //preface/clause | "\
+        "//sections/definitions | //clause[parent::sections]".freeze
 
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
@@ -89,7 +89,7 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "-#{(97 + j).chr.to_s}")
+          label = c.print + (j.zero? ? "" : "-#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] =
             anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
@@ -106,7 +106,7 @@ module IsoDoc
             c.increment(t)
           end
           label = "#{num}#{hiersep}#{c.print}" +
-            (j.zero? ? "" : "#{hierfigsep}#{(97 + j).chr.to_s}")
+            (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
                                             t["unnumbered"])
@@ -116,12 +116,23 @@ module IsoDoc
       def sequential_formula_names(clause)
         clause&.first&.xpath(ns(MIDDLE_SECTIONS))&.each do |c|
           if c["id"] && @anchors[c["id"]]
-          hierarchical_formula_names(c, @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
+            hierarchical_formula_names(c, @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
           else
             hierarchical_formula_names(c, "???")
           end
         end
       end
+
+      def hierarchical_formula_names(clause, num)
+      c = IsoDoc::Function::XrefGen::Counter.new
+      clause.xpath(ns(".//formula")).each do |t|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] =
+          anchor_struct("#{num}-#{c.increment(t).print}", nil,
+                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        "formula", t["unnumbered"])
+      end
+    end
     end
   end
 end

data/lib/metanorma/itu/processor.rb

@@ -2,6 +2,14 @@ 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

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.12"
+    VERSION = "1.0.17"
   end
 end

data/metanorma-itu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -269,12 +269,14 @@ files:
 - lib/isodoc/itu/html/itu.scss
 - lib/isodoc/itu/html/logo.png
 - lib/isodoc/itu/html/scripts.html
-- lib/isodoc/itu/html/scripts.pdf.html
 - lib/isodoc/itu/html/word_itu_intro.html
 - lib/isodoc/itu/html/word_itu_titlepage.html
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
 - lib/isodoc/itu/i18n-en.yaml
+- lib/isodoc/itu/itu.recommendation-annex.xsl
+- lib/isodoc/itu/itu.recommendation.xsl
+- lib/isodoc/itu/itu.resolution.xsl
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/ref.rb