RubyGems - metanorma-utils - Versions diffs - 1.10.2 → 1.11.2 - Mend

metanorma-utils 1.10.2 → 1.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f44541a6cf6b2c8a2ddb65412981c68516f37ebacda4bc7c1cec364c46a4530
-  data.tar.gz: e775ca9ed734be1acdbd7e6275143fe61f43e4403510eb768e552d89cfc084e2
+  metadata.gz: fb7eb442187f8f1129b1e5e0a6ae9e05f504522cb55c2a3f75b784fc803717cf
+  data.tar.gz: 6819e04fc69ba93d601ce0053905db9ab10cea6d1e4af39e51a6d3b283603c02
 SHA512:
-  metadata.gz: b38ccf0cf8e92485d94d6af2389d32f2cc6fa9582167ee96d0a3a2388b8e4336cad2df1f9257bb97430a71ab1d4a030291b05a078e246bdab63d1d7e6061f3e3
-  data.tar.gz: 43a6945199cdc8f8303e97ebcce4e6c3508e517745247bbf362b7c334ed3e600223e3fd6cd0a8a98e06723d3efe158721f6ff4945c91a5ec3b965247c1a62e79
+  metadata.gz: f21d1d2c7431b3de60715d50848d1a9ae6314c0dce3918a4db1d020e81928fff965148c8de4865186ab470e2242f775d35184ea212aa9c96f988a9ee32fc06bf
+  data.tar.gz: cc86b4e88d4cb126ac2d7824a996341db7194724ff95242bf17f4d2743a56552bb01486fb122e674901012cfe6a7f361acba60dd9504b98af7b8a8f7bbf3dbb8

data/lib/utils/cjk.rb ADDED Viewed

@@ -0,0 +1,110 @@
+module Metanorma
+  module Utils
+    class << self
+      # Basic CJK scripts
+      HAN = "\\p{Han}".freeze
+      BOPOMOFO = "\\p{Bopomofo}".freeze
+      HANGUL = "\\p{Hangul}".freeze
+      HIRAGANA = "\\p{Hiragana}".freeze
+      KATAKANA = "\\p{Katakana}".freeze
+      # Script extensions - characters shared between scripts
+      # CJK Symbols and Punctuation (U+3000–U+303F)
+      # Used across all CJK scripts
+      CJK_SYMBOLS = "[\\u3000-\\u303F]".freeze
+      # CJK Punctuation (subset of CJK Symbols commonly used)
+      CJK_PUNCTUATION = "[\\u3001-\\u3003\\u3008-\\u3011\\u3014-\\u301F]".freeze
+      # Halfwidth and Fullwidth Forms (U+FF00–U+FFEF)
+      # Used in all CJK contexts
+      CJK_HALFWIDTH_FULLWIDTH = "[\\uFF00-\\uFFEF]".freeze
+      # CJK Compatibility Forms (U+FE30–U+FE4F)
+      # Primarily used with Han but relevant for all CJK
+      CJK_COMPAT = "[\\uFE30-\\uFE4F]".freeze
+      # Vertical Forms (U+FE10–U+FE1F)
+      # Used in vertical text layout for all CJK
+      CJK_VERTICAL = "[\\uFE10-\\uFE1F]".freeze
+      # Small Form Variants (U+FE50–U+FE6F)
+      # Used in all CJK contexts
+      CJK_SMALL_FORMS = "[\\uFE50-\\uFE6F]".freeze
+      # Ideographic Description Characters (U+2FF0–U+2FFF)
+      # Used with Han script
+      HAN_IDC = "[\\u2FF0-\\u2FFF]".freeze
+      # Kanbun (U+3190–U+319F)
+      # Used with Han script for Japanese
+      KANBUN = "[\\u3190-\\u319F]".freeze
+      # CJK Compatibility (U+3300–U+33FF)
+      # Used with Han script
+      CJK_COMPAT_IDEOGRAPHS = "[\\u3300-\\u33FF]".freeze
+      # CJK Compatibility Ideographs (U+F900–U+FAFF)
+      HAN_COMPAT_IDEOGRAPHS = "[\\uF900-\\uFAFF]".freeze
+      # Script extensions by primary script
+      HAN_EXTENSIONS = [
+        HAN,
+        CJK_SYMBOLS,
+        CJK_PUNCTUATION,
+        CJK_HALFWIDTH_FULLWIDTH,
+        CJK_COMPAT,
+        CJK_VERTICAL,
+        CJK_SMALL_FORMS,
+        HAN_IDC,
+        KANBUN,
+        CJK_COMPAT_IDEOGRAPHS,
+        HAN_COMPAT_IDEOGRAPHS
+      ].join("|").freeze
+      HANGUL_EXTENSIONS = [
+        HANGUL,
+        CJK_SYMBOLS,
+        CJK_PUNCTUATION,
+        CJK_HALFWIDTH_FULLWIDTH,
+        CJK_VERTICAL,
+        CJK_SMALL_FORMS
+      ].join("|").freeze
+      HIRAGANA_EXTENSIONS = [
+        HIRAGANA,
+        CJK_SYMBOLS,
+        CJK_PUNCTUATION,
+        CJK_HALFWIDTH_FULLWIDTH,
+        CJK_VERTICAL,
+        CJK_SMALL_FORMS
+      ].join("|").freeze
+      KATAKANA_EXTENSIONS = [
+        KATAKANA,
+        CJK_SYMBOLS,
+        CJK_PUNCTUATION,
+        CJK_HALFWIDTH_FULLWIDTH,
+        CJK_VERTICAL,
+        CJK_SMALL_FORMS
+      ].join("|").freeze
+      BOPOMOFO_EXTENSIONS = [
+        BOPOMOFO,
+        CJK_SYMBOLS,
+        CJK_PUNCTUATION,
+        CJK_HALFWIDTH_FULLWIDTH
+      ].join("|").freeze
+      # Combined CJK pattern including all script extensions
+      CJK = [
+        HAN_EXTENSIONS,
+        HANGUL_EXTENSIONS,
+        HIRAGANA_EXTENSIONS,
+        KATAKANA_EXTENSIONS,
+        BOPOMOFO_EXTENSIONS
+      ].join("|").freeze
+    end
+  end
+end

data/lib/utils/log.rb CHANGED Viewed

@@ -43,6 +43,14 @@ module Metanorma
         end
       end
+      def messages
+        @log.values.each_with_object([]) do |v, m|
+          v.each do |e|
+            m << e
+          end
+        end
+      end
       def suppress_log?(category, severity, msg)
         category == "Relaton" && /^Fetching /.match?(msg) ||
           @suppress_log[:severity] <= severity ||
@@ -78,7 +86,7 @@ module Metanorma
           while !node.nil? && node["id"].nil? && node.respond_to?(:parent)
             node = node.parent
           end
-          node.respond_to?(:parent) ? "ID #{node['id']}" : ""
+          node.respond_to?(:parent) ? "ID #{node['anchor'] || node['id']}" : ""
         elsif node.is_a? String then node
         elsif node.respond_to?(:lineno) && !node.lineno.nil? &&
             !node.lineno.empty?
@@ -216,7 +224,7 @@ module Metanorma
         /^ID /.match?(loc) or return [loc, nil]
         loc.sub!(/^ID /, "")
         loc = @mapid[loc] while @mapid[loc]
-        url = "#{@htmlfilename}##{loc}"
+        url = "#{@htmlfilename}##{to_ncname loc}"
         [loc, url]
       end

data/lib/utils/main.rb CHANGED Viewed

@@ -5,6 +5,7 @@ require "htmlentities"
 require "nokogiri"
 require "csv"
 require_relative "../sterile/sterile"
+require_relative "cjk"
 module Metanorma
   module Utils
@@ -35,9 +36,6 @@ module Metanorma
         docfile.nil? ? "./" : "#{Pathname.new(docfile).parent}/"
       end
-      CJK = "\\p{Han}|\\p{Bopomofo}|\\p{Hangul}|\\p{Hiragana}|\\p{Katakana}"
-        .freeze
       # TODO needs internationalisation of quote
       def smartformat(text)
         ret = HTMLEntities.new.decode(
@@ -143,7 +141,7 @@ module Metanorma
 nopunct = LONGSTR_NOPUNCT)
         /^\s*$/.match?(text) and return text
         text.split(/(?=(?:\s|-))/).map do |w|
-          if /^\s*$/.match(text) || (w.size < threshold) then w
+          if /^\s*$/.match(w) || (w.size < threshold) then w
           else
             w.scan(/.{,#{threshold}}/o).map.with_index do |w1, i|
               w1.size < threshold ? w1 : break_up_long_str1(w1, i + 1, nopunct)

data/lib/utils/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.10.2".freeze
+    VERSION = "1.11.2".freeze
   end
 end

data/lib/utils/xml.rb CHANGED Viewed

@@ -69,7 +69,7 @@ module Metanorma
           cjk2 = /#{CJK}/o.match?(nextfirst)
           text1 = /[^\p{Z}\p{C}]/.match?(last)
           text2 = /[^\p{Z}\p{C}]/.match?(nextfirst)
-          (cjk1 && (cjk2 || !text2)) and next
+          cjk1 && (cjk2 || !text2) and next
           !text1 && cjk2 and next
           ret[i] += " "
         end
@@ -125,10 +125,18 @@ module Metanorma
       end
       # all element/attribute pairs that are ID anchors in Metanorma
-      def anchor_attributes
-        [%w[* id], %w[* bibitemid], %w[review from],
-         %w[review to], %w[index to], %w[xref target],
-         %w[callout target], %w[location target]]
+      def anchor_attributes(presxml: false)
+        ret = [%w(review from), %w(review to), %w(callout target), %w(xref to),
+               %w(eref bibitemid), %w(citation bibitemid), %w(xref target),
+               %w(label for), %w(location target), %w(index to),
+               %w(termsource bibitemid), %w(admonition target)]
+        ret1 = [%w(fn target), %w(semx source), %w(fmt-title source),
+                %w(fmt-xref to), %w(fmt-xref target), %w(fmt-eref bibitemid),
+                %w(fmt-xref-label container), %w(fmt-fn-body target),
+                %w(fmt-review-start source), %w(fmt-review-start end),
+                %w(fmt-review-start target), %w(fmt-review-end source),
+                %w(fmt-review-end start), %w(fmt-review-end target)]
+        presxml ? ret + ret1 : ret
       end
       # convert definition list term/value pair into Nokogiri XML attribute

data/metanorma-utils.gemspec CHANGED Viewed

@@ -41,7 +41,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "rubocop", "~> 1"
+spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2025-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -212,14 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +321,7 @@ files:
 - README.adoc
 - lib/metanorma-utils.rb
 - lib/sterile/sterile.rb
+- lib/utils/cjk.rb
 - lib/utils/hash_transform_keys.rb
 - lib/utils/image.rb
 - lib/utils/linestatus.rb
@@ -320,7 +335,7 @@ homepage: https://github.com/metanorma/metanorma-utils
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -335,8 +350,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: metanorma-utils
 test_files: []