metanorma 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17965bd6b4a4f5f6bc620947633b3286e938812e0fab3a8e71b92eb8651120a8
-  data.tar.gz: ea9f2b8b5db24dff0c95351747daf35d3de9c7dbe010657e2bc5eae655fc1c78
+  metadata.gz: 7aa08613809fac5ac67ed1e4e1b4b448e6891105eb10e3424229bbae689f247b
+  data.tar.gz: 742700dda1a2c119b92b6a0839bffd82cf63017da4f675e4897f684f30e579ba
 SHA512:
-  metadata.gz: 9afa1bd9a2b75a8d7fc409899220b7a3460fabfebd739aa0263f557d55d93f27deb8dc1bd96fa4d6f57b23a9200510e239f2c33b79678d48e5b9eab41e783f7c
-  data.tar.gz: 7e787898c91da56beb6da5fa575c1e0b2c988265e88d42f835a5b281f0894f3dfa83f42c0c5011a6436b6bc0b9ef169ef9906bfdb88896da3426ebd2b3cc5c54
+  metadata.gz: 37b584bde8e92687cc7ff797076994c913125ea361ce94c9c1bca6c83e399735bdd0415968f20bf2f5941d53c7bc8dafbf71b02394e21dfb42256335aa125f09
+  data.tar.gz: 8bba4bf99743f9d843301402f8e09b5a145794c5509124ad258fcc4769ed55e3764c57f95734fcd65a5a3a25a2c91890300727d75d0f20298f98716dfac1d860

data/.github/workflows/macos.yml

@@ -32,7 +32,7 @@ jobs:
           node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer@3.0.0
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -32,7 +32,9 @@ jobs:
           node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer@3.0.0
+          sudo apt-get update
+          sudo apt-get install libgbm1
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -34,7 +34,7 @@ jobs:
           node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer@3.0.0
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/lib/metanorma/compile.rb

@@ -32,6 +32,7 @@ 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
@@ -205,7 +206,11 @@ module Metanorma
           options[:relaton] = outfilename
           relaton_export(isodoc, options)
         else
+          begin
           @processor.output(isodoc, outfilename, ext, isodoc_options)
+          rescue StandardError => e  
+            puts e.message
+          end
         end
         if options[:wrapper] and /html$/.match file_extension
           outfilename = outfilename.sub(/\.html$/, "")

data/lib/metanorma/input/asciidoc.rb

@@ -34,6 +34,10 @@ module Metanorma
         }.reject { |_, val| val.nil? }
       end
 
+      def empty_attr(attr, name)
+        attr&.sub(/^#{name}:\s*$/, "#{name}: true")&.sub(/^#{name}:\s+/, "")
+      end
+
       def extract_options(file)
         headerextract = file.sub(/\n\n.*$/m, "\n")
 
@@ -58,8 +62,16 @@ module Metanorma
         /\n:data-uri-image: (?<datauriimage>[^\n]+)\n/ =~ headerextract
         /\n:htmltoclevels: (?<htmltoclevels>[^\n]+)\n/ =~ headerextract
         /\n:doctoclevels: (?<doctoclevels>[^\n]+)\n/ =~ headerextract
-        /\n:hierarchical-assets: (?<hierarchical_assets>[^\n]+)\n/ =~ headerextract
-        /\n:use-xinclude: (?<use_xinclude>[^\n]+)\n/ =~ headerextract
+        /\n:(?<hierarchical_assets>hierarchical-assets:[^\n]*)\n/ =~ headerextract
+        /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ headerextract
+        /\n:(?<break_up_urls_in_tables>break-up-urls-in-tables:[^\n]*)\n/ =~ headerextract
+
+        defined?(hierarchical_assets) and
+          hierarchical_assets = empty_attr(hierarchical_assets, "hierarchical-assets")
+        defined?(use_xinclude) and
+          use_xinclude = empty_attr(use_xinclude, "use-xinclude")
+        defined?(break_up_urls_in_tables) and
+          break_up_urls_in_tables = empty_attr(break_up_urls_in_tables, "break-up-urls-in-tables")
         {
           script: defined?(script) ? script : nil,
           bodyfont: defined?(bodyfont) ? bodyfont : nil,
@@ -84,6 +96,7 @@ module Metanorma
           doctoclevels: defined?(doctoclevels) ? doctoclevels : nil,
           hierarchical_assets: defined?(hierarchical_assets) ? hierarchical_assets : nil,
           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,
+          break_up_urls_in_tables: defined?(break_up_urls_in_tables) ? break_up_urls_in_tables : nil,
         }.reject { |_, val| val.nil? }
       end
 

data/lib/metanorma/output/xslfo.rb

@@ -8,8 +8,9 @@ module Metanorma
       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", "-jar", pdfjar, "--xml-file", url_path, "--xsl-file",
-               xsl_stylesheet, "--pdf-file", output_path].join(" ")
+        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?
       end

data/lib/metanorma/registry.rb

@@ -48,7 +48,7 @@ module Metanorma
       @processors.inject({}) do |acc, (k,v)|
         if v.asciidoctor_backend
           x = Asciidoctor.load nil, {backend: v.asciidoctor_backend}
-          acc[k] = x.converter.class::XML_ROOT_TAG
+          acc[k] = x.converter.xml_root_tag
         end
         acc
       end

data/lib/metanorma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor