rbpdf 1.18.4 → 1.18.5

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 5329616012db52c1743a298afb11aa835126a284
-  data.tar.gz: 6d92283c3fa55edaa59b68edab0b2db7f1311ae5
-SHA512:
-  metadata.gz: 74738ca0557dbe52a46177277d58b92ce1dc4e590fea0cfb6c4711e94f657db4359fe455aab918aeb67d55353fd4044d6bea4de05eaa7c1189b22e7daa05d918
-  data.tar.gz: f29d02d42ac883a7781314deed127c67216fc780b9df7d742cefeb8b839fc7e896fc2638a9459f6eb1010eb3a4b5e478450d523e6a55a9b55f045914efda2000
+--- 
+SHA512: 
+  data.tar.gz: 58ee6415442d443f581733352686a7ce871a2cfe04b5bf683544ba7e8202b934f7258d0c403942b07c52c2a56ad6288f02fb1bb210c1ca94401ca092729da139
+  metadata.gz: fca83b46f3d2abdc1efea548a5a7c7963b1fbbbbdde7e6dbf7a1b279a80cb25bb628a4eba853eb064cdef79ea4ad514928b6d243f3b4c01bf42f03046c2a122f
+SHA1: 
+  data.tar.gz: a973c8fae4a4b576b68cd8e5a7dc3b73211e26ab
+  metadata.gz: c27e1dfa12f3cbfbf8cee92658d17a99cff0a1e0

data/CHANGELOG

@@ -1,3 +1,12 @@
+1.18.5 2015-01-24
+       - Rails 4.2 and Ruby 2.2 supported.
+       - Fix Rails 4.2 (new HTML sanitizer) compatible.
+       - Method getHTMLUnitToUnits() and SetDisplayMode() was fixed, and the problem when dividing, by an integer was fixed. 
+       - Remove Rails 4.2 deprecated ::ActionView::Base.sanitized_allowed_css_properties=.
+       - Fixed no left padding problem on tables.
+       - Fixed thead tag position problem on page break.
+       - fix case of missing HTML image (without height attribute) file. 
+
 1.18.4 2014-12-21
        - utf8Bidi() Persion 0x200C(8204) and endedletter bug fixed.
        - utf8Bidi() Bidirectional Algorithm X9/I1 rule BN(ZERO WIDTH NON-JOINER) bug fixed.

data/lib/rbpdf.rb

@@ -363,7 +363,6 @@ class RBPDF
     @radiobutton_groups ||= []
     @radio_groups ||= []
     @textindent ||= 0
-    @nested_table = false
 
     @start_transaction_y ||= 0
     @in_thead ||= false
@@ -1340,7 +1339,7 @@ class RBPDF
   #
   def SetDisplayMode(zoom, layout='SinglePage', mode='UseNone')
     #Set display mode in viewer
-    if (zoom == 'fullpage' or zoom == 'fullwidth' or zoom == 'real' or zoom == 'default' or !zoom.is_a?(String))
+    if (zoom == 'fullpage' or zoom == 'fullwidth' or zoom == 'real' or zoom == 'default' or zoom.is_a?(Numeric))
       @zoom_mode = zoom
     else
       Error('Incorrect zoom display mode: ' + zoom)
@@ -2001,8 +2000,8 @@ class RBPDF
     #barcode = getBarcode()
     #if !barcode.empty?
     #  Ln(line_width)
-    #  barcode_width = ((getPageWidth() - ormargins['left'] - ormargins['right']) / 3).round
-    #  write1DBarcode(barcode, 'C128B', GetX(), cur_y + line_width, barcode_width, ((getFooterMargin() / 3) - line_width), 0.3, '', '')
+    #  barcode_width = ((getPageWidth() - ormargins['left'] - ormargins['right']) / 3.0).round
+    #  write1DBarcode(barcode, 'C128B', GetX(), cur_y + line_width, barcode_width, ((getFooterMargin() / 3.0) - line_width), 0.3, '', '')
     #end
     w_page = (@l.nil? or @l['w_page'].nil?) ? '' : @l['w_page']
     if @pagegroups.empty?
@@ -2126,8 +2125,9 @@ class RBPDF
       # set margins
       prev_lMargin = @l_margin
       prev_rMargin = @r_margin
-      @l_margin = @pagedim[@page]['olm']
-      @r_margin = @pagedim[@page]['orm']
+      prev_cMargin = @c_margin
+      @l_margin = @thead_margins['lmargin']
+      @r_margin = @thead_margins['rmargin']
       @c_margin = @thead_margins['cmargin']
       if @rtl
         @x = @w - @r_margin
@@ -2145,6 +2145,7 @@ class RBPDF
       @lasth = 0
       @l_margin = prev_lMargin
       @r_margin = prev_rMargin
+      @c_margin = prev_cMargin
     end
   end
   protected :setTableHeader
@@ -2840,12 +2841,12 @@ class RBPDF
     @font_size_pt = size;
     @font_size = size.to_f / @k;
     if !@current_font['desc'].nil? and !@current_font['desc']['Ascent'].nil? and (@current_font['desc']['Ascent'] > 0)
-      @font_ascent = @current_font['desc']['Ascent'] * @font_size / 1000
+      @font_ascent = @current_font['desc']['Ascent'] * @font_size / 1000.0
     else
       @font_ascent = 0.85 * @font_size
     end
     if !@current_font['desc'].nil? and !@current_font['desc']['Descent'].nil? and (@current_font['desc']['Descent'] <= 0)
-      @font_descent = - @current_font['desc']['Descent'] * @font_size / 1000
+      @font_descent = - @current_font['desc']['Descent'] * @font_size / 1000.0
     else
       @font_descent = 0.15 * @font_size
     end
@@ -2870,7 +2871,7 @@ class RBPDF
     fontdata = AddFont(font, style)
     font = getFontBuffer(fontdata['fontkey'])
     if font['desc'] and font['desc']['Descent'] and (font['desc']['Descent'] <= 0)
-      descent = - font['desc']['Descent'] * sizek / 1000
+      descent = - font['desc']['Descent'] * sizek / 1000.0
     else
       descent = 0.15 * sizek
     end
@@ -2893,7 +2894,7 @@ class RBPDF
     fontdata = AddFont(font, style)
     font = getFontBuffer(fontdata['fontkey'])
     if font['desc'] and font['desc']['Ascent'] and (font['desc']['Ascent'] > 0)
-      ascent = font['desc']['Ascent'] * sizek / 1000
+      ascent = font['desc']['Ascent'] * sizek / 1000.0
     else
       ascent = 0.85 * sizek
     end
@@ -3401,46 +3402,46 @@ class RBPDF
       case valign
       when 'T'
         # top
-        y -= @line_width / 2
+        y -= @line_width / 2.0
       when 'B'
         # bottom
-        y -= (h - @font_ascent - @font_descent - @line_width / 2)
+        y -= (h - @font_ascent - @font_descent - @line_width / 2.0)
       else # 'M'
         # center
-        y -= (h - @font_ascent - @font_descent) / 2
+        y -= (h - @font_ascent - @font_descent) / 2.0
       end
     when 'L'
       # font baseline
       case valign
       when 'T'
         # top
-        y -= (@font_ascent + @line_width / 2)
+        y -= (@font_ascent + @line_width / 2.0)
       when 'B'
         # bottom
-        y -= (h - @font_descent - @line_width / 2)
+        y -= (h - @font_descent - @line_width / 2.0)
       else # 'M'
         # center
-        y -= (h + @font_ascent - @font_descent) / 2
+        y -= (h + @font_ascent - @font_descent) / 2.0
       end
     when 'D'
       # font bottom
       case valign
       when 'T'
         # top
-        y -= (@font_ascent + @font_descent + @line_width / 2)
+        y -= (@font_ascent + @font_descent + @line_width / 2.0)
       when 'B'
         # bottom
-        y -= (h - @line_width / 2)
+        y -= (h - @line_width / 2.0)
       else # 'M'
         # center
-        y -= (h + @font_ascent + @font_descent) / 2
+        y -= (h + @font_ascent + @font_descent) / 2.0
       end
     when 'B'
       # cell bottom
       y -= h
     when 'C'
       # cell center
-      y -= h / 2
+      y -= h / 2.0
     else # 'T'
       # cell top
     end
@@ -3449,13 +3450,13 @@ class RBPDF
     case valign
     when 'T'
       # top
-      basefonty = y + @font_ascent + @line_width / 2
+      basefonty = y + @font_ascent + @line_width / 2.0
     when 'B'
       # bottom
-      basefonty = y + h - @font_descent - @line_width / 2
+      basefonty = y + h - @font_descent - @line_width / 2.0
     else # 'M'
       # center
-      basefonty = y + (h + @font_ascent - @font_descent) / 2
+      basefonty = y + (h + @font_ascent - @font_descent) / 2.0
     end
 
     if empty_string(w) or (w <= 0)
@@ -3482,7 +3483,7 @@ class RBPDF
       s << sprintf('%.2f %.2f %.2f %.2f re %s ', xk, (@h - y) * k, w * k, -h * k, op)
     end
     if (border.is_a?(String))
-      lm = @line_width / 2
+      lm = @line_width / 2.0
       if (border.include?('L'))
         if @rtl
           xk = (x - w) * k
@@ -3622,7 +3623,7 @@ class RBPDF
       txt2 = txt2.gsub("\r", ' ')
       case align
       when 'C'
-        dx = (w - width) / 2
+        dx = (w - width) / 2.0
       when 'R'
         if @rtl
           dx = @c_margin
@@ -3684,7 +3685,7 @@ class RBPDF
         s<<' Q';
       end
       if link && ((link.is_a?(String) and !link.empty?) or (link.is_a?(Fixnum) and link != 0)) # Fixnum is PDF file Page No.
-        Link(xdx, y + ((h - @font_size) / 2), width, @font_size, link, ns)
+        Link(xdx, y + ((h - @font_size) / 2.0), width, @font_size, link, ns)
       end
     end
 
@@ -3834,12 +3835,12 @@ class RBPDF
     starty = @y
     if autopadding
       # Adjust internal padding
-      if @c_margin < (@line_width / 2)
-        @c_margin = @line_width / 2
+      if @c_margin < (@line_width / 2.0)
+        @c_margin = @line_width / 2.0
       end
       # Add top space if needed
       if (@lasth - @font_size) < @line_width
-        @y += @line_width / 2
+        @y += @line_width / 2.0
       end
       # add top padding
       @y += @c_margin
@@ -3859,7 +3860,7 @@ class RBPDF
       @y += @c_margin
       # Add bottom space if needed
       if (@lasth - @font_size) < @line_width
-        @y += @line_width / 2
+        @y += @line_width / 2.0
       end
     end
 
@@ -4085,8 +4086,8 @@ class RBPDF
     end
     if autopadding
       # adjust internal padding
-      if cellMargin < (lineWidth / 2)
-        cellMargin = lineWidth / 2
+      if cellMargin < (lineWidth / 2.0)
+        cellMargin = lineWidth / 2.0
       end
     end
     wmax = w - (2 * cellMargin)
@@ -4187,8 +4188,8 @@ class RBPDF
         lineWidth = @line_width
       end
       # adjust internal padding
-      if cellMargin < (lineWidth / 2)
-        cellMargin = lineWidth / 2
+      if cellMargin < (lineWidth / 2.0)
+        cellMargin = lineWidth / 2.0
       end
       # add top and bottom space if needed
       if (@lasth - @font_size) < lineWidth
@@ -4817,6 +4818,7 @@ class RBPDF
     prev_x = @x
     if checkPageBreak(h, y)
       y = @y
+      y += @c_margin if !empty_string(@thead) and !@in_thead  ### fix ###
       if @rtl
         x += prev_x - @x
       else
@@ -4950,7 +4952,7 @@ class RBPDF
       if palign == 'L'
         ximg = @l_margin
       elsif palign == 'C'
-        ximg = (@w + @l_margin - @r_margin - w) / 2
+        ximg = (@w + @l_margin - @r_margin - w) / 2.0
       elsif palign == 'R'
         ximg = @w - @r_margin - w
       else
@@ -4961,7 +4963,7 @@ class RBPDF
       if palign == 'L'
         ximg = @l_margin
       elsif palign == 'C'
-        ximg = (@w + @l_margin - @r_margin - w) / 2
+        ximg = (@w + @l_margin - @r_margin - w) / 2.0
       elsif palign == 'R'
         ximg = @w - @r_margin - w
       else
@@ -4999,7 +5001,7 @@ class RBPDF
       @y = y
       @x = @img_rb_x
     when 'M'
-      @y = y + (h/2).round
+      @y = y + (h/2.0).round
       @x = @img_rb_x
     when 'B'
       @y = @img_rb_y
@@ -5721,7 +5723,7 @@ protected
             if @pagedim[n]['BoxColorInfo'][box]['C']
               color = @pagedim[n]['BoxColorInfo'][box]['C']
               out <<= ' /C ['
-              out << sprintf(' %.3f %.3f %.3f', color[0]/255, color[1]/255, color[2]/255)
+              out << sprintf(' %.3f %.3f %.3f', color[0]/255.0, color[1]/255.0, color[2]/255.0)
               out << ' ]'
             end
             if @pagedim[n]['BoxColorInfo'][box]['W']
@@ -6028,7 +6030,7 @@ protected
             annots << ' /C ['
             pl['opt']['c'].each {|col|
               col = col.to_i
-              color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255)
+              color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255.0)
               annots << sprintf(" %.4f", color)
             }
             annots << ']'
@@ -6188,7 +6190,7 @@ protected
                 annots << ' /BC ['
                 pl['opt']['mk']['bc'].each {|col|
                   col = col.to_i
-                  color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255)
+                  color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255.0)
                   annots << sprintf(' %.2f', color)
                 }
                 annots << ']'
@@ -6197,7 +6199,7 @@ protected
                 annots << ' /BG ['
                 pl['opt']['mk']['bg'].each {|col|
                   col = col.to_i
-                  color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255)
+                  color = col <= 0 ? 0 : (col >= 255 ? 1 : col / 255.0)
                   annots << sprintf(' %.2f', color)
                 }
                 annots << ']'
@@ -6923,7 +6925,7 @@ protected
       out = '[/Separation /' + name.gsub(' ', '#20')
       out << ' /DeviceCMYK <<'
       out << ' /Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0]'
-      out << ' ' + sprintf('/C1 [%.4f %.4f %.4f %.4f] ', color['c']/100, color['m']/100, color['y']/100, color['k']/100)
+      out << ' ' + sprintf('/C1 [%.4f %.4f %.4f %.4f] ', color['c']/100.0, color['m']/100.0, color['y']/100.0, color['k']/100.0)
       out << ' /FunctionType 2 /Domain [0 1] /N 1>>]'
       out << ' endobj'
       out(out)
@@ -7074,8 +7076,8 @@ protected
       out << ' /OpenAction [3 0 R /FitH null]'
     elsif (@zoom_mode=='real')
       out << ' /OpenAction [3 0 R /XYZ null null 1]'
-    elsif (!@zoom_mode.is_a?(String))
-      out << ' /OpenAction [3 0 R /XYZ null null ' + (@zoom_mode/100) + ']'
+    elsif @zoom_mode.is_a?(Numeric)
+      out << ' /OpenAction [3 0 R /XYZ null null ' + (@zoom_mode/100.0).to_s + ']'
     end
     if @layout_mode and !empty_string(@layout_mode)
       out << ' /PageLayout /' + @layout_mode
@@ -7393,7 +7395,7 @@ protected
   #
   def dolinethroughw(x, y, w)
     linew = - @current_font['ut'] / 1000.0 * @font_size_pt
-    return sprintf('%.2f %.2f %.2f %.2f re f', x * @k, (@h - y) * @k + linew + (@font_size_pt / 3), w * @k, linew)
+    return sprintf('%.2f %.2f %.2f %.2f re f', x * @k, (@h - y) * @k + linew + (@font_size_pt / 3.0), w * @k, linew)
   end
 
   #
@@ -8890,7 +8892,7 @@ public
     if border_style
       SetLineStyle(border_style)
     end
-    myArc = 4 / 3 * (::Math.sqrt(2) - 1)
+    myArc = 4 / 3.0 * (::Math.sqrt(2) - 1)
     outPoint(x + rx, y)
     xc = x + w - rx
     yc = y + ry
@@ -10685,8 +10687,7 @@ protected
     blocktags = ['blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','table','tr','td']
 
     # remove all unsupported tags (the line below lists all supported tags)
-    ::ActionView::Base.sanitized_allowed_css_properties = ["page-break-before", "page-break-after", "page-break-inside"]
-    html = "%s" % sanitize(html, :tags=> %w(a b blockquote body br dd del div dl dt em font h1 h2 h3 h4 h5 h6 hr i img li ol p pre small span strong sub sup table tablehead td th thead tr tt u ins ul), :attributes => %w(cellspacing cellpadding bgcolor color value width height src size colspan rowspan style align border face href dir class id nobr stroke strokecolor fill nested))
+    html = sanitize_html(html)
 
     # replace some blank characters
     html.gsub!(/<pre/, '<xre') # preserve pre tag
@@ -10840,8 +10841,8 @@ protected
           end
           if (dom[key]['value'] == 'table') and !empty_string(dom[(dom[key]['parent'])]['thead'])
             # remove the nobr attributes from the table header
-            dom[(dom[key]['parent'])]['thead'] = dom[(dom[key]['parent'])]['thead'].gsub(' nobr="true"', '')
-            dom[(dom[key]['parent'])]['thead'] << '</tablehead>'
+            dom[(dom[key]['parent'])]['thead'] = dom[(dom[key]['parent'])]['thead'].gsub(' nobr="true"', '').sub(/<table([ >])/, '<table tablehead="1"\1')
+            dom[(dom[key]['parent'])]['thead'] << '</table>'
           end
         else
           # *** opening html tag
@@ -11278,13 +11279,16 @@ public
   # [@see] Multicell(), writeHTML(), Cell()
   #
   def writeHTMLCell(w, h, x, y, html='', border=0, ln=0, fill=0, reseth=true, align='', autopadding=true)
-    @nested_table = true
     rtn = MultiCell(w, h, html, border, align, fill, ln, x, y, reseth, 0, true, autopadding, 0)
-    @nested_table = false
     return rtn
   end
   alias_method :write_html_cell, :writeHTMLCell
 
+  def sanitize_html(html)
+    html = "%s" % sanitize(html, :tags=> %w(a b blockquote body br dd del div dl dt em font h1 h2 h3 h4 h5 h6 hr i img li ol p pre small span strong sub sup table td th thead tr tt u ins ul), :attributes => %w(cellspacing cellpadding bgcolor color value width height src size colspan rowspan style align border face href dir class id nobr stroke strokecolor fill nested tablehead))
+  end
+  protected :sanitize_html
+
   #
   # Allows to preserve some HTML formatting (limited support).
   # IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
@@ -11454,8 +11458,18 @@ public
       if (dom[key]['value'] == 'tr') and dom[key]['thead'] and dom[key]['thead']
         if dom[key]['parent'] and dom[(dom[key]['parent'])]['thead'] and !empty_string(dom[(dom[key]['parent'])]['thead'])
           @in_thead = true
+
+          prev_lMargin = @l_margin
+          prev_rMargin = @r_margin
+          @l_margin = @thead_margins['lmargin']
+          @r_margin = @thead_margins['rmargin']
+
           # print table header (thead)
           writeHTML(@thead, false, false, false, false, '')
+
+          @l_margin = prev_lMargin
+          @r_margin = prev_rMargin
+
           if (@start_transaction_page == (@numpages - 1)) or (@y < @start_transaction_y) or checkPageBreak(@lasth, '', false)
             # restore previous object
             rollbackTransaction(true)
@@ -11555,7 +11569,7 @@ public
               startlinepage = @page
               startliney = @y
             end
-            @y += ((curfontsize * @cell_height_ratio / @k) + curfontascent - curfontdescent) / 2  - imgh
+            @y += ((curfontsize * @cell_height_ratio / @k) + curfontascent - curfontdescent) / 2.0  - imgh
             minstartliney = [@y, minstartliney].min
             maxbottomliney = startliney + @font_size * @cell_height_ratio
           end
@@ -11612,7 +11626,7 @@ public
                 startliney = @y
               end
               if !dom[key]['block']
-                @y += (((curfontsize - fontsize) * @cell_height_ratio / @k) + curfontascent - fontascent - curfontdescent + fontdescent) / 2
+                @y += (((curfontsize - fontsize) * @cell_height_ratio / @k) + curfontascent - fontascent - curfontdescent + fontdescent) / 2.0
                 if (dom[key]['value'] != 'sup') and (dom[key]['value'] != 'sub')
                   minstartliney = [@y, minstartliney].min
                   maxbottomliney = [@y + ((fontsize * @cell_height_ratio) / @k), maxbottomliney].max
@@ -11706,9 +11720,9 @@ public
             mdiff = (tw - linew).abs
             if plalign == 'C'
               if @rtl
-                t_x = -(mdiff / 2)
+                t_x = -(mdiff / 2.0)
               else
-                t_x = (mdiff / 2)
+                t_x = (mdiff / 2.0)
               end
             elsif (plalign == 'R') and !@rtl
               # right alignment on LTR document
@@ -11955,6 +11969,7 @@ public
           end
         end
         pbrk = checkPageBreak(@lasth)
+        @y += @c_margin if pbrk and !dom[key]['tag'] and !empty_string(@thead) and !@in_thead ### fix ###
         @newline = false
         startlinex = @x
         startliney = @y
@@ -12010,7 +12025,7 @@ public
             else
               wtmp = @w - @r_margin - @x
             end
-            if (@nested_table == true) or (dom[key]['attribute']['nested'] and (dom[key]['attribute']['nested'] == 'true'))
+            if cell or (dom[key]['attribute']['nested'] and (dom[key]['attribute']['nested'] == 'true'))
               # add margin for nested tables
               wtmp -= @c_margin
             end
@@ -12028,10 +12043,12 @@ public
               dom[table_el]['cols'] = dom[trid]['cols']
             end
             oldmargin = @c_margin
+            currentcmargin = @c_margin
             if !dom[(dom[trid]['parent'])]['attribute']['cellpadding'].nil?
               currentcmargin = getHTMLUnitToUnits(dom[(dom[trid]['parent'])]['attribute']['cellpadding'], 1, 'px')
-            else
-              currentcmargin = 0
+            end
+            if currentcmargin < (@line_width / 2.0)
+              currentcmargin = @line_width / 2.0
             end
             @c_margin = currentcmargin
             if !dom[(dom[trid]['parent'])]['attribute']['cellspacing'].nil?
@@ -12082,7 +12099,7 @@ public
             if dom[trid]['startx'].nil?
               dom[trid]['startx'] = @x
             else
-              @x += (cellspacingx / 2)
+              @x += (cellspacingx / 2.0)
             end
             if !dom[parentid]['attribute']['rowspan'].nil?
               rowspan = dom[parentid]['attribute']['rowspan'].to_i
@@ -12182,7 +12199,7 @@ public
                 end
               }
             end
-            @x += (cellspacingx / 2)
+            @x += (cellspacingx / 2.0)
           else
             # opening tag (or self-closing tag)
             if opentagpos.nil?
@@ -12218,7 +12235,7 @@ public
           if pfontsize.is_a?(Numeric) and (pfontsize > 0) and curfontsize.is_a?(Numeric) and (curfontsize > 0) and (pfontsize != curfontsize)
             pfontascent = getFontAscent(pfontname, pfontstyle, pfontsize)
             pfontdescent = getFontDescent(pfontname, pfontstyle, pfontsize)
-            @y += ((pfontsize - curfontsize) * @cell_height_ratio / @k + pfontascent - curfontascent - pfontdescent + curfontdescent) / 2
+            @y += ((pfontsize - curfontsize) * @cell_height_ratio / @k + pfontascent - curfontascent - pfontdescent + curfontdescent) / 2.0
             minstartliney = [@y, minstartliney].min
             maxbottomliney = [@y + pfontsize * @cell_height_ratio / @k, maxbottomliney].max
           end
@@ -12374,9 +12391,9 @@ public
         mdiff = (tw - linew).abs
         if plalign == 'C'
           if @rtl
-            t_x = -(mdiff / 2)
+            t_x = -(mdiff / 2.0)
           else
-            t_x = (mdiff / 2)
+            t_x = (mdiff / 2.0)
           end
         elsif (plalign == 'R') and !@rtl
           # right alignment on LTR document
@@ -12500,12 +12517,30 @@ public
           @thead = dom[key]['thead']
           if @thead_margins.nil? or @thead_margins.empty?
             @thead_margins ||= {}
-            @thead_margins['cmargin'] = @c_margin
+
+            if dom[key]['attribute']['cellpadding']
+              @thead_margins['cmargin'] = getHTMLUnitToUnits(dom[key]['attribute']['cellpadding'], 1, 'px')
+            else
+              @thead_margins['cmargin'] = @c_margin
+            end
+            if @thead_margins['cmargin'] < (@line_width / 2.0)
+              @thead_margins['cmargin'] = @line_width / 2.0
+            end
+            if cell
+              @thead_margins['lmargin'] = @l_margin + @c_margin
+              @thead_margins['rmargin'] = @r_margin + @c_margin
+            else
+              @thead_margins['lmargin'] = @l_margin
+              @thead_margins['rmargin'] = @r_margin
+            end
           end
         end
       end
       if !tag['attribute']['cellpadding'].nil?
         cp = getHTMLUnitToUnits(tag['attribute']['cellpadding'], 1, 'px')
+        if cp < (@line_width / 2.0)
+          cp = @line_width / 2.0
+        end
         @old_c_margin = @c_margin
         @c_margin = cp
       end
@@ -12526,7 +12561,7 @@ public
       else
         hrHeight = GetLineWidth()
       end
-      addHTMLVertSpace(hbz, (hrHeight / 2), cell, firstorlast)
+      addHTMLVertSpace(hbz, (hrHeight / 2.0), cell, firstorlast)
       x = GetX()
       y = GetY()
       wtmp = @w - @l_margin - @r_margin
@@ -12543,7 +12578,7 @@ public
       Line(x, y, x + hrWidth, y)
       SetLineWidth(prevlinewidth)
       Ln('', cell)
-      addHTMLVertSpace(hrHeight / 2, 0, cell, dom[key + 1].nil?)
+      addHTMLVertSpace(hrHeight / 2.0, 0, cell, dom[key + 1].nil?)
     when 'a'
       if tag['attribute'].key?('href')
         @href['url'] = get_sever_url(tag['attribute']['href'])
@@ -12594,11 +12629,6 @@ public
             xpos += 2 * GetStringWidth(32.chr)
           end
         end
-        if @rtl
-            xpos -= @line_width * 1.5
-        else
-            xpos += @line_width * 1.5
-        end
 
         imglink = ''
         if !@href['url'].nil? and !empty_string(@href['url'])
@@ -12636,8 +12666,8 @@ public
         l_margin = @l_margin
         r_margin = @r_margin
 
-        SetLeftMargin(@l_margin + @line_width * 1.5)
-        SetRightMargin(@r_margin + @line_width * 1.5)
+        SetLeftMargin(@l_margin + @c_margin)
+        SetRightMargin(@r_margin + @c_margin)
 
         begin
 #        if (type == 'eps') or (type == 'ai')
@@ -12645,19 +12675,24 @@ public
 #        elsif type == 'svg'
 #          ImageSVG(tag['attribute']['src'], xpos, @y, iw, ih, imglink, align, '', border, true)
 #        else
-          result_img = Image(tag['attribute']['src'], xpos, @y + @line_width * 1.5, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
+          result_img = Image(tag['attribute']['src'], xpos, @y, iw, ih, '', imglink, align, false, 300, '', false, false, border, false, false, true)
 #        end
         rescue => err
           logger.error "pdf: Image: error: #{err.message}"
           result_img = false
         end
-        case align
-        when 'T'
+
+        if result_img or ih != 0
+          case align
+          when 'T'
+            @y = prevy
+          when 'M'
+            @y = (@img_rb_y + prevy - (tag['fontsize'] / @k)) / 2
+          when 'B'
+            @y = @img_rb_y - (tag['fontsize'] / @k)
+          end
+        else
           @y = prevy
-        when 'M'
-          @y = (@img_rb_y + prevy - (tag['fontsize'] / @k)) / 2
-        when 'B'
-          @y = @img_rb_y - (tag['fontsize'] / @k)
         end
 
         # restore original margin values
@@ -12879,8 +12914,8 @@ public
             end
           end
         end
-      when 'table', 'tablehead'
-        if tag['value'] == 'tablehead'
+      when 'table'
+        if dom[(dom[key]['parent'])]['attribute']['tablehead'] and dom[(dom[key]['parent'])]['attribute']['tablehead'] == "1"
           # closing tag used for the thead part
           in_table_head = true
           @in_thead = false
@@ -13051,8 +13086,10 @@ public
             @thead_margins = {}
           end
         end
-        if tag['block'] ### fix ###
-          addHTMLVertSpace(hbz / 2, 0, cell, (dom[key+1].nil? or (dom[key+1]['value'] != 'table')))
+        if tag['block']
+          unless dom[(dom[key]['parent'])]['attribute']['tablehead'] and dom[(dom[key]['parent'])]['attribute']['tablehead'] == "1" ### fix ###
+            addHTMLVertSpace(hbz / 2, 0, cell, (dom[key+1].nil? or (dom[key+1]['value'] != 'table'))) ### fix ###
+          end
         end
       when 'a'
         @href = {}
@@ -13253,11 +13290,11 @@ public
     end
     case unit
     when '%' # percentage
-      retval = (value * refsize) / 100
+      retval = (value * refsize) / 100.0
     when 'em' # relative-size
       retval = value * refsize
     when 'ex' # height of lower case 'x' (about half the font-size)
-      retval = value * (refsize / 2)
+      retval = value * (refsize / 2.0)
     when 'in' # absolute-size
       retval = (value * @dpi) / k
     when 'cm' # centimeters
@@ -13372,23 +13409,23 @@ protected
     when 'disc', 'circle'
       fill = 'F' if listtype == 'disc'
       fill << 'D'
-      r = size / 6
+      r = size / 6.0
       lspace += 2 * r
       if @rtl
         @x += lspace
       else
         @x -= lspace
       end
-      Circle(@x + r, @y + @lasth / 2, r, 0, 360, fill, {'color'=>color}, color, 8)
+      Circle(@x + r, @y + @lasth / 2.0, r, 0, 360, fill, {'color'=>color}, color, 8)
     when 'square'
-      l = size / 3
+      l = size / 3.0
       lspace += l
       if @rtl
         @x += lspace
       else
         @x -= lspace
       end
-      Rect(@x, @y + (@lasth - l)/ 2, l, l, 'F', {}, color)
+      Rect(@x, @y + (@lasth - l)/ 2.0, l, l, 'F', {}, color)
 
     # ordered types
     # listcount[@listnum]