metanorma 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa08613809fac5ac67ed1e4e1b4b448e6891105eb10e3424229bbae689f247b
-  data.tar.gz: 742700dda1a2c119b92b6a0839bffd82cf63017da4f675e4897f684f30e579ba
+  metadata.gz: d31bfd040a821eb67e404cdcac72e196cd1eadcd431ea83898c61607ac3409ad
+  data.tar.gz: c82efc3000a7cae4121db548251396334d6be65bb466f010e862a5e19d511907
 SHA512:
-  metadata.gz: 37b584bde8e92687cc7ff797076994c913125ea361ce94c9c1bca6c83e399735bdd0415968f20bf2f5941d53c7bc8dafbf71b02394e21dfb42256335aa125f09
-  data.tar.gz: 8bba4bf99743f9d843301402f8e09b5a145794c5509124ad258fcc4769ed55e3764c57f95734fcd65a5a3a25a2c91890300727d75d0f20298f98716dfac1d860
+  metadata.gz: 8092c7467439a4d08fa6eada3c8f5f30d0f819b87d365448749ac6aa3dd49889fcae29b6b953a1dd5c44157009f67bdcbfe6bef3d7c773eb94062ca39543d916
+  data.tar.gz: 6297078a3b5f891faec9ffcf62580436e6f43dc64d1df25fb96566b33d87cf8a1366d74dc32d1bdcef2704fbc80367796708743e1db76e896c7892956e6813aa

data/lib/metanorma/compile.rb

@@ -9,9 +9,9 @@ module Metanorma
     end
 
     def compile(filename, options = {})
+      require_libraries(options)
       options = options_extract(filename, options)
       validate(options) or return nil
-      require_libraries(options)
       @processor = @registry.find_processor(options[:type].to_sym)
       extensions = get_extensions(options) or return nil
       (file, isodoc = process_input(filename, options)) or return nil
@@ -32,7 +32,6 @@ module Metanorma
       xml = Nokogiri::XML(file)
       if xml.root
         @registry.root_tags.each do |k, v|
-          STDERR.puts "k(#{k}), v(#{v})"
           return { type: k }  if v == xml.root.name
         end
       end
@@ -104,7 +103,7 @@ module Metanorma
     def process_input(filename, options)
       case extname = File.extname(filename)
       when ".adoc"
-        Util.log("[metanorma] Processing: Asciidoctor input.", :info)
+        Util.log("[metanorma] Processing: AsciiDoc input.", :info)
         file = read_file(filename)
         options[:asciimath] and
           file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")

data/lib/metanorma/output/xslfo.rb

@@ -1,5 +1,4 @@
-require "open3"
-require "tempfile"
+require 'mn2pdf'
 require_relative "./utils.rb"
 
 module Metanorma
@@ -7,12 +6,8 @@ module Metanorma
     class XslfoPdf < Base
       def convert(url_path, output_path, xsl_stylesheet)
         return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
-        pdfjar = File.join(File.dirname(__FILE__), "../../../bin/mn2pdf.jar")
-        cmd = ["java", "-Xss5m", "-Xmx1024m", "-jar", pdfjar, "--xml-file", 
-               url_path, "--xsl-file", xsl_stylesheet, "--pdf-file",
-               output_path].join(" ")
-        _, error_str, status = Open3.capture3(cmd)
-        raise error_str unless status.success?
+
+        Mn2pdf.convert(url_path, output_path, xsl_stylesheet)
       end
     end
   end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/metanorma.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'asciidoctor'
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'mn2pdf', "~> 1.13"
 
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mn2pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +176,6 @@ files:
 - Rakefile
 - bin/console
 - bin/metanorma-pdf.js
-- bin/mn2pdf.jar
 - bin/rasterize.js
 - bin/rspec
 - bin/setup