metanorma 1.3.5 → 1.3.9

data/lib/metanorma/util.rb

@@ -12,6 +12,23 @@ module Metanorma
       end
     end
 
+    # dependency ordering
+    def self.sort_extensions_execution_ord(ext)
+      case ext
+      when :xml then 0
+      when :rxl then 1
+      when :presentation then 2
+      else
+        99
+      end
+    end
+
+    def self.sort_extensions_execution(ext)
+      ext.sort do |a, b|
+        sort_extensions_execution_ord(a) <=> sort_extensions_execution_ord(b)
+      end
+    end
+
     class DisambigFiles
       def initialize
         @seen_filenames = []

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.5".freeze
+  VERSION = "1.3.9".freeze
 end

data/metanorma.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_runtime_dependency "asciidoctor"
-  spec.add_runtime_dependency "fontist", "~> 1.8"
+  spec.add_runtime_dependency "fontist", "~> 1.11"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "metanorma-utils", "~> 1.2.0"
   spec.add_runtime_dependency "mn2pdf", "~> 1"
@@ -36,10 +36,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.8.0"
+  spec.add_development_dependency "metanorma-iso", "~> 1.9.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
+  spec.add_development_dependency "mnconvert"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: mnconvert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -264,13 +278,9 @@ files:
 - lib/metanorma/input.rb
 - lib/metanorma/input/asciidoc.rb
 - lib/metanorma/input/base.rb
-- lib/metanorma/output.rb
-- lib/metanorma/output/base.rb
-- lib/metanorma/output/pdf.rb
-- lib/metanorma/output/utils.rb
-- lib/metanorma/output/xslfo.rb
 - lib/metanorma/processor.rb
 - lib/metanorma/registry.rb
+- lib/metanorma/sectionsplit.rb
 - lib/metanorma/util.rb
 - lib/metanorma/version.rb
 - metanorma.gemspec

data/lib/metanorma/output.rb

@@ -1,8 +0,0 @@
-require_relative "./output/base"
-require_relative "./output/pdf"
-require_relative "./output/xslfo"
-
-module Metanorma
-  module Output
-  end
-end

data/lib/metanorma/output/base.rb

@@ -1,13 +0,0 @@
-
-module Metanorma
-  module Output
-
-    class Base
-
-      def convert(in_path, out_path)
-        raise "This is an abstract class"
-      end
-
-    end
-  end
-end

data/lib/metanorma/output/pdf.rb

@@ -1,32 +0,0 @@
-require "open3"
-require_relative "./utils.rb"
-require "pathname"
-require "shellwords"
-
-module Metanorma
-  module Output
-    class Pdf < Base
-
-      def convert(url_path, output_path)
-        file_url = Utils::file_path(url_path)
-        pdfjs = File.join(File.dirname(__FILE__), "../../../bin/metanorma-pdf.js")
-
-        node_path = ENV["NODE_PATH"] || `npm root --quiet -g`.strip
-        node_cmd = ["node", pdfjs, file_url, output_path].map { |arg| shellescape(arg) }.join(" ")
-
-        _, error_str, status = Open3.capture3({ "NODE_PATH" => node_path }, node_cmd)
-        raise error_str unless status.success?
-      end
-
-      def shellescape(str)
-        if Gem.win_platform?()
-          # https://bugs.ruby-lang.org/issues/16741
-          str.match(" ") ? "\"#{str}\"" : str
-        else
-          Shellwords.shellescape(str)
-        end
-      end
-    end
-  end
-end
-

data/lib/metanorma/output/utils.rb

@@ -1,17 +0,0 @@
-require "pathname"
-
-module Metanorma
-  module Output
-    module Utils
-      class << self
-        def file_path(url_path)
-          file_url = url_path
-          file_url = "file://#{url_path}" if Pathname.new(file_url).absolute?
-          %r{^file://}.match?(file_url) or
-            file_url = "file://#{Dir.pwd}/#{url_path}"
-          file_url
-        end
-      end
-    end
-  end
-end

data/lib/metanorma/output/xslfo.rb

@@ -1,21 +0,0 @@
-require 'mn2pdf'
-require_relative "./utils.rb"
-
-module Metanorma
-  module Output
-    class XslfoPdf < Base
-      def convert(url_path, output_path, xsl_stylesheet, options = "")
-        return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
-
-        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet), options)
-      end
-
-      def quote(x)
-        return x if /^'.*'$/.match(x)
-        return x if /^".*"$/.match(x)
-        %("#{x}")
-      end
-    end
-  end
-end
-