cbeta 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833cb0a1b76d79d40438f7d5f9b5dc49ce464f99
-  data.tar.gz: 550bd5306dec92d4454c47cd7cb8bfed5065328d
+  metadata.gz: 6a715f9ac4b0f18f5625856482341f62bdff33a4
+  data.tar.gz: 154ad81979345e05396abeea9469e9af236223f7
 SHA512:
-  metadata.gz: 02c9a174e77a60db9fbda71d119965d36ef3048ebf5d485f657bfde32ba80a5b8e3c7cbc1a60db5ef97a259c7b83cb2a7aca03d37d3133682e87413c0b5f4387
-  data.tar.gz: 1bd1732b427d9778d22ee7b62d2546b4b6be93b29c2ca3a87ca2ca7bd32a34708782af21fc89252fb5bdc321acafd5005152b7e4d38f45308487798dc95796ac
+  metadata.gz: 3a89be3fc162f65bd4d370ef99005cefbb2baf30d7de1da047226167d711701f0d6c0c7d268a6b8a97dc79621ad9508f07491159ca188c8f1c56d998ef53bf11
+  data.tar.gz: 360a1f08ae300207ca0181bc459bccc9aac3f4b2f926c4a3f2f3d3cc1a2adc625eb14a7ce2a9c9a73825f77f5936757f0233da405d955139aacb32acc9404731

data/lib/cbeta/p5a_to_html_for_pdf.rb

@@ -83,28 +83,41 @@ class CBETA::P5aToHTMLForPDF
     @nav_doc.remove_namespaces!()
     @nav_root = @nav_doc.at_xpath('/ul')
     @current_nav = [@nav_root]
+    @div_count = 0
     @mulu_count = 0    
+    @open_divs = []
+    @text = ''
     
     @output_folder_work = File.join(@out_root, @series, work_id)
     FileUtils.mkdir_p(@output_folder_work) unless Dir.exist? @output_folder_work
-  end
-  
-  def before_parse_xml(xml_fn)
-    @div_count = 0
-    @in_l = false
-    @lg_row_open = false
-    @t_buf1 = []
-    @t_buf2 = []
-    @open_divs = []
-    @sutra_no = File.basename(xml_fn, ".xml")  
-    
+
     src = File.join(CBETA::DATA, 'html-for-pdf.css')
     copy_file(src)
     
+    @cover = nil
+    if @config.key? :graphic_base
+      cover = File.join(@config[:graphic_base], 'covers', @series, "#{work_id}.jpg")
+      if File.exist? cover
+        @mulu_count += 1
+        @cover = "<a id='mulu#{@mulu_count}'></a><mulu1 title='封面'>&nbsp;</mulu1>"
+        @cover += "<div id='cover'><img src='#{work_id}.jpg' /></div>"
+        copy_file(cover)
+      end
+    end
+    
     if @config[:front_page_title]
       s = @config[:front_page_title]
       @nav_root.add_child("<li><a href='#front'>#{s}</a></li>")
     end
+    
+  end
+  
+  def before_parse_xml(xml_fn)
+    @in_l = false
+    @lg_row_open = false
+    @t_buf1 = []
+    @t_buf2 = []
+    @sutra_no = File.basename(xml_fn, ".xml")
   end
 
   def convert_all
@@ -126,7 +139,7 @@ class CBETA::P5aToHTMLForPDF
   end
   
   def convert_work(work_id, xml_files)
-    puts "convert work #{work_id}"    
+    puts "convert xml to html: work_id: #{work_id}"
     
     before_convert_work(work_id)
     
@@ -136,14 +149,6 @@ class CBETA::P5aToHTMLForPDF
       @nav_root.add_child("<li><a href='#back'>#{s}</a></li>")
     end
     
-    @cover = nil
-    if @config.key? :graphic_base
-      cover = File.join(@config[:graphic_base], 'covers', @series, "#{work_id}.jpg")
-      if File.exist? cover
-        @cover = "<div id='cover'><img src='#{work_id}.jpg' /></div>"
-        copy_file(cover)
-      end
-    end
     
     if @config.key? :front_page
       s = File.read(@config[:front_page])
@@ -155,7 +160,6 @@ class CBETA::P5aToHTMLForPDF
       @back = "<div id='back'>#{s}</div>"
     end
     
-    @text = ''
     xml_files.each do |fn|
       @text += convert_xml_file(fn)
     end
@@ -419,7 +423,13 @@ class CBETA::P5aToHTMLForPDF
   end
 
   def handle_list(e)
-    "<ul>%s</ul>" % traverse(e)
+    doc = Nokogiri::XML::Document.new
+    node = doc.create_element('ul')
+    if e.key? 'rendition'
+      node['class'] = e['rendition']
+    end
+    node.inner_html = traverse(e)
+    to_html(node) + "\n"
   end
 
   def handle_milestone(e)
@@ -510,7 +520,13 @@ class CBETA::P5aToHTMLForPDF
   end
 
   def handle_p(e)
-    "<div class='p'>%s</div>\n" % traverse(e)
+    doc = Nokogiri::XML::Document.new
+    node = doc.create_element('p')
+    if e.key? 'rend'
+      node['style'] = e['rend']
+    end
+    node.inner_html = traverse(e)
+    to_html(node) + "\n"
   end
 
   def handle_row(e)

data/lib/data/html-for-pdf.css

@@ -16,6 +16,11 @@ a {
 body {
 	font-family: PMingLiU, extb;
 }
+
+div#cover {
+	page-break-after: always
+}
+
 div.lg {
 	display: table;
 	margin-left: 1em;
@@ -133,6 +138,7 @@ th, td {
 	word-break: break-all;
 	text-indent: 0;
 }
+
 ul.simple {
 	list-style-type: none;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Ray Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-28 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