metanorma-standoc 2.8.6 → 2.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26ef7eeadddd66ca86125ae72f91a3e920057ad5ed1e8f0e1e5670f831355d0b
-  data.tar.gz: e1d1e42f6d4962d11ab86421fec3fc2877480e33fdac9aabcc4bd478fd3cc2df
+  metadata.gz: c85d5bbd7c078ea07217f9d0e4eac15edec02f1123a2d631774a7d95e194b5ea
+  data.tar.gz: 69c26ff7e359967646790c05e81ec9addc1641bd05bf9d1e9bd2e58f330ba24a
 SHA512:
-  metadata.gz: 4a014a7cbc4f3665f07322713d0edad6dbd42301eb3b0e548a78efd116f7c6da4b7359db4f26e3cbc50315cdbdad99169997493fa792000b6f36e63c49c8ace1
-  data.tar.gz: 25f39be9f0df10ecdfaea29ecdf2e1cf8a50789f80fce1cf6fa71cd23beb1a69f6b890e2ca69527bc486091631281cce5926f3b3ec743bdbbfb24b9c7d195264
+  metadata.gz: 616aac498897af730a4bd1198011b7bfb310782ca3d1ee940638f753a39c5ee8ef9b0d9d344199d089fef554c757b52dcc1bfafe9dee22b031cf22616bbd358a
+  data.tar.gz: 88b94f216dc5db91750d334f0555edcf7cef65f8b2c6b011ea6684317dd25817ee216ea9cf935a13f5299710042b996f6f46ea5a784e95d5e2b43760507009b4

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -19,14 +19,30 @@ module Metanorma
       def asciimath2mathml_indiv(elem)
         elem["type"] = "MathML"
         expr = @c.decode(elem.text)
-        ret = Plurimath::Math.parse(expr, "asciimath")
-          .to_mathml(display_style: elem["block"])
-        ret += "<asciimath>#{@c.encode(@c.decode(expr), :basic)}</asciimath>"
+        ret = asciimath_parse(expr, elem)
+        ret += "<asciimath>#{@c.encode(expr, :basic)}</asciimath>"
         elem.children = ret
       rescue StandardError => e
         asciimath2mathml_err(elem.to_xml, e)
       end
 
+      # https://medium.com/@rickwang_wxc/in-ruby-given-a-string-detect-if-it-is-valid-numeric-c58275eace60
+      NUMERIC_REGEX = %r{^((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?$}.freeze
+
+      MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
+
+      def asciimath_parse(expr, elem)
+        if NUMERIC_REGEX.match?(expr)
+          @novalid or elem["validate"] = "false"
+          <<~MATH
+            <math xmlns='#{MATHML_NS}'><mstyle displaystyle='false'><mn>#{expr}</mn></mstyle></math>
+          MATH
+        else
+          Plurimath::Math.parse(expr, "asciimath")
+            .to_mathml(display_style: elem["block"])
+        end
+      end
+
       def asciimath2mathml_err(text, expr)
         err = "Malformed MathML: #{expr}\n#{text}"
         @log.add("Maths", nil, err, severity: 0)
@@ -57,8 +73,6 @@ module Metanorma
         xml.children = math
       end
 
-      MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
-
       def mathml_preserve_space(math)
         math.xpath(".//m:mtext", "m" => MATHML_NS).each do |x|
           x.children = x.children.to_xml
@@ -193,7 +207,8 @@ module Metanorma
 
       def mathml_cleanup(xmldoc)
         unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
-        xmldoc.xpath("//stem[@type = 'MathML']").each do |x|
+        xmldoc.xpath("//stem[@type = 'MathML'][not(@validate = 'false')]")
+          .each do |x|
           xml_unescape_mathml(x)
           mathml_namespace(x)
           mathml_preserve_space(x)

data/lib/metanorma/standoc/init.rb

@@ -33,7 +33,7 @@ module Metanorma
         @boilerplateauthority = node.attr("boilerplate-authority")
         @embed_hdr = node.attr("embed_hdr")
         @embed_id = node.attr("embed_id")
-        @document_scheme = node.attr("document-scheme")
+        @document_scheme = document_scheme(node)
         @xrefstyle = node.attr("xrefstyle")
         @source_linenums = node.attr("source-linenums-option") == "true"
       end

data/lib/metanorma/standoc/macros.rb

@@ -100,7 +100,7 @@ module Metanorma
         status[:midline_docattr] && !/^:[^ :]+: /.match?(text) and
           status[:midline_docattr] = false
         if (status[:is_delim] && /^(-+|\*+|=+|_+)$/.match?(text)) ||
-            (!status[:is_delim] && !status[:delimln] && text == "----")
+            (!status[:is_delim] && !status[:delimln] && /^-----*$|^\.\.\.\.\.*$/.match?(text))
           status[:delimln] = text
           status[:pass] = true
         elsif status[:pass_delim]

data/lib/metanorma/standoc/validate.rb

@@ -34,8 +34,12 @@ module Metanorma
 
       def math_validate(doc)
         doc.xpath("//m:math", "m" => MATHML_NS).each do |m|
-          math = mathml_sanitise(m.dup)
-          Plurimath::Math.parse(math, "mathml").to_mathml
+          if m.parent["validate"] == "false"
+            m.parent.delete("validate")
+          else
+            math = mathml_sanitise(m.dup)
+            Plurimath::Math.parse(math, "mathml").to_mathml
+          end
         rescue StandardError => e
           math_validate_error(math, m, e)
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.6".freeze
+    VERSION = "2.8.7".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.9.0"
+  spec.add_dependency "isodoc", "~> 2.10.0"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement