cbeta 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d32b2ace3526aa8492fcfb42bbbebf08edfa1a1df1d3ef5aecc8e409e7423a9
-  data.tar.gz: 67bb568adb4710f114216161e16a6c7c5e0a0c34af6b770a42fc1e26143a3b03
+  metadata.gz: d6371fac001d191b3245ba02d1b3287cedfe46213bea091d9259d9d24c2454b7
+  data.tar.gz: f71e61e1598462fd02fed5eb8e1c0111ee259d1b3bb85424ce869a9f0ea0dad8
 SHA512:
-  metadata.gz: 71ade7189b3f3bf90f9436e1d756c88f72164285972d7cab8cb81bb2ed27d2c13a048e2909cfb58f8250288e5d31bee888acedf6cf4ea225db5e7ea5605db575
-  data.tar.gz: f84625e849635021b7ba2c10b7b54725830bce6786eb40fe8b3696b8b732274ec89cbbb4fbedb9e494be88f221e7252c23d90fe83fe8e8b81edc8189bf9969f0
+  metadata.gz: fcc4e69ae85ef617ab214e489842d6c82a4c61fa7326c5f3d9ada35f49e71b602bb4f7c4153aeb9e3aa5c978a52ac19cc926842ea2535e6518b4c518e80f274a
+  data.tar.gz: 837dc5642b1285cf602a66572908d0ac4b3b3a32e7a509ee1c19337ea5f9363b3cbf9b1d59cab65565f45dd39808eff511383521c633ecc08fe480c9c360a6bb

data/lib/cbeta/gaiji.rb

@@ -1,10 +1,12 @@
 require 'json'
+require 'unihan2'
 
 # 存取 CBETA 缺字資料庫
 class CBETA::Gaiji
   
   # 載入 CBETA 缺字資料庫
   def initialize
+    @us = CBETA::UnicodeService.new
     folder = File.join(File.dirname(__FILE__), '../data')
     fn = File.join(folder, 'cbeta_gaiji.json')
     @gaijis = JSON.parse(File.read(fn))
@@ -73,9 +75,12 @@ class CBETA::Gaiji
     
     if gid.start_with? 'CB'
       cb_priority.each do |k|
-        if k == 'PUA'
+        case k
+        when 'PUA'
           return CBETA.pua(gid)
-        elsif g.key? k
+        when 'uni_char', 'norm_uni_char'
+          return g[k] if @us.level2?(g[k])
+        else
           return g[k] unless g[k].empty?
         end
       end

data/lib/cbeta/unicode_service.rb

@@ -0,0 +1,19 @@
+class CBETA::UnicodeService
+  def initialize
+    @u2 = Unihan2.new
+  end
+
+  def level1?(code)
+    return false if code.nil?
+    # Unicode 3.0 以內 在 mobile 可以正確顯示
+    v = @u2.ver(code)
+    raise "Unihan2.ver 回傳 nil, code: #{code}" if v.nil?
+    v <= 3
+  end
+
+  def level2?(code)
+    return false if code.nil?
+    # Unicode 10 以內 在 desktop 有字型可以顯示
+    @u2.ver(code) <= 10
+  end
+end

data/lib/cbeta.rb

@@ -234,4 +234,5 @@ require 'cbeta/p5a_to_simple_html'
 require 'cbeta/p5a_to_text'
 require 'cbeta/p5a_validator'
 require 'cbeta/html_to_text'
+require 'cbeta/unicode_service'
 require 'cbeta/xml_document'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Ray Chou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for use Chinese Buddhist Text resources made by CBETA (http://www.cbeta.org).
 email: zhoubx@gmail.com
@@ -31,6 +31,7 @@ files:
 - lib/cbeta/p5a_to_simple_html.rb
 - lib/cbeta/p5a_to_text.rb
 - lib/cbeta/p5a_validator.rb
+- lib/cbeta/unicode_service.rb
 - lib/cbeta/xml_document.rb
 - lib/data/canons.csv
 - lib/data/categories.json