cbeta 2.2.21 → 2.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ef4a791e3515d6ce95a46d16a9e6c0b42c5da34
-  data.tar.gz: 0dde5e0d8ab8f1220fd8aaa31ab2df0d6e96db54
+  metadata.gz: c051fafb22469b41ce99482cb6c7e42c2b57a934
+  data.tar.gz: b844d9fd876dcda4236f3c0d74b21baa234fec5c
 SHA512:
-  metadata.gz: 35818ddb6eff8efc36689f0a8de8ec6edb9f3fddb84ecea4ee46f1cad1f4eac5e26d70a89a04babff1a02daf1c3323c12b86bb6b2c94b31bb6da8f8d9487a068
-  data.tar.gz: 3193cd10f1541f8b60c5925122d1bd11618d95cb1d14744759fb3edff3d6665ead3997c4bcb2e976fa3f8019c3726b15a2be41414e343439f0caefc3ecb0c002
+  metadata.gz: 74c281e563811da223290c5cd35fc5246bae9f25267d634c553010ed3e9e7a9d7451d745b54408dbda05bec0218e1ac553fcb447b34c7ab37dd6bdbe806782cc
+  data.tar.gz: 25a7190bde65648a11d5ea65f476b247a406c50736df9f66c1f9b90c12f7f14e3af7581023e4a397bd2fa4270134f9c9e66df257abed8bda7f752af8b8fdcaf7

data/lib/cbeta/p5a_to_html_for_pdf.rb

@@ -43,37 +43,17 @@ class CBETA::P5aToHTMLForPDF
 
   # 將 CBETA XML P5a 轉為 HTML 供轉為 PDF
   #
-  # @example for convert 大正藏第一冊:
-  #
-  #   c = CBETA::P5aToHTMLForPDF.new('/PATH/TO/CBETA/XML/P5a', '/OUTPUT/FOLDER')
-  #   c.convert('T01')
-  #
   # @example for convert 大正藏全部:
   #
   #   c = CBETA::P5aToHTMLForPDF.new('/PATH/TO/CBETA/XML/P5a', '/OUTPUT/FOLDER')
   #   c.convert('T')
   #
-  # @example for convert 大正藏第五冊至第七冊:
-  #
-  #   c = CBETA::P5aToHTMLForPDF.new('/PATH/TO/CBETA/XML/P5a', '/OUTPUT/FOLDER')
-  #   c.convert('T05..T07')
-  #
   # T 是大正藏的 ID, CBETA 的藏經 ID 系統請參考: http://www.cbeta.org/format/id.php
   def convert(target=nil)
     return convert_all if target.nil?
 
     arg = target.upcase
-    if arg.size <= 2
-      convert_collection(arg)
-    else
-      if arg.include? '..'
-        arg.match(/^([^\.]+?)\.\.([^\.]+)$/) {
-          handle_vols($1, $2)
-        }
-      else
-        handle_vol(arg)
-      end
-    end
+    convert_collection(arg)
   end
 
   private
@@ -129,7 +109,10 @@ class CBETA::P5aToHTMLForPDF
   
   def convert_collection(c)
     @series = c
-    puts 'handle_collection ' + c
+    puts 'convert_collection ' + c
+    
+    @orig = @cbeta.get_canon_abbr(c)
+    
     folder = File.join(@xml_root, @series)
     @works = {}
     prepare_work_list(folder)
@@ -385,13 +368,14 @@ class CBETA::P5aToHTMLForPDF
   end
 
   def handle_lem(e)
-    r = ''
+    r = nil
     w = e['wit']
-    if w.include? 'CBETA' and not w.include? @orig
-      r = "<span class='corr'>%s</span>" % traverse(e)
-    else
-      r = traverse(e)
+    if e.key? 'wit'
+      if (w.include? 'CBETA') and (not w.include? @orig)
+        r = "<span class='corr'>%s</span>" % traverse(e)
+      end
     end
+    r = traverse(e) if r.nil?
     r
   end
 
@@ -633,6 +617,7 @@ class CBETA::P5aToHTMLForPDF
 
     @orig = @cbeta.get_canon_abbr(vol[0])
     abort "未處理底本" if @orig.nil?
+    puts "#{__LINE__} orig: #{@orig}"
 
     @vol = vol
     @series = CBETA.get_canon_from_vol(vol)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 2.2.21
+  version: 2.2.22
 platform: ruby
 authors:
 - Ray Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-03 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