metanorma-utils 1.4.9 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2fc77a1340a09081ae875e3d2488e75504dd8f96bb0209eb5e881453b79311
-  data.tar.gz: 3ee3013cd792903ff7bfbd58876751608633df96bd185ef3b07314fde91fd627
+  metadata.gz: 37fbf39c85da8b63e44be8849a9ce41a15522c2e6b805cfb5f9de006701f3110
+  data.tar.gz: 743944d95ebf66f6489df542172126de21bf71e86f9048518bdaa3b9efb9fe0e
 SHA512:
-  metadata.gz: d0b4d37b78694dbf54cab56fde0a7e7d8ee865071992c5dcd1e3d2ef93e5f785d0397224a73082e3884d99ced913ba8be7f0e29359155fc5ee076f478356b562
-  data.tar.gz: e96945c91aa5d052e84e2656319c6b83800660b11f9edcb3aed0a68146925be06d864bb5e286a91fb57bb9e32a1fc1dc7e4c5899ce3119a9b369c6cc1fd67749
+  metadata.gz: 54239cf1ac5eddd882ea7426124ee609987376942d79ac08d52fb7827dbde060345da8940aafad22fcc01e2db4a1f3047863759e649d7a9529c57aa2eb60b0de
+  data.tar.gz: 4a2d387e3040dcf8f66d88c7f2f131b6bcc1c7fb81acc8d6fa583d46909e5f0dca91de3e8334ece768d6ccb716c7fa9112878aece02fdb54b4e4a9cc1b54a87e

data/lib/utils/log.rb

@@ -37,13 +37,23 @@ module Metanorma
       end
 
       def context(node)
-        return nil if node.is_a? String
-
-        node.respond_to?(:to_xml) and return node.to_xml
+        node.is_a? String and return nil
+        node.respond_to?(:to_xml) and return human_readable_xml(node)
         node.respond_to?(:to_s) and return node.to_s
         nil
       end
 
+      # try to approximate input, at least for maths
+      def human_readable_xml(node)
+        ret = node.dup
+        ret.xpath(".//*[local-name() = 'stem']").each do |s|
+          sub = s.at("./*[local-name() = 'asciimath'] | " \
+                     "./*[local-name() = 'latexmath']")
+          sub and s.replace(sub)
+        end
+        ret.to_xml
+      end
+
       def write(file)
         File.open(file, "w:UTF-8") do |f|
           f.puts "#{file} errors"

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.4.9".freeze
+    VERSION = "1.5.1".freeze
   end
 end

data/lib/utils/xml.rb

@@ -41,14 +41,15 @@ module Metanorma
       # block for processing XML document fragments as XHTML,
       # to allow for HTMLentities
       # Unescape special chars used in Asciidoctor substitution processing
-      def noko(&block)
+      def noko(script = "Latn", &block)
         doc = ::Nokogiri::XML.parse(NOKOHEAD)
         fragment = doc.fragment("")
         ::Nokogiri::XML::Builder.with fragment, &block
+        eoln = %w(Hans Hant Jpan).include?(script) ? "" : " "
         fragment.to_xml(encoding: "US-ASCII", indent: 0,
                         save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
           .lines.map do |l|
-          l.gsub(/>\n$/, ">").gsub(/\s*\n$/m, " ").gsub("–", "\u0096")
+          l.gsub(/>\n$/, ">").gsub(/\n$/m, eoln).gsub("–", "\u0096")
             .gsub("—", "\u0097").gsub("–", "\u0096")
             .gsub("—", "\u0097")
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor