metanorma-un 0.3.8 → 0.4.1

data/lib/isodoc/un/word_convert.rb

@@ -13,11 +13,6 @@ module IsoDoc
         @toc = options[:toc]
       end
 
-      #def convert1(docxml, filename, dir)
-        #FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
-        #super
-      #end
-
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
@@ -92,6 +87,7 @@ module IsoDoc
       end
 
       def middle(isoxml, out)
+        middle_admonitions(isoxml, out)
         clause isoxml, out
         annex isoxml, out
         bibliography isoxml, out
@@ -102,8 +98,8 @@ module IsoDoc
         if node["inline-header"] == "true"
           inline_header_title(out, node, c1)
         else
-          div.send "h#{anchor(node['id'], :level, false) || '1'}" do |h|
-            lbl = anchor(node['id'], :label, false)
+          div.send "h#{@xrefs.anchor(node['id'], :level, false) || '1'}" do |h|
+            lbl = @xrefs.anchor(node['id'], :label, false)
             if lbl && !@suppressheadingnumbers
               h << "#{lbl}. "
               insert_tab(h, 1)

data/lib/isodoc/un/xref.rb

@@ -0,0 +1,186 @@
+require "roman-numerals"
+
+module IsoDoc
+  module UN
+    class Xref < IsoDoc::Xref
+      def initial_anchor_names(d)
+        preface_names(d.at(ns("//preface/abstract")))
+        preface_names(d.at(ns("//foreword")))
+        preface_names(d.at(ns("//introduction")))
+        d.xpath(ns("//preface/clause")).each do |c| 
+          preface_names(c)
+        end
+        preface_names(d.at(ns("//acknowledgements")))
+        sequential_asset_names(
+          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                     "//preface/clause | //acknowledgements")))
+        middle_section_asset_names(d)
+        clause_names(d, 0)
+        termnote_anchor_names(d)
+        termexample_anchor_names(d)
+      end
+
+      def clause_names(docxml, sect_num)
+        q = "//clause[parent::sections]"
+        @paranumber = 0
+        docxml.xpath(ns(q)).each_with_index do |c, i|
+          section_names(c, (i + sect_num), 1)
+        end
+      end
+
+      def levelnumber(num, lvl)
+        case lvl % 3
+        when 1 then RomanNumerals.to_roman(num)
+        when 2 then ("A".ord + num - 1).chr
+        when 0 then num.to_s
+        end
+      end
+
+      def annex_levelnum(num, lvl)
+        case lvl % 3
+        when 0 then RomanNumerals.to_roman(num)
+        when 1 then ("A".ord + num - 1).chr
+        when 2 then num.to_s
+        end
+      end
+
+      NONTERMINAL =
+        "./clause | ./term  | ./terms | ./definitions | ./references".freeze
+
+      def leaf_section?(clause)
+        !clause.at(ns(NONTERMINAL)) &&
+          !%w(definitions annex terms).include?(clause.name) &&
+          clause.at(ns("./p | ./bibitem"))
+      end
+
+      def label_leaf_section(clause, lvl)
+        @paranumber += 1
+        @anchors[clause["id"]] = {label: @paranumber.to_s, 
+                                  xref: "paragraph #{@paranumber}", 
+                                  level: lvl, type: "paragraph" }
+      end
+
+      def label_annex_leaf_section(clause, num, lvl)
+        @paranumber += 1
+        @anchors[clause["id"]] = {label: @paranumber.to_s, 
+                                  xref: "paragraph #{num}.#{@paranumber}", 
+                                  level: lvl, type: "paragraph" }
+      end
+
+      def section_names(clause, num, lvl)
+        return num if clause.nil?
+        leaf_section?(clause) and label_leaf_section(clause, lvl) and return
+        num = num + 1
+        lbl = levelnumber(num, 1)
+        @anchors[clause["id"]] = { label: lbl, level: lvl, type: "clause",
+                                   xref: l10n("#{@labels['clause']} #{lbl}") }
+        i = 1
+        clause.xpath(ns(NONTERMINAL)).each do |c|
+          next if c["unnumbered"] == "true"
+          section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
+          i += 1 if !leaf_section?(c)
+        end
+        num
+      end
+
+      def section_names1(clause, num, level)
+        leaf_section?(clause) and label_leaf_section(clause, level) and return
+        /\.(?<leafnum>[^.]+$)/ =~ num
+        @anchors[clause["id"]] = { label: leafnum, level: level, type: "clause",
+                                   xref: l10n("#{@labels['clause']} #{num}") }
+        i = 1
+        clause.xpath(ns(NONTERMINAL)).each do |c|
+          next if c["unnumbered"] == "true"
+          section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
+          i += 1 if !leaf_section?(c)
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        l10n("<b>#{@labels['annex']} #{num}</b>")
+      end
+
+      SUBCLAUSES =
+        "./clause | ./references | ./term  | ./terms | ./definitions".freeze
+
+
+      def annex_names(clause, num)
+        hierarchical_asset_names(clause, num)
+        leaf_section?(clause) and
+          label_annex_leaf_section(clause, num, 1) and return
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
+                                   type: "clause",
+                                   xref: "#{@labels['annex']} #{num}", level: 1 }
+        if a = single_annex_special_section(clause)
+          annex_names1(a, "#{num}", 1)
+        else
+          i = 1
+          clause.xpath(ns(SUBCLAUSES)).each do |c|
+            next if c["unnumbered"] == "true"
+            annex_names1(c, "#{num}.#{annex_levelnum(i, 2)}", 2)
+            i += 1 if !leaf_section?(c)
+          end
+        end
+      end
+
+      def annex_names1(clause, num, level)
+        leaf_section?(clause) and
+          label_annex_leaf_section(clause, num, level) and return
+        /\.(?<leafnum>[^.]+$)/ =~ num
+        @anchors[clause["id"]] = { label: leafnum, xref: "#{@labels['annex']} #{num}",
+                                                              level: level, type: "clause" }
+        i = 1
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          next if c["unnumbered"] == "true"
+          annex_names1(c, "#{num}.#{annex_levelnum(i, level + 1)}", level + 1)
+          i += 1 if !leaf_section?(c)
+        end
+      end
+
+      def back_anchor_names(docxml)
+        docxml.xpath(ns("//annex")).each_with_index do |c, i|
+          @paranumber = 0
+          annex_names(c, RomanNumerals.to_roman(i + 1))
+        end
+        docxml.xpath(ns("//bibliography/clause |"\
+                        "//bibliography/references")).each do |b|
+          preface_names(b)
+        end
+        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+          reference_names(ref)
+        end
+      end
+
+      def sequential_admonition_names(clause)
+        i = 0
+        clause.xpath(ns(".//admonition")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          i += 1 unless t["unnumbered"] == "true"
+          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @labels["admonition"],
+                                            "box", t["unnumbered"])
+        end
+      end
+
+      def hierarchical_admonition_names(clause, num)
+        i = 0
+        clause.xpath(ns(".//admonition")).each do |t|
+          next if t["id"].nil? || t["id"].empty?
+          i += 1 unless t["unnumbered"] == "true"
+          @anchors[t["id"]] =
+            anchor_struct("#{num}.#{i}", nil, @labels["admonition"], "box",
+                          t["unnumbered"])
+        end
+      end
+
+      def sequential_asset_names(clause)
+        super
+        sequential_admonition_names(clause)
+      end
+
+      def hierarchical_asset_names(clause, num)
+        super
+        hierarchical_admonition_names(clause, num)
+      end
+    end
+  end
+end

data/lib/metanorma/un/processor.rb

@@ -3,7 +3,11 @@ require "metanorma/processor"
 module Metanorma
   module UN
     def self.fonts_used
-      ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"]
+      {
+        html: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
+        doc: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
+        pdf: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
+      }
     end
 
     class Processor < Metanorma::Processor
@@ -26,18 +30,16 @@ module Metanorma
         "Metanorma::UN #{Metanorma::UN::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::UN::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::UN::HtmlConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::UN::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::UN::WordConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::UN::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::UN::PdfConvert.new(options).convert(outname, isodoc_node)
+          IsoDoc::UN::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :presentation
+          IsoDoc::UN::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.3.8"
+    VERSION = "0.4.1"
   end
 end

data/metanorma-unece.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "iso-639"
 
-  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 "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -86,28 +86,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
@@ -276,7 +276,6 @@ files:
 - lib/isodoc/un/html/htmlstyle.scss
 - lib/isodoc/un/html/logo.jpg
 - lib/isodoc/un/html/scripts.html
-- lib/isodoc/un/html/scripts.pdf.html
 - lib/isodoc/un/html/unece.scss
 - lib/isodoc/un/html/word_unece_intro.html
 - lib/isodoc/un/html/word_unece_plenary_titlepage.html
@@ -285,9 +284,12 @@ files:
 - lib/isodoc/un/html_convert.rb
 - lib/isodoc/un/metadata.rb
 - lib/isodoc/un/pdf_convert.rb
+- lib/isodoc/un/presentation_xml_convert.rb
+- lib/isodoc/un/un.plenary-attachment.xsl
 - lib/isodoc/un/un.plenary.xsl
 - lib/isodoc/un/un.recommendation.xsl
 - lib/isodoc/un/word_convert.rb
+- lib/isodoc/un/xref.rb
 - lib/metanorma-un.rb
 - lib/metanorma/un.rb
 - lib/metanorma/un/UN_emblem_blue.svg
@@ -299,7 +301,7 @@ homepage: https://github.com/metanorma/metanorma-un
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -314,9 +316,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 UN.
 test_files: []

data/lib/isodoc/un/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>
-