cbeta 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ece655cfcd0c962034b74bd4bb530a21f034422b183540588965eda67b7fb7
-  data.tar.gz: c1ea4749573d1eaee1f6635dcd1c8c2b818f94a13f9075e8ddde39b96baa3946
+  metadata.gz: 02f6421948b47e5d049f7e5a695b5c7b4b73519401e6bd13a24ba4e96b685eb3
+  data.tar.gz: 8f8bcd8c63d9dbc3b54aa9dfdd841b95b8819776c2a185ff04dee106ee3f538a
 SHA512:
-  metadata.gz: df5dca4c13c0e1be0d8142145685b350d0773073b3f8fe378d68e67ce49f7eae24f12f455d0d74bb2c5c91dcb4c7fa28576d31cc5da44d43ee854878d4903cac
-  data.tar.gz: 73dacb3d58b47812309f6f16c9b11c30407cd0b9ff390d6648bba89b91b5a2d10366ea4283888e3f4ffc1fa6536a5633e93c8b91c9765d9607669f49c05a7452
+  metadata.gz: dbb2320988bcccc49f6daf616a78ff7e64bffcb94fe989d6c68955952dce891bf79ec580e7911a0099b343c0aaf675b5f6cde189dc344a734a5848b46a4101d5
+  data.tar.gz: 6dd81d74d311de2e7339fa045a9a2e78b94710a47e2eb9e9ebe0108611401ce51c02d1dabe27b31fd0c6488ed0e2d3527311df0de5ceff64fba479ad7cb65c24

data/lib/cbeta/p5a_checker.rb

@@ -17,6 +17,7 @@ require_relative 'cbeta_share'
 #   * [E12] note 直接出現在 lg 下
 #   * [E13] tt 直接出現在 lg 下
 #   * [E14] <anchor type="right"> 不應直接出現在 div 或 body 下
+#   * [E15] <note> corresp 無對應的 <note>
 #
 # * 警告類型
 #   * [W01] 夾注包夾注
@@ -33,7 +34,7 @@ class CBETA::P5aChecker
     @xml_root = xml_root
     @figures = figures
     @log = log
-    @errors = ''
+    @errors = []
     @g_errors = {}
   end
   
@@ -118,17 +119,17 @@ class CBETA::P5aChecker
   def display_errors
     @g_errors.keys.sort.each do |k|
       s = @g_errors[k].to_a.join(',')
-      @errors << "#{k} 無缺字資料，出現於：#{s}\n"
+      @errors << "#{k} 無缺字資料，出現於：#{s}"
     end
     
     if @errors.empty?
       puts "檢查完成，未發現錯誤。"
     elsif @log.nil?
-      puts "發現錯誤："
-      puts @errors
+      puts "發現 #{@errors.size} 錯誤："
+      puts @errors.join("\n")
     else
-      File.write(@log, @errors)
-      puts "發現錯誤，請查看 #{@log}"
+      File.write(@log, @errors.join("\n"))
+      puts "發現 #{@errors.size} 錯誤，請查看 #{@log}"
     end
   end
 
@@ -197,13 +198,9 @@ class CBETA::P5aChecker
   end
 
   def e_note(e)
-    if e.parent.name == 'div'
-      error "[E11] note 直接出現在 div 下"
-    end
-    
-    if e.parent.name == 'lg'
-      error "[E12] note 直接出現在 lg 下"
-    end
+    error "[E11] note 直接出現在 div 下" if e.parent.name == 'div'    
+    error "[E12] note 直接出現在 lg 下" if e.parent.name == 'lg'
+    e_note_corresp(e) if e.key?('corresp')
 
     unless e['place'] == 'inline'
       traverse(e)
@@ -213,11 +210,18 @@ class CBETA::P5aChecker
     if @element_stack.include?('inline_note')
       error "[W01] 夾注包夾注"
     end
+
     @element_stack << 'inline_note'
     traverse(e)
     @element_stack.pop
   end
 
+  def e_note_corresp(e)
+    n = e['corresp'].delete_prefix('#')
+    return if @notes.include?(n)
+    error "[E15] note corresp #{n} 無對應 note"
+  end
+
   def e_p(e)
     if e.parent.name == 'list'
       error "[E10] p 不應直接出現在 list 下"
@@ -261,8 +265,8 @@ class CBETA::P5aChecker
   end
 
   def error(msg)
-    s = "#{msg}, #{@basename}, lb: #{@lb}\n"
-    print s
+    s = "#{msg}, #{@basename}, lb: #{@lb}"
+    puts "\n#{s}"
     @errors << s
   end
   
@@ -281,7 +285,7 @@ class CBETA::P5aChecker
 
     s = File.read(fn)
     if s.include? "\u200B"
-      @errors << "#{@basename} 含有 U+200B Zero Width Space 字元\n"
+      @errors << "#{@basename} 含有 U+200B Zero Width Space 字元"
     end
     
     doc = Nokogiri::XML(s)
@@ -292,7 +296,7 @@ class CBETA::P5aChecker
       @element_stack = []
       traverse(doc.root)
     else
-      @errors << "錯誤: #{@basename} not well-formed\n"
+      @errors << "錯誤: #{@basename} not well-formed"
     end
   end
 
@@ -315,7 +319,7 @@ class CBETA::P5aChecker
   end
   
   def handle_vol(folder)
-    puts "check vol: #{File.basename(folder)}"
+    print "\rcheck vol: #{File.basename(folder)}  "
     Dir.entries(folder).sort.each do |f|
       next if f.start_with? '.'
       path = File.join(folder, f)

data/lib/cbeta.rb

@@ -47,6 +47,8 @@ class CBETA
   # @param lb[String] 例如 "0001a01" 或 "0757b29"
   # @return [String] CBETA 行首資訊，例如 "T01n0001_p0001a01" 或 "T25n1510ap0757b29"
   def self.get_linehead(file_basename, lb)
+    return nil if file_basename.nil?
+    
     if file_basename.match(/^(T\d\dn0220)/)
       r = $1
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Ray Chou
@@ -34,7 +34,7 @@ cert_chain:
   xyQse8slbARanDyyT6HCYtlaKD9WYw647tkJhyY2GniloCNcOJS0URvhlulLzJYg
   9CrAxVAO2NMeM6tbxg1VjYbqopjoLCwLdAJouA==
   -----END CERTIFICATE-----
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unihan2