isodoc 2.2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35faf26226ce9567b1cbe542ce0e2e5e9addaa4db63d88460a978b91e1aa7b1f
-  data.tar.gz: 3c6c08ee8a7b87edb3f4d17c5e1dd58e7b23081e3cce392a85404f8eafd3c280
+  metadata.gz: efcdfcde0ed6b8878845a1b030b1bf7f375dc21f7daae1589ba6b8324e06a333
+  data.tar.gz: 6498b1dc8efa9f850c2fed954ec9f7067d847fb932d86b4e353125754e780dad
 SHA512:
-  metadata.gz: 2c1f5785099717614434d6099c2b6f843d24cb5e7de0cd2cfbfb4da5a42039bd790d90b91f270befd4fa6002f79509007024e2baf52803a5720d7f0d75433294
-  data.tar.gz: 05203b0d0f5092a7e0ab26659d8b8f6a7b8ed9d1a2d3a6ffa0d2cd06b94748d432c264978c32bbc0af391817af0046313782dfff74f840c8b14cfcc28992b466
+  metadata.gz: 0b6a7404d5021f2ef2db93b83803a122a842febd05e30fb0fbda876407c8b8673382ef818038f73899376d6ba1b465410d12c4076c782829a8292adefd65e758
+  data.tar.gz: 251e5f94894578f8d5e365333a1512a1c8bac91d0c6020afa95d409eb1c9299f4bbb73762c94e2103775e85f5bb43e5b6710161c9f79ebee2fa0d29d5d94f0f1

data/isodoc.gemspec

@@ -34,13 +34,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath"
   spec.add_dependency "html2doc", "~> 1.4.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "isodoc-i18n", "~> 1.0.6"
+  spec.add_dependency "isodoc-i18n", "~> 1.0.7"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.3.2"
-  spec.add_dependency "mn-requirements", "~> 0.1.2"
+  spec.add_dependency "metanorma-utils", "~> 1.4.0"
+  spec.add_dependency "mn2pdf"
+  spec.add_dependency "mn-requirements", "~> 0.1.3"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", "~> 0.4.0"
   spec.add_dependency "roman-numerals"
@@ -52,7 +53,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-iso", ">= 2.1.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rexml"
   spec.add_development_dependency "rspec", "~> 3.6"

data/lib/isodoc/i18n.rb

@@ -1,9 +1,12 @@
 require "yaml"
 require "isodoc-i18n"
 require_relative "function/utils"
+require "metanorma-utils"
 
 module IsoDoc
   class I18n
+    Hash.include Metanorma::Utils::Hash
+
     def load_yaml1(lang, script)
       case lang
       when "en", "fr", "ru", "de", "es", "ar"
@@ -24,21 +27,3 @@ module IsoDoc
   end
 end
 
-class ::Hash
-  def deep_merge(second)
-    merger = proc { |_, v1, v2|
-      if Hash === v1 && Hash === v2
-        v1.merge(v2, &merger)
-      elsif Array === v1 && Array === v2
-        v1 | v2
-      elsif [:undefined, nil,
-             :nil].include?(v2)
-        v1
-      else
-        v2
-      end
-    }
-    merge(second.to_h, &merger)
-  end
-end
-

data/lib/isodoc/pdf_convert.rb

@@ -1,7 +1,6 @@
 require_relative "html_function/comments"
 require_relative "html_function/footnotes"
 require_relative "html_function/html"
-require "metanorma"
 
 module IsoDoc
   class PdfConvert < ::IsoDoc::Convert

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.2.2.2".freeze
+  VERSION = "2.2.3".freeze
 end

data/lib/isodoc/xslfo_convert.rb

@@ -1,5 +1,3 @@
-require "metanorma"
-
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
     MN_OPTIONS_KEY = :mn2pdf

data/lib/relaton/render/general.rb

@@ -5,8 +5,11 @@ module Relaton
   module Render
     module IsoDoc
       class General < ::Relaton::Render::General
+        Hash.include Metanorma::Utils::Hash
+
         def config_loc
-          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+          YAML.load_file(File.join(File.dirname(__FILE__),
+                                   "config.yml"))
         end
 
         def read_config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: mn2pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: metanorma-iso
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement