isodoc-i18n 1.1.7 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cac5aeb35b5ef95804ecb4ccde36d048613feb1120030518f7b2cc1d8c92b5
-  data.tar.gz: e91952a59254cc33d11339955ee050f6bc8761d80fa59d91d8c1e0c7f4889cdd
+  metadata.gz: e6ff9dd68aee9f2481e2c3b3efb12eb227d534841dd30ac23fa7402f64a3ffd2
+  data.tar.gz: 5b6b0bd8eb4b8323cf8650a5dba48c966226f2898ac812beb5f5b3f31cd91b1f
 SHA512:
-  metadata.gz: 61311452a113779cbe5c0e5971d5bca2b5f1f14fbfda11056abd073ebcf188aa21cef54620a64ef15f896df0b3016e22df76a1474ba5d71c3fddea8fb2fea16d
-  data.tar.gz: 84c4275111d86ff51c6547e821e976910766a0803ff38685b8c053197da8259c2ebbb4031e5dc89aeb86ed9fe8f4be9c8bf92c4baab3ae4cc5e5f8b2404a8adf
+  metadata.gz: a3333a3f5386017bf62a88d8b82597477702965cf7aa9505b00927dd883420cb3a881363774a07311653703316d2f591ad1bb8b2f21d485b034ad2d9356d6544
+  data.tar.gz: b980154492673ddd83d2cd3c90fcde55856a14e055f493df0372cc627ffd2602a197c2e3ccb0680e3c942c058540551634f4c3a7d7c51c0ba9eb77f35d422c18

data/lib/isodoc/i18n/version.rb

@@ -1,5 +1,5 @@
 module IsoDoc
   class I18n
-    VERSION = "1.1.7".freeze
+    VERSION = "1.1.9".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,29 @@
-require "yaml"
 require "htmlentities"
-require "metanorma-utils"
 require "twitter_cldr"
 require_relative "i18n/version"
+require_relative "i18n-yaml"
+require_relative "date"
 
 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
+    def initialize(lang, script, locale: nil, i18nyaml: nil, i18nhash: nil)
+      @lang = lang
+      @script = script
+      @locale = locale
+      @cal = calendar_data
+      @cal_en = TwitterCldr::Shared::Calendar.new(:en)
+      @c = HTMLEntities.new
+      init_labels(i18nyaml, i18nhash)
     end
 
-    # locally defined in calling class
-    def load_yaml2(lang)
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-#{lang}.yaml"))
+    def calendar_data
+      TwitterCldr::Shared::Calendar.new(tw_cldr_lang)
     rescue StandardError
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-en.yaml"))
+      TwitterCldr::Shared::Calendar.new(:en)
     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
+    def init_labels(i18nyaml, i18nhash)
+      @labels = load_yaml(@lang, @script, i18nyaml, i18nhash)
       @labels["language"] = @lang
       @labels["script"] = @script
       @labels.each do |k, _v|
@@ -158,6 +118,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 +160,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.7
+  version: 1.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -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