metanorma-csa 1.4.8 → 1.4.9

data/lib/isodoc/csa/html/scripts.html

@@ -1,24 +1,8 @@
   <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': true, //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();
-      }
-      });
-      
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
 <script>

data/lib/isodoc/csa/pdf_convert.rb

@@ -1,62 +1,31 @@
 # frozen_string_literal: true
 
-require_relative 'base_convert'
 require 'isodoc'
 
 module IsoDoc
   module Csa
     # A {Converter} implementation that generates CSA output, and a document
     # schema encapsulation of the document for validation
-    class PdfConvert < IsoDoc::PdfConvert
+
+    class PdfConvert < IsoDoc::XslfoPdfConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
       end
 
-      def default_fonts(options)
-        is_hans = options[:script] == 'Hans'
-
-        {
-          bodyfont: is_hans ? '"SimSun",serif' : '"Source Sans Pro",sans-serif',
-          headerfont: (is_hans ? '"SimHei",sans-serif' 
-                               : '"Source Sans Pro",sans-serif'),
-          monospacefont: '"Space Mono",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          htmlstylesheet: html_doc_path('htmlstyle.scss'),
-          htmlcoverpage: html_doc_path('html_csa_titlepage.html'),
-          htmlintropage: html_doc_path('html_csa_intro.html'),
-          scripts_pdf: 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=Rubik:300,300i,500" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:100,300,300i,600,900" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900" rel="stylesheet">
-        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)
+      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, "csa.standard.xsl"))
       end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      include BaseConvert
     end
   end
 end

data/lib/metanorma/csa/processor.rb

@@ -5,6 +5,10 @@ require 'asciidoctor/csa/converter'
 
 module Metanorma
   module Csa
+    def self.pdf_fonts
+      %w(AzoSans AzoSans-Light SourceCodePro-Light)
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize

data/lib/metanorma/csa/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Csa
-    VERSION = '1.4.8'
+    VERSION = '1.4.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -284,6 +284,7 @@ files:
 - lib/asciidoctor/csa/reqt.rng
 - lib/asciidoctor/csa/validate.rb
 - lib/isodoc/csa/base_convert.rb
+- lib/isodoc/csa/csa.standard.xsl
 - lib/isodoc/csa/html/csa-logo-white.png
 - lib/isodoc/csa/html/csa.png
 - lib/isodoc/csa/html/csa.scss