metanorma-utils 1.8.2 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4137257679b627f458d91b4931f6de9d7956af0cb50661f17c6c7a035cb98fc8
-  data.tar.gz: 631a4d0c9554f357c0cb815fb0f13b0353d08451d81fb05cb26c3c99cc6f76ff
+  metadata.gz: acea881df59c64c2137792a3fc9bbb5a36d09dd43fc5fa6d0e3b066b3bbb60da
+  data.tar.gz: 00fc04e75a5eec309ed1a1d62633e7c9358e93adbf0558f12bad11fa069d4441
 SHA512:
-  metadata.gz: 3d5fd0bcd6479a83094f17c748e67815cf044ba183c61c9344dfb2d54fdd49c6cda283aff42bfc25f0ad9bc8df7e87dc18c96ba67f9e2c3dc1ab1fa924b45de7
-  data.tar.gz: 3af52dc1dcec7a36d0c9e4abd6605f0a99af743e8cf1e67466a6cf5f9d2df03b7c01775293843c3df180098285c767b8348080df5e473ef5c8fb40f4b0057228
+  metadata.gz: 2ba485eb93b52444caa930e05dc185f8506fc1d68c70483f43593e560e63ab418aeea60375e579363b120a7864046daefe4cd6ded9769491990748a88570cf83
+  data.tar.gz: c16aecbe71a3acdede53591130d310f9745fc3b8d59a7624250d36ab93468a0f16ecc05b6251c10d6dac34bab792fd15fb0344a2cd30e606f4166b4d5ed045af

data/lib/utils/hash_transform_keys.rb

@@ -61,8 +61,7 @@ module Metanorma
             v1.merge(v2, &merger)
           elsif ::Array === v1 && ::Array === v2
             v1 | v2
-          elsif [:undefined, nil,
-                 :nil].include?(v2)
+          elsif [:undefined].include?(v2)
             v1
           else
             v2

data/lib/utils/main.rb

@@ -4,6 +4,7 @@ require "sterile"
 require "htmlentities"
 require "nokogiri"
 require "csv"
+require_relative "../sterile/sterile"
 
 module Metanorma
   module Utils
@@ -34,21 +35,26 @@ module Metanorma
         docfile.nil? ? "./" : "#{Pathname.new(docfile).parent}/"
       end
 
-      # TODO needs internationalisation
+      CJK = "\\p{Han}|\\p{Bopomofo}|\\p{Hangul}|\\p{Hiragana}|\\p{Katakana}"
+        .freeze
+
+      # TODO needs internationalisation of quote
       def smartformat(text)
-        HTMLEntities.new.encode(
-          HTMLEntities.new.decode(
-            text.gsub(/ --? /, " — ")
-            .gsub("--", "—"),
-          )
-            .smart_format, :basic
+        ret = HTMLEntities.new.decode(
+          text.gsub(/ --? /, " — ")
+          .gsub("--", "—"),
         )
+        ret = ret.gsub(%r{(#{CJK})(["'])}o, "\\1\u200a\\2")
+          .gsub(%r{(["'])(#{CJK})}o, "\\1\u200a\\2")
+        ret = ret.smart_format
+        ret = ret.gsub(%r{(#{CJK})\u200a}o, "\\1")
+          .gsub(%r{\u200a(#{CJK})}o, "\\1")
+        HTMLEntities.new.encode(ret, :basic)
       end
 
       def endash_date(elem)
         elem.traverse do |n|
-          next unless n.text?
-
+          n.text? or next
           n.replace(n.text.gsub(/\s+--?\s+/, "–").gsub("--", "–"))
         end
       end
@@ -133,7 +139,8 @@ module Metanorma
       # if punct fails, try break on camel case, with soft hyphen
       # break regardless every LONGSTRING_THRESHOLD * LONGSTR_NOPUNCT,
       # with soft hyphen
-      def break_up_long_str(text, threshold = LONGSTR_THRESHOLD, nopunct = LONGSTR_NOPUNCT)
+      def break_up_long_str(text, threshold = LONGSTR_THRESHOLD,
+nopunct = LONGSTR_NOPUNCT)
         /^\s*$/.match?(text) and return text
         text.split(/(?=(?:\s|-))/).map do |w|
           if /^\s*$/.match(text) || (w.size < threshold) then w

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.8.2".freeze
+    VERSION = "1.8.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor