metanorma-itu 0.2.8 → 1.0.2

data/lib/isodoc/itu/html_convert.rb

@@ -15,12 +15,6 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path('Logo_ITU.jpg'), "#{@localdir}/Logo_ITU.jpg"
-        @files_to_delete << "#{@localdir}/Logo_ITU.jpg"
-        super
-      end
-
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
@@ -55,6 +49,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -63,7 +58,26 @@ module IsoDoc
         end
       end
 
-      include BaseConvert
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
+       include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/i18n-en.yaml

@@ -10,3 +10,4 @@ inform_annex: (This appendix does not form an integral part of this %.)
 formula: Equation
 inequality: Inequality
 annex_subclause: Clause
+in: in

data/lib/isodoc/itu/metadata.rb

@@ -6,6 +6,12 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
+        here = File.dirname(__FILE__)
+        set(:logo_html,
+            File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
+        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")))
       end
 
       def title(isoxml, _out)
@@ -13,9 +19,11 @@ module IsoDoc
         set(:doctitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
-        series1 = isoxml&.at(ns("//bibdata/series[@type='secondary']/title"))&.text
+        series1 =
+          isoxml&.at(ns("//bibdata/series[@type='secondary']/title"))&.text
         set(:series1, series1)
-        series2 = isoxml&.at(ns("//bibdata/series[@type='tertiary']/title"))&.text
+        series2 =
+          isoxml&.at(ns("//bibdata/series[@type='tertiary']/title"))&.text
         set(:series2, series2)
         annext = isoxml&.at(ns("//bibdata/title[@type='annex']"))&.text
         set(:annextitle, annext)
@@ -88,7 +96,8 @@ module IsoDoc
       end
 
       def ip_notice_received(isoxml, _out)
-        received = isoxml.at(ns("//bibdata/ext/ip-notice-received"))&.text || "false"
+        received = isoxml.at(ns("//bibdata/ext/ip-notice-received"))&.text ||
+          "false"
         set(:ip_notice_received, received)
       end
     end

data/lib/isodoc/itu/pdf_convert.rb

@@ -13,11 +13,11 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path('Logo_ITU.jpg'), File.join(@localdir, "Logo_ITU.jpg")
-        @files_to_delete << File.join(@localdir, "Logo_ITU.jpg")
-        super
-      end
+      #def convert1(docxml, filename, dir)
+      #  FileUtils.cp html_doc_path('Logo_ITU.jpg'), File.join(@localdir, "Logo_ITU.jpg")
+      #  @files_to_delete << File.join(@localdir, "Logo_ITU.jpg")
+      #  super
+      #end
 
       def html_toc(docxml)
         docxml
@@ -57,6 +57,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -65,6 +66,25 @@ module IsoDoc
         end
       end
 
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml     
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
       include BaseConvert
     end
   end

data/lib/isodoc/itu/terms.rb

@@ -0,0 +1,87 @@
+module IsoDoc
+  module ITU
+    module BaseConvert
+       def terms_defs_title(node)
+        t = node.at(ns("./title")) and return t.text
+        super
+      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)
+          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
+
+      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)
+            insert_tab(b, 1)
+            term.children.each { |n| parse(n, b) }
+          end
+          source and p << " [#{source.value}]"
+          p << ": "
+        end
+        defn and defn.children.each { |n| parse(n, div) }
+      end
+
+      def termdef_parse(node, out)
+        term = node.at(ns("./preferred"))
+        defn = node.at(ns("./definition"))
+        source = node.at(ns("./termsource/origin/@citeas"))
+        out.div **attr_code(id: node["id"]) do |div|
+          termdef_parse1(node, div, term, defn, source)
+          set_termdomain("")
+          node.children.each do |n|
+            next if %w(preferred definition termsource title).include? n.name
+            parse(n, out)
+          end
+        end
+      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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/itu/word_convert.rb

@@ -26,6 +26,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2 
+          boilerplate docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
@@ -70,7 +71,9 @@ module IsoDoc
         word_preface_cleanup(docxml)
         word_term_cleanup(docxml)
         word_history_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
         super
+        authority_cleanup(docxml)
         docxml
       end
 
@@ -124,15 +127,6 @@ module IsoDoc
         end
       end
 
-      def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path('itu-document-comb.png'),
-          File.join(@localdir, "itu-document-comb.png")
-        FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
-        @files_to_delete << File.join(@localdir, "itu-document-comb.png")
-        @files_to_delete << File.join(@localdir, "logo.png")
-        super
-      end
-
       def default_fonts(options)
         { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
@@ -151,15 +145,89 @@ module IsoDoc
           olstyle: "l2", }
       end
 
-      def word_example_cleanup(docxml)
-        super
-        docxml.xpath("//div[@class = 'pseudocode']//p[not(@class)]").each do |p|
-          p["class"] = "pseudocode"
+      def make_tr_attr(td, row, totalrows, header)
+        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
       end
 
-      def make_tr_attr(td, row, totalrows, header)
-        super.merge(valign: "top")
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        Html2Doc.process(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
+
+=begin
+      def eref_parse(node, out)
+        linkend = get_linkend(node)
+        if node["type"] == "footnote"
+          out.sup { |s| s << linkend }
+        else
+          out << linkend
+        end
+      end
+
+      def xref_parse(node, out)
+        #target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
+        #  "##{node["target"]}"
+        out << get_linkend(node)
+      end
+=end
+
+      def link_parse(node, out)
+        out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
+          if node.text.empty?
+            l << node["target"].sub(/^mailto:/, "")
+          else
+            node.children.each { |n| parse(n, l) }
+          end
+        end
+      end
+
+      def authority_hdr_cleanup(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
+        %w(copyright license legal).each do |t|
+          docxml&.xpath("//div[@class = '#{t}']").each do |d|
+            p = d&.at("./descendant::h1[2]") and
+              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            d.xpath(".//h1 | .//h2").each do |p|
+              p.name = "p"
+              p["class"] = "boilerplateHdr"
+            end
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@class = 'draft-warning']")
+        auth = docxml.at("//div[@id = 'draft-warning']")
+        dest and auth and dest.replace(auth.remove)
+        %w(copyright license legal).each do |t|
+          dest = docxml.at("//div[@id = '#{t}']")
+          auth = docxml.at("//div[@class = '#{t}']")
+          next unless auth && dest
+          t == "copyright" and p = auth&.at(".//p[@class = 'Normalaftertitle']") and
+            p["class"] = "boilerplateHdr"
+          auth&.xpath(".//p[not(@class) or @class = 'Normalaftertitle']")&.each do |p|
+            p["class"] = "boilerplate"
+          end
+          auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
+          dest.replace(auth.remove)
+        end
       end
 
       include BaseConvert

data/lib/isodoc/itu/xref.rb

@@ -46,9 +46,8 @@ module IsoDoc
       end
 
       def initial_anchor_names(d)
-        d.xpath("//xmlns:preface/child::*").each do |c|
-          preface_names(c)
-        end
+        d.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
+        d.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         @hierarchical_assets ?
           hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
           sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
@@ -83,7 +82,7 @@ module IsoDoc
       def sequential_figure_names(clause)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0
@@ -99,7 +98,7 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "0.2.8"
+    VERSION = "1.0.2"
   end
 end

data/metanorma-itu.gemspec

@@ -24,13 +24,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "asciidoctor", "~> 1.5.7"
   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_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -41,4 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
+  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciidoctor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.7
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +206,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Metanorma for the ITU.
 
   '
@@ -260,18 +260,21 @@ files:
 - lib/asciidoctor/itu.rb
 - lib/asciidoctor/itu/basicdoc.rng
 - lib/asciidoctor/itu/biblio.rng
+- lib/asciidoctor/itu/cleanup.rb
 - lib/asciidoctor/itu/converter.rb
 - lib/asciidoctor/itu/front.rb
 - lib/asciidoctor/itu/i18n-en.yaml
 - lib/asciidoctor/itu/isodoc.rng
 - lib/asciidoctor/itu/isostandard.rng
 - lib/asciidoctor/itu/itu.rng
+- lib/asciidoctor/itu/itu_intro.xml
 - lib/asciidoctor/itu/macros.rb
 - lib/asciidoctor/itu/reqt.rng
 - lib/asciidoctor/itu/validate.rb
 - lib/isodoc/itu.rb
 - lib/isodoc/itu/base_convert.rb
 - lib/isodoc/itu/html/Logo_ITU.jpg
+- lib/isodoc/itu/html/_coverpage.scss
 - lib/isodoc/itu/html/header.html
 - lib/isodoc/itu/html/html_itu_intro.html
 - lib/isodoc/itu/html/html_itu_titlepage.html
@@ -289,6 +292,7 @@ files:
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/ref.rb
+- lib/isodoc/itu/terms.rb
 - lib/isodoc/itu/word_convert.rb
 - lib/isodoc/itu/xref.rb
 - lib/metanorma-itu.rb