metanorma-itu 1.0.11 → 1.0.16

data/lib/isodoc/itu/metadata.rb

@@ -8,17 +8,17 @@ module IsoDoc
         super
         here = File.dirname(__FILE__)
         set(:logo_html,
-            #File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
             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", "logo.png")))
         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 =
@@ -40,11 +40,12 @@ module IsoDoc
         set(:bureau, bureau.text) if bureau
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
+        super
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier"))
-        set(:docidentifier, dn&.text)
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ITU']"))
+        set(:docnumber, dn&.text)
         dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
         oblig = isoxml&.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
@@ -55,27 +56,6 @@ module IsoDoc
         %w(in-force-prepublished draft).include? status.downcase
       end
 
-      def version(isoxml, _out)
-        super
-        revdate = get[:revdate]
-        set(:revdate_monthyear, monthyr(revdate))
-      end
-
-      MONTHS = {
-        "01": "January",
-        "02": "February",
-        "03": "March",
-        "04": "April",
-        "05": "May",
-        "06": "June",
-        "07": "July",
-        "08": "August",
-        "09": "September",
-        "10": "October",
-        "11": "November",
-        "12": "December",
-      }.freeze
-
       def bibdate(isoxml, _out)
         pubdate = isoxml.xpath(ns("//bibdata/date[@type = 'published']"))
         pubdate and set(:pubdate_monthyear, monthyr(pubdate.text))

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
@@ -18,7 +18,8 @@ module IsoDoc
 
       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))}]"
+          id = render_identifier(bibitem_ref_code(b))
+          ref << (id[0] || "[#{id[1]}]")
           date_note_process(b, ref)
           insert_tab(ref, 1)
           reference_format(b, ref)
@@ -29,6 +30,12 @@ module IsoDoc
         nonstd_bibitem(list, b, ordinal, biblio)
       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,29 +45,21 @@ module IsoDoc
         s.gsub(/ |\_|\-/, " ").split(/ /).map(&:capitalize).join(" ")
       end
 
-      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(@type = 'DOI' or @type = 'ISSN' or "\
-                       "@type = 'ISBN')]"))
-        id ||= b.at(ns("./docidentifier"))
-        return id if id
-        id = Nokogiri::XML::Node.new("docidentifier", b.document)
-        id.text = "(NO ID)"
-        id
+      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 multi_bibitem_ref_code(b)
-        id = b.xpath(ns("./docidentifier[not(@type = 'DOI' or @type = "\
-                        "'metanorma' or @type = 'ISSN' or @type = 'ISBN')]"))
-        id.empty? and id = b.xpath(ns("./docidentifier[not(@type = 'DOI' or "\
-                                      "@type = 'ISSN' or @type = 'ISBN')]"))
-        id.empty? and id = b.xpath(ns("./docidentifier"))
-        return ["(NO ID)"] if id.empty?
+        id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or #{IGNORE_IDS})]"))
+        id.empty? and id = b.xpath(ns("./docidentifier[not(@type = 'metanorma')]"))
+        return [] if id.empty?
         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(/\]$/, ""))
@@ -79,10 +78,11 @@ module IsoDoc
 
       def reference_format_start(b, r)
         id = multi_bibitem_ref_code(b)
-        r << render_identifiers(id)
+        id1 = render_multi_identifiers(id)
+        r << id1
         date = b.at(ns("./date[@type = 'published']")) and
           r << " (#{date.text.sub(/-.*$/, '')})"
-        r << ", "
+        r << ", " if (date || !id1.empty?)
       end
 
       def reference_format_title(b, r)
@@ -96,6 +96,11 @@ module IsoDoc
           /\.$/.match(title&.text) or r << "."
         end
       end
+
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
+      end
     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|

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?

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)
@@ -68,10 +72,10 @@ module IsoDoc
       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 +93,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 +110,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,7 +120,7 @@ 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

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.11"
+    VERSION = "1.0.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -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

data/lib/isodoc/itu/html/scripts.pdf.html

@@ -1,72 +0,0 @@
-  <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': false, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
-  </script>
-
-<script>
-  //TOC toggle animation
-$('#toggle').on('click', function(){
-    if( $('nav').is(':visible') ) {
-        $('nav').animate({ 'left': '-353px' }, 'slow', function(){
-            $('nav').hide();
-        });
-        $('.container').animate({ 'padding-left': '31px' }, 'slow');
-    }
-    else {
-        $('nav').show();
-        $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
-    }
-});
-</script>
-
-<script>
-    // Scroll to top button
-    window.onscroll = function() {scrollFunction()};
-    
-    function scrollFunction() {
-        if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-            document.getElementById("myBtn").style.display = "block";
-        } else {
-            document.getElementById("myBtn").style.display = "none";
-        }
-    }
-    
-    // When the user clicks on the button, scroll to the top of the document
-    function topFunction() {
-        document.body.scrollTop = 0;
-        document.documentElement.scrollTop = 0;
-    }
-    </script>
-
-  <script>
-/*
-  $(document).ready(function() {
-          $('[id^=toc]').each(function ()
-          {
-             var currentToc = $(this);
-       var url = window.location.href;
-             currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
-          });
-});
-*/
-</script>
-