metanorma-m3d 1.3.17 → 1.3.22

data/lib/isodoc/m3d/pdf_convert.rb

@@ -1,71 +1,30 @@
-require "isodoc"
 require_relative "base_convert"
+require "isodoc"
 
 module IsoDoc
   module M3d
-    # A {Converter} implementation that generates CSAND output, and a document
+
+    # A {Converter} implementation that generates HTML 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 convert1(docxml, filename, dir)
-        #add_image(%w(logo.jpg m3-logo.png))
-        #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_m3d_titlepage.html"),
-          htmlintropage: html_doc_path("html_m3d_intro.html"),
-          standardstylesheet: nil,
-          scripts_pdf: html_doc_path("scripts.pdf.html"),
-        }
-      end
-
-      def colophon(body, docxml)
-        body.div **{ class: "colophon" } do |div|
-          div << <<~"COLOPHON"
-          <p>As with all M3AAWG documents that we publish, please check the M3AAWG website
-          (<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to this paper.</p>
-          <p>&copy; {{ docyear }} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
-          COLOPHON
+      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, "m3d.report.xsl"))
       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=Overpass:300,300i,600,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)
-          colophon(body, docxml)
-        end
-      end
-
-      def html_toc(docxml)
-        docxml
-      end
-
-      include BaseRender
     end
   end
 end

data/lib/metanorma-m3d.rb

@@ -1,8 +1,8 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/m3d/converter"
 require_relative "isodoc/m3d/html_convert"
-require_relative "isodoc/m3d/pdf_convert"
 require_relative "isodoc/m3d/word_convert"
+require_relative "isodoc/m3d/pdf_convert"
 require_relative "metanorma/m3d/version"
 
 if defined? Metanorma

data/lib/metanorma/m3d/processor.rb

@@ -2,6 +2,14 @@ require "metanorma/processor"
 
 module Metanorma
   module M3d
+    def self.fonts_used
+      {
+        html: ["Overpass", "Space Mono"],
+        doc: ["Garamond", "Courier New"],
+        pdf: ["Garamond", "Courier New"]
+      }
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize
@@ -30,10 +38,10 @@ module Metanorma
         case format
         when :html
           IsoDoc::M3d::HtmlConvert.new(options).convert(outname, isodoc_node)
-        when :pdf
-          IsoDoc::M3d::PdfConvert.new(options).convert(outname, isodoc_node)
         when :doc
           IsoDoc::M3d::WordConvert.new(options).convert(outname, isodoc_node)
+        when :pdf
+          IsoDoc::M3d::WordConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/m3d/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module M3d
-    VERSION = "1.3.17"
+    VERSION = "1.3.22"
   end
 end

data/metanorma-m3d.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-m3d
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.22
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -114,14 +114,14 @@ 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
@@ -308,11 +308,11 @@ files:
 - lib/isodoc/m3d/html/m3-logo.png
 - lib/isodoc/m3d/html/m3d.scss
 - lib/isodoc/m3d/html/scripts.html
-- lib/isodoc/m3d/html/scripts.pdf.html
 - lib/isodoc/m3d/html/word_m3d_intro.html
 - lib/isodoc/m3d/html/word_m3d_titlepage.html
 - lib/isodoc/m3d/html/wordstyle.scss
 - lib/isodoc/m3d/html_convert.rb
+- lib/isodoc/m3d/m3d.report.xsl
 - lib/isodoc/m3d/metadata.rb
 - lib/isodoc/m3d/pdf_convert.rb
 - lib/isodoc/m3d/word_convert.rb

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