cbeta 3.6.1 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0afcec06986d4abb932de0ec7095d8ecda4eeb3b7827798f1bf67e830baeea
-  data.tar.gz: 5af3540b82784566fefe59821c507cc36c66b56ca7855056573f66b31af14f14
+  metadata.gz: 644f49e37566f3f90599849baa5b31c2df1a0ca28c76c530ec42ec8e839c5da5
+  data.tar.gz: 2293f8fcf48f5aceecf09e2731ef4c3825f6bc80ac97249105a8e435f1ad9100
 SHA512:
-  metadata.gz: 063bbde7b625bc97bb84a16eb47acb2da82876ab9e2474aec105e1da1dbe19e1f0a5e925f7c02ea1f59816429bc4d9f247f3e791e4137c4d870973f8946dce05
-  data.tar.gz: c274c8605e5cc1249edd667660d88314772bbb88c4e3c96342993ddc6840ceb25a9b28c87d7ed544f099890d90d99d1dded1068c67d65df1a6c455b877b4533c
+  metadata.gz: cfdc23cf230a4e60a00085dade6a73f09352bc4ec0b24c29aaadb94c95e11fa692a3c4f1b7fb82c398b59238e36be365f65e0f0c8d67dcd52f24246318104d84
+  data.tar.gz: 272b18af22f0a121ba9d94311588602b1e4435782227759e6ca49d09c39cd42eb7cac56895a92671d598b218949810a832e60b201fa86e54706311f3bbef8eea

data/lib/cbeta/p5a_checker.rb

@@ -1,6 +1,12 @@
 require_relative 'cbeta_share'
 
 # 檢查 CBETA XML P5a
+# 錯誤類型
+#   [E01] 行號重複
+#   [E02] 文字直接出現在 div 下
+#   [E03] 星號校勘 app 沒有對應的 note
+# 警告類型
+#   [W01] 夾注包夾注
 class CBETA::P5aChecker
   # @param xml_root [String] 來源 CBETA XML P5a 路徑
   # @param figures [String] 插圖 路徑 (可由 https://github.com/cbeta-git/CBR2X-figures 取得)
@@ -10,11 +16,11 @@ class CBETA::P5aChecker
     @xml_root = xml_root
     @figures = figures
     @log = log
+    @errors = ''
+    @g_errors = {}
   end
   
   def check
-    @errors = ''
-    @g_errors = {}
     puts "xml: #{@xml_root}"
     each_canon(@xml_root) do |c|
       @canon = c
@@ -22,6 +28,26 @@ class CBETA::P5aChecker
       handle_canon(path)
     end
 
+    display_errors
+  end
+  
+  def check_file(fn)
+    handle_file(fn)
+    display_errors
+  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 display_errors
     @g_errors.keys.sort.each do |k|
       s = @g_errors[k].to_a.join(',')
       @errors << "#{k} 無缺字資料，出現於：#{s}\n"
@@ -37,17 +63,6 @@ class CBETA::P5aChecker
       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_app(e)
     if e['type'] == 'star'
@@ -99,6 +114,16 @@ class CBETA::P5aChecker
     traverse(e)
   end
 
+  def e_note(e)
+    return unless e['place'] == 'inline'
+    if @element_stack.include?('inline_note')
+      @errors << "[W01] 夾注包夾注: #{@basename}, lb: #{@lb}\n"
+    end
+    @element_stack << 'inline_note'
+    traverse(e)
+    @element_stack.pop
+  end
+
   def e_rdg(e)
     return if e['type'] == 'cbetaRemark'
     unless e.key?('wit')
@@ -126,7 +151,8 @@ class CBETA::P5aChecker
   
   def handle_file(fn)
     @basename = File.basename(fn)
-    
+    @canon ||= CBETA.get_canon_id_from_linehead(@basename)
+
     s = File.read(fn)
     if s.include? "\u200B"
       @errors << "#{@basename} 含有 U+200B Zero Width Space 字元\n"
@@ -137,6 +163,7 @@ class CBETA::P5aChecker
       doc.remove_namespaces!
       @lbs = Set.new
       read_notes(doc)
+      @element_stack = []
       traverse(doc.root)
     else
       @errors << "錯誤: #{@basename} not well-formed\n"
@@ -150,6 +177,7 @@ class CBETA::P5aChecker
     when 'graphic' then e_graphic(e)
     when 'lb'      then e_lb(e)
     when 'lem'     then e_lem(e)
+    when 'note'    then e_note(e)
     when 'rdg'     then e_rdg(e)
     else traverse(e)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.3
 platform: ruby
 authors:
 - Ray Chou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unihan2