cbeta 2.2.30 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04e8e940a47a7b5b05a9322ab598a3e8053942f
-  data.tar.gz: ed1e3c05c7f1991e37a7e18266cd10adc7299331
+  metadata.gz: eb30cf1dbade7e5dd1c0fee89281cc0a0b39de7f
+  data.tar.gz: f21ed4d913b5e26af500265ea69a0cf2f8764de2
 SHA512:
-  metadata.gz: 9828eac0f714977ba235e82137833fd8d6b519923e6622ab19ad3ebb080a78c8b307083eb4347c0249f892d9399155609555b4fe14c803ab1bf6d849fb5bfcd9
-  data.tar.gz: 8675e03701df763de435cc91549caf932c140291c517d31307da06e41e6523fa84ace512c0410c529f662714e452d7190142f420ce3eaf6d1a0f5f041912fe21
+  metadata.gz: 1a88323e03773df0a698f9b4f17613257015775cdbcda49830139fa692497dfedc63b4b41ae347b2a3c4c798417b0fff30ea9ef9145921bb7a136daca0965d37
+  data.tar.gz: 8e35361c39b5bcda889c809b6da65cc5a7136c62f1c6e5a1288ff5145e60193f1a3fca8f96eb8d0fc76dcd52a464279b20b843b22c799cb849b34187fe7826a4

data/lib/cbeta/cbeta_share.rb

@@ -0,0 +1,11 @@
+module CbetaShare
+
+  def to_html(e)
+    e.to_xml(
+      encoding: 'UTF-8',
+      save_with: Nokogiri::XML::Node::SaveOptions::AS_XML |
+                 Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS
+    )
+  end
+
+end

data/lib/cbeta/p5a_to_html.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'json'
 require 'nokogiri'
 require 'set'
+require_relative 'cbeta_share'
 
 # Convert CBETA XML P5a to HTML
 #
@@ -64,6 +65,8 @@ class CBETA::P5aToHTML
   end
 
   private
+  
+  include CbetaShare
 
   def convert_all
     Dir.foreach(@xml_root) { |c|
@@ -742,14 +745,6 @@ class CBETA::P5aToHTML
     text
   end
 
-  def to_html(e)
-    e.to_xml(
-      encoding: 'UTF-8',
-      save_with: Nokogiri::XML::Node::SaveOptions::AS_XML |
-                 Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS
-    )
-  end
-
   def traverse(e, mode='html')
     r = ''
     e.children.each { |c| 

data/lib/cbeta/p5a_to_html_for_every_edition.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'json'
 require 'nokogiri'
 require 'set'
+require_relative 'cbeta_share'
 
 # Convert CBETA XML P5a to HTML for every edition
 #
@@ -52,6 +53,8 @@ class CBETA::P5aToHTMLForEveryEdition
 
   private
   
+  include CbetaShare
+  
   def before_parse_xml(xml_fn)
     @back = { 0 => '' }
     @back_orig = { 0 => '' }
@@ -852,10 +855,6 @@ class CBETA::P5aToHTMLForEveryEdition
     puts msg
   end
 
-  def to_html(e)
-    e.to_xml(encoding: 'UTF-8', :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML)
-  end
-
   def traverse(e, mode='html')
     r = ''
     e.children.each { |c| 

data/lib/cbeta/p5a_to_html_for_pdf.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'nokogiri'
 require 'set'
 require 'erb'
+require_relative 'cbeta_share'
 
 # Convert CBETA XML P5a to HTML for PDF
 #
@@ -58,6 +59,8 @@ class CBETA::P5aToHTMLForPDF
 
   private
   
+  include CbetaShare
+  
   def before_convert_work(work_id)
     @nav_doc = Nokogiri::XML('<ul></ul>')
     @nav_doc.remove_namespaces!()
@@ -729,10 +732,6 @@ class CBETA::P5aToHTMLForPDF
     end
   end
 
-  def to_html(e)
-    e.to_xml(encoding: 'UTF-8', :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML)
-  end
-
   def traverse(e, mode='html')
     r = ''
     e.children.each { |c| 

data/lib/cbeta/p5a_to_simple_html.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'json'
 require 'nokogiri'
 require 'set'
+require_relative 'cbeta_share'
 
 # Convert CBETA XML P5a to simple HTML
 #
@@ -69,6 +70,8 @@ class CBETA::P5aToSimpleHTML
   end
 
   private
+  
+  include CbetaShare
 
   def convert_all
     Dir.entries(@xml_root).sort.each { |c|
@@ -145,7 +148,7 @@ class CBETA::P5aToSimpleHTML
 
   def handle_lb(e)
     @lb = e['n']
-    r = "<a id='lb#{@lb}'/>"
+    r = %(<a id="lb#{@lb}"></a>)
     unless @next_line_buf.empty?
       r += @next_line_buf + "\n"
       @next_line_buf = ''
@@ -169,7 +172,7 @@ class CBETA::P5aToSimpleHTML
     if e['unit'] == 'juan'
       @juan = e['n'].to_i
       r += "<juan #{@juan}>"
-      r += "<a id='lb#{@lb}'/>" unless @lb.nil?
+      r += %(<a id="lb#{@lb}"></a>) unless @lb.nil?
     end
     r
   end
@@ -410,7 +413,4 @@ class CBETA::P5aToSimpleHTML
     File.write(fn, text)
   end
 
-  def to_html(e)
-    e.to_xml(encoding: 'UTF-8', :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbeta
 version: !ruby/object:Gem::Version
-  version: 2.2.30
+  version: 2.3.0
 platform: ruby
 authors:
 - Ray Chou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 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
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - lib/cbeta.rb
 - lib/cbeta/bm_to_text.rb
+- lib/cbeta/cbeta_share.rb
 - lib/cbeta/char_count.rb
 - lib/cbeta/char_freq.rb
 - lib/cbeta/gaiji.rb