metanorma-itu 1.0.16 → 1.1.2

data/lib/isodoc/itu/metadata.rb

@@ -11,7 +11,8 @@ 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)
@@ -68,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

@@ -21,19 +21,6 @@ module IsoDoc
           "itu.recommendation.xsl"
         end
       end
-
-      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
     end
   end
 end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -0,0 +1,10 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module ITU
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    end
+  end
+end
+

data/lib/isodoc/itu/ref.rb

@@ -5,6 +5,7 @@ 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
@@ -15,14 +16,17 @@ module IsoDoc
         end
         num
       end
+=end
 
       def nonstd_bibitem(list, b, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+        list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
           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)
+          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
 
@@ -30,11 +34,35 @@ 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
+        return nil if x.nil?
+        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{x}]"
+      end
 
       def reference_format(b, r)
         reference_format_start(b, r)
@@ -50,7 +78,7 @@ module IsoDoc
       end
 
       IGNORE_IDS =
-  "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
+        "@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 = 'metanorma' or #{IGNORE_IDS})]"))
@@ -96,11 +124,6 @@ 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,8 +1,8 @@
 module IsoDoc
   module ITU
     module BaseConvert
-       def term_def_title(node)
-         node
+      def term_def_title(node)
+        node
       end
 
       def terms_defs(node, out, num)
@@ -35,11 +35,11 @@ module IsoDoc
       def termdef_parse1(node, div, term, defn, source)
         div.p **{ class: "TermNum", id: node["id"] } do |p|
           p.b do |b|
-            b << anchor(node["id"], :label)
+            b << @xrefs.anchor(node["id"], :label)
             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) }
@@ -60,24 +60,11 @@ module IsoDoc
       end
 
       def termnote_parse(node, out)
-      out.div **{ class: "Note" } do |div|
-        first = node.first_element_child
-        div.p do |p|
-          p << note_label(node) # "#{anchor(node['id'], :label) || '???'}: "
-          para_then_remainder(first, node, p, div)
-        end
-      end
-    end
-
-      def termnote_anchor_names(docxml)
-        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-          c = IsoDoc::Function::XrefGen::Counter.new
-          notes = t.xpath(ns(".//termnote"))
-          notes.each do |n|
-            return if n["id"].nil? || n["id"].empty?
-            idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-            @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl,
-                                              "termnote", false)
+        out.div **note_attrs(node) do |div|
+          first = node.first_element_child
+          div.p do |p|
+            p << note_label(node) # "#{@xrefs.anchor(node['id'], :label) || '???'}: "
+            para_then_remainder(first, node, p, div)
           end
         end
       end

data/lib/isodoc/itu/word_convert.rb

@@ -118,11 +118,11 @@ module IsoDoc
       end
 
       def formula_parse1(node, out)
-        out.div **attr_code(id: node["id"], class: "formula") do |div|
+        out.div **attr_code(class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            lbl = anchor(node['id'], :label, false)
+            lbl = @xrefs.anchor(node['id'], :label, false)
             unless lbl.nil?
               insert_tab(div, 1)
               div << "(#{lbl})"
@@ -153,10 +153,8 @@ module IsoDoc
         super.merge(valign: "top")
       end
 
-      def ol_parse(node, out)
-        out.ol **attr_code(class: node["class"], id: node["id"] ) do |ol|
-          node.children.each { |n| parse(n, ol) }
-        end
+      def ol_attrs(node)
+        { class: node["class"], id: node["id"], style: keep_style(node) }
       end
 
       def toWord(result, filename, dir, header)
@@ -214,8 +212,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

@@ -4,14 +4,19 @@ require "fileutils"
 
 module IsoDoc
   module ITU
-    module BaseConvert
+    class Xref < IsoDoc::Xref
+      def initialize(lang, script, klass, labels, options)
+        super
+        @hierarchical_assets = options[:hierarchical_assets]
+      end
+
       def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ? @appendix_lbl : @annex_lbl
+        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
         l10n("<b>#{lbl} #{num}</b>")
       end
 
       def annex_names(clause, num)
-        lbl = clause["obligation"] == "informative" ? @appendix_lbl : @annex_lbl
+        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
             xref: "#{lbl} #{num}", level: 1 }
@@ -67,10 +72,6 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-      def hiersep
-        "-"
-      end
-
       MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
         "//foreword | //introduction | //acknowledgements | "\
         "//references[@normative = 'true'] | "\
@@ -85,7 +86,7 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::Function::XrefGen::Counter.new
+        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
@@ -96,12 +97,12 @@ module IsoDoc
           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"])
+            anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
         end
       end
 
       def hierarchical_figure_names(clause, num)
-        c = IsoDoc::Function::XrefGen::Counter.new
+        c = IsoDoc::XrefGen::Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
@@ -112,7 +113,7 @@ module IsoDoc
           label = "#{num}#{hiersep}#{c.print}" +
             (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",
+          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
                                             t["unnumbered"])
         end
       end
@@ -120,12 +121,42 @@ 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::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"] ? @labels["inequality"] : @labels["formula"],
+                          "formula", t["unnumbered"])
+        end
+      end
+
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
+      end
+
+      def termnote_anchor_names(docxml)
+        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+          c = IsoDoc::XrefGen::Counter.new
+          notes = t.xpath(ns(".//termnote"))
+          notes.each do |n|
+            return if n["id"].nil? || n["id"].empty?
+            idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
+            @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"],
+                                              "termnote", false)
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/itu/processor.rb

@@ -30,18 +30,16 @@ module Metanorma
         "Metanorma::ITU #{Metanorma::ITU::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
-      def output(isodoc_node, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::ITU::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::ITU::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::ITU::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::ITU::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::ITU::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::ITU::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::ITU::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.16"
+    VERSION = "1.1.2"
   end
 end

data/metanorma-itu.gemspec

@@ -26,10 +26,11 @@ 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 "isodoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.1.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.1.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - lib/isodoc/itu/itu.resolution.xsl
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
+- lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb
 - lib/isodoc/itu/word_convert.rb
@@ -292,7 +307,7 @@ homepage: https://github.com/metanorma/metanorma-itu
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -307,9 +322,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Metanorma for the ITU
 test_files: []