metanorma 2.0.6 → 2.0.9

data/lib/metanorma/input/asciidoc.rb

@@ -14,15 +14,16 @@ module Metanorma
       end
 
       def extract_metanorma_options(file)
-        headerextract = file.sub(/\n\n.*$/m, "\n")
-        /\n:mn-document-class:\s+(?<type>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ headerextract
-        /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
-        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ headerextract
-        asciimath = if defined?(asciimath)
-                      !asciimath.nil? && asciimath != ":mn-keep-asciimath: false"
-                    end
+        hdr = file.sub(/\n\n.*$/m, "\n")
+        /\n:(?:mn-)?(?:document-class|flavor):\s+(?<type>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ hdr
+        /\n(?<asciimath>:(?:mn-)?keep-asciimath:[^\n]*)\n/ =~ hdr
+        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ hdr
+        if defined?(asciimath)
+          asciimath =
+            !asciimath.nil? && !/keep-asciimath: false/.match?(asciimath)
+        end
         asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type&.strip : nil,
@@ -62,7 +63,7 @@ module Metanorma
            toc-tables toc-recommendations).freeze
 
       def attr_name_normalise(name)
-        name.gsub("-", "").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
+        name.delete("-").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
           .to_sym
       end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.6".freeze
+  VERSION = "2.0.9".freeze
 end

data/metanorma.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_runtime_dependency "asciidoctor"
+  spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 2.6.3"
-  spec.add_runtime_dependency "mn2pdf", "~> 1"
+  spec.add_runtime_dependency "isodoc", ">= 2.12.2"
+  spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "shale"
 
   # get relaton-cli to avoid circular reference with metanorma-standoc
   # spec.add_dependency "relaton-cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  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: fontist
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +72,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shale
-  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: debug
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +316,7 @@ files:
 - lib/metanorma/collection/renderer/navigation.rb
 - lib/metanorma/collection/renderer/render_word.rb
 - lib/metanorma/collection/renderer/renderer.rb
+- lib/metanorma/collection/renderer/svg.rb
 - lib/metanorma/collection/renderer/utils.rb
 - lib/metanorma/collection/sectionsplit/collection.rb
 - lib/metanorma/collection/sectionsplit/sectionsplit.rb
@@ -333,7 +334,6 @@ files:
 - lib/metanorma/processor.rb
 - lib/metanorma/processor/processor.rb
 - lib/metanorma/registry/registry.rb
-- lib/metanorma/shale_monkeypatch.rb
 - lib/metanorma/util/fontist_helper.rb
 - lib/metanorma/util/util.rb
 - lib/metanorma/util/worker_pool.rb

data/lib/metanorma/shale_monkeypatch.rb

@@ -1,15 +0,0 @@
-module Shale
-  module Adapter
-    module Nokogiri
-      class Node
-        def content
-          @node
-        end
-
-        def to_xml
-          @node.to_xml
-        end
-      end
-    end
-  end
-end