isodoc-i18n 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf80de5e127891bdd42fef149b032db2649100b48e3903255b8045021d11f8d7
-  data.tar.gz: cbb3b8f8791089bd9ec2e161a0d268ae02b3768338963181f452812110aa32bf
+  metadata.gz: 03d82802ceebe9b649964369efa5a449b5fa528bb317e327a2683ffd1bcdc502
+  data.tar.gz: 32001c9565f97ce9b2327ba452e7e745317ce7db56cead17c873e70cdd4f49d3
 SHA512:
-  metadata.gz: b6f9db2ae6a42c46dc8b8b6722daaf90b0bcfddd67d3eb244186c9d4e561d76019c837609cce2dcad35d7bf039393c8aaffeeb46e4249688a1c6b1330da2aee1
-  data.tar.gz: b79476f0ca524c142d0135de71206b6a137055286f214a94bbfc0d125d12a8d18a7357cb2162b6e75e3a8308c6b9d85005bd88bcdffc545c8764c22c55911e22
+  metadata.gz: 734f890b5868a2a889f91749167a7ea89d050b3bc58d12e1064242b858776c5ad7f793ecfa1d1f58972bf3f12d314996cc5f9ec0afb32614a96a5f6ea5b35674
+  data.tar.gz: 458345fb6eabfc69ec4416444b693ec1b56b07cd28ca994619927ec505c8bba793f161b1f8562a501d42990d56f5a86a1112e5cb9a5af518122696f14f875115

data/isodoc-i18n.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-utils", "~> 1.4.0"
+  spec.add_dependency "metanorma-utils", ">= 1.5.0"
   spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "debug"

data/lib/isodoc/i18n/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.1.6".freeze
+    VERSION = "1.1.8".freeze
   end
 end

data/lib/isodoc/i18n-yaml.rb

@@ -0,0 +1,58 @@
+require "yaml"
+require "metanorma-utils"
+
+module IsoDoc
+  class I18n
+    Hash.include Metanorma::Utils::Hash
+
+    def load_yaml(lang, script, i18nyaml = nil, i18nhash = nil)
+      ret = load_yaml1(lang, script)
+      i18nyaml and
+        return normalise_hash(ret.deep_merge(YAML.load_file(i18nyaml)))
+      i18nhash and return normalise_hash(ret.deep_merge(i18nhash))
+
+      normalise_hash(ret)
+    end
+
+    def normalise_hash(ret)
+      case ret
+      when Hash
+        ret.each do |k, v|
+          ret[k] = normalise_hash(v)
+        end
+        ret
+      when Array then ret.map { |n| normalise_hash(n) }
+      when String then cleanup_entities(ret.unicode_normalize(:nfc))
+      else ret
+      end
+    end
+
+    def load_yaml1(lang, script)
+      case lang
+      when "zh"
+        if script == "Hans" then load_yaml2("zh-Hans")
+        else load_yaml2("en")
+        end
+      else
+        load_yaml2(lang)
+      end
+    end
+
+    # locally defined in calling class
+    def load_yaml2(lang)
+      YAML.load_file(File.join(File.dirname(__FILE__),
+                               "../isodoc-yaml/i18n-#{lang}.yaml"))
+    rescue StandardError
+      YAML.load_file(File.join(File.dirname(__FILE__),
+                               "../isodoc-yaml/i18n-en.yaml"))
+    end
+
+    def get
+      @labels
+    end
+
+    def set(key, val)
+      @labels[key] = val
+    end
+  end
+end

data/lib/isodoc/i18n.rb

@@ -1,69 +1,16 @@
-require "yaml"
 require "htmlentities"
-require "metanorma-utils"
 require "twitter_cldr"
 require_relative "i18n/version"
+require_relative "i18n-yaml"
 
 module IsoDoc
   class I18n
-    Hash.include Metanorma::Utils::Hash
-
-    def load_yaml(lang, script, i18nyaml = nil, i18nhash = nil)
-      ret = load_yaml1(lang, script)
-      i18nyaml and
-        return normalise_hash(ret.deep_merge(YAML.load_file(i18nyaml)))
-      i18nhash and return normalise_hash(ret.deep_merge(i18nhash))
-
-      normalise_hash(ret)
-    end
-
-    def normalise_hash(ret)
-      case ret
-      when Hash
-        ret.each do |k, v|
-          ret[k] = normalise_hash(v)
-        end
-        ret
-      when Array then ret.map { |n| normalise_hash(n) }
-      when String then cleanup_entities(ret.unicode_normalize(:nfc))
-      else ret
-      end
-    end
-
-    def load_yaml1(lang, script)
-      case lang
-      when "zh"
-        if script == "Hans" then load_yaml2("zh-Hans")
-        else load_yaml2("en")
-        end
-      else
-        load_yaml2(lang)
-      end
-    end
-
-    # locally defined in calling class
-    def load_yaml2(lang)
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-#{lang}.yaml"))
-    rescue StandardError
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-en.yaml"))
-    end
-
-    def get
-      @labels
-    end
-
-    def set(key, val)
-      @labels[key] = val
-    end
-
     def initialize(lang, script, locale: nil, i18nyaml: nil, i18nhash: nil)
       @lang = lang
       @script = script
       @locale = locale
-      y = load_yaml(lang, script, i18nyaml, i18nhash)
-      @labels = y
+      @c = HTMLEntities.new
+      @labels = load_yaml(lang, script, i18nyaml, i18nhash)
       @labels["language"] = @lang
       @labels["script"] = @script
       @labels.each do |k, _v|
@@ -158,6 +105,29 @@ module IsoDoc
       text.gsub(/^(:\s)/, "#{colonsp}\\1")
     end
 
+    def self.cjk_extend(text)
+      cjk_extend(text)
+    end
+
+    def cjk_extend(title)
+      @c.decode(title).chars.map.with_index do |n, i|
+        if i.zero? || !interleave_space_cjk?(title[i - 1] + title[i])
+          n
+        else "\u3000#{n}"
+        end
+      end.join
+    end
+
+    def interleave_space_cjk?(text)
+      text.size == 2 or return
+      ["\u2014\u2014", "\u2025\u2025", "\u2026\u2026", "\u22ef\u22ef"].include?(text) ||
+        /\d\d|\p{Latin}\p{Latin}|[[:space:]]/.match?(text) ||
+        /^[\u2018\u201c(\u3014\[{\u3008\u300a\u300c\u300e\u3010\u2985\u3018\u3016\u00ab\u301d]/.match?(text) ||
+        /[\u2019\u201d)\u3015\]}\u3009\u300b\u300d\u300f\u3011\u2986\u3019\u3017\u00bb\u301f]$/.match?(text) ||
+        /[\u3002.\u3001,\u30fb:;\u2010\u301c\u30a0\u2013!?\u203c\u2047\u2048\u2049]/.match?(text) and return false
+      true
+    end
+
     def boolean_conj(list, conn)
       case list.size
       when 0 then ""
@@ -177,14 +147,13 @@ module IsoDoc
     end
 
     def cleanup_entities(text, is_xml: true)
-      c = HTMLEntities.new
       if is_xml
         text.split(/([<>])/).each_slice(4).map do |a|
-          a[0] = c.decode(a[0])
+          a[0] = @c.decode(a[0])
           a
         end.join
       else
-        c.decode(text)
+        @c.decode(text)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -28,16 +28,16 @@ dependencies:
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +210,7 @@ files:
 - isodoc-i18n.gemspec
 - lib/isodoc-i18n.rb
 - lib/isodoc-yaml/i18n-en.yaml
+- lib/isodoc/i18n-yaml.rb
 - lib/isodoc/i18n.rb
 - lib/isodoc/i18n/version.rb
 homepage: https://github.com/metanorma/isodoc-i18n