cbeta 3.6.6 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09339a088f3a6f7bae716f3a3d05bf401e3a7d45f62dd3fd0af765618e386eb3'
-  data.tar.gz: cd889c37c408366b55d1ca3b3ba3bcb0d0f37b06fe2686f4c9dc14e5cb094fd1
+  metadata.gz: 72686576079012f5ab43a671e344ca818f613c0458222b61320578e4753b5667
+  data.tar.gz: a30557a1b5b0a386e5fda0c833fec10ecb033f4968a8ddd300cb4d0bb01d39de
 SHA512:
-  metadata.gz: f526d244db1b78c909bd9ffea89d031271fe0a81d5d757637e5265980b67b53c2cfbd9d2d5f54e00e73e33b3796b7840b9a0e8b8f3e0fb3ef33f59e7e1a5cece
-  data.tar.gz: c9cd2d0766f254ab14f53920ce8efa13ff26a5f33f4e6747145aad1a5a5835de16ef8048baa196159dc641d39d99091698803a9c23545e79687cb570224d63fc
+  metadata.gz: 7a94542b928cd00a7f92323cb2953132095cd477f9808fcf30ffe002b3163a92312a656711173460c02634100d031113eaeb999e2139b9ab956b2e0a87b4d304
+  data.tar.gz: 4c4d735c996635dbbfe5219c28dfb0b543d7cdd66a6c7c5e2632f920aa4f5c7a1bd3199a3c0fa03775db8a32f18df7830d79b735fec800098f3153ac495487f4

data/lib/cbeta/p5a_checker.rb

@@ -6,6 +6,13 @@ require_relative 'cbeta_share'
 #   * [E01] 行號重複
 #   * [E02] 文字直接出現在 div 下
 #   * [E03] 星號校勘 app 沒有對應的 note
+#   * [E04] rdg 缺少 wit 屬性"
+#   * [E05] 圖檔 不存在
+#   * [E06] lb format error
+#   * [E07] lem 缺少 wit 屬性
+#   * [E08] item 下有多個 list
+#   * [E09] table cols 屬性值錯誤
+#
 # * 警告類型
 #   * [W01] 夾注包夾注
 #   * [W02] 出現罕用字元
@@ -78,7 +85,7 @@ class CBETA::P5aChecker
   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 下"
+      error "[E02] 文字直接出現在 div 下, text: #{node.text.inspect}"
     end
     if node.text =~ /(\$|\{|\})/
       char = $1
@@ -89,7 +96,7 @@ class CBETA::P5aChecker
         return
       end
 
-      @errors << "[W02] 出現罕用字元: #{@basename}, lb: #{@lb}, char: #{char}\n"
+      error "[W02] 出現罕用字元: char: #{char}"
     end
   end
 
@@ -114,7 +121,7 @@ class CBETA::P5aChecker
     if e['type'] == 'star'
       n = e['corresp'].delete_prefix('#')
       unless @notes.include?(n)
-        error "lb: #{@lb}, corresp: #{n}", type: "[E03] 星號校勘 app 沒有對應的 note"
+        error "[E03] 星號校勘 app 沒有對應的 note, corresp: #{n}"
       end
     end
     traverse(e)
@@ -132,22 +139,30 @@ class CBETA::P5aChecker
     url = File.basename(e['url'])
     fn = File.join(@figures, @canon, url)
     unless File.exist? fn
-      error "圖檔 #{url} 不存在"
+      error "[E05] 圖檔 不存在, url: #{url}"
+    end
+  end
+
+  def e_item(e)
+    lists = e.xpath('list')
+    if lists.size > 1
+      error "[E08] item 下有多個 list"
     end
+    traverse(e)
   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']}"
+      error "[E06] lb format error: #{e['n']}"
     end
 
+    return if e['ed'] == 'R'
+
     @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
+      error "[E01] 行號重複, ed: #{e['ed']}"
     else
       @lbs << ed_lb
     end
@@ -155,7 +170,7 @@ class CBETA::P5aChecker
   
   def e_lem(e)
     unless e.key?('wit')
-      error "lem 缺少 wit 屬性"
+      error "[E07] lem 缺少 wit 屬性"
     end
     traverse(e)
   end
@@ -163,7 +178,7 @@ class CBETA::P5aChecker
   def e_note(e)
     return unless e['place'] == 'inline'
     if @element_stack.include?('inline_note')
-      @errors << "[W01] 夾注包夾注: #{@basename}, lb: #{@lb}\n"
+      error "[W01] 夾注包夾注"
     end
     @element_stack << 'inline_note'
     traverse(e)
@@ -173,16 +188,35 @@ class CBETA::P5aChecker
   def e_rdg(e)
     return if e['type'] == 'cbetaRemark'
     unless e.key?('wit')
-      error "rdg 缺少 wit 屬性, lb: #{@lb}"
+      error "[E04] rdg 缺少 wit 屬性"
     end
   end
 
-  def error(msg, type: nil)
-    s = ''
-    s << "#{type}: " unless type.nil?
-    s << "#{@basename}, #{msg}"
-    puts s
-    @errors << s + "\n"
+  def e_table(e)
+    max_cols = 0
+    e.xpath('row').each do |row|
+      cols = 0
+      row.xpath('cell').each do |cell|
+        if cell.key?('cols')
+          cols += cell['cols'].to_i
+        else
+          cols += 1
+        end
+      end
+      max_cols = cols if cols > max_cols
+    end
+
+    if e['cols'].to_i != max_cols
+      error "[E09] table cols 屬性值錯誤, table/@cols: #{e['cols']}, 根據 cell 計算的 cols: #{max_cols}"
+    end
+
+    traverse(e)
+  end
+
+  def error(msg)
+    s = "#{msg}, #{@basename}, lb: #{@lb}\n"
+    print s
+    @errors << s
   end
   
   def handle_canon(folder)
@@ -220,10 +254,12 @@ class CBETA::P5aChecker
     when 'app'     then e_app(e)
     when 'g'       then e_g(e)
     when 'graphic' then e_graphic(e)
+    when 'item'    then e_item(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)
+    when 'table'   then e_table(e)
     else traverse(e)
     end
   end

metadata

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