isodoc-i18n 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a7b4e2dcb8b00587cc92988c85a99c411444fb8698f8bd067c92a4f90751e2
-  data.tar.gz: 6304cf921c57b555ff259b9c1dfad4d7306e726c7f56f08291e4959a188a6181
+  metadata.gz: db66af34abba937daa72bbef574be08220618ca75b104c5b1e6275736494e781
+  data.tar.gz: b94275b875363991d526ea1a83ec3be97bdc93dcd0db16681cee8ba0197a8577
 SHA512:
-  metadata.gz: 9de07fcd21fdfd8ba2ab4d758f76952cbfe84075caad216543cd0a6fa2bcf409fab8e71bc71309aa98ed50342727be9a46c5ffc2625c27f987ede80c65e29b18
-  data.tar.gz: fff4809002eef23c8d550baed4fb1185f134b99fb7a61733d3413045134b11b1e18eaab54a8787e0e4817601ff9051d67ffc1efc97cfaa589a73320188e70d98
+  metadata.gz: 16e56e238e36071225875002eeb86959c23ddcf2ae874fa7db18e6893978e4d7105b88964867f8cd331718c975bdea5175845533e6ad045b621b035bff34a3c7
+  data.tar.gz: 87da9b7308403c25d52f8008177cb0ef62da042df0d58d8f26864678de53b84a925465dd36b9b40e1a106ca8a8406411d515567f1316903d54643cbbc89dc339

data/lib/isodoc/i18n.rb

@@ -98,23 +98,24 @@ module IsoDoc
     end
 
     def l10n_zh(text)
-      xml = Nokogiri::HTML::DocumentFragment.parse(text)
+      xml = Nokogiri::XML::DocumentFragment.parse(text)
       xml.traverse do |n|
         next unless n.text?
 
         n.replace(cleanup_entities(l10_zh1(n.text), is_xml: false))
       end
-      xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
+      xml.to_xml(encoding: "UTF-8").gsub(/<b>/, "").gsub("</b>", "")
+        .gsub(/<\?[^>]+>/, "")
     end
 
     def l10n_fr(text, locale)
-      xml = Nokogiri::HTML::DocumentFragment.parse(text)
+      xml = Nokogiri::XML::DocumentFragment.parse(text)
       xml.traverse do |n|
         next unless n.text?
 
         n.replace(cleanup_entities(l10n_fr1(n.text, locale), is_xml: false))
       end
-      xml.to_xml
+      xml.to_xml(encoding: "UTF-8")
     end
 
     ZH_CHAR = "\\p{Han}|\\p{In CJK Symbols And Punctuation}|"\
@@ -144,12 +145,14 @@ module IsoDoc
     end
 
     def l10n_fr1(text, locale)
-      text = text.gsub(/(?<=\p{Alnum})([»›;?!])/, "\u202f\\1")
+      text = text.gsub(/(?<=\p{Alnum})([»›;?!])(?=\s)/, "\u202f\\1")
+      text = text.gsub(/(?<=\p{Alnum})([»›;?!])$/, "\u202f\\1")
       text = text.gsub(/^([»›;?!])/, "\u202f\\1")
       text = text.gsub(/([«‹])/, "\\1\u202f")
       colonsp = locale == "CH" ? "\u202f" : "\u00a0"
-      text = text.gsub(/(?<=\p{Alnum})(:)/, "#{colonsp}\\1")
-      text.gsub(/^(:)/, "#{colonsp}\\1")
+      text = text.gsub(/(?<=\p{Alnum})(:)(?=\s)/, "#{colonsp}\\1")
+      text = text.gsub(/(?<=\p{Alnum})(:)$/, "#{colonsp}\\1")
+      text.gsub(/^(:\s)/, "#{colonsp}\\1")
     end
 
     def boolean_conj(list, conn)
@@ -169,11 +172,11 @@ module IsoDoc
       c = HTMLEntities.new
       if is_xml
         text.split(/([<>])/).each_slice(4).map do |a|
-          a[0] = c.encode(c.decode(a[0]), :hexadecimal)
+          a[0] = c.decode(a[0])
           a
         end.join
       else
-        c.encode(c.decode(text), :hexadecimal)
+        c.decode(text)
       end
     end
 

data/lib/isodoc/version.rb

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

data/spec/isodoc/base_spec.rb

@@ -103,6 +103,8 @@ RSpec.describe IsoDoc::I18n do
     expect(e.encode(c.l10n("Code; «code» and: code!"), :hexadecimal))
       .to be_equivalent_to "Code ; « code » "\
                            "and : code !"
+    expect(e.encode(c.l10n("http://xyz a;b"), :hexadecimal))
+      .to be_equivalent_to "http://xyz a;b"
   end
 
   it "does boolean conjunctions" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc-i18n
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-25 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities