cbeta 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57589aae785253515b3d2e73f7e5ee0f2267eb5cfd78ffc07a31cda853e0dc4
-  data.tar.gz: 636713370e0c81c2b25121be8aa58f4d959eb24c0297f64d6a6300431848b805
+  metadata.gz: f2007fa55a92c4a68dc438764c107ffbc212bb3b6010a142cd461f6dd4b94836
+  data.tar.gz: 57268cdd51b3390c5e0d636d26d31a1f9893d7cdae9b4e5e8b42f95db0f544af
 SHA512:
-  metadata.gz: de9137c36aad2f633b1b682d7b22a32d99d260b7e2d5a506bd404a2a13596098755884da9292dacf6692f9751b1744c9f8eccdd5aacc8670c66cadd0ab94a287
-  data.tar.gz: 8885756792aeb5e473fbf4ffa638c03ba330156a10e7f800464146c93b81defb9a7b8ed5103c6b9cee010c6714b3e361eb1ae0e685dd9f94fc29eb9f2dab1fdc
+  metadata.gz: 46e9830b7171683c4e43642c8eef1851e059cde4cb1696df85bb7fea7d48e4d28a1728975a9a8c36cdd3b6591f8b0d0290f74123bb29c44dee2d4a41425453a9
+  data.tar.gz: 36db93a0d3bc3794b248aa249bea059f53c4c176de4263b19f8abcf30799dd9a17b1323c28e9697645f511452e6b118d09a67279f8f1349a1b5e59dae98a76fe

data/lib/cbeta/p5a_checker.rb

@@ -10,11 +10,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 +22,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,16 +57,15 @@ 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 下"
+  def e_app(e)
+    if e['type'] == 'star'
+      n = e['corresp'].delete_prefix('#')
+      unless @notes.include?(n)
+        error "lb: #{@lb}, corresp: #{n}", type: "[E03] 星號校勘 app 沒有對應的 note"
+      end
     end
+    traverse(e)
   end
 
   def e_g(e)
@@ -86,6 +105,7 @@ class CBETA::P5aChecker
     unless e.key?('wit')
       error "lem 缺少 wit 屬性"
     end
+    traverse(e)
   end
 
   def e_rdg(e)
@@ -107,7 +127,7 @@ class CBETA::P5aChecker
     Dir.entries(folder).sort.each do |f|
       next if f.start_with? '.'
       @vol = f
-      $stderr.puts @vol + ' '
+      $stderr.print "#{@vol} "
       path = File.join(folder, @vol)
       handle_vol(path)
     end
@@ -115,7 +135,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"
@@ -125,6 +146,7 @@ class CBETA::P5aChecker
     if doc.errors.empty?
       doc.remove_namespaces!
       @lbs = Set.new
+      read_notes(doc)
       traverse(doc.root)
     else
       @errors << "錯誤: #{@basename} not well-formed\n"
@@ -133,6 +155,7 @@ class CBETA::P5aChecker
 
   def handle_node(e)
     case e.name
+    when 'app'     then e_app(e)
     when 'g'       then e_g(e)
     when 'graphic' then e_graphic(e)
     when 'lb'      then e_lb(e)
@@ -149,6 +172,15 @@ class CBETA::P5aChecker
       handle_file(path)
     end
   end
+  
+  def read_notes(doc)
+    @notes = Set.new
+    doc.xpath('//note').each do |e|
+      if e.key?('n')
+        @notes << e['n']
+      end
+    end
+  end
 
   def traverse(e)
     e.children.each { |c| 

metadata

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