rbpdf 1.18.4 → 1.18.5

data/lib/rbpdf/version.rb

@@ -1,3 +1,3 @@
 module Rbpdf
-  VERSION = "1.18.4"
+  VERSION = "1.18.5"
 end

data/test/rbpdf_css_test.rb

@@ -227,7 +227,7 @@ class RbpdfCssTest < ActiveSupport::TestCase
     assert_equal dom[4]['attribute'], {'border'=>'2px #ff0000 solid', 'style'=>';border:2px #ff0000 solid;'}
     assert_equal dom[4]['style']['border'], '2px #ff0000 solid'
     assert_equal dom[4]['attribute']['border'], '2px #ff0000 solid'
-    assert_equal dom[4]['thead'], '<style>table {;border:2px #ff0000 solid;}</style><table><tr><th>abc<marker style="font-size:0"/></th></tr></tablehead>'
+    assert_equal dom[4]['thead'], '<style>table {;border:2px #ff0000 solid;}</style><table tablehead="1"><tr><th>abc<marker style="font-size:0"/></th></tr></table>'
   end
 
   test "CSS Dom line-height test normal" do
@@ -323,7 +323,67 @@ class RbpdfCssTest < ActiveSupport::TestCase
     assert_equal dom[3]['value'], 'span'
     assert_equal dom[3]['style']['color'], '#006600'
     assert_equal dom[3]['style']['font-style'], 'italic'
+  end
+
+  test "CSS Dom height width test" do 
+    pdf = MYPDF.new
+
+    html = '<style> p.first { height: 60%; }
+                    p.second { width: 70%; }</style>
+            <p class="first">ABC</p><p class="second">DEF</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 7
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['height'], '60%'
+    assert_equal dom[1]['height'], '60%'
+
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
+
+    # <p class="second">
+    assert_equal dom[4]['elkey'], 3
+    assert_equal dom[4]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[4]['tag'], true
+    assert_equal dom[4]['opening'], true
+    assert_equal dom[4]['value'], 'p'
+    assert_not_nil dom[4]['style']
+    assert_equal dom[4]['style']['width'], '70%'
+    assert_equal dom[4]['width'], '70%'
+  end
+
+  test "CSS Dom font-weight test" do
+    pdf = MYPDF.new
+
+    html = '<style> p.first { font-weight: bold; }</style>
+            <p class="first">ABC</p><p class="second">DEF</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 7
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['font-weight'], 'bold'
+    assert_equal dom[1]['fontstyle'], 'B'
 
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
   end
 
   test "CSS Dom id test" do
@@ -358,4 +418,219 @@ class RbpdfCssTest < ActiveSupport::TestCase
     assert_equal dom[3]['value'], 'span'
     assert_equal dom[3]['style']['background-color'], '#FFFFAA'
   end
+
+  test "CSS Dom text-decoration test" do
+    pdf = MYPDF.new
+
+    html = '<style> p.first { text-decoration: none;}
+                    p.second {text-decoration: underline;}
+                    p.third {text-decoration: overline;}
+                    p.fourth {text-decoration: line-through;}
+                    p.fifth {text-decoration: underline overline line-through;}</style>
+            <p class="first">ABC</p><p class="second">DEF</p><p class="third">GHI</p><p class="fourth">JKL</p><p class="fifth">MNO</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 16
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['text-decoration'], 'none'
+    assert_equal dom[1]['fontstyle'], ''
+
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
+
+    # <p class="second">
+    assert_equal dom[4]['elkey'], 3
+    assert_equal dom[4]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[4]['tag'], true
+    assert_equal dom[4]['opening'], true
+    assert_equal dom[4]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[4]['style']['text-decoration'], 'underline'
+    assert_equal dom[4]['fontstyle'], 'U'
+
+    # <p class="third">
+    assert_equal dom[7]['elkey'], 6
+    assert_equal dom[7]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[7]['tag'], true
+    assert_equal dom[7]['opening'], true
+    assert_equal dom[7]['value'], 'p'
+    assert_not_nil dom[7]['style']
+    assert_equal dom[7]['style']['text-decoration'], 'overline'
+    assert_equal dom[7]['fontstyle'], 'O'
+
+    # <p class="fourth">
+    assert_equal dom[10]['elkey'], 9
+    assert_equal dom[10]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[10]['tag'], true
+    assert_equal dom[10]['opening'], true
+    assert_equal dom[10]['value'], 'p'
+    assert_not_nil dom[10]['style']
+    assert_equal dom[10]['style']['text-decoration'], 'line-through'
+    assert_equal dom[10]['fontstyle'], 'D'
+
+    # <p class="fifth">
+    assert_equal dom[13]['elkey'], 12
+    assert_equal dom[13]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[13]['tag'], true
+    assert_equal dom[13]['opening'], true
+    assert_equal dom[13]['value'], 'p'
+    assert_not_nil dom[13]['style']
+    assert_equal dom[13]['style']['text-decoration'], 'underline overline line-through'
+    assert_equal dom[13]['fontstyle'], 'UOD'
+  end
+
+  test "CSS Dom text-indent test" do
+    pdf = MYPDF.new
+
+    html = '<style> p.first { text-indent: 10px; }
+                    p.second { text-indent: 5em; }
+                    p.third { text-indent: 5ex; }
+                    p.fourth { text-indent: 50%; }</style>
+            <p class="first">ABC</p><p class="second">DEF</p><p class="third">GHI</p><p class="fourth">JKL</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 13
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['text-indent'], '10px'
+    assert_in_delta dom[1]['text-indent'], 3.53, 0.01
+
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
+
+    # <p class="second">
+    assert_equal dom[4]['elkey'], 3
+    assert_equal dom[4]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[4]['tag'], true
+    assert_equal dom[4]['opening'], true
+    assert_equal dom[4]['value'], 'p'
+    assert_not_nil dom[4]['style']
+    assert_equal dom[4]['style']['text-indent'], '5em'
+    assert_equal dom[4]['text-indent'], 5.0
+
+    # <p class="third">
+    assert_equal dom[7]['elkey'], 6
+    assert_equal dom[7]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[7]['tag'], true
+    assert_equal dom[7]['opening'], true
+    assert_equal dom[7]['value'], 'p'
+    assert_not_nil dom[7]['style']
+    assert_equal dom[7]['style']['text-indent'], '5ex'
+    assert_equal dom[7]['text-indent'], 2.5
+
+    # <p class="fourth">
+    assert_equal dom[10]['elkey'], 9
+    assert_equal dom[10]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[10]['tag'], true
+    assert_equal dom[10]['opening'], true
+    assert_equal dom[10]['value'], 'p'
+    assert_not_nil dom[10]['style']
+    assert_equal dom[10]['style']['text-indent'], '50%'
+    assert_equal dom[10]['text-indent'], 0.5
+  end
+
+  test "CSS Dom list-style-type test" do
+    pdf = MYPDF.new
+
+    html = '<style> p.first { list-style-type: none; }
+                    p.second { list-style-type: disc; }
+                    p.third { list-style-type: circle; }
+                    p.fourth { list-style-type: square; }</style>
+            <p class="first">ABC</p><p class="second">DEF</p><p class="third">GHI</p><p class="fourth">JKL</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 13
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['list-style-type'], 'none'
+    assert_equal dom[1]['listtype'], 'none'
+
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
+
+    # <p class="second">
+    assert_equal dom[4]['elkey'], 3
+    assert_equal dom[4]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[4]['tag'], true
+    assert_equal dom[4]['opening'], true
+    assert_equal dom[4]['value'], 'p'
+    assert_not_nil dom[4]['style']
+    assert_equal dom[4]['style']['list-style-type'], 'disc'
+    assert_equal dom[4]['listtype'], 'disc'
+
+    # <p class="third">
+    assert_equal dom[7]['elkey'], 6
+    assert_equal dom[7]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[7]['tag'], true
+    assert_equal dom[7]['opening'], true
+    assert_equal dom[7]['value'], 'p'
+    assert_not_nil dom[7]['style']
+    assert_equal dom[7]['style']['list-style-type'], 'circle'
+    assert_equal dom[7]['listtype'], 'circle'
+  end
+
+  test "CSS Dom page-break test" do
+    pdf = MYPDF.new
+
+    html = '<style> p.first { page-break-before: left; page-break-after: always; }
+                    p.second { page-break-inside:avoid; }</style>
+            <p class="first">ABC</p><p class="second">DEF</p>'
+    dom = pdf.getHtmlDomArray(html)
+    assert_equal dom.length, 7
+
+    # <p class="first">
+    assert_equal dom[1]['elkey'], 0
+    assert_equal dom[1]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[1]['tag'], true
+    assert_equal dom[1]['opening'], true
+    assert_equal dom[1]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[1]['style']['page-break-before'], 'left'
+    assert_equal dom[1]['style']['page-break-after'], 'always'
+    assert_not_nil dom[1]['attribute']
+    assert_equal dom[1]['attribute']['pagebreak'], 'left'
+    assert_equal dom[1]['attribute']['pagebreakafter'], 'true'
+
+    # ABC
+    assert_equal dom[2]['elkey'], 1
+    assert_equal dom[2]['parent'], 1
+    assert_equal dom[2]['tag'], false
+    assert_equal dom[2]['value'], 'ABC'
+
+    # <p class="second">
+    assert_equal dom[4]['elkey'], 3
+    assert_equal dom[4]['parent'], 0   # parent -> parent tag key
+    assert_equal dom[4]['tag'], true
+    assert_equal dom[4]['opening'], true
+    assert_equal dom[4]['value'], 'p'
+    assert_not_nil dom[1]['style']
+    assert_equal dom[4]['style']['page-break-inside'], 'avoid'
+    assert_not_nil dom[4]['attribute']
+    assert_equal dom[4]['attribute']['nobr'], 'true'
+  end
 end

data/test/rbpdf_dom_test.rb

@@ -47,23 +47,24 @@ class RbpdfTest < ActiveSupport::TestCase
 
     # Error Tag (doble colse tag)
     dom = pdf.getHtmlDomArray('</ul></div>')
-    assert_equal dom.length, 3
 
     assert_equal 0, dom[0]['parent']  # Root
     assert_equal false, dom[0]['tag']
     assert_equal({}, dom[0]['attribute'])
 
-    assert_equal dom[1]['parent'], 0   # parent -> Root key
-    assert_equal dom[1]['elkey'], 0
-    assert_equal dom[1]['tag'], true
-    assert_equal dom[1]['opening'], false
-    assert_equal dom[1]['value'], 'ul'
-
-    assert_equal dom[2]['parent'], 0   # parent -> Root key
-    assert_equal dom[2]['elkey'], 1
-    assert_equal dom[2]['tag'], true
-    assert_equal dom[2]['opening'], false
-    assert_equal dom[2]['value'], 'div'
+    if dom.length == 3 # for Rails 3.x/4.0/4.1 (no use Rails 4.2 later)
+      assert_equal dom[1]['parent'], 0   # parent -> Root key
+      assert_equal dom[1]['elkey'], 0
+      assert_equal dom[1]['tag'], true
+      assert_equal dom[1]['opening'], false
+      assert_equal dom[1]['value'], 'ul'
+
+      assert_equal dom[2]['parent'], 0   # parent -> Root key
+      assert_equal dom[2]['elkey'], 1
+      assert_equal dom[2]['tag'], true
+      assert_equal dom[2]['opening'], false
+      assert_equal dom[2]['value'], 'div'
+    end
 
     # Attribute
     dom = pdf.getHtmlDomArray('<p style="text-align:justify">abc</p>')
@@ -78,8 +79,8 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal dom[1]['tag'], true
     assert_equal dom[1]['opening'], true
     assert_equal dom[1]['value'], 'p'
-    assert_equal dom[1]['attribute'], {'style'=>'text-align: justify;'}
-    assert_equal dom[1]['attribute']['style'], 'text-align: justify;'
+    assert_not_nil dom[1]['attribute']
+    assert_equal dom[1]['attribute']['style'].gsub(' ', ''), 'text-align:justify;'
     assert_equal dom[1]['align'], 'J'
 
     # Table border
@@ -265,7 +266,7 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal temprtl, false
   end
 
-  test "Dom HTMLTagHandler img test" do
+  test "Dom HTMLTagHandler img y position with height attribute test" do
     pdf = MYPDF.new
     pdf.add_page
 
@@ -280,6 +281,21 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal pdf.get_image_rby - (12 / pdf.get_scale_factor) , y2
   end
 
+  test "Dom HTMLTagHandler img y position without height attribute test" do
+    pdf = MYPDF.new
+    pdf.add_page
+
+    # Image Error HTML
+    htmlcontent = '<img src="' + Rails.root.to_s + '/public/ng.png" alt="test alt attribute" border="0"/>'
+    dom1 = pdf.getHtmlDomArray(htmlcontent)
+    y1 = pdf.get_y
+
+    dom2 = pdf.openHTMLTagHandler(dom1, 1, false)
+    y2 = pdf.get_y
+    assert_equal dom1, dom2
+    assert_equal y1, y2
+  end
+
   test "getHtmlDomArray encoding test" do
     return unless 'test'.respond_to?(:force_encoding)
 

data/test/rbpdf_html_func_test.rb

@@ -5,6 +5,9 @@ class RbpdfTest < ActiveSupport::TestCase
     def addHTMLVertSpace(hbz, hb, cell, firstorlast)
       super
     end
+    def sanitize_html(html)
+      super
+    end
   end
 
   test "html func addHTMLVertSpace empty lines test" do
@@ -133,4 +136,27 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal x4, x3
     assert_equal y4, y3 + 10 + 2
   end
+
+  test "html func sanitize test 1" do
+    pdf = MYPDF.new
+    pdf.add_page()
+    html = '<table border="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>
+                 <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>
+                 <tr><td>' + 'ABC' + '</td></tr></table>'
+    html = pdf.sanitize_html(html).gsub(/[\r\n]/,'')
+
+    assert_equal html, %{<table border="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>                 <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>                 <tr><td>ABC</td></tr></table>}
+  end
+
+  test "html func sanitize test 2" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    htmlcontent = '1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br>'
+    html = '<table cellpadding="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>
+                 <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>
+                 <tr><td>' + htmlcontent + '</td></tr></table>'
+    html = pdf.sanitize_html(html).gsub(/[\r\n]/,'')
+    assert_equal html, %{<table cellpadding="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>                 <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>                 <tr><td>1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br></td></tr></table>}
+  end
 end

data/test/rbpdf_html_test.rb

@@ -11,7 +11,6 @@ class RbpdfTest < ActiveSupport::TestCase
     pdf = RBPDF.new
     pdf.add_page()
 
-
     htmlcontent = '<h1>HTML Example</h1>'
     pdf.write_html(htmlcontent, true, 0, true, 0)
 
@@ -25,7 +24,7 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal pno, 3
   end
 
-  test "write_html Table test" do
+  test "write_html Table test 1" do
     pdf = RBPDF.new
     pdf.add_page()
 
@@ -41,6 +40,63 @@ class RbpdfTest < ActiveSupport::TestCase
     assert_equal pno, 3
   end
 
+  test "write_html Table test 2" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    htmlcontent = '1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br>'
+
+    tablehtml = '<table border="1"><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr>
+                 <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>
+                 <tr><td>' + htmlcontent + '</td></tr></table>'
+    pdf.write_html(tablehtml, true, 0, true, 0)
+
+    pno = pdf.get_page
+    assert_equal pno, 3
+
+    content = []
+    contents = pdf.getPageBuffer(1)
+    contents.each_line {|line| content.push line.chomp }
+    count = 0
+    count_text = 0
+    pos1 = -1
+    pos2 = -2
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /ABCD/
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $1
+        assert_not_nil pos1
+      end
+      if line =~ /abcd/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+      end
+    end
+    assert_equal count_text, 13
+    assert_equal count, 1
+    assert_equal pos1, pos2
+
+    content = []
+    contents = pdf.getPageBuffer(2)
+    contents.each_line {|line| content.push line.chomp }
+    count_head = 0
+    count = 0
+    count_text = 0
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /\([6-9]\)/
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+    end
+    assert_equal count_text, 7
+  end
+
   test "write_html Table thead tag test 1" do
     pdf = MYPDF.new
     pdf.add_page()
@@ -71,7 +127,7 @@ class RbpdfTest < ActiveSupport::TestCase
 
     htmlcontent = '1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br><br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br><br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br><br><br><br><br><br><br><br><br>'
 
-    tablehtml = '<table border="1" cellpadding="1" cellspacing="1"><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>
+    tablehtml = '<table><thead><tr><td>ABCD</td><td>EFGH</td><td>IJKL</td></tr></thead>
                  <tr><td>abcd</td><td>efgh</td><td>ijkl</td></tr>
                  <tr><td>' + htmlcontent + '</td></tr></table>'
 
@@ -79,43 +135,402 @@ class RbpdfTest < ActiveSupport::TestCase
     page = pdf.get_page
     assert_equal 3, page
 
+    # Page 1
     content = []
     contents = pdf.getPageBuffer(1)
     contents.each_line {|line| content.push line.chomp }
-    count_head = 0
-    count = 0
+    count_text = count_head = count = 0
+    pos1 = -1
+    pos2 = -2
     content.each do |line|
-      count_head += 1 if line =~ /ABCD/
-      count += 1 if line =~ /abcd/
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /ABCD/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $1
+        assert_not_nil pos1
+      end
+      if line =~ /abcd/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+      end
     end
+    assert_equal count_text, 13
     assert_equal count_head, 1
     assert_equal count, 1
+    assert_equal pos1, pos2
 
+    # Page 2
     content = []
     contents = pdf.getPageBuffer(2)
     contents.each_line {|line| content.push line.chomp }
-    count_head = 0
-    count = 0
+    count_text = count_head = count = 0
     content.each do |line|
-      count_head += 1 if line =~ /ABCD/
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /ABCD/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
       count += 1 if line =~ /abcd/
+      if line =~ /\([6-9]\)/
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
     end
+    assert_equal count_text, 10
     assert_equal count_head, 1
     assert_equal count, 0
 
+    # Page 3
     content = []
     contents = pdf.getPageBuffer(3)
     contents.each_line {|line| content.push line.chomp }
-    count_head = 0
-    count = 0
+    count_text = count_head = count = 0
     content.each do |line|
-      count_head += 1 if line =~ /ABCD/
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /ABCD/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
       count += 1 if line =~ /abcd/
+      if line =~ /\(11\)/
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
     end
+    assert_equal count_text, 5
     assert_equal count_head, 1
     assert_equal count, 0
   end
 
+  test "write_html_cell Table thead tag test" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    htmlcontent = '<br>1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br>
+<br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br>
+<br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br>
+<br><br><br><br><br><br><br><br>'
+
+    tablehtml ='<table><thead><tr>
+    <th style="text-align: left">Left align</th>
+    <th style="text-align: right">Right align</th>
+    <th style="text-align: center">Center align</th>
+    </tr> </thead><tbody> <tr>
+    <td style="text-align: left">left' + htmlcontent + '</td>
+    <td style="text-align: right">right</td>
+    <td style="text-align: center">center</td>
+    </tr> </tbody></table>'
+
+    pdf.write_html_cell(0, 0, '', '',tablehtml)
+
+    page = pdf.get_page
+    assert_equal 1, page
+
+    # Page 1
+    content = []
+    contents = pdf.getPageBuffer(1)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = -1
+    pos2 = -2
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $1
+        assert_not_nil pos1
+      end
+      if line =~ /left/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+      end
+    end
+    assert_equal count_text, 13
+    assert_equal count_head, 1
+    assert_equal count, 1
+    assert_equal pos1, pos2
+
+    # Page 2
+    content = []
+    contents = pdf.getPageBuffer(2)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+      if line =~ /\(6\)/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+    end
+    assert_equal count_text, 10
+    assert_equal count_head, 1
+    assert_equal count, 1
+
+    # Page 3
+    content = []
+    contents = pdf.getPageBuffer(3)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+      if line =~ /\(11\)/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+    end
+    assert_equal count_text, 5
+    assert_equal count_head, 1
+    assert_equal count, 1
+  end
+
+  test "write_html_cell Table thead tag  cellpadding x position test" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    htmlcontent = '<br>1<br><br><br><br><br><br><br><br><br><br> 2<br><br><br><br><br><br><br><br><br><br> 3<br><br><br><br><br><br><br><br><br><br> 4<br>
+<br><br><br><br><br><br><br><br><br> 5<br><br><br><br><br><br><br><br><br><br> 6<br><br><br><br><br><br><br><br><br><br> 7<br><br><br><br><br><br><br>
+<br><br><br> 8<br><br><br><br><br><br><br><br><br><br> 9<br><br><br><br><br><br><br><br><br><br> 10<br><br><br><br><br><br><br><br><br><br> 11<br><br>
+<br><br><br><br><br><br><br><br>'
+
+    tablehtml ='<table cellpadding="10"><thead><tr>
+    <th style="text-align: left">Left align</th>
+    <th style="text-align: right">Center align</th>
+    <th style="text-align: left">Right align</th>
+    </tr> </thead><tbody> <tr>
+    <td style="text-align: left">left</td>
+    <td style="text-align: right">center</td>
+    <td style="text-align: left">right' + htmlcontent + '</td>
+    </tr> </tbody></table>'
+
+    pdf.write_html_cell(0, 0, '', '',tablehtml)
+
+    page = pdf.get_page
+    assert_equal 1, page
+
+    # Page 1
+    content = []
+    contents = pdf.getPageBuffer(1)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = -1
+    pos2 = -2
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Right align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $1
+        assert_not_nil pos1
+      end
+      if line =~ /right/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+      end
+    end
+    assert_equal count_text, 13
+    assert_equal count_head, 1
+    assert_equal count, 1
+    assert_equal pos1, pos2
+
+    # Page 2
+    content = []
+    contents = pdf.getPageBuffer(2)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Right align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+      if line =~ /\(6\)/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $1
+        assert_not_nil pos2
+        assert_equal pos1, pos2
+      end
+    end
+    assert_equal count_text, 10
+    assert_equal count_head, 1
+    assert_equal count, 1
+  end
+
+  test "write_html_cell Table thead tag cellpadding y position test 1" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    table_start='<table cellpadding="10"><thead><tr>
+<th style="text-align: left">Left align</th><th style="text-align: center">Center align</th><th style="text-align: right">Right align</th>
+</tr></thead><tbody>'
+    table_col='<tr><td style="text-align: left">AAA</td><td style="text-align: center">BBB</td><td style="text-align: right">CCC</td></tr>'
+    table_end='</tbody></table>'
+    tablehtml= table_start + table_col * 30 + table_end
+
+    pdf.write_html_cell(0, 0, '', '',tablehtml)
+
+    # Page 1
+    content = []
+    contents = pdf.getPageBuffer(1)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = pos2 = -1
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $2
+        assert_not_nil pos1
+      end
+      if line =~ /AAA/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $2 if pos2 == -1
+        assert_not_nil pos2
+      end
+    end
+
+    assert_equal count_text, 65
+    assert_equal count_head, 1
+    assert_equal count, 20
+    base_pos = pos1.to_i - pos2.to_i
+
+    # Page 2
+    content = []
+    contents = pdf.getPageBuffer(2)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = pos2 = -1
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $2
+        assert_not_nil pos1
+      end
+      if line =~ /AAA/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $2 if pos2 == -1
+        assert_not_nil pos2
+      end
+    end
+    assert_equal count_text, 34
+    assert_equal count_head, 1
+    assert_equal count, 10
+    assert_equal base_pos, pos1.to_i - pos2.to_i
+  end
+
+  test "write_html_cell Table thead tag cellpadding y position test 2" do
+    pdf = MYPDF.new
+    pdf.add_page()
+
+    table_start='abc<br><table cellpadding="10"><thead><tr>
+<th style="text-align: left">Left align</th><th style="text-align: center">Center align</th><th style="text-align: right">Right align</th>
+</tr></thead><tbody>'
+    table_col='<tr><td style="text-align: left">AAA</td><td style="text-align: center">BBB</td><td style="text-align: right">CCC</td></tr>'
+    table_end='</tbody></table>'
+    tablehtml= table_start + table_col * 30 + table_end
+
+    pdf.write_html_cell(0, 0, '', '',tablehtml)
+
+    # Page 1
+    content = []
+    contents = pdf.getPageBuffer(1)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = pos2 = -1
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $2
+        assert_not_nil pos1
+      end
+      if line =~ /AAA/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $2 if pos2 == -1
+        assert_not_nil pos2
+      end
+    end
+
+    assert_equal count_text, 66
+    assert_equal count_head, 1
+    assert_equal count, 20
+    base_pos = pos1.to_i - pos2.to_i
+
+    # Page 2
+    content = []
+    contents = pdf.getPageBuffer(2)
+    contents.each_line {|line| content.push line.chomp }
+    count_text = count_head = count = 0
+    pos1 = pos2 = -1
+    content.each do |line|
+      count_text += 1 if line =~ /TJ ET Q$/
+      if line =~ /Left align/
+        count_head += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos1 = $2
+        assert_not_nil pos1
+      end
+      if line =~ /AAA/
+        count += 1
+        line =~ /BT ([0-9.]+) ([0-9.]+) Td/
+        pos2 = $2 if pos2 == -1
+        assert_not_nil pos2
+      end
+    end
+    assert_equal count_text, 34
+    assert_equal count_head, 1
+    assert_equal count, 10
+    assert_equal base_pos, pos1.to_i - pos2.to_i
+  end
+
   test "write_html ASCII text test" do
     pdf = MYPDF.new
     pdf.add_page()