mn2pdf 1.62 → 1.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc6978a2d6f90c8fe16e3fe7409af92dfadd8cab35d7d94157ea38a19b34a1a7
-  data.tar.gz: 2ec44dee196ee1aa5157d7d46c706a318d9cfdb3bf40260b095a5300fb5f1115
+  metadata.gz: 38d552855d0b21a4841aeae1ffd9369b7661325a82504b13ee477c668f14ed43
+  data.tar.gz: 288a4772fe692ed6fea5a53b54e3c940dcc1e33d1d1f818109fca6c4433b6903
 SHA512:
-  metadata.gz: 60aba1335f3bc599799a69f40bc49a8a739701e0902daf9e82c98aef8343ce787b7e5317b96ac59d1c8ce336648a2df192dec1315694b8608934252ef41408bd
-  data.tar.gz: 52ef2b4dc662114f4f679c1b0ecb57e0b1a5cf99a3aaee33bd06c344b670cd09bb24116a2d47c7cf3b06efcb73e1709171f0752484f7cea00edd1cf30636f7d6
+  metadata.gz: 3347305976be72acc8474ec9493261ead5f3514267f19bfb3d27b13338dfd00a365f04aba715c8f99dbc2c374eceeb2905fa4b2bf2db1f7f7f5c15337523e89a
+  data.tar.gz: d1ac9c63a5cc79736804da71e4acba77b30b20a752ffdc363f75ac88cbe1415e011931d2310824f2b7d8d053bda5fe5fde7cedc155725ea4f2e725d43a65c38a

data/lib/mn2pdf/version.rb

@@ -1,4 +1,4 @@
 module Mn2pdf
-  VERSION = "1.62".freeze
-  MN2PDF_JAR_VERSION = VERSION
+  VERSION = "1.62.1".freeze
+  MN2PDF_JAR_VERSION = "1.62".freeze
 end

data/lib/mn2pdf.rb

@@ -5,7 +5,7 @@ require "yaml"
 
 module Mn2pdf
   MN2PDF_JAR_PATH = File.join(File.dirname(__FILE__), "../bin/mn2pdf.jar")
-  DEFAULT_JAVA_OPTS = ["-Xss5m", "-Xmx2048m"].freeze
+  DEFAULT_JAVA_OPTS = %w[-Xss5m -Xmx2048m -Djava.awt.headless=true].freeze
   FONTS_MANIFEST = :font_manifest
 
   def self.jvm_options
@@ -38,24 +38,9 @@ module Mn2pdf
 
     case options
     when String
-      cmd << options
-
-      mn2pdf(cmd)
+      mn2pdf(cmd + [options])
     when Hash
-      manifest = options.delete(FONTS_MANIFEST)
-
-      options.each do |k, v|
-        sep = k.to_s.end_with?("=") ? "" : " "
-        cmd << "#{k}#{sep}#{quote(v)}"
-      end
-      if manifest
-        dump_fontist_manifest_locations(manifest) do |manifest_path|
-          cmd << "--font-manifest" << quote(manifest_path)
-          mn2pdf(cmd)
-        end
-      else
-        mn2pdf(cmd)
-      end
+      mn2pdf_hash(cmd, options)
     else
       warn "Unsupported options type #{options.class}"
     end
@@ -71,18 +56,43 @@ module Mn2pdf
      "--pdf-file", quote(output)]
   end
 
+  def self.mn2pdf_hash(cmd, options)
+    manifest = options.delete(FONTS_MANIFEST)
+    options_to_cmd(options, cmd)
+    if manifest
+      dump_fontist_manifest_locations(manifest) do |manifest_path|
+        cmd << "--font-manifest" << quote(manifest_path)
+        mn2pdf(cmd)
+      end
+    else
+      mn2pdf(cmd)
+    end
+  end
+
   def self.mn2pdf(cmd)
     cmd = cmd.join(" ")
     puts cmd
-    out, err, status = Open3.capture3(cmd)
+    stdout, stderr, status = Open3.capture3(cmd)
+
+    unless status.success?
+      puts_error_log(stdout, stderr)
+
+      raise StandardError.new("mn2pdf failed! #{parse_error_msg(stderr)}")
+    end
+  end
 
-    raise prepare_error_msg(out, err) unless status.success?
+  def self.puts_error_log(stdout, stderr)
+    puts ["Fatal error!", "STDOUT:", stdout.strip, "STDERR:", stderr.strip]
+      .join("\n")
+      .split("\n")
+      .map { |line| "[mn2pdf] #{line}" }
+      .join("\n")
   end
 
-  def self.prepare_error_msg(stdout, stderr)
-    # Strip default mn2pdf message
-    stdout = stdout.gsub("Preparing...", "").strip
-    ["[mn2pdf] Fatal:", stdout, stderr].join(" ").strip
+  def self.parse_error_msg(stderr)
+    err = stderr.split("\n").detect { |line| line.start_with? "Error: " }
+
+    err ? err[7..-1] : stderr.strip
   end
 
   def self.quote(str)
@@ -100,4 +110,11 @@ module Mn2pdf
       yield f.path
     end
   end
+
+  def self.options_to_cmd(options, cmd)
+    options.each do |k, v|
+      sep = k.to_s.end_with?("=") ? "" : " "
+      cmd << "#{k}#{sep}#{quote(v)}"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn2pdf
 version: !ruby/object:Gem::Version
-  version: '1.62'
+  version: 1.62.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies: []
 description: |
   mn2pdf converts Metanorma XML into PDF.