isodoc-i18n 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e08e5e4a6c9b89a5f628ee426ce22f8bcdbae97e7cccd4411f4962844d29b231
-  data.tar.gz: 9d8cbc5526c1d8aabe9db00c25deeb581a3604358b50b18e6f5a9bb7faab6909
+  metadata.gz: 02e65f54740c83c1d9698623c18711219680d6541f88e2cd0aaa62d3595c103d
+  data.tar.gz: f57b0e7bf29a2d02576dda04b3d7b34ded97a42ec382ebdbc9caefb12a1aa17b
 SHA512:
-  metadata.gz: 3880d68a1f094ab500840e74767f970af57fca01a12ae751da68e9cdc72ba00df9139516df3c74dda5059114fe723b800c057c665efdd485e44aa9a247cdde22
-  data.tar.gz: 80643511d523a3535293a2b7b82e60fe81a8910dbe9fc336cf8a4ab95a9763b1adf1375f802f5b36177a6e4570c51688b803576f7d2d39b8fc7c29e894d2f235
+  metadata.gz: b0a869f0df1ef445e5f18d336d0d3f18968e7055444e81535d7da4219a7c24f4e370ea45e0033d1ed2766d8fc5ea2c577f74ea07c232fc6217ff236aacc65e8e
+  data.tar.gz: 801f9ccb9c81c372c77834ad3667b88491f0aa1429c588e1a8c1854fc5ca8f1a817607de4bd0c44ed1d02f2a3984d5c336714692cff31c860d6c14a658502e9b

data/isodoc-i18n.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-utils", ">= 1.7.0"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/lib/isodoc/i18n/version.rb

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

data/lib/isodoc/i18n-yaml.rb

@@ -7,10 +7,13 @@ module IsoDoc
 
     def load_yaml(lang, script, i18nyaml = nil, i18nhash = nil)
       ret = load_yaml1(lang, script)
-      i18nyaml and
-        return postprocess(ret.deep_merge(YAML.load_file(i18nyaml)))
+      if i18nyaml
+        Array(i18nyaml).compact.each do |y|
+          ret = ret.deep_merge(YAML.load_file(y))
+        end
+        return postprocess(ret)
+      end
       i18nhash and return postprocess(ret.deep_merge(i18nhash))
-
       postprocess(ret)
     end
 
@@ -38,7 +41,7 @@ module IsoDoc
     def resolve_string_references(str, labels)
       # Match patterns like #{self["key"]["subkey"]} or #{self.key.subkey}
       # Allow spaces around the self expression
-      str.gsub(/\#\{\s*self([^\}]+?)\s*\}/) do |match|
+      str.gsub(/\#\{\s*self([^}]+?)\s*\}/) do |match|
         path_expr = Regexp.last_match(1)
         resolve_path(path_expr, labels, match)
       end
@@ -68,11 +71,9 @@ module IsoDoc
     end
 
     def parse_path(path_expr)
-      segments = []
-      path_expr = path_expr.sub(/^\./, "")
       # Split by dots and brackets while preserving the content
-      parts = path_expr.scan(/\.?([\w-]+)|\[([^\]]+)\]/)
-      parts.each do |dot_part, bracket_part|
+      parts = path_expr.sub(/^\./, "").scan(/\.?([\w-]+)|\[([^\]]+)\]/)
+      parts.each_with_object([]) do |(dot_part, bracket_part), segments|
         if dot_part
           segments << dot_part
         elsif bracket_part
@@ -80,7 +81,6 @@ module IsoDoc
           segments << segment
         end
       end
-      segments
     end
 
     def normalise_hash(ret)
@@ -123,5 +123,9 @@ module IsoDoc
     def set(key, val)
       @labels[key] = val
     end
+
+    def merge(new_labels)
+      @labels = @labels.deep_merge(new_labels)
+    end
   end
 end

data/lib/isodoc/i18n.rb

@@ -27,7 +27,6 @@ module IsoDoc
     CJK_SCRIPTS = %w(Hans Hant Jpan Kore).freeze
 
     def liquid_init
-      ::IsoDoc::I18n::Liquid.set(self)
       ::Liquid::Environment.default.register_filter(::IsoDoc::I18n::Liquid)
     end
 
@@ -50,6 +49,7 @@ module IsoDoc
 
     # populate with variables, Liquid, inflections, ordinals/spellout
     def populate(keys, vars = {})
+      ::IsoDoc::I18n::Liquid.set(self)
       ::Liquid::Template.parse(@labels.dig(*Array(keys)))
         .render(vars.merge("labels" => @labels))
     end

data/lib/isodoc/l10n.rb

@@ -44,15 +44,26 @@ module IsoDoc
       t = xml.xpath(".//text()").reject { |node| node.text.empty? }
       text_cache = build_text_cache(t, options[:prev], options[:foll])
 
-      # Identify which text nodes are within <esc> tags
-      esc_indices = Set.new
-      t.each_with_index do |node, i|
-        esc_indices.add(i) if node.ancestors("esc").any?
-      end
+      # Find all text nodes within <esc> tags in one XPath query
+      # This is O(n) instead of O(n*m) where m is tree depth
+      esc_indices = build_esc_indices(xml, t)
 
       [t, text_cache, xml, options[:prev], options[:foll], esc_indices]
     end
 
+    # Build set of indices for text nodes within <esc> tags
+    # Handles both namespaced and non-namespaced <esc> elements
+    def build_esc_indices(xml, text_nodes)
+      # Try both non-namespaced and namespace-agnostic queries
+      esc_text_nodes = Set.new(xml.xpath(".//esc//text()") +
+                               xml.xpath(".//*[local-name()='esc']//text()"))
+      Set.new.tap do |indices|
+        text_nodes.each_with_index do |node, i|
+          indices.add(i) if esc_text_nodes.include?(node)
+        end
+      end
+    end
+
     # Cache text content once per method call to avoid repeated .text calls
     # Build text cache with optional prepended/appended context
     # Also, reduce multiple spaces to single, to avoid miscrecognition of space

data/lib/isodoc/l10n_cjk.rb

@@ -57,7 +57,7 @@ module IsoDoc
     ZH_PUNCT_AUTOTEXT = {
       colon: ":",
       comma: ",",
-      "enum-comma": ",",
+      # "enum-comma": ",", # enum-comma is ambiguous with comma
       semicolon: ";",
       period: ".",
       "close-paren": ")",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -84,16 +84,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement