cbeta 3.5.4 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9706507dcec5a3319dbaf853c7cc38c57910508c744b419825b7468d87ff35c
-  data.tar.gz: 4eaf41cc673fe83fb43b276be541496cc184b22e1b3a3a48c428e57555f4d77f
+  metadata.gz: d57589aae785253515b3d2e73f7e5ee0f2267eb5cfd78ffc07a31cda853e0dc4
+  data.tar.gz: 636713370e0c81c2b25121be8aa58f4d959eb24c0297f64d6a6300431848b805
 SHA512:
-  metadata.gz: a4b71cf41c24169e6045ef9db81b59f2b41834fa1e76650c4031322405558505a539ef6d0c80081c51e8834cf6e10e38980ee4ef6513cc22c1b46f689bffd7f1
-  data.tar.gz: 5e7b0767fe9e2d0ad294567064664c82050bc53b26ded128df005c6849ed525aae3162603b6ff143e2668d96638dcf5921f09836084510f57098699860e1e0bf
+  metadata.gz: de9137c36aad2f633b1b682d7b22a32d99d260b7e2d5a506bd404a2a13596098755884da9292dacf6692f9751b1744c9f8eccdd5aacc8670c66cadd0ab94a287
+  data.tar.gz: 8885756792aeb5e473fbf4ffa638c03ba330156a10e7f800464146c93b81defb9a7b8ed5103c6b9cee010c6714b3e361eb1ae0e685dd9f94fc29eb9f2dab1fdc

data/lib/cbeta/cbeta_share.rb

@@ -1,4 +1,10 @@
 module CbetaShare
+  def each_canon(xml_root)
+    Dir.entries(xml_root).sort.each do |c|
+      next unless c.match(/^#{CBETA::CANON}$/)
+      yield(c)
+    end
+  end
 
   def to_html(e)
     e.to_xml(
@@ -8,4 +14,4 @@ module CbetaShare
     )
   end
 
-end
+end

data/lib/cbeta/p5a_checker.rb

@@ -0,0 +1,162 @@
+require_relative 'cbeta_share'
+
+# 檢查 CBETA XML P5a
+class CBETA::P5aChecker
+  # @param xml_root [String] 來源 CBETA XML P5a 路徑
+  # @param figures [String] 插圖 路徑 (可由 https://github.com/cbeta-git/CBR2X-figures 取得)
+  # @param log [String] Log file path
+  def initialize(xml_root: nil, figures: nil, log: nil)
+    @gaijis = CBETA::Gaiji.new
+    @xml_root = xml_root
+    @figures = figures
+    @log = log
+  end
+  
+  def check
+    @errors = ''
+    @g_errors = {}
+    puts "xml: #{@xml_root}"
+    each_canon(@xml_root) do |c|
+      @canon = c
+      path = File.join(@xml_root, @canon)
+      handle_canon(path)
+    end
+
+    @g_errors.keys.sort.each do |k|
+      s = @g_errors[k].to_a.join(',')
+      @errors << "#{k} 無缺字資料，出現於：#{s}\n"
+    end
+    
+    if @errors.empty?
+      puts "檢查完成，未發現錯誤。"
+    elsif @log.nil?
+      puts "\n發現錯誤："
+      puts @errors
+    else
+      File.write(@log, @errors)
+      puts "\n發現錯誤，請查看 #{@log}"
+    end
+  end
+  
+  private
+
+  include CbetaShare
+
+  def chk_text(node)
+    return if node.text.strip.empty?
+    if node.parent.name == 'div'
+      error "lb: #{@lb}, text: #{node.text.inspect}", type: "[E02] 文字直接出現在 div 下"
+    end
+  end
+
+  def e_g(e)
+    gid = e['ref'][1..-1]
+    unless @gaijis.key? gid
+      @g_errors[gid] = Set.new unless @g_errors.key? gid
+      @g_errors[gid] << @basename
+    end
+  end
+  
+  def e_graphic(e)
+    url = File.basename(e['url'])
+    fn = File.join(@figures, @canon, url)
+    unless File.exist? fn
+      error "圖檔 #{url} 不存在"
+    end
+  end
+  
+  def e_lb(e)
+    return if e['type']=='old'
+    unless e['n'].match(/^[a-z\d]\d{3}[a-z]\d+$/)
+      error "lb format error: #{e['n']}"
+    end
+
+    @lb = e['n']
+    ed_lb = "#{e['ed']}#{@lb}"
+    if @lbs.include? ed_lb
+      unless e['ed'].start_with?('R')
+        error "lb: #{@lb}, ed: #{e['ed']}", type: "[E01] 行號重複"
+      end
+    else
+      @lbs << ed_lb
+    end
+  end
+  
+  def e_lem(e)
+    unless e.key?('wit')
+      error "lem 缺少 wit 屬性"
+    end
+  end
+
+  def e_rdg(e)
+    return if e['type'] == 'cbetaRemark'
+    unless e.key?('wit')
+      error "rdg 缺少 wit 屬性, lb: #{@lb}"
+    end
+  end
+
+  def error(msg, type: nil)
+    s = ''
+    s << "#{type}: " unless type.nil?
+    s << "#{@basename}, #{msg}"
+    puts s
+    @errors << s + "\n"
+  end
+  
+  def handle_canon(folder)
+    Dir.entries(folder).sort.each do |f|
+      next if f.start_with? '.'
+      @vol = f
+      $stderr.puts @vol + ' '
+      path = File.join(folder, @vol)
+      handle_vol(path)
+    end
+  end
+  
+  def handle_file(fn)
+    @basename = File.basename(fn)
+    
+    s = File.read(fn)
+    if s.include? "\u200B"
+      @errors << "#{@basename} 含有 U+200B Zero Width Space 字元\n"
+    end
+    
+    doc = Nokogiri::XML(s)
+    if doc.errors.empty?
+      doc.remove_namespaces!
+      @lbs = Set.new
+      traverse(doc.root)
+    else
+      @errors << "錯誤: #{@basename} not well-formed\n"
+    end
+  end
+
+  def handle_node(e)
+    case e.name
+    when 'g'       then e_g(e)
+    when 'graphic' then e_graphic(e)
+    when 'lb'      then e_lb(e)
+    when 'lem'     then e_lem(e)
+    when 'rdg'     then e_rdg(e)
+    else traverse(e)
+    end
+  end
+  
+  def handle_vol(folder)
+    Dir.entries(folder).sort.each do |f|
+      next if f.start_with? '.'
+      path = File.join(folder, f)
+      handle_file(path)
+    end
+  end
+
+  def traverse(e)
+    e.children.each { |c| 
+      if c.text?
+        chk_text(c)
+      elsif e.element?
+        handle_node(c)
+      end
+    }
+  end
+end

data/lib/cbeta.rb

@@ -282,6 +282,7 @@ require 'cbeta/canon'
 require 'cbeta/char_count'
 require 'cbeta/char_freq'
 require 'cbeta/html_to_pdf'
+require 'cbeta/p5a_checker'
 require 'cbeta/p5a_to_html'
 require 'cbeta/p5a_to_html_for_every_edition'
 require 'cbeta/p5a_to_html_for_pdf'

data/lib/data/cbeta_gaiji.json

@@ -122910,6 +122910,7 @@
   },
   "CB22704": {
     "composition": "[諒-口+日]",
+    "moe_variant_id": "A03845-001",
     "pua": "U+F58B0"
   },
   "CB22705": {
@@ -123668,6 +123669,7 @@
     "unicode": "2087D",
     "uni_char": "𠡽",
     "composition": "[(京-口+日)*力]",
+    "moe_variant_id": "B00255-001",
     "pua": "U+F596A"
   },
   "CB22891": {
@@ -136899,6 +136901,7 @@
     "unicode": "22C4A",
     "uni_char": "𢱊",
     "composition": "[掠-口+日]",
+    "moe_variant_id": "A01586-001",
     "pua": "U+F6476"
   },
   "CB25719": {
@@ -140257,6 +140260,7 @@
     "unicode": "7174",
     "uni_char": "煴",
     "composition": "[火*(日/皿)]",
+    "moe_variant_id": "B02420-003",
     "pua": "U+F6796"
   },
   "CB26519": {
@@ -140701,7 +140705,10 @@
     "pua": "U+F680A"
   },
   "CB26635": {
+    "unicode": "2907F",
+    "uni_char": "𩁿",
     "composition": "[雨/(匚@一)]",
+    "moe_variant_id": "A03605-029-1",
     "pua": "U+F680B"
   },
   "CB26636": {
@@ -142366,10 +142373,10 @@
     "pua": "U+F69AF"
   },
   "CB27057": {
-    "unicode": "233FD",
-    "uni_char": "𣏽",
+    "unicode": "22A8A",
+    "uni_char": "𢪊",
     "composition": "[打-丁+(敲-高)]",
-    "moe_variant_id": "a01880-002",
+    "moe_variant_id": "C04127",
     "pua": "U+F69B1"
   },
   "CB27058": {
@@ -145071,6 +145078,7 @@
   },
   "CB27738": {
     "composition": "[打-丁+(孝-子+丁)]",
+    "moe_variant_id": "A01563-001",
     "pua": "U+F6C5A"
   },
   "CB27739": {
@@ -155500,6 +155508,7 @@
     "unicode": "29D4B",
     "uni_char": "𩵋",
     "composition": "[魚-(烈-列)+大]",
+    "moe_variant_id": "A04691-004",
     "pua": "U+F75A0"
   },
   "CB30113": {
@@ -164191,6 +164200,7 @@
     "unicode": "5BAB",
     "uni_char": "宫",
     "composition": "[宋-木+(口/口)]",
+    "moe_variant_id": "A01028-001",
     "pua": "U+F7BCF"
   },
   "CB31696": {
@@ -168131,6 +168141,7 @@
   },
   "CB32550": {
     "composition": "[((嘹-口)-小)-日+(隹/寸)]",
+    "moe_variant_id": "A00874-017",
     "pua": "U+F7F26"
   },
   "CB32551": {
@@ -178076,7 +178087,7 @@
     "uni_char": "禄",
     "composition": "[祿-(彖-豕)+(┐@一)]",
     "norm_big5_char": "祿",
-    "moe_variant_id": "a02898-008",
+    "moe_variant_id": "A02898-024",
     "pua": "U+F85F2"
   },
   "CB34291": {
@@ -178837,6 +178848,7 @@
     "unicode": "8F3C",
     "uni_char": "輼",
     "composition": "[輥-比+皿]",
+    "moe_variant_id": "B05038-001",
     "pua": "U+F866F"
   },
   "CB34416": {
@@ -181649,5 +181661,122 @@
   "CB34867": {
     "composition": "[恢-火+么]",
     "pua": "U+F8833"
+  },
+  "CB34868": {
+    "unicode": "25B41",
+    "uni_char": "𥭁",
+    "composition": "[竺-二+米]",
+    "pua": "U+F8834"
+  },
+  "CB34869": {
+    "unicode": "20114",
+    "uni_char": "𠄔",
+    "composition": "[?予]",
+    "norm_big5_char": "幻",
+    "moe_variant_id": "A01197-001",
+    "pua": "U+F8835"
+  },
+  "CB34870": {
+    "composition": "[八/ㄅ/羽]",
+    "pua": "U+F8836"
+  },
+  "CB34871": {
+    "unicode": "6E0C",
+    "uni_char": "渌",
+    "composition": "[淥-(彖-豕)+(┐@一)]",
+    "norm_big5_char": "淥",
+    "moe_variant_id": "B02145-001",
+    "pua": "U+F8837"
+  },
+  "CB34872": {
+    "unicode": "21356",
+    "uni_char": "𡍖",
+    "composition": "[土*(彔-(彖-豕)+(┐@一))]",
+    "norm_big5_char": "埭",
+    "moe_variant_id": "B00542-006",
+    "pua": "U+F8838"
+  },
+  "CB34874": {
+    "unicode": "226D5",
+    "uni_char": "𢛕",
+    "composition": "[怡-台+囷]",
+    "moe_variant_id": "C03737",
+    "pua": "U+F883A"
+  },
+  "CB34875": {
+    "unicode": "260A0",
+    "uni_char": "𦂠",
+    "composition": "[綡-口+日]",
+    "moe_variant_id": "C10288",
+    "pua": "U+F883B"
+  },
+  "CB34876": {
+    "unicode": "2F825",
+    "uni_char": "勇",
+    "composition": "[勇-用+田]",
+    "norm_big5_char": "勇",
+    "moe_variant_id": "A00388-002",
+    "pua": "U+F883C"
+  },
+  "CB34877": {
+    "unicode": "6E07",
+    "uni_char": "渇",
+    "composition": "[渴-人+(乏-之)]",
+    "norm_big5_char": "渴",
+    "moe_variant_id": "A02267-001",
+    "pua": "U+F883D"
+  },
+  "CB34878": {
+    "unicode": "9AD9",
+    "uni_char": "髙",
+    "composition": "[扃-戶+(〦/(〡*(一/一)*〡))]",
+    "norm_big5_char": "高",
+    "moe_variant_id": "A04667-003",
+    "pua": "U+F883E"
+  },
+  "CB34879": {
+    "unicode": "4E89",
+    "uni_char": "争",
+    "composition": "[爭-(采-木)+(色-巴)]",
+    "norm_big5_char": "爭",
+    "moe_variant_id": "A02468-001",
+    "pua": "U+F883F"
+  },
+  "CB34880": {
+    "unicode": "9759",
+    "uni_char": "静",
+    "composition": "[靜-(采-木)+(色-巴)]",
+    "norm_big5_char": "靜",
+    "moe_variant_id": "A04502-001",
+    "pua": "U+F8840"
+  },
+  "CB34881": {
+    "norm_unicode": "29C7F",
+    "norm_uni_char": "𩱿",
+    "composition": "[鬼-(白-日)+亡]",
+    "norm_big5_char": "魅",
+    "pua": "U+F8841"
+  },
+  "CB34882": {
+    "unicode": "226D4",
+    "uni_char": "𢛔",
+    "composition": "[怡-台+東]",
+    "moe_variant_id": "C03728",
+    "pua": "U+F8842"
+  },
+  "CB34883": {
+    "unicode": "25783",
+    "uni_char": "𥞃",
+    "composition": "[禾*出]",
+    "moe_variant_id": "C09055",
+    "pua": "U+F8843"
+  },
+  "CB34884": {
+    "unicode": "3943",
+    "uni_char": "㥃",
+    "composition": "[怡-台+門]",
+    "norm_big5_char": "悶",
+    "moe_variant_id": "A01384-001",
+    "pua": "U+F8844"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.0
 platform: ruby
 authors:
 - Ray Chou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unihan2
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - lib/cbeta/gaiji.rb
 - lib/cbeta/html_to_pdf.rb
 - lib/cbeta/html_to_text.rb
+- lib/cbeta/p5a_checker.rb
 - lib/cbeta/p5a_to_html.rb
 - lib/cbeta/p5a_to_html_for_every_edition.rb
 - lib/cbeta/p5a_to_html_for_pdf.rb