metanorma-unece 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4106169b0beff0251701a368f8d8435c00f6abbce94f305529ad381ec3785757
-  data.tar.gz: 57873f037a5cc25f9649bf48550e79a4a1df9c1adbfe1212cbb00dc15c852725
+  metadata.gz: bdb5f95d47c9db88bf4a33313dc66f5064eca19a5005165e539a393fed984534
+  data.tar.gz: efc6015774feab34665ca9e6e35b2331675b88710c8805e840dacae1f4cf6fb7
 SHA512:
-  metadata.gz: 8f9216030eecdf32a03b316725d9d1264d86d58aed32d45be1de9d20f17d3331aa85be1a4dd990991f8589e386cd0f85c554c912eac9c9166c60265c5f87fae8
-  data.tar.gz: b290ff5c12a82a1033b697c23ddc6ffb70342186deee081ecf6fb9fbf233f8b1bca0029646b4df530c1c6189d76b69de848f4d4df56602f3f364e7d4ef94bb61
+  metadata.gz: e5d100882e8c8a963b0b568a3ca3ab287f2d2bd45f2c9152492d6d06357ffb493eb8db7caa8a705890fd0430bc78c1bc2b4fc5dd3a527291fe092ace741ef6bc
+  data.tar.gz: 8e7b0e98c4940fa509687463420f53f8d08bbabee615d65d928478b5b226df7f887a1fda82762afb2ea024eaeecdb7615622b9336b721877dd5d758aeb73fc23

data/lib/asciidoctor/unece/basicdoc.rng

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="document"/>
-  </start>
+  <include href="biblio.rng">
+    <start>
+      <ref name="document"/>
+    </start>
+  </include>
   <define name="document">
     <element name="document">
       <optional>

data/lib/asciidoctor/unece/biblio.rng

@@ -33,6 +33,9 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
+  <start>
+    <ref name="relaton_collection"/>
+  </start>
   <define name="status">
     <element name="status">
       <ref name="stage"/>

data/lib/asciidoctor/unece/converter.rb

@@ -150,6 +150,7 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
+          pdf_converter(node).convert filename unless node.attr("nodoc")
         end
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
@@ -181,6 +182,10 @@ module Asciidoctor
         IsoDoc::Unece::WordConvert.new(doc_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        IsoDoc::Unece::PdfConvert.new(doc_extract_attributes(node))
+      end
+
       def sections_cleanup(xmldoc)
         super
         xmldoc.xpath("//clause/p | //annex/p").each do |p|

data/lib/isodoc/unece.rb

@@ -1,6 +1,7 @@
 require "isodoc/unece/metadata"
 require "isodoc/unece/html_convert"
 require "isodoc/unece/word_convert"
+require "isodoc/unece/pdf_convert"
 
 module IsoDoc
   module Unece

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

@@ -0,0 +1,72 @@
+  <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>
+

data/lib/isodoc/unece/html/unece.scss

@@ -591,10 +591,6 @@ div.WordSection2
       }
 div.WordSection3
 	{page:WordSection3;}
-ol
-	{margin-bottom:0cm;}
-ul
-	{margin-bottom:0cm;}
 table.MsoISOTable
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
@@ -616,8 +612,6 @@ table.MsoISOTable
         margin-bottom:12pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable tr
-    {page-break-inside:avoid;}
 table.MsoISOTable th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
@@ -645,20 +639,10 @@ table.MsoTableGrid
         margin-bottom:12pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-td { page-break-inside:avoid; }
-tr { page-break-after:avoid; }
-span.stem
-    {font-family:"Cambria Math",serif;
-    mso-ascii-font-family:"Cambria Math";
-    font-style:
-    italic;}
 div.formula
     {tab-stops:right 487.45pt;}
 body
     {tab-interval:36.0pt;}
-dt
-    {page-break-inside:avoid;
-    page-break-after:avoid}
 .coverpage_docnumber
     {text-align:center;
     font-size:14.0pt;

data/lib/isodoc/unece/html/wordstyle.scss

@@ -1058,106 +1058,44 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-level-number-position:left;
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
-        p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:18.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:36.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:54.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:72.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:90.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:108.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:126.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:144.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:162.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
 
+div.ListContLevel1
+        {mso-style-priority:34;
+        margin-left:18.0pt;
+        margin-right:0cm;}
+div.ListContLevel2
+        {mso-style-priority:34;
+        margin-top:0cm;
+        margin-left:36.0pt;
+        margin-right:0cm;}
+div.ListContLevel3
+        {mso-style-priority:34;
+        margin-left:54.0pt;
+        margin-right:0cm;}
+div.ListContLevel4
+        {mso-style-priority:34;
+        margin-left:72.0pt;
+        margin-right:0cm;}
+div.ListContLevel5
+        {mso-style-priority:34;
+        margin-left:90.0pt;
+        margin-right:0cm;}
+div.ListContLevel6
+        {mso-style-priority:34;
+        margin-left:108.0pt;
+        margin-right:0cm;}
+div.ListContLevel7
+        {mso-style-priority:34;
+        margin-left:126.0pt;
+        margin-right:0cm;}
+div.ListContLevel8
+        {mso-style-priority:34;
+        margin-left:144.0pt;
+        margin-right:0cm;}
+div.ListContLevel9
+        {mso-style-priority:34;
+        margin-left:162.0pt;
+        margin-right:0cm;}
 
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
@@ -1172,12 +1110,6 @@ table.MsoNormalTable
 	mso-pagination:widow-orphan;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-br.section
-    {page-break-before:always;
-    mso-break-type:section-break;}
-br.pagebreak
-    {page-break-before:always;
-    mso-special-character:line-break;}
 ol
 	{margin-bottom:0cm;
 	margin-left:18pt;}

data/lib/isodoc/unece/html_convert.rb

@@ -13,11 +13,11 @@ module IsoDoc
         super
       end
 
-      def convert1(docxml, filename, dir)
-        FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
-        @files_to_delete << File.join(@localdir, "logo.jpg")
-        super
-      end
+      #def convert1(docxml, filename, dir)
+        #FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
+        #@files_to_delete << File.join(@localdir, "logo.jpg")
+        #super
+      #end
 
       def default_fonts(options)
         {

data/lib/isodoc/unece/metadata.rb

@@ -8,6 +8,8 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, labels)
         super
+                here = File.dirname(__FILE__)
+set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
       end
 
       def title(isoxml, _out)

data/lib/isodoc/unece/pdf_convert.rb

@@ -0,0 +1,132 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module Unece
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PdfConvert < IsoDoc::PdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      #def convert1(docxml, filename, dir)
+        #FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
+        #@files_to_delete << File.join(@localdir, "logo.jpg")
+        #super
+      #end
+
+      def default_fonts(options)
+        {
+          bodyfont: (
+            options[:script] == "Hans" ?
+            '"SimSun",serif' :
+            '"Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif'
+          ),
+          headerfont: (
+            options[:script] == "Hans" ?
+            '"SimHei",sans-serif' :
+            '"Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif'
+          ),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(_options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_unece_titlepage.html"),
+          htmlintropage: html_doc_path("html_unece_intro.html"),
+          scripts: 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|Space+Mono:400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,500,700,900" rel="stylesheet">
+        HEAD
+      end
+
+      def make_body(xml, docxml)
+        plenary = docxml.at(ns("//bibdata/ext[doctype = 'plenary']"))
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
+          @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")
+        end
+        #@htmlintropage = nil if plenary
+        xml.body **body_attr do |body|
+          make_body1(body, docxml)
+          make_body2(body, docxml)
+          make_body3(body, docxml)
+        end
+      end
+
+      def make_body3(body, docxml)
+        body.div **{ class: "main-section" } do |div3|
+          abstract docxml, div3
+          foreword docxml, div3
+          introduction docxml, div3
+          middle docxml, div3
+          footnotes div3
+          comments div3
+        end
+      end
+
+      def html_preface(docxml)
+        super
+        docxml
+      end
+
+      def middle(isoxml, out)
+        clause isoxml, out
+        annex isoxml, out
+        bibliography isoxml, out
+      end
+
+      def clause_parse_title(node, div, c1, out)
+        if node["inline-header"] == "true"
+          inline_header_title(out, node, c1)
+        else
+          div.send "h#{anchor(node['id'], :level) || '1'}" do |h|
+            lbl = anchor(node['id'], :label, false)
+            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
+            insert_tab(h, 1) if lbl && !@suppressheadingnumbers
+            c1&.children&.each { |c2| parse(c2, h) }
+          end
+        end
+      end
+
+      def introduction(isoxml, out)
+        f = isoxml.at(ns("//introduction")) || return
+        page_break(out)
+        out.div **{ class: "Section3", id: f["id"] } do |div|
+          div.h1(**{ class: "IntroTitle" }) do |h1|
+            h1 << @introduction_lbl
+          end
+          f.elements.each do |e|
+            parse(e, div) unless e.name == "title"
+          end
+        end
+      end
+
+      def foreword(isoxml, out)
+        f = isoxml.at(ns("//foreword")) || return
+        page_break(out)
+        out.div **attr_code(id: f["id"]) do |s|
+          s.h1(**{ class: "ForewordTitle" }) do |h1|
+            h1 << @foreword_lbl
+          end
+          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+        end
+      end
+
+      include BaseConvert
+    end
+  end
+end
+

data/lib/isodoc/unece/word_convert.rb

@@ -13,10 +13,10 @@ 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 convert1(docxml, filename, dir)
+        #FileUtils.cp html_doc_path('logo.jpg'), File.join(@localdir, "logo.jpg")
+        #super
+      #end
 
       def default_fonts(options)
         {

data/lib/metanorma/unece/processor.rb

@@ -14,6 +14,7 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
+          pdf: "pdf",
         )
       end
 
@@ -31,6 +32,8 @@ module Metanorma
           IsoDoc::Unece::HtmlConvert.new(options).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Unece::WordConvert.new(options).convert(outname, isodoc_node)
+        when :pdf
+          IsoDoc::Unece::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -303,6 +303,7 @@ files:
 - lib/isodoc/unece/html/htmlstyle.scss
 - lib/isodoc/unece/html/logo.jpg
 - lib/isodoc/unece/html/scripts.html
+- lib/isodoc/unece/html/scripts.pdf.html
 - lib/isodoc/unece/html/unece.scss
 - lib/isodoc/unece/html/word_unece_intro.html
 - lib/isodoc/unece/html/word_unece_plenary_titlepage.html
@@ -310,6 +311,7 @@ files:
 - lib/isodoc/unece/html/wordstyle.scss
 - lib/isodoc/unece/html_convert.rb
 - lib/isodoc/unece/metadata.rb
+- lib/isodoc/unece/pdf_convert.rb
 - lib/isodoc/unece/word_convert.rb
 - lib/metanorma-unece.rb
 - lib/metanorma/unece.rb