cbeta 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec72fbd4c93e57fc423a28a190984256ab7e2dc
-  data.tar.gz: 68977b6a4c131378cc98f7252bab67b7a511bb57
+  metadata.gz: 9eb8fa0e6bc0a0b9a049fc6a9c24ce1b57594575
+  data.tar.gz: 3dd5c4dfb50fb78d0290d8dd558710ede86df997
 SHA512:
-  metadata.gz: 982ff7caa25181074d1d59d6f49e42b43699cc20208c2661a443d0004845a8358a995c02a9f2135f6fd0725792a2bc29fff34dc2aaac666177d77fade2c88112
-  data.tar.gz: c5020c2d999986051a2c8a38f72a6ea03f62ad105019eb018096ffe4f7a746afef3eebf186e29323f7d8cf1dc0f003807b109288ce676e344d0f549d530b9a4b
+  metadata.gz: 4eab2c2ddea6eaad8ef585ca61e53b96d47ef39f46ae074d2b0a4a6aeb8e4d8958c4a6f11a5a6e443a9f82507a09e0583f6e597c67969bb18262fb2674e5a7ad
+  data.tar.gz: d4379cf58742674b48d866ef0907c32c773c0fab09606cbd3e88f68aaab5622e69e40fab3d7f7e4d8a0489c0a13d36ebb1982920b8c9998b25b191fd6a28b94b

data/lib/cbeta/p5a_to_html_for_every_edition.rb

@@ -179,7 +179,7 @@ class CBETA::P5aToHTMLForEveryEdition
         @notes_dila[@juan] << "<span class='footnote dila' id='dila_note#{n}'>#{note}</span>"
       end
     end
-    r + "<r w='【CBETA】' l='#{@lb}' w='#{@char_count}'>%s</r>" % traverse(e)
+    r + "<r w='【CBETA】' l='#{@lb}' w='#{@char_count}'><span class='cbeta'>%s</span></r>" % traverse(e)
   end
 
   def handle_div(e)
@@ -500,7 +500,7 @@ class CBETA::P5aToHTMLForEveryEdition
         @pass.pop
         #@back[@juan] = "<span class='footnote_cb' id='n#{n}'>#{s}</span>\n"
         @notes_mod[@juan][n] = s
-        return "<r w='【CBETA】'><a class='noteAnchor' href='#n#{n}'></a></r>"
+        return "<r w='【CBETA】'><a class='noteAnchor cb' href='#n#{n}'></a></r>"
       when 'rest'
         return ''
       else
@@ -527,13 +527,18 @@ class CBETA::P5aToHTMLForEveryEdition
     @pass.pop
     @notes_orig[@juan][n] = s
     @notes_mod[@juan][n] = s
+    
+    c = @series
+    
+    # 如果 CBETA 沒有修訂，就跟底本的註一樣
+    c += " cb" unless @mod_notes.include? n
 
     label = case anchor_type
     when 'biao' then " data-label='標#{n[-2..-1]}'"
     when 'ke'   then " data-label='科#{n[-2..-1]}'"
     else ''
     end
-    s = "<a class='noteAnchor' href='#n#{n}'#{label}></a>"
+    s = "<a class='noteAnchor #{c}' href='#n#{n}'#{label}></a>"
     r = "<r w='#{@orig}'>#{s}</r>"
     
     unless @mod_notes.include? n
@@ -879,6 +884,7 @@ class CBETA::P5aToHTMLForEveryEdition
   #{copyright}
 </body></html>
 eos
+      puts "write #{output_path}"
       File.write(output_path, text)
     end    
   end

data/lib/cbeta/p5a_to_text.rb

@@ -128,6 +128,16 @@ class CBETA::P5aToText
     end
   end
 
+  # 取得所有對校版本
+  def get_editions(doc)
+    r = Set.new [@orig, "【CBETA】"] # 至少有底本及 CBETA 兩個版本
+    doc.xpath('//lem|//rdg').each do |e|
+      w = e['wit'].scan(/【.*?】/)
+      r.merge w
+    end
+    r
+  end
+  
   def handle_anchor(e)
     if e.has_attribute?('type')
       if e['type'] == 'circle'
@@ -274,12 +284,16 @@ class CBETA::P5aToText
   end
 
   def handle_lem(e)
-    r = ''
-    r = traverse(e)
-    w = e['wit'].scan(/【.*?】/)
-    @editions.merge w
-    w = w.join(' ')
-    "<r w='#{w}'>#{r}</r>"
+    # 沒有 rdg 的版本，用字同 lem
+    editions = Set.new @editions
+    e.xpath('./following-sibling::rdg').each do |rdg|
+      rdg['wit'].scan(/【.*?】/).each do |w|
+        editions.delete w
+      end
+    end
+    
+    w = editions.to_a.join(' ')
+    "<r w='#{w}'>%s</r>" % traverse(e)
   end
 
   def handle_lg(e)
@@ -363,10 +377,7 @@ class CBETA::P5aToText
   end
 
   def handle_rdg(e)
-    r = traverse(e)
-    w = e['wit'].scan(/【.*?】/)
-    @editions.merge w
-    "<r w='#{e['wit']}'>#{r}</r>"
+    "<r w='#{e['wit']}'>%s</r>" % traverse(e)
   end
 
   def handle_row(e)
@@ -385,7 +396,7 @@ class CBETA::P5aToText
     puts "convert sutra #{xml_fn}"
     @dila_note = 0
     @div_count = 0
-    @editions = Set.new [@orig, "【CBETA】"] # 至少有底本跟CBETA兩種版本
+    #@editions = Set.new [@orig, "【CBETA】"] # 至少有底本跟CBETA兩種版本
     @in_l = false
     @juan = 0
     @lg_row_open = false
@@ -510,6 +521,8 @@ class CBETA::P5aToText
   def parse_xml(xml_fn)
     doc = open_xml(xml_fn)        
     root = doc.root()
+    
+    @editions = get_editions(doc)
 
     body = root.xpath("text/body")[0]
     traverse(body)
@@ -531,9 +544,10 @@ class CBETA::P5aToText
     @editions.each do |ed|
       frag = Nokogiri::XML.fragment(txt)
       frag.search("r").each do |node|
-        if node['w'] != ed
-          node.remove
+        if node['w'].include? ed
+          node.add_previous_sibling node.inner_html
         end
+        node.remove
       end
       text = frag.content
       text = appify(text) if @settings[:format] == 'app'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Ray Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem for use Chinese Buddhist Text resources made by CBETA (http://www.cbeta.org).
 email: zhoubx@gmail.com