metanorma-utils 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43530083e199af0abeff8df1b697507ed4f08f5039de4acba24409008c51e534
-  data.tar.gz: 19a237c0c4134abbf35daeeff19e0aeea715a528c9f55cd6150908460f21bed1
+  metadata.gz: 292c59c5af886a4ee9c6536f299fce7f70c8ebe58009bdd317ee438411a1ea0b
+  data.tar.gz: '0593b2df3787f376b0369cadd96b277f988cab030a60f90104599ec86f9b481e'
 SHA512:
-  metadata.gz: a910ee73c2ee55d26cae92489643cd41b6de237f663910030475f4de1e295b45e6199f0722bc1dd8665007ccb0a3fdd1117fdb6dcb9a1dada1afc3998cd8e346
-  data.tar.gz: 8942457b7b8a19372a9a559c7db552e5c63675d2f26f24a17d47962c65c4cddd491eadfc56223533b8412f34c52cafbb3f818f16246c24ce76ed8b62810206d9
+  metadata.gz: ea0f40979be2bde7c11bf6ee30cf02e67d924928383c6d9bbcef20d67b1db686c4528fdc4a0e8b54b019dcc988e18c405f011e282445290a3638bcfa38737fe5
+  data.tar.gz: ec2c9516dc1e4161a7c07d1d7b96cd9c826ee33fff2e1ca322c63eb7ef3163de3ce597e5d19a49eea009bff2fb81e00923e56ee74109b58ff6765b42f3114079

data/lib/utils/image.rb

@@ -115,8 +115,10 @@ module Metanorma
         svg.xpath("//m:style", "m" => SVG_NS).each do |s|
           c = s.children.to_xml
           ids.each do |i|
-            c = c.gsub(%r[##{i}\b], sprintf("#%s_%09d", i, idx))
-              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]), sprintf("[id='%s_%09d']", i, idx))
+            c = c.gsub(%r[##{i}\b],
+                       sprintf("#%<id>s_%<idx>09d", id: i, idx: idx))
+              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
+                    sprintf("[id='%<id>s_%<idx>09d']", id: i, idx: idx))
           end
           s.children = c
         end

data/lib/utils/log.rb

@@ -29,7 +29,7 @@ module Metanorma
               (!node.respond_to?(:level) || node.level.positive?) &&
               (!node.respond_to?(:context) || node.context != :section)
             node = node.parent
-            return "Section: #{node.title}" if node&.respond_to?(:context) &&
+            return "Section: #{node.title}" if node.respond_to?(:context) &&
               node&.context == :section
           end
           "??"
@@ -50,13 +50,19 @@ module Metanorma
           @log.each_key do |key|
             f.puts "\n\n== #{key}\n\n"
             @log[key].sort_by { |a| a[:location] }.each do |n|
-              loc = n[:location] ? "(#{n[:location]}): " : ""
-              f.puts "#{loc}#{n[:message]}"
-              n[:context]&.split(/\n/)&.first(5)&.each { |l| f.puts "\t#{l}" }
+              write1(f, n)
             end
           end
         end
       end
+
+      def write1(file, entry)
+        loc = entry[:location] ? "(#{entry[:location]}): " : ""
+        file.puts "#{loc}#{entry[:message]}"
+        entry[:context]&.split(/\n/)&.first(5)&.each do |l|
+          file.puts "\t#{l}"
+        end
+      end
     end
   end
 end

data/lib/utils/main.rb

@@ -68,10 +68,8 @@ module Metanorma
       def set_nested_value(hash, keys, new_val)
         key = keys[0]
         if keys.length == 1
-          hash[key] = if hash[key].is_a?(Array)
-                        (hash[key] << new_val)
-                      else
-                        hash[key].nil? ? new_val : [hash[key], new_val]
+          hash[key] = if hash[key].is_a?(Array) then (hash[key] << new_val)
+                      else hash[key].nil? ? new_val : [hash[key], new_val]
                       end
         elsif hash[key].is_a?(Array)
           hash[key][-1] = {} if !hash[key].empty? && hash[key][-1].nil?
@@ -118,6 +116,26 @@ module Metanorma
         end
       end
 
+      def default_script(lang)
+        case lang
+        when "ar", "fa" then "Arab"
+        when "ur" then "Aran"
+        when "ru", "bg" then "Cyrl"
+        when "hi" then "Deva"
+        when "el" then "Grek"
+        when "zh" then "Hans"
+        when "ko" then "Kore"
+        when "he" then "Hebr"
+        when "ja" then "Jpan"
+        else
+          "Latn"
+        end
+      end
+
+      def rtl_script?(script)
+        %w(Arab Aran Hebr).include? script
+      end
+
       # not currently used
       def flatten_rawtext_lines(node, result)
         node.lines.each do |x|

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.2.7".freeze
+    VERSION = "1.2.8".freeze
   end
 end

data/spec/utils_spec.rb

@@ -7,8 +7,10 @@ RSpec.describe Metanorma::Utils do
   end
 
   it "capitalises" do
-    expect(Metanorma::Utils.strict_capitalize_phrase("ABC def gHI")).to eq "ABC Def GHI"
-    expect(Metanorma::Utils.strict_capitalize_first("aBC def gHI")).to eq "ABC def gHI"
+    expect(Metanorma::Utils.strict_capitalize_phrase("ABC def gHI"))
+      .to eq "ABC Def GHI"
+    expect(Metanorma::Utils.strict_capitalize_first("aBC def gHI"))
+      .to eq "ABC def gHI"
   end
 
   it "converts OS-specific external path" do
@@ -29,12 +31,13 @@ RSpec.describe Metanorma::Utils do
   end
 
   it "sets metanorma IDs if not provided" do
+    uuid = /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
     expect(Metanorma::Utils.anchor_or_uuid)
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new(nil)))
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new("")))
-      .to match (/^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      .to match (uuid)
     expect(Metanorma::Utils.anchor_or_uuid(Dummy.new("A"))).to eq "A"
   end
 
@@ -55,7 +58,8 @@ RSpec.describe Metanorma::Utils do
 
   it "applies smart formatting" do
     expect(Metanorma::Utils.smartformat("A - B A -- B A--B '80s '80' <A>"))
-      .to eq "A&#8201;&#8212;&#8201;B A&#8201;&#8212;&#8201;B A&#8212;B ’80s ‘80’ &lt;A&gt;"
+      .to eq "A&#8201;&#8212;&#8201;B A&#8201;&#8212;&#8201;B "\
+             "A&#8212;B ’80s ‘80’ &lt;A&gt;"
   end
 
   it "applies en-dash normalisation" do
@@ -98,6 +102,14 @@ RSpec.describe Metanorma::Utils do
     OUTPUT
   end
 
+  it "maps languages to scripts" do
+    expect(Metanorma::Utils.default_script("hi")).to eq "Deva"
+    expect(Metanorma::Utils.rtl_script?(Metanorma::Utils.default_script("el")))
+      .to eq false
+    expect(Metanorma::Utils.rtl_script?(Metanorma::Utils.default_script("fa")))
+      .to eq true
+  end
+
   it "rewrites SVGs" do
     FileUtils.cp("spec/fixtures/action_schemaexpg1.svg",
                  "action_schemaexpg1.svg")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: metanorma-utils