metanorma-utils 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf1c0f7c6fc507ad433fe2050575ce055f637d14be8d8422841aa562c710b71
-  data.tar.gz: 1492564fdf19ecdea102ec3042f38222ae1c495d33ccc07db74d40312d01be66
+  metadata.gz: fe2af0c9b9521b3ae1953545fb434d08e45d028dd93c02fa509a8251e14e1c8e
+  data.tar.gz: c551aa4d4c08dba83273ce0be945a171cfbbdc4a9a2c02fd09044b3c97a8b317
 SHA512:
-  metadata.gz: c20276334e3ae738d797f823d809d45242677571f0b1746af012b08789b2da879877eb96f3196639fdc80ca1aa880294462cb07a3f36dbd91b20e8940fd84b0e
-  data.tar.gz: 6339006703fe2e0fc338a06a5c55b5b7c38bbc899623a16b22deb18fac01967db131e7b8888fab7388a710dfda658d51db0ce76d8556285c01a54616f034ba2b
+  metadata.gz: f6a23dde225425211a6ac35bb0e9b718189f0bc071eeef526a36ecebd3f8572f78addf7b93c4390374511642c360b6543e88e98e459ea1bb76849d077e008730
+  data.tar.gz: b537b6828491a4cc6f495c462e0c0810a8b1fcd61effb326232980f07325fe70e2ddc6b9f3c09d60b1f8c6af250c38e21064617acd294f8fa3542e141d647f40

data/lib/utils/linestatus.rb

@@ -29,7 +29,7 @@ module Metanorma
           @middoc_docattr = false
           @pass = false
         elsif (@is_delim && /^(--+|\*\*+|==+|__+)$/.match?(text)) ||
-            (!@is_delim && !@delimln && /^-----*$|^\.\.\.\.\.*$|\/\/\/\/\/*$/
+            (!@is_delim && !@delimln && /^-----*$|^\.\.\.\.\.*$|^\/\/\/\/\/*$/
           .match?(text))
           @delimln = text
           @pass = true

data/lib/utils/log.rb

@@ -91,7 +91,7 @@ module Metanorma
         if node.respond_to?(:line) && !node.line.nil?
           "#{'%06d' % node.line}"
         elsif /^XML Line /.match?(msg)
-          msg.sub(/^XML Line /, "").sub(/:.*$/, "")
+          msg.sub(/^XML Line /, "").sub(/(^[^:]+):.*$/, "\\1")
         else
           "000000"
         end

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.10.0".freeze
+    VERSION = "1.10.1".freeze
   end
 end

data/lib/utils/xml.rb

@@ -99,15 +99,15 @@ module Metanorma
       end
 
       def ns(xpath)
-        xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
-          .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
-          .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
-          .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
+        xpath.gsub(%r{/([a-zA-Z])}, "/xmlns:\\1")
+          .gsub(%r{::([a-zA-Z])}, "::xmlns:\\1")
+          .gsub(%r{\[([a-zA-Z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
+          .gsub(%r{\[([a-zA-Z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
       end
 
       def numeric_escapes(xml)
         c = HTMLEntities.new
-        xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
+        xml.split(/(&[^ \r\n\t#&;]+;)/).map do |t|
           if /^(&[^ \t\r\n#;]+;)/.match?(t)
             c.encode(c.decode(t), :hexadecimal)
           else t

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor