metanorma-csd 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7627c2e066294a10125980df6ac9f96f7c2ebf368c77317e43036de59abb617d
-  data.tar.gz: 1da0618c9fca2472453f0210ad5645e825c3fb7d6d0fe28d6fb6f544892540bf
+  metadata.gz: 98bb923f1fa0d6386171746c6c1f6256026408aad33555851703591774886c6e
+  data.tar.gz: ffe452187fcda8f1b0a6902aa6c62c3aa370808803fc7f1184761189d8d9c40b
 SHA512:
-  metadata.gz: 4e5c0e16d39f15587886c38f0b15504782135f66d2d3009e338df68496bd7fd159ab24e5cd0f3e798790aafcae4572a74f10159375998d45f52f910029726a3a
-  data.tar.gz: 8a3bedd76c6ec9c44ab4539ccb28e2e05e38442b453815f6621a80465b9b2964ab2b02424ec496f69698d1aedf6a719ed8a12063ebc38ee0ae11d3d5c53def9b
+  metadata.gz: c9f378917cd2b3a1623944501c908f7b76d4675c4e690cba3132c4516211040a1f4a23ac009d4bc69fa5499ebd0ce5d424486a7e3a96b532515de348be10d128
+  data.tar.gz: 5589a1b8c394532d1030cfaf4134ece3857148e391c23ab4feaadf16ed634ad712d5aa9d7cbf3d6c005c4bf95f44c1651a50254d4dc0dbb6cecc4527926a277a

data/lib/asciidoctor/csd/converter.rb

@@ -97,13 +97,6 @@ module Asciidoctor
         d
       end
 
-      def pdf_convert(filename)
-        url = "#{Dir.pwd}/#{filename}.html"
-        pdfjs = File.join(File.dirname(__FILE__), 'pdf.js')
-        system "export NODE_PATH=$(npm root --quiet -g);
-                node #{pdfjs} file://#{url} #{filename}.pdf"
-      end
-
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -114,7 +107,7 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename
           word_converter(node).convert filename
-          pdf_convert(filename.sub(/\.xml$/, ""))
+          pdf_converter(node).convert filename
         end
         @files_to_delete.each { |f| system "rm #{f}" }
         ret
@@ -150,6 +143,10 @@ module Asciidoctor
         IsoDoc::Csd::HtmlConvert.new(html_extract_attributes(node))
       end
 
+      def pdf_converter(node)
+        IsoDoc::Csd::PdfConvert.new(html_extract_attributes(node))
+      end
+
       def word_converter(node)
         IsoDoc::Csd::WordConvert.new(doc_extract_attributes(node))
       end

data/lib/asciidoctor/csd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csd
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/isodoc/csd/html/htmlstyle.scss

@@ -59,10 +59,10 @@ time, mark, audio, video {
 
 
 html, body, div, span, applet, object, iframe,
-p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
+p, blockquote, 
+a, abbr, acronym, address, big, cite, 
+del, dfn, em, img, ins, q, s, 
+small, strike, strong, sub, sup, var,
 b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
@@ -74,6 +74,10 @@ time, mark, audio, video {
   font-family: $bodyfont;
 }
 
+code, pre, tt, kbd, samp {
+  font-family: $monospacefont;
+}
+
 h1, h2, h3, h4, h5, h6, .h2Annex {
   font-family: $headerfont;
 }
@@ -146,7 +150,7 @@ table {
 */
 
 
-@media (min-width: 768px) {
+@media screen and (min-width: 768px) {
     nav {
         position: fixed;
         top: 0;
@@ -198,7 +202,7 @@ table {
     }
 }
 
-@media (max-width: 768px) {
+@media screen and (max-width: 768px) {
     #toc {
         padding: 0 1.5em 0 1.5em;
         overflow: visible;

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

@@ -0,0 +1,70 @@
+  <script>
+    //TOC generation
+      $('#toc').toc({
+          'selectors': 'h1,h2:not(.TermNum)', //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/csd/metadata.rb

@@ -11,7 +11,7 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//title[@language='en']"))&.text
+        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
         set(:doctitle, main)
       end
 
@@ -21,7 +21,7 @@ module IsoDoc
 
       def author(isoxml, _out)
         set(:tc, "XXXX")
-        tc = isoxml.at(ns("//editorialgroup/technical-committee"))
+        tc = isoxml.at(ns("//bibdata/editorialgroup/technical-committee"))
         set(:tc, tc.text) if tc
       end
 

data/lib/isodoc/csd/pdf_convert.rb

@@ -0,0 +1,124 @@
+require "isodoc"
+require_relative "metadata"
+
+module IsoDoc
+  module Csd
+    # A {Converter} implementation that generates CSD 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 default_fonts(options)
+        {
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          monospacefont: '"Space Mono",monospace'
+        }
+      end
+
+      def default_file_locations(options)
+        {
+          htmlstylesheet: html_doc_path("htmlstyle.scss"),
+          htmlcoverpage: html_doc_path("html_csd_titlepage.html"),
+          htmlintropage: html_doc_path("html_csd_intro.html"),
+          scripts_pdf: html_doc_path("scripts.pdf.html"),
+        }
+      end
+
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+      end
+
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{get_anchors[annex['id']][:label]} "
+          t << "<b>#{name.text}</b>"
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@inform_annex_lbl})")
+        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
+      end
+
+      def pre_parse(node, out)
+        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      end
+
+      def term_defs_boilerplate(div, source, term, preface)
+        if source.empty? && term.nil?
+          div << @no_terms_boilerplate
+        else
+          div << term_defs_boilerplate_cont(source, term)
+        end
+      end
+
+      def i18n_init(lang, script)
+        super
+        @annex_lbl = "Appendix"
+      end
+
+      def error_parse(node, out)
+        # catch elements not defined in ISO
+        case node.name
+        when "pre"
+          pre_parse(node, out)
+        when "keyword"
+          out.span node.text, **{ class: "keyword" }
+        else
+          super
+        end
+      end
+
+      def html_head()
+        <<~HEAD.freeze
+        <title>{{ doctitle }}</title>
+    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+
+    <!--TOC script import-->
+    <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+
+    <!--Google fonts-->
+    <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=Overpass:300,300i,600,900" rel="stylesheet">
+    <!--Font awesome import for the link icon-->
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+<style class="anchorjs"></style>
+        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)
+        end
+      end
+
+      def html_toc(docxml)
+        docxml
+      end
+
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+      end
+
+      def term_cleanup(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          h2.add_child("&nbsp;")
+          h2.add_child(d.remove)
+        end
+        docxml
+      end
+    end
+  end
+end
+

data/lib/metanorma-csd.rb

@@ -2,6 +2,7 @@ require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/csd/converter"
 require_relative "isodoc/csd/html_convert"
 require_relative "isodoc/csd/word_convert"
+require_relative "isodoc/csd/pdf_convert"
 require_relative "asciidoctor/csd/version"
 
 if defined? Metanorma

data/lib/metanorma/csd/processor.rb

@@ -33,13 +33,7 @@ module Metanorma
         when :doc
           IsoDoc::Csd::WordConvert.new(options).convert(outname, isodoc_node)
         when :pdf
-          #require 'tempfile'
-          # Tempfile.open("#{outname}.html") do |tmp|
-          outname_html = outname + ".html"
-          IsoDoc::Csd::HtmlConvert.new(options).convert(outname_html, isodoc_node)
-          puts outname_html
-          #system "cat #{outname_html}"
-          Metanorma::Output::Pdf.new.convert(outname_html, outname)
+          IsoDoc::Csd::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/metanorma-csd.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"
-  spec.add_dependency "isodoc", "~> 0.8.8"
+  spec.add_dependency "isodoc", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -232,11 +232,13 @@ files:
 - lib/isodoc/csd/html/html_csd_titlepage.html
 - lib/isodoc/csd/html/htmlstyle.scss
 - lib/isodoc/csd/html/scripts.html
+- lib/isodoc/csd/html/scripts.pdf.html
 - lib/isodoc/csd/html/word_csd_intro.html
 - lib/isodoc/csd/html/word_csd_titlepage.html
 - lib/isodoc/csd/html/wordstyle.scss
 - lib/isodoc/csd/html_convert.rb
 - lib/isodoc/csd/metadata.rb
+- lib/isodoc/csd/pdf_convert.rb
 - lib/isodoc/csd/word_convert.rb
 - lib/metanorma-csd.rb
 - lib/metanorma/csd.rb