rbpdf 1.21.2 → 1.21.4

data/lib/rbpdf.rb

@@ -1,4 +1,5 @@
 # coding: ASCII-8BIT
+# frozen_string_literal: true
 #============================================================+
 # File name   : rbpdf.rb
 # Begin       : 2002-08-03
@@ -59,6 +60,12 @@ rescue LoadError
   # MiniMagick is not available
 end
 
+begin
+  require 'marcel' unless Object.const_defined?(:Marcel)
+rescue LoadError
+  # Marcel is not available
+end
+
 unless Object.const_defined?(:MiniMagick)
   begin
     # RMagick 2.14.0
@@ -234,7 +241,7 @@ class RBPDF
   # This is the class constructor.
   # It allows to set up the page format, the orientation and
   # the measure unit used in all the methods (except for the font sizes).
-  # @since 1.0
+  # [@since 1.0]
   # [@param string :orientation]
   #   page orientation. Possible values are (case insensitive):
   #   * P or Portrait (default)
@@ -330,13 +337,16 @@ class RBPDF
     @listindent ||= 0
     @listindentlevel ||= 0
     @lispacer ||= ""
+    @li_position_x = nil
 
     # bookmark
     @outlines ||= []
 
     # --- javascript and form ---
-    @javascript ||= ''
-    @js_objects ||= []
+    @javascript ||= +''
+    @js_objects ||= {}
+    @js_start_obj_id ||= 300000
+    @js_obj_id ||= 300000
 
     @dpi = 72.0
     @newpagegroup ||= []
@@ -394,6 +404,7 @@ class RBPDF
     @page_obj_id ||= []
     @embedded_start_obj_id ||= 100000
     @form_obj_id ||= []
+    @default_form_prop ||= {'lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>[255, 255, 255], 'strokeColor'=>[128, 128, 128]}
     @apxo_start_obj_id ||= 400000
     @apxo_obj_id ||= 400000
     @annotation_fonts ||= {}
@@ -444,8 +455,9 @@ class RBPDF
     if @diskcache
       @buffer ||= nil
     else
-      @buffer ||= ''
+      @buffer ||= +''
     end
+    @tmp_buffer = nil
     @pages ||= []
     @prev_pages ||= []
     @state ||= 0
@@ -525,18 +537,9 @@ class RBPDF
     @href ||= {}
     @fontlist ||= []
     getFontsList()
-    @fgcolor = ActiveSupport::OrderedHash.new
-    @fgcolor['R'] = 0
-    @fgcolor['G'] = 0
-    @fgcolor['B'] = 0
-    @strokecolor = ActiveSupport::OrderedHash.new
-    @strokecolor['R'] = 0
-    @strokecolor['G'] = 0
-    @strokecolor['B'] = 0
-    @bgcolor = ActiveSupport::OrderedHash.new
-    @bgcolor['R'] = 255
-    @bgcolor['G'] = 255
-    @bgcolor['B'] = 255
+    @fgcolor = [0, 0, 0]
+    @strokecolor = [0, 0, 0]
+    @bgcolor = [255, 255, 255]
     @extgstates ||= []
 
     # user's rights
@@ -1452,7 +1455,7 @@ class RBPDF
   #
   # Defines the title of the document.
   # [@param string :title] The title.
-  # [@access public$
+  # [@access public]
   # [@since 1.2]
   # [@see] SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
   #
@@ -2295,20 +2298,15 @@ class RBPDF
     if (col2 == -1) and (col3 == -1) and (col4 == -1)
       # Grey scale
       @draw_color = sprintf('%.3f G', col1 / 255.0)
-      @strokecolor['G'] = col1
+      @strokecolor = [col1]
     elsif col4 == -1
       # RGB
       @draw_color = sprintf('%.3f %.3f %.3f RG', col1 / 255.0, col2 / 255.0, col3 / 255.0)
-      @strokecolor['R'] = col1
-      @strokecolor['G'] = col2
-      @strokecolor['B'] = col3
+      @strokecolor = [col1, col2, col3]
     else
       # CMYK
       @draw_color = sprintf('%.3f %.3f %.3f %.3f K', col1 / 100.0, col2 / 100.0, col3 / 100.0, col4 / 100.0)
-      @strokecolor['C'] = col1
-      @strokecolor['M'] = col2
-      @strokecolor['Y'] = col3
-      @strokecolor['K'] = col4
+      @strokecolor = [col1, col2, col3, col4]
     end
     if (@page>0)
       out(@draw_color + ' ')
@@ -2368,20 +2366,15 @@ class RBPDF
     if (col2 == -1) and (col3 == -1) and (col4 == -1)
       # Grey scale
       @fill_color = sprintf('%.3f g', col1 / 255.0)
-      @bgcolor['G'] = col1
+      @bgcolor = [col1]
     elsif col4 == -1
       # RGB
       @fill_color = sprintf('%.3f %.3f %.3f rg', col1 / 255.0, col2 / 255.0, col3 / 255.0)
-      @bgcolor['R'] = col1
-      @bgcolor['G'] = col2
-      @bgcolor['B'] = col3
+      @bgcolor = [col1, col2, col3]
     else
       # CMYK
       @fill_color = sprintf('%.3f %.3f %.3f %.3f k', col1 / 100.0, col2 / 100.0, col3 / 100.0, col4 / 100.0)
-      @bgcolor['C'] = col1
-      @bgcolor['M'] = col2
-      @bgcolor['Y'] = col3
-      @bgcolor['K'] = col4
+      @bgcolor = [col1, col2, col3, col4]
     end
 
     @color_flag = (@fill_color != @text_color)
@@ -2458,20 +2451,16 @@ class RBPDF
     if (col2 == -1) and (col3 == -1) and (col4 == -1)
       # Grey scale
       @text_color = sprintf('%.3f g', col1 / 255.0)
-      @fgcolor['G'] = col1
+      @fgcolor = [col1]
     elsif col4 == -1
       # RGB
       @text_color = sprintf('%.3f %.3f %.3f rg', col1 / 255.0, col2 / 255.0, col3 / 255.0)
-      @fgcolor['R'] = col1
-      @fgcolor['G'] = col2
-      @fgcolor['B'] = col3
+      @fgcolor = [col1, col2, col3]
+
     else
       # CMYK
       @text_color = sprintf('%.3f %.3f %.3f %.3f k', col1 / 100.0, col2 / 100.0, col3 / 100.0, col4 / 100.0)
-      @fgcolor['C'] = col1
-      @fgcolor['M'] = col2
-      @fgcolor['Y'] = col3
-      @fgcolor['K'] = col4
+      @fgcolor = [col1, col2, col3, col4]
     end
     @color_flag = (@fill_color != @text_color)
   end
@@ -2663,7 +2652,7 @@ class RBPDF
     end
 
     tempstyle = style.upcase
-    style = ''
+    style = +''
     # underline
     if tempstyle.index('U') != nil
       @underline = true
@@ -3464,8 +3453,8 @@ class RBPDF
   # [@see] Cell()
   #
   def getCellCode(w, h=0, txt='', border=0, ln=0, align='', fill=0, link=nil, stretch=0, ignore_min_height=false, calign='T', valign='M')
-    txt = '' if txt.nil?
-    rs = "" # string to be returned
+    txt = +'' if txt.nil?
+    rs = +"" # string to be returned
     txt = removeSHY(txt)
     if !ignore_min_height
       min_cell_height = @font_size * @cell_height_ratio
@@ -3547,7 +3536,7 @@ class RBPDF
         w = @w - @r_margin - x
       end
     end
-    s = '';
+    s = +'';
     # fill and borders
     if (fill == 1) or (border.to_i == 1)
       if (fill == 1)
@@ -4025,7 +4014,9 @@ class RBPDF
       ccode = getCellCode(w, h, '', border, 1, '', fill, '', 0, true)
       @lasth = prevLastH
 
-      if (border != 0) or (fill == 1)
+      if @tmp_buffer
+        @tmp_buffer = "#{ccode}\n#{@tmp_buffer}"
+      elsif (border != 0) or (fill == 1)
         if !@transfmrk[@page].nil?
           pagemark = @transfmrk[@page]
           @transfmrk[@page] += (ccode + "\n").length
@@ -4081,7 +4072,7 @@ class RBPDF
   #   * T: top
   #   * R: right
   #   * B: bottom
-  # [@param string multicell position: 'start', 'middle', 'end'
+  # [@param string multicell :position] 'start', 'middle', 'end'
   # [@return mixed] border mode
   # [@access protected]
   # [@since 4.4.002 (2008-12-09)]
@@ -4091,7 +4082,7 @@ class RBPDF
       return 1
     end
     return 0 if border == 0
-    cborder = ''
+    cborder = +''
     case position
     when 'start'
       if border == 1
@@ -4686,7 +4677,7 @@ class RBPDF
   # [@access public]
   #
   def UTF8ArrSubString(strarr, start=0, last=strarr.size)
-    string = ""
+    string = +""
     start.upto(last - 1) do |i|
       string << unichr(strarr[i])
     end
@@ -4704,7 +4695,7 @@ class RBPDF
   # [@since 4.5.037 (2009-04-07)]
   #
   def UniArrSubString(uniarr, start=0, last=uniarr.length)
-    string = ''
+    string = +''
     start.upto(last - 1) do |i|
       string << uniarr[i]
     end
@@ -5156,7 +5147,7 @@ class RBPDF
     end
     bpc=!a['bits'].nil? ? a['bits'] : 8;
     #Read whole file
-    data='';
+    data=+'';
     open(file,'rb') do |f|
       data << f.read()
     end
@@ -5269,9 +5260,9 @@ class RBPDF
     f.read(4)
     parms='/DecodeParms <</Predictor 15 /Colors ' + (ct == 2 ? 3 : 1).to_s + ' /BitsPerComponent ' + bpc.to_s + ' /Columns ' + w.to_s + '>>'
     # Scan chunks looking for palette, transparency and image data
-    pal = ''
-    trns = ''
-    data = ''
+    pal = +''
+    trns = +''
+    data = +''
     begin
       n = freadint(f)
       type = f.read(4)
@@ -5704,7 +5695,7 @@ class RBPDF
     self.instance_variables.each { |val|
       if destroyall or ((val != '@internal_encoding') and (val != '@state') and (val != '@bufferlen') and (val != '@buffer') and (val != '@diskcache') and (val != '@sign') and (val != '@signature_data') and (val != '@signature_max_length') and (val != '@byterange_string'))
         if (!preserve_objcopy or (val.to_s != '@objcopy')) and !val.nil?
-          eval("#{val} = nil")
+          instance_variable_set(val, nil)
         end
       end
     }
@@ -5866,7 +5857,7 @@ protected
       temppage = temppage.gsub(@epsmarker, '')
       #Page
       @page_obj_id[n] = newobj()
-      out = '<<'
+      out = +'<<'
       out << ' /Type /Page'
       out << ' /Parent 1 0 R'
       out << ' /LastModified ' + datestring()
@@ -5956,7 +5947,7 @@ protected
     end
     #Pages root
     @offsets[1]=@bufferlen
-    out = '1 0 obj << /Type /Pages  /Kids ['
+    out = +'1 0 obj << /Type /Pages  /Kids ['
     @page_obj_id.each { |page_obj|
       out << ' ' + page_obj.to_s + ' 0 R' unless page_obj.nil?
     }
@@ -5986,9 +5977,9 @@ protected
   #
   def getannotsrefs(n)
     unless @page_annots[n] or (@sign and @signature_data['cert_type'])
-      return ''
+      return +''
     end
-    out = ' /Annots ['
+    out = +' /Annots ['
     if @page_annots[n]
       num_annots = @page_annots[n].length
       0.upto(num_annots - 1) do |i|
@@ -6026,28 +6017,27 @@ protected
         @page_annots[n].each_with_index { |pl, key|
           # create annotation object for grouping radiobuttons
           if @radiobutton_groups[n] and @radiobutton_groups[n][pl['txt']] and @radiobutton_groups[n][pl['txt']].is_a?(Array)
-            annots = '<<'
+            annots = +'<<'
             annots << ' /Type /Annot'
             annots << ' /Subtype /Widget'
             annots << ' /T ' + dataannobjstring(pl['txt'])
             annots << ' /FT /Btn'
             annots << ' /Ff 49152'
             annots << ' /Kids ['
+            defval = nil
             @radiobutton_groups[n][pl['txt']].each {|data|
-              annots << ' ' + data['kid'] + ' 0 R'
+              annots << " #{data['kid']} 0 R"
               if data['def'] != 'Off'
                 defval = data['def']
               end
             }
             annots << ' ]'
-            if defval
-              annots << ' /V /' + defval
-            end
+            annots << " /V /#{defval}" if defval
             annots << ' >>'
             @annot_obj_id += 1
             @offsets[@annot_obj_id] = @bufferlen
-            out(@annot_obj_id + ' 0 obj ' + annots + ' endobj')
-            @form_obj_id.push = @annot_obj_id
+            out("#{@annot_obj_id} 0 obj #{annots} endobj")
+            @form_obj_id << @annot_obj_id
             # store object id to be used on Parent entry of Kids
             @radiobutton_groups[n][pl['txt']] = @annot_obj_id
           end
@@ -6063,7 +6053,7 @@ protected
           d = pl['h'] * @k
           rect = sprintf('%.2f %.2f %.2f %.2f', a, b, a + c, b + d)
           # create new annotation object
-          annots = '<</Type /Annot'
+          annots = +'<</Type /Annot'
           annots << ' /Subtype /' + pl['opt']['subtype']
           annots << ' /Rect [' + rect + ']'
           ft = ['Btn', 'Tx', 'Ch', 'Sig']
@@ -6105,7 +6095,7 @@ protected
             else
               val = pl['opt']['f'].to_i
             end
-            annots << ' /F ' + val.to_i
+            annots << " /F #{val}"
           end
           # annots << ' /AP '
           # annots << ' /AS '
@@ -6114,24 +6104,23 @@ protected
           end
           if pl['opt']['ap']
             # appearance stream
-            annots << ' /AP << ' + pl['opt']['ap'] + ' >>'
             annots << ' /AP <<'
             if pl['opt']['ap'].is_a?(Hash)
               pl['opt']['ap'].each {|apmode, apdef|
                 # apmode can be: n = normal; r = rollover; d = down
                 annots << ' /' + apmode.upcase
-                if apdef.is_a?(Array)
+                if apdef.is_a?(Hash)
                   annots << ' <<'
                   apdef.each {|apstate, stream|
                     # reference to XObject that define the appearance for this mode-state
                     apsobjid = putAPXObject(c, d, stream)
-                    annots << ' /' + apstate + ' ' + apsobjid + ' 0 R'
+                    annots << " /#{apstate} #{apsobjid} 0 R"
                   }
                   annots << ' >>'
                 else
                   # reference to XObject that define the appearance for this mode
                   apsobjid = putAPXObject(c, d, apdef)
-                  annots << ' ' + apsobjid + ' 0 R'
+                  annots << " #{apsobjid} 0 R"
                 end
               }
             else
@@ -6143,7 +6132,7 @@ protected
             annots << ' /BS <<'
             annots << ' /Type /Border'
             if !pl['opt']['bs']['w'].nil?
-              annots << ' /W ' + pl['opt']['bs']['w'].to_i
+              annots << " /W #{pl['opt']['bs']['w']}"
             end
             bstyles = ['S', 'D', 'B', 'I', 'U']
             if !pl['opt']['bs']['s'].nil? and bstyles.include?(pl['opt']['bs']['s'])
@@ -6205,7 +6194,7 @@ protected
             if !pl['opt']['t'].nil? and pl['opt']['t'].is_a?(String)
               annots << ' /T ' + textannobjstring(pl['opt']['t'])
             end
-            # annots .= ' /Popup '
+            # annots << ' /Popup '
             if !pl['opt']['ca'].nil?
               annots << ' /CA ' + sprintf("%.4f", pl['opt']['ca'].to_f)
             end
@@ -6420,9 +6409,9 @@ protected
             end # end MK
 
             # --- Entries for field dictionaries ---
-            if @radiobutton_groups[n][pl['txt']]
+            if @radiobutton_groups[n] and @radiobutton_groups[n][pl['txt']]
               # set parent
-              annots << ' /Parent ' + @radiobutton_groups[n][pl['txt']] + ' 0 R'
+              annots << " /Parent #{@radiobutton_groups[n][pl['txt']]} 0 R"
             end
             if pl['opt']['t'] and pl['opt']['t'].is_a?(String)
               annots << ' /T ' + dataannobjstring(pl['opt']['t'])
@@ -6443,7 +6432,7 @@ protected
               else
                 flag = pl['opt']['ff'].to_i
               end
-              annots << ' /Ff ' + flag
+              annots << " /Ff #{flag}"
             end
             if pl['opt']['maxlen']
               annots << ' /MaxLen ' + pl['opt']['maxlen'].to_i.to_s
@@ -6529,9 +6518,9 @@ protected
           @offsets[@annot_obj_id] = @bufferlen
           out(@annot_obj_id.to_s + ' 0 obj ' + annots + ' endobj')
 
-          if formfield and ! @radiobutton_groups[n][pl['txt']]
+          if formfield and !(@radiobutton_groups[n] and @radiobutton_groups[n][pl['txt']])
             # store reference of form object
-            @form_obj_id.push = @annot_obj_id
+            @form_obj_id << @annot_obj_id
           end
         }
       end # end for each page
@@ -6563,7 +6552,7 @@ protected
     rect = sprintf('%.2f %.2f', w, h)
     out << ' /BBox [0 0 ' + rect + ']'
     out << ' /Matrix [1 0 0 1 0 0]'
-    out << ' /Resources <</ProcSet [/PDF]>>'
+    out << ' /Resources 2 0 R'
     out << ' /Length ' + stream.length.to_s
     out << ' >>'
     out << ' ' + getstream(stream)
@@ -6855,7 +6844,7 @@ protected
     subsetglyphs = subsetglyphs_tmp
 
     # build new glyf table with only used glyphs
-    glyf = ''
+    glyf = +''
     glyfSize = 0
     # create new empty indexToLoc table
     newIndexToLoc = Array.new(indexToLoc.length, 0)
@@ -6871,7 +6860,7 @@ protected
       end
     }
     # build new loca table
-    loca = ''
+    loca = +''
     if short_offset
       newIndexToLoc.each {|offset|
         loca << [offset / 2].pack('n')
@@ -6933,7 +6922,7 @@ protected
     table['glyf']['offset'] = offset
     table['glyf']['checkSum'] = getTTFtableChecksum(table['glyf']['data'], table['glyf']['length'])
     # rebuild font
-    font = ''
+    font = +''
     font << [0x10000].pack('N') # sfnt version
     numTables = table.length
     font << [numTables].pack('n') # numTables
@@ -7074,7 +7063,7 @@ protected
       end
     }
     # output data
-    w = ''
+    w = +''
     range.each_with_index {|ws, k|
       if ws and ws.uniq.length == 1
         # interval mode is more compact
@@ -7149,7 +7138,7 @@ protected
         end
         newobj()
         @font_files[file]['n'] = @n
-        out = '<</Length '+ font.length.to_s
+        out = +'<</Length '+ font.length.to_s
         if compressed
           out << ' /Filter /FlateDecode'
         end
@@ -7163,7 +7152,7 @@ protected
         out(out)
       end
     end
-    @fontkeys.each do |k|
+    @fontkeys.each_with_index do |k, i|
       #Font objects
       setFontSubBuffer(k, 'n', @n + 1)
       font = getFontBuffer(k)
@@ -7172,7 +7161,7 @@ protected
       if (type=='core')
         # standard core font
         obj_id = newobj()
-        out = '<</Type /Font'
+        out = +'<</Type /Font'
         out << ' /Subtype /Type1'
         out << ' /BaseFont /' + name
         out << ' /Name /F' + font['i'].to_s
@@ -7181,14 +7170,14 @@ protected
         end
         if name.downcase == 'helvetica'
           # add default font for annotations
-          @annotation_fonts['helvetica'] = k
+          @annotation_fonts['helvetica'] = i
         end
         out << ' >> endobj'
         out(out)
       elsif (type=='Type1' || type=='TrueType')
         # additional Type1 or TrueType font
         obj_id = newobj()
-        out = '<</Type /Font'
+        out = +'<</Type /Font'
         out << ' /Subtype /' + type
         out << ' /BaseFont /' + name
         out << ' /Name /F' + font['i'].to_s
@@ -7232,9 +7221,9 @@ protected
           Error('Unsupported font type: ' + type)
         end
         obj_id = self.send(mtd,font)
-        # store object ID for current font
-        @font_obj_ids[k] = obj_id
       end
+      # store object ID for current font
+      @font_obj_ids[k] = obj_id
     end
   end
 
@@ -7248,7 +7237,7 @@ protected
   # [@since 1.52.0.TC005 (2005-01-05)]
   #
   def puttruetypeunicode(font)
-    fontname = ''
+    fontname = +''
     if font['subset']
       # change name for font subsetting
       subtag = sprintf('%06u', font['i'])
@@ -7259,7 +7248,7 @@ protected
     # Type0 Font
     # A composite font composed of other fonts, organized hierarchically
     obj_id = newobj()
-    out = '<</Type /Font'
+    out = +'<</Type /Font'
     out << ' /Subtype /Type0'
     out << ' /BaseFont /' + fontname + ''
     out << ' /Name /F' + font['i'].to_s
@@ -7280,7 +7269,7 @@ protected
     # CIDFontType2
     # A CIDFont whose glyph descriptions are based on TrueType font technology
     newobj();
-    out = '<</Type /Font'
+    out = +'<</Type /Font'
     out << ' /Subtype /CIDFontType2'
     out << ' /BaseFont /' + fontname
 
@@ -7301,7 +7290,7 @@ protected
     # Font descriptor
     # A font descriptor describing the CIDFont default metrics other than its glyph widths
     newobj();
-    out = '<</Type /FontDescriptor'
+    out = +'<</Type /FontDescriptor'
     out << ' /FontName /' + fontname
     font['desc'].each do |key, value|
       if value.is_a? Float
@@ -7339,7 +7328,7 @@ protected
         Error('Font file not found: ' + ctgfile)
       end
       size = File.size(fontfile)
-      out = '<</Length ' + size.to_s + ''
+      out = +'<</Length ' + size.to_s + ''
       if (fontfile[-2,2] == '.z') # check file extension
         # Decompresses data encoded using the public-domain
         # zlib/deflate compression method, reproducing the
@@ -7392,7 +7381,7 @@ protected
       longname = name
     end
     obj_id = newobj()
-    out = '<</Type /Font'
+    out = +'<</Type /Font'
     out << ' /Subtype /Type0'
     out << ' /BaseFont /' + longname
     out << ' /Name /F' + font['i'].to_s
@@ -7403,7 +7392,7 @@ protected
     out << ' >> endobj'
     out(out)
     newobj()
-    out = '<</Type /Font'
+    out = +'<</Type /Font'
     out << ' /Subtype /CIDFontType0'
     out << ' /BaseFont /' + name
     cidinfo = '/Registry ' + datastring(font['cidinfo']['Registry'])
@@ -7440,7 +7429,7 @@ protected
       info = getImageBuffer(file)
       newobj();
       setImageSubBuffer(file, 'n', @n)
-      out = '<</Type /XObject'
+      out = +'<</Type /XObject'
       out << ' /Subtype /Image'
       out << ' /Width ' + info['w'].to_s
       out << ' /Height ' + info['h'].to_s
@@ -7463,7 +7452,7 @@ protected
         out << ' ' + info['parms']
       end
       if (!info['trns'].nil? and info['trns'].kind_of?(Array))
-        trns='';
+        trns=+'';
         count_info = info['trns'].length
         count_info.times do |i|
           trns << info['trns'][i].to_s + ' ' + info['trns'][i].to_s + ' '
@@ -7496,14 +7485,14 @@ protected
 
   #
   # Output Spot Colors Resources.
-  # [@access protected[
+  # [@access protected]
   # [@since 4.0.024 (2008-09-12)]
   #
   def putspotcolors()
     @spot_colors.each { |name, color|
       newobj()
       @spot_colors[name]['n'] = @n
-      out = '[/Separation /' + name.gsub(' ', '#20')
+      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.0, color['m']/100.0, color['y']/100.0, color['k']/100.0)
@@ -7518,7 +7507,7 @@ protected
   # [@access protected]
   #
   def putresourcedict()
-    out = '2 0 obj'
+    out = +'2 0 obj'
     out << ' << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]'
     out << ' /Font <<'
     @fontkeys.each do |fontkey|
@@ -7547,23 +7536,28 @@ protected
       end
     }
     out << ' >>'
-=begin
+
     # gradient patterns
     if @gradients and !@gradients.empty?
       out << ' /Pattern <<'
-      @gradients.each_with_index  {|grad, id|
-        out << ' /p' + id + ' ' + grad['pattern'] + ' 0 R'
-      }
+      @gradients.each_with_index do |grad, id|
+        next unless grad
+
+        out << " /p#{id} #{grad['pattern']} 0 R"
+      end
       out << ' >>'
     end
     # gradient shadings
     if @gradients and !@gradients.empty?
       out << ' /Shading <<'
-      @gradients.each_with_index  {|grad, id|
-        out << ' /Sh' + id + ' ' + grad['id'] + ' 0 R'
-      }
+      @gradients.each_with_index do |grad, id|
+        next unless grad
+
+        out << " /Sh#{id} #{grad['id']} 0 R"
+      end
       out << ' >>'
     end
+=begin
     # spot colors
     if @spot_colors and !@spot_colors.empty?
       out << ' /ColorSpace <<'
@@ -7585,16 +7579,18 @@ protected
     mapLinksToHtmlAnchors()
     putextgstates()
     putocg()
-    putfonts();
-    putimages();
+    putfonts()
+    putimages()
     putspotcolors()
+    putshaders()
 
     #Resource dictionary
     @offsets[2]=@bufferlen
-    putresourcedict();
+    putresourcedict()
     putbookmarks()
     putEmbeddedFiles()
     putannotsobjs()
+    putjavascript()
     # encryption
 
     ### T.B.D ### TCPDF 5.0.000 ###
@@ -7607,7 +7603,7 @@ protected
   #
   def putinfo()
     newobj()
-    out = '<<'
+    out = +'<<'
     if !empty_string(@title)
       # The document's title.
       out << ' /Title ' + textstring(@title)
@@ -7651,13 +7647,13 @@ protected
   #
   def putcatalog()
     newobj()
-    out = '<< /Type /Catalog'
+    out = +'<< /Type /Catalog'
     out << ' /Pages 1 0 R'
-    if (@zoom_mode=='fullpage')
+    if @zoom_mode == 'fullpage'
       out << ' /OpenAction [3 0 R /Fit]'
-    elsif (@zoom_mode=='fullwidth')
+    elsif @zoom_mode == 'fullwidth'
       out << ' /OpenAction [3 0 R /FitH null]'
-    elsif (@zoom_mode=='real')
+    elsif @zoom_mode == 'real'
       out << ' /OpenAction [3 0 R /XYZ null null 1]'
     elsif @zoom_mode.is_a?(Numeric)
       out << ' /OpenAction [3 0 R /XYZ null null ' + (@zoom_mode/100.0).to_s + ']'
@@ -7674,7 +7670,7 @@ protected
     end
     out << ' /Names <<'
     if !@javascript.empty? or !@js_objects.empty?
-      out << ' /JavaScript ' + @n_js + ' 0 R'
+      out << " /JavaScript #{@n_js} 0 R"
     end
     out << ' >>'
 
@@ -7687,9 +7683,43 @@ protected
     v = @n_ocg_view.to_s + ' 0 R'
     as = '<</Event /Print /OCGs [' + p + ' ' + v + '] /Category [/Print]>> <</Event /View /OCGs [' + p + ' ' + v + '] /Category [/View]>>'
     out << ' /OCProperties <</OCGs [' + p + ' ' + v + '] /D <</ON [' + p + '] /OFF [' + v + '] /AS [' + as + ']>>>>'
+    # AcroForm
+    if !@form_obj_id.empty? || (@sign && @signature_data['cert_type'])
+      out << ' /AcroForm<<'
+      objrefs = +''
+      if @sign && @signature_data['cert_type']
+          objrefs << "#{@sig_obj_id} 0 R"
+      end
+      @form_obj_id.each{|objid|
+        objrefs << " #{objid} 0 R"
+      }
+      out << " /Fields [#{objrefs}]"
+      if @sign && @signature_data['cert_type']
+        out << ' /SigFlags 3'
+      end
 
-    ### T.B.D ### TCPDF 5.0.000 ###
-
+      #out << ' /CO '
+      unless @annotation_fonts.empty?
+        out << ' /DR <<'
+        out << ' /Font <<'
+        @annotation_fonts.each {|font, fontkey|
+          out << " /F#{fontkey + 1} #{@font_obj_ids[font]} 0 R"
+        }
+        out << ' >> >>'
+      end
+      out << " /DA (/F#{@fontkeys.index('helvetica') + 1} 0 Tf 0 g)"
+      out << ' /Q ' + (@rtl ? '2' : '0')
+      #out << ' /XFA '
+      out << ' >>'
+      # signatures
+      if @sign && @signature_data['cert_type']
+        if @signature_data['cert_type'] > 0
+          out << " /Perms<</DocMDP #{@sig_obj_id + 1} 0 R>>"
+        else
+          out << " /Perms<</UR3 #{@sig_obj_id + 1} 0 R>>"
+        end
+      end
+    end
     out << ' >> endobj'
     out(out)
   end
@@ -7702,7 +7732,7 @@ protected
   # [@access protected]
   #
   def putviewerpreferences()
-    out = '/ViewerPreferences <<'
+    out = +'/ViewerPreferences <<'
     if @rtl
       out << ' /Direction /R2L'
     else
@@ -7756,7 +7786,7 @@ protected
       end
     end
     if @viewer_preferences['PrintPageRange']
-      print_page_range_num = ''
+      print_page_range_num = +''
       @viewer_preferences['PrintPageRange'].each { |v|
         print_page_range_num << ' ' + (v - 1).to_s + ''
       }
@@ -7775,7 +7805,7 @@ protected
   # [@access protected]
   #
   def puttrailer()
-    out = 'trailer <<'
+    out = +'trailer <<'
     out << ' /Size ' + (@n+1).to_s
     out << ' /Root ' + @n.to_s + ' 0 R'
     out << ' /Info ' + (@n-1).to_s + ' 0 R'
@@ -7833,6 +7863,20 @@ protected
         out(sprintf('%010d 00000 n ', @offsets[i]))
       end
     end
+    # Javascript Objects
+    if @js_obj_id > @js_start_obj_id
+      out((@js_start_obj_id + 1).to_s + ' ' + (@js_obj_id - @js_start_obj_id).to_s)
+      (@js_start_obj_id + 1).upto(@js_obj_id) do |i|
+        out(sprintf('%010d 00000 n ', @offsets[i]))
+      end
+    end
+    # Appearance streams XObjects
+    if @apxo_obj_id > @apxo_start_obj_id
+      out((@apxo_start_obj_id + 1).to_s + ' ' + (@apxo_obj_id - @apxo_start_obj_id).to_s)
+      (@apxo_start_obj_id + 1).upto(@apxo_obj_id) do |i|
+        out(sprintf('%010d 00000 n ', @offsets[i]))
+      end
+    end
     #Trailer
     puttrailer();
     out('startxref');
@@ -7872,7 +7916,7 @@ protected
   #
   def beginpage(orientation='', format='')
     @page += 1;
-    setPageBuffer(@page, '')
+    setPageBuffer(@page, +'')
     # initialize array for graphics tranformation positions inside a page buffer
     @state=2;
     if empty_string(orientation)
@@ -8024,7 +8068,6 @@ protected
   # [@access protected]
   #
   def escape(s)
-    # Add \ before \, ( and )
     s.gsub('\\','\\\\\\').gsub('(','\\(').gsub(')','\\)').gsub(13.chr, '\r')
   end
 
@@ -8108,9 +8151,9 @@ protected
 
   #
   # get raw output stream.
-  # @param string :s string to output.
-  # @param int :n object reference for encryption mode
-  # @access protected
+  # [@param string :s] string to output.
+  # [@param int :n] object reference for encryption mode
+  # [@access protected]
   #
   def getrawstream(s, n=0)
     if n <= 0
@@ -8122,9 +8165,9 @@ protected
 
   #
   # Format output stream
-  # @param string :s string to output.
-  # @param int :n object reference for encryption mode
-  # @access protected
+  # [@param string :s] string to output.
+  # [@param int :n] object reference for encryption mode
+  # [@access protected]
   #
   def getstream(s, n=0)
     "stream\n" + getrawstream(s, n=0) + "\nendstream"
@@ -8146,8 +8189,11 @@ protected
   # [@access protected]
   #
   def out(s)
-    s.force_encoding('ASCII-8BIT') if s.respond_to?(:force_encoding)
-    if (@state==2)
+    s = (+s).force_encoding('ASCII-8BIT') if s.respond_to?(:force_encoding)
+
+    if @tmp_buffer
+      @tmp_buffer << "#{s}\n"
+    elsif (@state==2)
       if !@in_footer and !@footerlen[@page].nil? and (@footerlen[@page] > 0)
         # puts data before page footer
         pagebuff = getPageBuffer(@page)
@@ -8320,7 +8366,7 @@ protected
     if !@is_unicode
       return str # string is not in unicode
     end
-    outstr = '' # string to be returned
+    outstr = +'' # string to be returned
     unicode = UTF8StringToArray(str) # array containing UTF-8 unicode values
     unicode.each {|char|
       if char < 256
@@ -8404,7 +8450,7 @@ protected
   # [@see] UTF8ToUTF16BE()
   #
   def arrUTF8ToUTF16BE(unicode, setbom=true)
-    outstr = ""; # string to be returned
+    outstr = +""; # string to be returned
     if (setbom)
       outstr << "\xFE\xFF"; # Byte Order Mark (BOM)
     end
@@ -8610,7 +8656,16 @@ public
   # [@return array] RGB color or empty array in case of error.
   # [@access public]
   #
-  def convertHTMLColorToDec(color = "#FFFFFF")
+  def convert_html_color_to_dec_array(color = "#FFFFFF")
+    returncolor = _convert_html_color_to_dec(color)
+    if returncolor.is_a? Hash
+      returncolor.values
+    else
+      returncolor
+    end
+  end
+
+  private def _convert_html_color_to_dec(color = "#FFFFFF")
     color = color.gsub(/[\s]*/, '') # remove extra spaces
     color = color.downcase
     if !(dotpos = color.index('.')).nil?
@@ -8620,7 +8675,6 @@ public
     if color.length == 0
       return []
     end
-    returncolor = ActiveSupport::OrderedHash.new
     #  RGB ARRAY
     if color[0,3] == 'rgb'
       codes = color.sub(/^rgb\(/, '')
@@ -8635,6 +8689,7 @@ public
     if color[0,4] == 'cmyk'
       codes = color.sub(/^cmyk\(/, '')
       codes = codes.gsub(')', '')
+      returncolor = codes.split(',', 4)
       returncolor[0] = returncolor[0].to_i
       returncolor[1] = returncolor[1].to_i
       returncolor[2] = returncolor[2].to_i
@@ -8653,6 +8708,7 @@ public
       color_code = color.sub(/^#/, "")
     end
     # RGB VALUE
+    returncolor = {}
     case color_code.length
     when 3
       # three-digit hexadecimal representation
@@ -8672,6 +8728,11 @@ public
     end
     return returncolor
   end
+
+  def convertHTMLColorToDec(color = "#FFFFFF")
+    warn("#{__callee__} is deprecated, use convert_html_color_to_dec_array instead.", uplevel: 1)
+    _convert_html_color_to_dec(color)
+  end
   alias_method :convert_html_color_to_dec, :convertHTMLColorToDec
 
   #
@@ -8796,7 +8857,7 @@ public
     tm[5] = y - tm[0] * y - tm[1] * x
 
     # generate the transformation matrix
-    Transform(tm)
+    transform(tm)
   end
   alias_method :rotate, :Rotate
 
@@ -8807,7 +8868,7 @@ public
   # [@since 2.1.000 (2008-01-07)]
   # [@see] StartTransform(), StopTransform()
   #
-  def Transform(tm)
+  def transform(tm)
     out(sprintf('%.3f %.3f %.3f %.3f %.3f %.3f cm', tm[0], tm[1], tm[2], tm[3], tm[4], tm[5]))
     # add tranformation matrix
     @transfmatrix[@transfmatrix_key].push 'a' => tm[0], 'b' => tm[1], 'c' => tm[2], 'd' => tm[3], 'e' => tm[4], 'f' => tm[5]
@@ -8816,7 +8877,7 @@ public
       @transfmrk[@page] = @pagelen[@page]
     end
   end
-  protected :Transform
+  protected :transform
 
   # END TRANSFORMATIONS SECTION -------------------------
 
@@ -8893,6 +8954,7 @@ public
     end
     if !style['dash'].nil?
       dash = style['dash']
+      phase = style['phase'].to_i
       dash_string = ''
       if dash != 0 and dash != ''
         if dash.is_a?(String) && dash =~ /^.+,/
@@ -8900,15 +8962,17 @@ public
         else
           tab = [dash]
         end
-        dash_string = ''
+        dash_string = +''
         tab.each_with_index { |v, i|
           if i != 0
             dash_string << ' '
           end
           dash_string << sprintf("%.2f", v.to_f)
         }
+      else
+        phase = 0
       end
-      phase = 0
+
       @linestyle_dash = sprintf("[%s] %.2f d", dash_string, phase)
       out(@linestyle_dash)
     end
@@ -9012,13 +9076,13 @@ public
   # [@param float :y1] Ordinate of first point
   # [@param float :x2] Abscissa of second point
   # [@param float :y2]] Ordinate of second point
-  # [@param hash :style] Line style. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
+  # [@param hash :style] Line style. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty Hash).
   # [@access public]
   # [@since 1.0]
   # [@see] SetLineWidth(), SetDrawColor(), SetLineStyle()
   #
-  def Line(x1, y1, x2, y2, style=nil)
-    if style.is_a? Hash
+  def Line(x1, y1, x2, y2, style={})
+    if style.is_a?(Hash) && !style.empty?
       SetLineStyle(style)
     end
     outPoint(x1, y1)
@@ -9283,8 +9347,8 @@ public
   #   * all: Line style of all lines. Array like for {@link SetLineStyle SetLineStyle}.
   #   * 0 to (:np - 1): Line style of each line. Array like for {@link SetLineStyle SetLineStyle}.
   #   If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-  # [@param array :fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-  # [@param boolean :closed if true the polygon is closes, otherwise will remain open
+  # [@param array :fill_color] Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
+  # [@param boolean :closed] if true the polygon is closes, otherwise will remain open
   # [@access public]
   # [@since 4.8.003 (2009-09-15)]
   #
@@ -10307,7 +10371,7 @@ public
 
   #
   # Create a bookmark PDF string.
-  # [@access private]
+  # [@access protected]
   # [@author] Olivier Plathey, Nicola Asuni
   # [@since 2.1.002 (2008-02-12)]
   #
@@ -10370,165 +10434,1083 @@ public
   protected :putbookmarks
 
   # --- JAVASCRIPT ------------------------------------------------------
-  # --- FORM FIELDS -----------------------------------------------------
-  # --- END FORMS FIELDS ------------------------------------------------
-
   #
-  # Create a new page group.
-  # * NOTE: call this function before calling AddPage()
-  # [@param int :page] starting group page (leave empty for next page).
+  # Adds a javascript
+  # [@param string :script] Javascript code
   # [@access public]
-  # [@since 3.0.000 (2008-03-27)]
+  # [@author Johannes G�ntert, Nicola Asuni]
+  # [@since 2.1.002 (2008-02-12)]
   #
-  def startPageGroup(page=0)
-    if !page.is_a? Integer or page.zero?
-      page = @page + 1
-    end
-    @newpagegroup[page] = true
+  def IncludeJS(script)
+    @javascript << script
   end
-  alias_method :start_page_group, :startPageGroup
 
   #
-  # Defines an alias for the total number of pages.
-  # It will be substituted as the document is closed.
-  # [@param string :alias] The alias.
+  # Adds a javascript object and return object ID
+  # [@param string :script] Javascript code
+  # [@param boolean :onload] if true executes this object when opening the document
+  # [@return int] internal object ID
   # [@access public]
-  # [@since 1.4]
-  # [@see] getAliasNbPages(), PageNo(), Footer()
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
   #
-  def AliasNbPages(alias_nb ='{nb}')
-    @alias_nb_pages = alias_nb
+  def addJavascriptObject(script, onload = false)
+    @js_obj_id += 1
+    @js_objects[@js_obj_id] = {'js' => script, 'onload' => onload}
+    @js_obj_id
   end
-  alias_method :alias_nb_pages, :AliasNbPages
 
   #
-  # Returns the string alias used for the total number of pages.
-  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
-  # [@return string]
-  # [@access public]
-  # [@since 4.0.018 (2008-08-08)]
-  # [@see] AliasNbPages(), PageNo(), Footer()
+  # Create a javascript PDF string.
+  # [@access protected]
+  # [@author Johannes G�ntert, Nicola Asuni]
+  # [@since 2.1.002 (2008-02-12)]
   #
-  def getAliasNbPages()
-    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
-      return '{' + @alias_nb_pages + '}'
+  def putjavascript()
+    return if @javascript.empty? && @js_objects.empty?
+
+    if @javascript.index 'this.addField'
+      # @setUserRights() unless @ur
+
+      # the following two lines are used to avoid form fields duplication after saving
+      # The addField method only works on Acrobat Writer, unless the document is signed with Adobe private key (UR3)
+      jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%.2f,%.2f,%.2f,%.2f]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1)
+      jsb = "getField('tcpdfdocsaved').value='saved';"
+      @javascript = "#{jsa}\n#{@javascript}\n#{jsb}"
+    end
+    @n_js = newobj()
+    out = +' << /Names ['
+    unless @javascript.empty?
+      out << " (EmbeddedJS) #{@n + 1} 0 R"
+    end
+    unless @js_objects.empty?
+      @js_objects.each{|key, val|
+        out << " (JS#{key}) #{key} 0 R" if val['onload']
+      }
+    end
+    out << ' ] >> endobj'
+    out(out)
+    # default Javascript object
+    unless @javascript.empty?
+      newobj()
+      out = +'<< /S /JavaScript'
+      out << " /JS #{textstring(@javascript)}"
+      out << ' >> endobj'
+      out(out)
+    end
+    # additional Javascript objects
+    unless @js_objects.empty?
+      @js_objects.each {|key, val|
+        @offsets[key] = @bufferlen
+        out = "#{key} 0 obj\n << /S /JavaScript /JS #{textstring(val['js'])} >> endobj"
+        out(out)
+      }
     end
-    return @alias_nb_pages
   end
-  alias_method :get_alias_nb_pages, :getAliasNbPages
+  protected :putjavascript
 
   #
-  # Defines an alias for the page number.
-  # It will be substituted as the document is closed.
-  # [@param string :alias] The alias.
-  # [@access public]
-  # [@since 4.5.000 (2009-01-02)]
-  # [@see] getAliasNbPages(), PageNo(), Footer()
+  # Convert color to javascript color.
+  # [@param string :color] color name or #RRGGBB
+  # [@access protected]
+  # [@author Denis Van Nuffelen, Nicola Asuni]
+  # [@since 2.1.002 (2008-02-12)]
   #
-  def AliasNumPage(alias_num='{pnb}')
-    # Define an alias for total number of pages
-    @alias_num_page = alias_num
+  def JScolor(color)
+    aColors = ['transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray']
+    if color[0] == '#'
+      return sprintf("['RGB',%.3f,%.3f,%.3f]", color[1, 2].to_i(16) / 255, color[3, 2].to_i(16) / 255, color[5, 2].to_i(16) / 255)
+    end
+
+    unless aColors.include? color
+      Error('Invalid color: ' + color)
+    end
+    'color.' + color
   end
-  alias_method :alias_num_page, :AliasNumPage
+  protected :JScolor
 
   #
-  # Returns the string alias used for the page number.
-  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
-  # [@return string]
-  # [@access public]
-  # [@since 4.5.000 (2009-01-02)]
-  # [@see] AliasNbPages(), PageNo(), Footer()
+  # Adds a javascript form field.
+  # [@param string :type] field type
+  # [@param string :name] field name
+  # [@param int :x] horizontal position
+  # [@param int :y] vertical position
+  # [@param int :w] width
+  # [@param int :h] height
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@access protected]
+  # [@author Denis Van Nuffelen, Nicola Asuni]
+  # [@since 2.1.002 (2008-02-12)]
   #
-  def getAliasNumPage()
-    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
-      return '{' + @alias_num_page + '}'
+  def addfield(type, name, x, y, w, h, prop)
+    x = x - w if @rtl
+
+    # the followind avoid fields duplication after saving the document
+    @javascript << "if(getField('tcpdfdocsaved').value != 'saved') {"
+    k = @k
+    @javascript << "f#{name}=this.addField('#{name}','#{type}',#{PageNo() - 1},[#{sprintf("%.2f,%.2f,%.2f,%.2f", x * k, (@h - y) * k + 1, (x + w) * k, (@h - y - h) * k + 1)}]);\n"
+    @javascript << "f#{name}.textSize=#{@font_size_pt};\n"
+    prop.each {|k, v|
+      val = k[-5..-1] == 'Color' ? JScolor(v) : "'#{v}'"
+      @javascript << "f#{name}.#{k}=#{val};\n"
+    }
+    if @rtl
+      @x -= w
+    else
+      @x += w
     end
-    return @alias_num_page
+    @javascript << '}'
   end
-  alias_method :get_alias_num_page, :getAliasNumPage
+  protected :addfield
+
+  # --- FORM FIELDS -----------------------------------------------------
 
   #
-  # Return the current page in the group.
-  # [@return] current page in the group
+  # Convert JavaScript form fields properties array to Annotation Properties array.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@return array of annotation properties]
+  # [@access protected]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-06)]
+  #
+  def getAnnotOptFromJSProp(prop)
+    # the annotation options area already defined
+    return prop['aopt'] if prop['aopt'].is_a?(Array)
+
+    opt = {} # value to be returned
+    # alignment: Controls how the text is laid out within the text field.
+    if prop['alignment']
+      opt['q'] = case prop['alignment']
+                 when 'left'; 0
+                 when 'center'; 1
+                 when 'right'; 2
+                 else @rtl ? 2 : 0
+                 end
+    end
+    # lineWidth: Specifies the thickness of the border when stroking the perimeter of a field's rectangle.
+    if prop['lineWidth']
+      linewidth = prop['lineWidth'].to_i
+    else
+      linewidth = 1
+    end
+    # borderStyle: The border style for a field.
+    case prop['borderStyle']
+    when 'border.d', 'dashed'
+      opt['border'] = [0, 0, linewidth, [3, 2]]
+      opt['bs'] = {'w'=>linewidth, 's'=>'D', 'd'=>[3, 2]}
+    when 'border.b', 'beveled'
+      opt['border'] = [0, 0, linewidth]
+      opt['bs'] = {'w'=>linewidth, 's'=>'B'}
+    when 'border.i', 'inset'
+      opt['border'] = [0, 0, linewidth]
+      opt['bs'] = {'w'=>linewidth, 's'=>'I'}
+    when 'border.u', 'underline'
+      opt['border'] = [0, 0, linewidth]
+      opt['bs'] = {'w'=>linewidth, 's'=>'U'}
+    else # 'border.s', 'solid'
+      opt['border'] = [0, 0, linewidth]
+      opt['bs'] = {'w'=>linewidth, 's'=>'S'}
+    end
+
+    opt['border'] = prop['border'] if prop['border'].is_a?(Array)
+    opt['mk'] ||= {}
+    opt['mk']['if'] ||= {}
+    opt['mk']['if']['a'] = [0.5, 0.5]
+    # buttonAlignX: Controls how space is distributed from the left of the button face with respect to the icon.
+    opt['mk']['if']['a'][0] = prop['buttonAlignX'] if prop['buttonAlignX']
+    # buttonAlignY: Controls how unused space is distributed from the bottom of the button face with respect to the icon.
+    opt['mk']['if']['a'][1] = prop['buttonAlignY'] if prop['buttonAlignY']
+    # buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
+    opt['mk']['if']['fb'] = true if prop['buttonFitBounds'] && (prop['buttonFitBounds'] == 'true')
+    # buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
+    case prop['buttonScaleHow']
+    when 'scaleHow.proportional'; opt['mk']['if']['s'] = 'P'
+    when 'scaleHow.anamorphic';   opt['mk']['if']['s'] = 'A'
+    end
+    # buttonScaleWhen: Controls when an icon is scaled to fit inside the button face.
+    case prop['buttonScaleWhen']
+    when 'scaleWhen.always';   opt['mk']['if']['sw'] = 'A'
+    when 'scaleWhen.never';    opt['mk']['if']['sw'] = 'N'
+    when 'scaleWhen.tooBig';   opt['mk']['if']['sw'] = 'B'
+    when 'scaleWhen.tooSmall'; opt['mk']['if']['sw'] = 'S'
+    end
+    # buttonPosition: Controls how the text and the icon of the button are positioned with respect to each other within the button face.
+    case prop['buttonPosition']
+    when 0, 'position.textOnly';  opt['mk']['tp'] = 0
+    when 1, 'position.iconOnly';  opt['mk']['tp'] = 1
+    when 2, 'position.iconTextV'; opt['mk']['tp'] = 2
+    when 3, 'position.textIconV'; opt['mk']['tp'] = 3
+    when 4, 'position.iconTextH'; opt['mk']['tp'] = 4
+    when 5, 'position.textIconH'; opt['mk']['tp'] = 5
+    when 6, 'position.overlay';   opt['mk']['tp'] = 6
+    end
+    # fillColor: Specifies the background color for a field.
+    if prop['fillColor']
+      if prop['fillColor'].is_a? Array
+        opt['mk']['bg'] = prop['fillColor']
+      else
+        opt['mk']['bg'] = convert_html_color_to_dec_array(prop['fillColor'])
+      end
+    end
+    # strokeColor: Specifies the stroke color for a field that is used to stroke the rectangle of the field with a line as large as the line width.
+    if prop['strokeColor']
+      if prop['strokeColor'].is_a? Array
+        opt['mk']['bc'] = prop['strokeColor']
+      else
+        opt['mk']['bc'] = convert_html_color_to_dec_array(prop['strokeColor'])
+      end
+    end
+    # rotation: The rotation of a widget in counterclockwise increments.
+    opt['mk']['r'] = prop['rotation'] if prop['rotation']
+    # charLimit: Limits the number of characters that a user can type into a text field.
+    opt['maxlen'] = prop['charLimit'].to_i if prop['charLimit']
+
+    ff ||= 0
+    # readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
+    ff |= 1 << 0 if prop['readonly'] == 'true'
+    # required: Specifies whether a field requires a value.
+    ff |= 1 << 1 if prop['required'] == 'true'
+    # multiline: Controls how text is wrapped within the field.
+    ff |= 1 << 12 if prop['multiline'] == 'true'
+    # password: Specifies whether the field should display asterisks when data is entered in the field.
+    ff |= 1 << 13 if prop['password'] == 'true'
+    # NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
+    ff |= 1 << 14 if prop['NoToggleToOff'] == 'true'
+    # Radio: If set, the field is a set of radio buttons.
+    ff |= 1 << 15 if prop['Radio'] == 'true'
+    # Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
+    ff |= 1 << 16 if prop['Pushbutton'] == 'true'
+    # Combo: If set, the field is a combo box; if clear, the field is a list box.
+    ff |= 1 << 17 if prop['Combo'] == 'true'
+    # editable: Controls whether a combo box is editable.
+    ff |= 1 << 18 if prop['editable'] == 'true'
+    # Sort: If set, the field's option items shall be sorted alphabetically.
+    ff |= 1 << 19 if prop['Sort'] == 'true'
+    # fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
+    ff |= 1 << 20 if prop['fileSelect'] == 'true'
+    # multipleSelection: If true, indicates that a list box allows a multiple selection of items.
+    ff |= 1 << 21 if prop['multipleSelection'] == 'true'
+    # doNotSpellCheck: If true, spell checking is not performed on this editable text field.
+    ff |= 1 << 22 if prop['doNotSpellCheck'] == 'true'
+    # doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
+    ff |= 1 << 23 if prop['doNotScroll'] == 'true'
+    # comb: If set to true, the field background is drawn as series of boxes (one for each character in the value of the field) and each character of the content is drawn within those boxes. The number of boxes drawn is determined from the charLimit property. It applies only to text fields. The setter will also raise if any of the following field properties are also set multiline, password, and fileSelect. A side-effect of setting this property is that the doNotScroll property is also set.
+    ff |= 1 << 24 if prop['comb'] == 'true'
+    # radiosInUnison: If false, even if a group of radio buttons have the same name and export value, they behave in a mutually exclusive fashion, like HTML radio buttons.
+    ff |= 1 << 25 if prop['radiosInUnison'] == 'true'
+    # richText: If true, the field allows rich text formatting.
+    ff |= 1 << 25 if prop['richText'] == 'true'
+    # commitOnSelChange: Controls whether a field value is committed after a selection change.
+    ff |= 1 << 26 if prop['commitOnSelChange'] == 'true'
+    opt['ff'] = ff
+
+    # defaultValue: The default value of a field - that is, the value that the field is set to when the form is reset.
+    opt['dv'] = prop['defaultValue'] if prop['defaultValue']
+    f = 1 << 2 # default value for annotation flags
+    # readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
+    if prop['readonly'] == 'true'
+      f |= 1 << 6
+    end
+    # display: Controls whether the field is hidden or visible on screen and in print.
+    case prop['display']
+    when 'display.visible'
+      #
+    when 'display.hidden'
+      f |= 1 << 1
+    when 'display.noPrint'
+      f &= ~(1 << 2)
+    when 'display.noView'
+      f |= 1 << 5
+    end
+    opt['f'] = f
+
+    # currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
+    opt['i'] = prop['currentValueIndices'] if prop['currentValueIndices'].is_a?(Array)
+    # value: The value of the field data that the user has entered.
+    if prop['value']
+      if prop['value'].is_a?(Array)
+        opt['opt'] = []
+        prop['value'].each_with_index {|v, i|
+          # exportValues: An array of strings representing the export values for the field.
+          if prop['exportValues'] && prop['exportValues'][i]
+            opt['opt'][i] = [prop['exportValues'][i], v]
+          else
+            opt['opt'][i] = v
+          end
+        }
+      else
+        opt['v'] = prop['value']
+      end
+    end
+    # richValue: This property specifies the text contents and formatting of a rich text field.
+    opt['rv'] = prop['richValue'] if prop['richValue']
+    # submitName: If nonempty, used during form submission instead of name. Only applicable if submitting in HTML format (that is, URL-encoded).
+    opt['tm'] = prop['submitName'] if prop['submitName']
+    # name: Fully qualified field name.
+    opt['t'] = prop['name'] if prop['name']
+    # userName: The user name (short description string) of the field.
+    opt['tu'] = prop['userName'] if prop['userName']
+    # highlight: Defines how a button reacts when a user clicks it.
+    case prop['highlight']
+    when 'none',    'highlight.n'; opt['h'] = 'N'
+    when 'invert',  'highlight.i'; opt['h'] = 'i'
+    when 'push',    'highlight.p'; opt['h'] = 'P'
+    when 'outline', 'highlight.o'; opt['h'] = 'O'
+    end
+    # Unsupported options:
+    # - calcOrderIndex: Changes the calculation order of fields in the document.
+    # - delay: Delays the redrawing of a field's appearance.
+    # - defaultStyle: This property defines the default style attributes for the form field.
+    # - style: Allows the user to set the glyph style of a check box or radio button.
+    # - textColor, textFont, textSize
+    opt
+  end
+  protected :getAnnotOptFromJSProp
+
+  #
+  # Set default properties for form fields.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
   # [@access public]
-  # [@since 3.0.000 (2008-03-27)]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-06)]
   #
-  def getGroupPageNo()
-    return @pagegroups[@currpagegroup]
+  def setFormDefaultProp(prop = [])
+    @default_form_prop = prop
   end
-  alias_method :get_group_page_no, :getGroupPageNo
+  alias_method :set_form_default_prop, :setFormDefaultProp
 
   #
-  # Returns the current group page number formatted as a string.
+  # Return the default properties for form fields.
+  # [@return array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
   # [@access public]
-  # [@since 4.3.003 (2008-11-18)]
-  # [@see] PaneNo(), formatPageNumber()
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-06)]
   #
-  def getGroupPageNoFormatted()
-    return formatPageNumber(getGroupPageNo())
+  def getFormDefaultProp()
+    @default_form_prop
   end
-  alias_method :get_group_page_no_formatted, :getGroupPageNoFormatted
+  alias_method :get_form_default_prop, :getFormDefaultProp
 
   #
-  # Return the alias of the current page group
-  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
-  # (will be replaced by the total number of pages in this group).
-  # [@return] alias of the current page group
+  # Creates a text field
+  # [@param string :name] field name
+  # [@param float :w] Width of the rectangle
+  # [@param float :h] Height of the rectangle
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
   # [@access public]
-  # [@since 3.0.000 (2008-03-27)]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
   #
-  def getPageGroupAlias()
-    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont1')
-      return '{' + @currpagegroup + '}'
+  def TextField(name, w, h, prop = {}, opt = {}, x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('text', name, x, y, w, h, prop)
+      return
+    end
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set default appearance stream
+    font = @font_family
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+    fontstyle = sprintf("/F%d %.2f Tf %s", fontkey + 1, @font_size_pt, @text_color)
+    popt['da'] = fontstyle
+    popt['ap'] = {}
+
+    if opt['v'] && !empty_string(opt['v'])
+      # set Appearances
+      popt['ap']['n'] = +"/Tx BMC q #{fontstyle} "
+      gvars = getGraphicVars()
+      @h = h
+      @w = w
+      @t_margin = 0
+      @c_margin = 0.2
+
+      @tmp_buffer = +''
+      multi_cell(w, h, opt['v'], 0, '', 0, 0, 0.2, 0, true, 0, false, true, 0)
+      popt['ap']['n'] << @tmp_buffer
+      @tmp_buffer = nil
+      popt['ap']['n'] << 'Q EMC'
+
+      # restore previous values
+      setGraphicVars(gvars, true)
+    else
+      popt['ap']['n'] = "q BT #{fontstyle} ET Q"
+    end
+
+    # merge options
+    opt = popt.merge opt
+    # remove some conflicting options
+    opt.delete :bs
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Tx'
+    opt['t'] = name
+    #
+    # Additional annotation's parameters (check _putannotsobj() method):
+    # opt['f']
+    # opt['ap']
+    # opt['as']
+    # opt['bs']
+    # opt['be']
+    # opt['c']
+    # opt['border']
+    # opt['h']
+    # opt['mk']
+    # opt['mk']['r']
+    # opt['mk']['bc']
+    # opt['mk']['bg']
+    # opt['mk']['ca']
+    # opt['mk']['rc']
+    # opt['mk']['ac']
+    # opt['mk']['i']
+    # opt['mk']['ri']
+    # opt['mk']['ix']
+    # opt['mk']['if']
+    # opt['mk']['if']['sw']
+    # opt['mk']['if']['s']
+    # opt['mk']['if']['a']
+    # opt['mk']['if']['fb']
+    # opt['mk']['tp']
+    # opt['tu']
+    # opt['tm']
+    # opt['ff']
+    # opt['v']
+    # opt['dv']
+    # opt['a']
+    # opt['aa']
+    # opt['q']
+    Annotation(x, y, w, h, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
     end
-    return @currpagegroup
   end
-  alias_method :get_page_group_alias, :getPageGroupAlias
+  alias_method :text_field, :TextField
 
   #
-  # Return the alias for the page number on the current page group
-  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
-  # (will be replaced by the total number of pages in this group).
-  # [@return] alias of the current page group
+  # Creates a RadioButton field
+  # [@param string :name] field name
+  # [@param int :w] width
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param string :onvalue] value to be returned if selected.
+  # [@param boolean :checked] define the initial state.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
   # [@access public]
-  # [@since 4.5.000 (2009-01-02)]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
   #
-  def getPageNumGroupAlias()
-    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
-      return '{' + @currpagegroup.gsub('{nb', '{pnb') +'}'
+  def RadioButton(name, w, prop = {}, opt = {}, onvalue = 'On', checked = false, x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('radiobutton', name, x, y, w, w, prop)
+      return
     end
-    return @currpagegroup.gsub('{nb', '{pnb')
-  end
-  alias_method :get_page_num_group_alias, :getPageNumGroupAlias
 
-  #
-  # Format the page numbers.
-  # This method can be overriden for custom formats.
-  # [@param int :num] page number
-  # [@access protected]
-  # [@since 4.2.005 (2008-11-06)]
-  #
-  def formatPageNumber(num)
-    return number_with_delimiter(num, :delimiter => ",")
+    onvalue = 'On' if empty_string(onvalue)
+    defval = checked ? onvalue : 'Off'
+    # set data for parent group
+    @radiobutton_groups[@page] ||= {}
+    unless @radiobutton_groups[@page][name]
+      @radiobutton_groups[@page][name] = []
+      @annot_obj_id += 1
+      @radio_groups << @annot_obj_id
+    end
+    # save object ID to be added on Kids entry on parent object
+    @radiobutton_groups[@page][name] << {'kid' => @annot_obj_id + 1, 'def' => defval}
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    prop['NoToggleToOff'] = 'true'
+    prop['Radio'] = 'true'
+    prop['borderStyle'] = 'inset'
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set additional default values
+    font = 'zapfdingbats'
+    AddFont(font)
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+    fontstyle = sprintf('/F%d %.2f Tf', fontkey + 1, @font_size_pt)
+    popt['da'] = "#{fontstyle} #{@text_color}"
+    popt['ap'] = {}
+    popt['ap']['n'] = {}
+    popt['ap']['n'][onvalue] = "q #{@text_color} BT #{fontstyle} 0 0 Td (n) Tj ET Q"
+    popt['ap']['n']['Off'] = "q #{@text_color} BT #{fontstyle} 0 0 Td (o) Tj ET Q"
+    popt['mk'] ||= {}
+    popt['mk']['ca'] = '(l)'
+    # merge options
+    opt = popt.merge opt
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Btn'
+    if checked
+      opt['v'] = ["/#{onvalue}"]
+      opt['as'] = onvalue
+    else
+      opt['as'] = 'Off'
+    end
+    Annotation(x, y, w, w, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
+    end
   end
-  protected :formatPageNumber
+  alias_method :radio_button, :RadioButton
 
   #
-  # Format the page numbers on the Table Of Content.
-  # This method can be overriden for custom formats.
-  # [@param int :num] page number
-  # [@access protected]
-  # [@since 4.5.001 (2009-01-04)]
-  # [@see] addTOC(), addHTMLTOC()
+  # Creates a List-box field
+  # [@param string :name] field name
+  # [@param int :w] width
+  # [@param int :h] height
+  # [@param array :values] array containing the list of values.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+  # [@access public]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
   #
-  def formatTOCPageNumber(num)
-    return number_with_delimiter(num, :delimiter => ",")
+  def ListBox(name, w, h, values, prop = {}, opt = {}, x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('listbox', name, x, y, w, h, prop)
+      s = +''
+      values.each {|v|
+        if v.is_a?(Array)
+          s << "['#{v[0]}','#{v[1]}'],"
+        else
+          s << "'#{v}',"
+        end
+      }
+      @javascript << "f#{name}.setItems([#{s[0...-1]}]);\n"
+      return
+    end
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set additional default values
+    font = @font_family
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+    s = +''
+    values.each {|v|
+      if v.is_a?(Array)
+        s << "#{v[1]}\n"
+      else
+        s << "#{v}\n"
+      end
+    }
+
+    fontstyle = sprintf('/F%d %.2f Tf %s', fontkey + 1, @font_size_pt, @text_color)
+    popt['da'] = fontstyle
+    popt['ap'] = {}
+    # set Appearances
+    popt['ap']['n'] = +"/Tx BMC q #{fontstyle} "
+    gvars = getGraphicVars()
+    @h = h
+    @w = w
+    @t_margin = 0
+    @c_margin = 0.2
+
+    @tmp_buffer = +''
+    multi_cell(w, h, s, 0, '', 0, 0, 0.2, 0, true, 0, false, true, 0)
+    popt['ap']['n'] << @tmp_buffer
+    popt['ap']['n'] << 'Q EMC'
+    @tmp_buffer = nil
+
+    # restore previous values
+    setGraphicVars(gvars, true)
+
+    # merge options
+    opt = popt.merge opt
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Ch'
+    opt['t'] = name
+    opt['opt'] = values
+    Annotation(x, y, w, h, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
+    end
   end
-  protected :formatTOCPageNumber
+  alias_method :list_box, :ListBox
 
   #
-  # Returns the current page number formatted as a string.
-  # [@access public]
+  # Creates a Combo-box field
+  # [@param string :name] field name
+  # [@param int :w] width
+  # [@param int :h] height
+  # [@param array :values] array containing the list of values.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+  # [@access public]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
+  #
+  def ComboBox(name, w, h, values, prop = {}, opt = {}, x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('combobox', name, x, y, w, h, prop)
+      s = +''
+      values.each {|v|
+        if v.is_a?(Array)
+          s << "['#{v[0]}','#{v[1]}'],"
+        else
+          s << "'#{v}',"
+        end
+      }
+      @javascript << "f#{name}.setItems([#{s[0...-1]}]);\n"
+      return
+    end
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    prop['Combo'] = 'true'
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set additional default options
+    font = @font_family
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+
+    s = +''
+    values.each {|v|
+      if v.is_a?(Array)
+        s << "#{v[1]}\n"
+      else
+        s << "#{v}\n"
+      end
+    }
+    fontstyle = sprintf('/F%d %.2f Tf %s', fontkey + 1, @font_size_pt, @text_color)
+    popt['da'] = fontstyle
+    popt['ap'] = {}
+    # set Appearances
+    popt['ap']['n'] = +"/Tx BMC q #{fontstyle} "
+    gvars = getGraphicVars()
+    @h = h
+    @w = w
+    @t_margin = 0
+    @c_margin = 0.2
+
+    @tmp_buffer = +''
+    multi_cell(w, h, s, 0, '', 0, 0, 0.2, 0, true, 0, false, true, 0)
+    popt['ap']['n'] << @tmp_buffer
+    popt['ap']['n'] << 'Q EMC'
+    @tmp_buffer = nil
+
+    # restore previous values
+    setGraphicVars(gvars, true)
+
+    # merge options
+    opt = popt.merge opt
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Ch'
+    opt['t'] = name
+    opt['opt'] = values
+    Annotation(x, y, w, h, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
+    end
+  end
+  alias_method :combo_box, :ComboBox
+
+  #
+  # Creates a CheckBox field
+  # [@param string :name] field name
+  # [@param int :w] width
+  # [@param boolean :checked] define the initial state.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param string :onvalue] value to be returned if selected.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+  # [@access public]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
+  #
+  def CheckBox(name, w, checked=false, prop = {}, opt = {}, onvalue = 'Yes', x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('checkbox', name, x, y, w, w, prop)
+      return
+    end
+
+    prop['value'] ||= ['Yes']
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    prop['borderStyle'] = 'inset'
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set additional default options
+    font = 'zapfdingbats'
+    AddFont(font)
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+    fontstyle = sprintf('/F%d %.2f Tf', fontkey + 1, @font_size_pt)
+    popt['da'] = "#{fontstyle} #{@text_color}"
+    popt['ap'] = {}
+    popt['ap']['n'] = {}
+    popt['ap']['n']['Yes'] = "q #{@text_color} BT #{fontstyle} 0 0 Td (n) Tj ET Q"
+    popt['ap']['n']['Off'] = "q #{@text_color} BT #{fontstyle} 0 0 Td (o) Tj ET Q"
+
+    # merge options
+    opt = popt.merge opt
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Btn'
+    opt['t'] = name
+    if empty_string(onvalue)
+      onvalue = 'Yes'
+    end
+    opt['opt'] = [onvalue]
+    if checked
+      opt['v'] = ['/Yes']
+      opt['as'] = 'Yes'
+    else
+      opt['v'] = ['/Off']
+      opt['as'] = 'Off'
+    end
+    Annotation(x, y, w, w, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
+    end
+  end
+  alias_method :check_box, :CheckBox
+
+  #
+  # Creates a button field
+  # [@param string :name] field name
+  # [@param int :w] width
+  # [@param int :h] height
+  # [@param string :caption] caption.
+  # [@param mixed :action] action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
+  # [@param array :prop] javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+  # [@param array :opt] annotation parameters. Possible values are described on official PDF32000_2008 reference.
+  # [@param float :x] Abscissa of the upper-left corner of the rectangle
+  # [@param float :y] Ordinate of the upper-left corner of the rectangle
+  # [@param boolean :js] if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+  # [@access public]
+  # [@author Nicola Asuni]
+  # [@since 4.8.000 (2009-09-07)]
+  #
+  def Button(name, w, h, caption, action, prop = {}, opt = {}, x = '', y = '', js = false)
+    x = @x if x == ''
+    y = @y if y == ''
+
+    if js
+      addfield('button', name, x, y, w, h, prop)
+      @javascript << "f#{name}.buttonSetCaption('#{caption}');\n"
+      @javascript << "f#{name}.setAction('MouseUp','#{action}');\n"
+      @javascript << "f#{name}.highlight='push';\n"
+      @javascript << "f#{name}.print=false;\n"
+      return
+    end
+    # get default style
+    prop = getFormDefaultProp.merge prop
+    prop['Pushbutton'] = 'true'
+    prop['highlight'] = 'push'
+    prop['display'] = 'display.noPrint'
+    # get annotation data
+    popt = getAnnotOptFromJSProp(prop)
+    # set additional default options
+    popt['mk'] ||= {}
+    popt['mk']['ca'] = textstring(caption)
+    popt['mk']['rc'] = textstring(caption)
+    popt['mk']['ac'] = textstring(caption)
+    font = @font_family
+    fontkey = @fontkeys.index font
+    unless @annotation_fonts.include? fontkey
+      @annotation_fonts[font] = fontkey
+    end
+    fontstyle = sprintf('/F%d %.2f Tf %s', fontkey + 1, @font_size_pt, @text_color)
+    popt['da'] = fontstyle
+    popt['ap'] = {}
+    # set Appearances
+    popt['ap']['n'] = +"/Tx BMC q #{fontstyle} 0.800 g\n"
+
+    gvars = getGraphicVars()
+    @h = h
+    @w = w
+    @c_margin *= 1.6
+
+    @tmp_buffer = +''
+    SetLineStyle({'width' => 1.0, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => [231]})
+    SetFillColor(204)
+    multi_cell(w, h, caption, 1, 'C', 1, 0, 0, 0, true)
+    popt['ap']['n'] << @tmp_buffer
+    popt['ap']['n'] << 'Q EMC'
+    @tmp_buffer = nil
+
+    # restore previous values
+    setGraphicVars(gvars, true)
+
+    # merge options
+    opt = popt.merge opt
+    # set remaining annotation data
+    opt['Subtype'] = 'Widget'
+    opt['ft'] = 'Btn'
+    opt['t'] = caption
+    opt['v'] = name
+    unless action.empty?
+      if action.is_a?(Hash)
+        # form action options as on section 12.7.5 of PDF32000_2008.
+        opt['aa'] = +'/D <<'
+        bmode = ['SubmitForm', 'ResetForm', 'ImportData']
+        action.each {|key, val|
+          if (key == 'S') && bmode.include?(val)
+            opt['aa'] << " /S /#{val}"
+          elsif (key == 'F') && !val.empty?
+            opt['aa'] << " /F #{datastring(val)}"
+          elsif (key == 'Fields') && val.is_a?(Array) && !val.empty?
+            opt['aa'] << ' /Fields ['
+            val.each {|field|
+              opt['aa'] << " #{textstring(field)}"
+            }
+            opt['aa'] << ']'
+          elsif key == 'Flags'
+            ff = 0
+            if val.is_a?(Array)
+              val.each {|flag|
+                case flag
+                when 'Include/Exclude';      ff |= 1 << 0
+                when 'IncludeNoValueFields'; ff |= 1 << 1
+                when 'ExportFormat';         ff |= 1 << 2
+                when 'GetMethod';            ff |= 1 << 3
+                when 'SubmitCoordinates';    ff |= 1 << 4
+                when 'XFDF';                 ff |= 1 << 5
+                when 'IncludeAppendSaves';   ff |= 1 << 6
+                when 'IncludeAnnotations';   ff |= 1 << 7
+                when 'SubmitPDF';            ff |= 1 << 8
+                when 'CanonicalFormat';      ff |= 1 << 9
+                when 'ExclNonUserAnnots';    ff |= 1 << 10
+                when 'ExclFKey';             ff |= 1 << 11
+                when 'EmbedForm';            ff |= 1 << 13
+                end
+              }
+            else
+              ff = val.to_i
+            end
+            opt['aa'] << " /Flags #{ff}"
+          end
+        }
+        opt['aa'] << ' >>'
+      else
+        # Javascript action or raw action command
+        js_obj_id = addJavascriptObject(action)
+        opt['aa'] = "/D #{js_obj_id} 0 R"
+      end
+    end
+    Annotation(x, y, w, h, name, opt, 0)
+    if @rtl
+      @x -= w
+    else
+      @x += w
+    end
+  end
+  alias_method :button, :Button
+
+  # --- END FORMS FIELDS ------------------------------------------------
+
+  #
+  # Create a new page group.
+  # * NOTE: call this function before calling AddPage()
+  # [@param int :page] starting group page (leave empty for next page).
+  # [@access public]
+  # [@since 3.0.000 (2008-03-27)]
+  #
+  def startPageGroup(page=0)
+    if !page.is_a? Integer or page.zero?
+      page = @page + 1
+    end
+    @newpagegroup[page] = true
+  end
+  alias_method :start_page_group, :startPageGroup
+
+  #
+  # Defines an alias for the total number of pages.
+  # It will be substituted as the document is closed.
+  # [@param string :alias] The alias.
+  # [@access public]
+  # [@since 1.4]
+  # [@see] getAliasNbPages(), PageNo(), Footer()
+  #
+  def AliasNbPages(alias_nb ='{nb}')
+    @alias_nb_pages = alias_nb
+  end
+  alias_method :alias_nb_pages, :AliasNbPages
+
+  #
+  # Returns the string alias used for the total number of pages.
+  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
+  # [@return string]
+  # [@access public]
+  # [@since 4.0.018 (2008-08-08)]
+  # [@see] AliasNbPages(), PageNo(), Footer()
+  #
+  def getAliasNbPages()
+    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
+      return '{' + @alias_nb_pages + '}'
+    end
+    return @alias_nb_pages
+  end
+  alias_method :get_alias_nb_pages, :getAliasNbPages
+
+  #
+  # Defines an alias for the page number.
+  # It will be substituted as the document is closed.
+  # [@param string :alias] The alias.
+  # [@access public]
+  # [@since 4.5.000 (2009-01-02)]
+  # [@see] getAliasNbPages(), PageNo(), Footer()
+  #
+  def AliasNumPage(alias_num='{pnb}')
+    # Define an alias for total number of pages
+    @alias_num_page = alias_num
+  end
+  alias_method :alias_num_page, :AliasNumPage
+
+  #
+  # Returns the string alias used for the page number.
+  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
+  # [@return string]
+  # [@access public]
+  # [@since 4.5.000 (2009-01-02)]
+  # [@see] AliasNbPages(), PageNo(), Footer()
+  #
+  def getAliasNumPage()
+    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
+      return '{' + @alias_num_page + '}'
+    end
+    return @alias_num_page
+  end
+  alias_method :get_alias_num_page, :getAliasNumPage
+
+  #
+  # Return the current page in the group.
+  # [@return] current page in the group
+  # [@access public]
+  # [@since 3.0.000 (2008-03-27)]
+  #
+  def getGroupPageNo()
+    return @pagegroups[@currpagegroup]
+  end
+  alias_method :get_group_page_no, :getGroupPageNo
+
+  #
+  # Returns the current group page number formatted as a string.
+  # [@access public]
+  # [@since 4.3.003 (2008-11-18)]
+  # [@see] PaneNo(), formatPageNumber()
+  #
+  def getGroupPageNoFormatted()
+    return formatPageNumber(getGroupPageNo())
+  end
+  alias_method :get_group_page_no_formatted, :getGroupPageNoFormatted
+
+  #
+  # Return the alias of the current page group
+  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
+  # (will be replaced by the total number of pages in this group).
+  # [@return] alias of the current page group
+  # [@access public]
+  # [@since 3.0.000 (2008-03-27)]
+  #
+  def getPageGroupAlias()
+    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont1')
+      return '{' + @currpagegroup + '}'
+    end
+    return @currpagegroup
+  end
+  alias_method :get_page_group_alias, :getPageGroupAlias
+
+  #
+  # Return the alias for the page number on the current page group
+  # If the current font is unicode type, the returned string is surrounded by additional curly braces.
+  # (will be replaced by the total number of pages in this group).
+  # [@return] alias of the current page group
+  # [@access public]
+  # [@since 4.5.000 (2009-01-02)]
+  #
+  def getPageNumGroupAlias()
+    if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
+      return '{' + @currpagegroup.gsub('{nb', '{pnb') +'}'
+    end
+    return @currpagegroup.gsub('{nb', '{pnb')
+  end
+  alias_method :get_page_num_group_alias, :getPageNumGroupAlias
+
+  #
+  # Format the page numbers.
+  # This method can be overriden for custom formats.
+  # [@param int :num] page number
+  # [@access protected]
+  # [@since 4.2.005 (2008-11-06)]
+  #
+  def formatPageNumber(num)
+    return number_with_delimiter(num, :delimiter => ",")
+  end
+  protected :formatPageNumber
+
+  #
+  # Format the page numbers on the Table Of Content.
+  # This method can be overriden for custom formats.
+  # [@param int :num] page number
+  # [@access protected]
+  # [@since 4.5.001 (2009-01-04)]
+  # [@see] addTOC(), addHTMLTOC()
+  #
+  def formatTOCPageNumber(num)
+    return number_with_delimiter(num, :delimiter => ",")
+  end
+  protected :formatTOCPageNumber
+
+  #
+  # Returns the current page number formatted as a string.
+  # [@access public]
   # [@since 4.2.005 (2008-11-06)]
   # [@see] PaneNo(), formatPageNumber()
   #
@@ -10627,7 +11609,7 @@ public
       newobj()
       @extgstates[i] ||= {}
       @extgstates[i]['n'] = @n
-      out = '<< /Type /ExtGState'
+      out = +'<< /Type /ExtGState'
       if @extgstates[i]['parms']
         @extgstates[i]['parms'].each {|k, v|
           if v.is_a? Float
@@ -10761,6 +11743,434 @@ public
   end
   alias_method :set_viewer_preferences, :setViewerPreferences
 
+  #
+  # Paints a linear colour gradient.
+  # [@param float :x] abscissa of the top left corner of the rectangle.
+  # [@param float :y] ordinate of the top left corner of the rectangle.
+  # [@param float :w] width of the rectangle.
+  # [@param float :h] height of the rectangle.
+  # [@param array :col1] first color (Grayscale, RGB or CMYK components).
+  # [@param array :col2] second color (Grayscale, RGB or CMYK components).
+  # [@param array :coords] array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access public]
+  #
+  def LinearGradient(x, y, w, h, col1=[], col2=[], coords=[0,0,1,0])
+    Clip(x, y, w, h)
+    Gradient(2, coords, [{'color' => col1, 'offset' => 0, 'exponent' => 1}, {'color' => col2, 'offset' => 1, 'exponent' => 1}], [], false)
+  end
+  alias_method :linear_gradient, :LinearGradient
+
+  #
+  # Paints a radial colour gradient.
+  # [@param float :x] abscissa of the top left corner of the rectangle.
+  # [@param float :y] ordinate of the top left corner of the rectangle.
+  # [@param float :w] width of the rectangle.
+  # [@param float :h] height of the rectangle.
+  # [@param array :col1] first color (Grayscale, RGB or CMYK components).
+  # [@param array :col2] second color (Grayscale, RGB or CMYK components).
+  # [@param array :coords] array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access public]
+  #
+  def RadialGradient(x, y, w, h, col1=[], col2=[], coords=[0.5,0.5,0.5,0.5,1])
+    Clip(x, y, w, h)
+    Gradient(3, coords, [{'color' => col1, 'offset' => 0, 'exponent' => 1}, {'color' => col2, 'offset' => 1, 'exponent' => 1}], [], false)
+  end
+  alias_method :radial_gradient, :RadialGradient
+
+  #
+  # Paints a coons patch mesh.
+  # [@param float :x] abscissa of the top left corner of the rectangle.
+  # [@param float :y] ordinate of the top left corner of the rectangle.
+  # [@param float :w] width of the rectangle.
+  # [@param float :h] height of the rectangle.
+  # [@param array :col1] first color (lower left corner) (RGB components).
+  # [@param array :col2] second color (lower right corner) (RGB components).
+  # [@param array :col3] third color (upper right corner) (RGB components).
+  # [@param array :col4] fourth color (upper left corner) (RGB components).
+  # [@param array :coords] <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
+  # [@param array :coords_min] minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
+  # [@param array :coords_max] maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
+  # [@param boolean :antialias] A flag indicating whether to filter the shading function to prevent aliasing artifacts.
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access public]
+  #
+  def CoonsPatchMesh(x, y, w, h, col1=[], col2=[], col3=[], col4=[], coords=[0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33], coords_min=0, coords_max=1, antialias=false)
+    Clip(x, y, w, h)
+    n = @gradients.size + 1
+    @gradients[n] = {}
+    @gradients[n]['type'] = 6 #coons patch mesh
+    @gradients[n]['coords'] = []
+    @gradients[n]['antialias'] = antialias
+    @gradients[n]['colors'] = []
+    @gradients[n]['transparency'] = false
+    # check the coords array if it is the simple array or the multi patch array
+    if coords[0].is_a? Hash
+      # multi patch array
+      patch_array = coords
+    else
+      # simple array -> convert to multi patch array
+      if col1[1].nil?
+        col1[1] = col1[2] = col1[0]
+      end
+      if col2[1].nil?
+        col2[1] = col2[2] = col2[0]
+      end
+      if col3[1].nil?
+        col3[1] = col3[2] = col3[0]
+      end
+      if col4[1].nil?
+        col4[1] = col4[2] = col4[0]
+      end
+      patch_array = []
+      patch_array[0] = {}
+      patch_array[0]['f'] = 0
+      patch_array[0]['points'] = coords
+      patch_array[0]['colors'] = []
+      patch_array[0]['colors'][0] = {}
+      patch_array[0]['colors'][0]['r'] = col1[0]
+      patch_array[0]['colors'][0]['g'] = col1[1]
+      patch_array[0]['colors'][0]['b'] = col1[2]
+      patch_array[0]['colors'][1] = {}
+      patch_array[0]['colors'][1]['r'] = col2[0]
+      patch_array[0]['colors'][1]['g'] = col2[1]
+      patch_array[0]['colors'][1]['b'] = col2[2]
+      patch_array[0]['colors'][2] = {}
+      patch_array[0]['colors'][2]['r'] = col3[0]
+      patch_array[0]['colors'][2]['g'] = col3[1]
+      patch_array[0]['colors'][2]['b'] = col3[2]
+      patch_array[0]['colors'][3] = {}
+      patch_array[0]['colors'][3]['r'] = col4[0]
+      patch_array[0]['colors'][3]['g'] = col4[1]
+      patch_array[0]['colors'][3]['b'] = col4[2]
+    end
+    bpcd = 65535 #16 bits per coordinate
+    # build the data stream
+    @gradients[n]['stream'] = +''
+    count_patch = patch_array.size
+    count_patch.times do |i|
+      @gradients[n]['stream'] << (patch_array[i]['f']).chr # start with the edge flag as 8 bit
+      count_points = patch_array[i]['points'].size
+      count_points.times do |j|
+        # each point as 16 bit
+        patch_array[i]['points'][j] = ((patch_array[i]['points'][j] - coords_min) / (coords_max - coords_min)) * bpcd
+        if patch_array[i]['points'][j] < 0
+          patch_array[i]['points'][j] = 0
+        end
+        if patch_array[i]['points'][j] > bpcd
+          patch_array[i]['points'][j] = bpcd
+        end
+        @gradients[n]['stream'] << ((patch_array[i]['points'][j] / 256.0).floor).chr
+        @gradients[n]['stream'] << ((patch_array[i]['points'][j] % 256.0).floor).chr
+      end
+      count_cols = patch_array[i]['colors'].size
+      count_cols.times do |j|
+        # each color component as 8 bit
+        @gradients[n]['stream'] << (patch_array[i]['colors'][j]['r']).chr
+        @gradients[n]['stream'] << (patch_array[i]['colors'][j]['g']).chr
+        @gradients[n]['stream'] << (patch_array[i]['colors'][j]['b']).chr
+      end
+    end
+    # paint the gradient
+    out("/Sh#{n} sh")
+    # restore previous Graphic State
+    out('Q')
+  end
+  alias_method :coons_patch_mesh, :CoonsPatchMesh
+
+  #
+  # Set a rectangular clipping area.
+  # [@param float :x] abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
+  # [@param float :y] ordinate of the top left corner of the rectangle.
+  # [@param float :w] width of the rectangle.
+  # [@param float :h] height of the rectangle.
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access protected]
+  #
+  def Clip(x, y, w, h)
+    x = @w - x - w if @rtl
+
+    # save current Graphic State
+    s = +'q'
+    # set clipping area
+    s << sprintf(' %.2f %.2f %.2f %.2f re W n', x * @k, (@h - y) * @k, w * @k, -h * @k)
+    # set up transformation matrix for gradient
+    s << sprintf(' %.3f 0 0 %.3f %.3f %.3f cm', w * @k, h * @k, x * @k, (@h - (y + h)) * @k)
+    out(s)
+  end
+  protected :Clip
+
+	#
+  # Output gradient.
+  # [@param int :type] type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
+  # [@param array :coords] array of coordinates.
+  # [@param array :stops] array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
+  # [@param array :background] An array of colour components appropriate to the colour space, specifying a single background colour value.
+  # [@param boolean :antialias] A flag indicating whether to filter the shading function to prevent aliasing artifacts.
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access public]
+  #
+  def Gradient(type, coords, stops, background=[], antialias=false)
+    n = @gradients.size + 1
+    @gradients[n] = {}
+    @gradients[n]['type'] = type
+    @gradients[n]['coords'] = coords
+    @gradients[n]['antialias'] = antialias
+    @gradients[n]['colors'] = []
+    @gradients[n]['transparency'] = false
+    # color space
+    numcolspace = stops[0]['color'].size
+    bcolor = background
+    case numcolspace
+    when 4 # CMYK
+      @gradients[n]['colspace'] = 'DeviceCMYK'
+      unless background.empty?
+        @gradients[n]['background'] = sprintf('%.3f %.3f %.3f %.3f', bcolor[0]/100.0, bcolor[1]/100.0, bcolor[2]/100.0, bcolor[3]/100.0)
+      end
+    when 3 # RGB
+      @gradients[n]['colspace'] = 'DeviceRGB'
+      unless background.empty?
+        @gradients[n]['background'] = sprintf('%.3f %.3f %.3f', bcolor[0]/255.0, bcolor[1]/255.0, bcolor[2]/255.0)
+      end
+    when 1 # Gray scale
+      @gradients[n]['colspace'] = 'DeviceGray'
+      unless background.empty?
+        @gradients[n]['background'] = sprintf('%.3f', bcolor[0]/255.0)
+      end
+    end
+    num_stops = stops.size
+    last_stop_id = num_stops - 1
+    stops.each_with_index do |stop, key|
+      @gradients[n]['colors'][key] = {}
+      # offset represents a location along the gradient vector
+      if stop['offset']
+        @gradients[n]['colors'][key]['offset'] = stop['offset']
+      else
+        if key == 0
+          @gradients[n]['colors'][key]['offset'] = 0
+        elsif key == last_stop_id
+          @gradients[n]['colors'][key]['offset'] = 1
+        else
+          offsetstep = (1 - @gradients[n]['colors'][key - 1]['offset']) / (num_stops - key)
+          @gradients[n]['colors'][key]['offset'] = @gradients[n]['colors'][key - 1]['offset'] + offsetstep
+        end
+      end
+      if stop['opacity']
+        @gradients[n]['colors'][key]['opacity'] = stop['opacity']
+        if stop['opacity'] < 1
+          @gradients[n]['transparency'] = true
+        end
+      else
+        @gradients[n]['colors'][key]['opacity'] = 1
+      end
+      # exponent for the exponential interpolation function
+      if stop['exponent']
+        @gradients[n]['colors'][key]['exponent'] = stop['exponent']
+      else
+        @gradients[n]['colors'][key]['exponent'] = 1
+      end
+      # set colors
+      color = stop['color']
+      case numcolspace
+      when 4 # CMYK
+        @gradients[n]['colors'][key]['color'] = sprintf('%.3f %.3f %.3f %.3f', color[0]/100.0, color[1]/100.0, color[2]/100.0, color[3]/100.0)
+      when 3 # RGB
+        @gradients[n]['colors'][key]['color'] = sprintf('%.3f %.3f %.3f', color[0]/255.0, color[1]/255.0, color[2]/255.0)
+      when 1 # Gray scale
+        @gradients[n]['colors'][key]['color'] = sprintf('%.3f', color[0]/255.0)
+      end
+    end
+    if @gradients[n]['transparency']
+      # paint luminosity gradient
+      out("/TGS#{n} gs")
+    end
+    # paint the gradient
+    out("/Sh#{n} sh")
+    # restore previous Graphic State
+    out('Q')
+  end
+  alias_method :gradient, :Gradient
+
+  #
+  # Output gradient shaders.
+  # [@since 3.1.000 (2008-06-09)]
+  # [@access protected]
+  #
+  def putshaders()
+    idt = @gradients.size #index for transparency gradients
+    @gradients.each_with_index do |grad, id|
+      next unless grad
+
+      if (grad['type'] == 2) || (grad['type'] == 3)
+        newobj()
+        fc = @n
+        out = +'<<'
+        out << ' /FunctionType 3'
+        out << ' /Domain [0 1]'
+        functions = +''
+        bounds = +''
+        encode = +''
+        i = 1
+        num_cols = grad['colors'].size
+        lastcols = num_cols - 1
+        1.upto(num_cols - 1) do |i|
+          functions << "#{fc + i} 0 R "
+          if i < lastcols
+            bounds << sprintf('%.3f ', grad['colors'][i]['offset'])
+          end
+          encode << '0 1 '
+        end
+        out << " /Functions [#{functions.strip}]"
+        out << " /Bounds [#{bounds.strip}]"
+        out << " /Encode [#{encode.strip}]"
+        out << ' >>'
+        out << ' endobj'
+        out(out)
+        1.upto(num_cols - 1) do |i|
+          newobj()
+          out = +'<<'
+          out << ' /FunctionType 2'
+          out << ' /Domain [0 1]'
+          out << " /C0 [#{grad['colors'][i - 1]['color']}]"
+          out << " /C1 [#{grad['colors'][i]['color']}]"
+          out << " /N #{grad['colors'][i]['exponent']}"
+          out << ' >>'
+          out << ' endobj'
+          out(out)
+        end
+        # set transparency fuctions
+        if grad['transparency']
+          newobj()
+          ft = @n
+          out = +'<<'
+          out << ' /FunctionType 3'
+          out << ' /Domain [0 1]'
+          functions = +''
+          i = 1
+          num_cols = grad['colors'].size
+          1.upto(num_cols - 1) do |i|
+            functions << "#{ft + i} 0 R "
+          end
+          out << " /Functions [#{functions.strip}]"
+          out << " /Bounds [#{bounds.strip}]"
+          out << " /Encode [#{encode.strip}]"
+          out << ' >>'
+          out << ' endobj'
+          out(out)
+          1.upto(num_cols - 1) do |i|
+            newobj()
+            out = +'<<'
+            out << ' /FunctionType 2'
+            out << ' /Domain [0 1]'
+            out << " /C0 [#{grad['colors'][(i - 1)]['opacity']}]"
+            out << " /C1 [#{grad['colors'][i]['opacity']}]"
+            out << " /N #{grad['colors'][i]['exponent']}"
+            out << ' >>'
+            out << ' endobj'
+            out(out)
+          end
+        end
+      end
+      # set shading object
+      newobj()
+      out = +"<< /ShadingType #{grad['type']}"
+      if grad['colspace']
+        out << " /ColorSpace /#{grad['colspace']}"
+      else
+        out << ' /ColorSpace /DeviceRGB'
+      end
+      if grad['background'] && !grad['background'].empty?
+        out << " /Background [#{grad['background']}]"
+      end
+      if grad['antialias'] == true
+        out << ' /AntiAlias true'
+      end
+      case grad['type']
+      when 2
+        out << sprintf(' /Coords [%.3f %.3f %.3f %.3f]', grad['coords'][0], grad['coords'][1], grad['coords'][2], grad['coords'][3])
+        out << ' /Domain [0 1]'
+        out << " /Function #{fc} 0 R"
+        out << ' /Extend [true true]'
+        out << ' >>'
+      when 3
+        # x0, y0, r0, x1, y1, r1
+        # at this this time radius of inner circle is 0
+        out << sprintf(' /Coords [%.3f %.3f 0 %.3f %.3f %.3f]', grad['coords'][0], grad['coords'][1], grad['coords'][2], grad['coords'][3], grad['coords'][4])
+        out << ' /Domain [0 1]'
+        out << " /Function #{fc} 0 R"
+        out << ' /Extend [true true]'
+        out << ' >>'
+      when 6
+        out << ' /BitsPerCoordinate 16'
+        out << ' /BitsPerComponent 8'
+        out << ' /Decode[0 1 0 1 0 1 0 1 0 1]'
+        out << ' /BitsPerFlag 8'
+        out << " /Length #{grad['stream'].length} >> "
+        out << getstream(grad['stream'])
+      end
+      out << ' endobj'
+      out(out)
+      if grad['transparency']
+        shading_transparency = out.gsub(%r{/ColorSpace /[^\s]+}mi, '/ColorSpace /DeviceGray')
+        shading_transparency = shading_transparency.gsub(%r{/Function [0-9]+ }mi, "/Function #{ft} ")
+      end
+      @gradients[id]['id'] = @n
+      # set pattern object
+      newobj()
+      out = +'<< /Type /Pattern /PatternType 2'
+      out << " /Shading #{@gradients[id]['id']} 0 R"
+      out << ' >> endobj'
+      out(out)
+      @gradients[id]['pattern'] = @n
+      # set shading and pattern for transparency mask
+      if grad['transparency']
+        # luminosity pattern
+        idgs = id + idt
+        newobj()
+        out(shading_transparency)
+        @gradients[idgs] = {}
+        @gradients[idgs]['id'] = @n
+        newobj()
+        out = +'<< /Type /Pattern /PatternType 2'
+        out << " /Shading #{@gradients[idgs]['id']} 0 R"
+        out << ' >> endobj'
+        out(out)
+        @gradients[idgs]['pattern'] = @n
+        # luminosity XObject
+        newobj()
+        filter = ''
+        stream = "q /a0 gs /Pattern cs /p#{idgs} scn 0 0 #{@w_pt} #{@h_pt} re f Q"
+        if @compress
+          filter = ' /Filter /FlateDecode'
+          stream = Zlib::Deflate.deflate(stream)
+        end
+        out = +"<< /Type /XObject /Subtype /Form /FormType 1#{filter}"
+        out << " /Length #{stream.length}"
+        out << " /BBox [0 0 #{@w_pt} #{@h_pt}]"
+        out << ' /Group << /Type /Group /S /Transparency /CS /DeviceGray >>'
+        out << ' /Resources <<'
+        out << ' /ExtGState << /a0 << /ca 1 /CA 1 >> >>'
+        out << " /Pattern << /p#{idgs} #{@gradients[idgs]['pattern']} 0 R >>"
+        out << ' >>'
+        out << ' >> '
+        out << getstream(stream)
+        out << ' endobj'
+        out(out)
+        # SMask
+        newobj()
+        out = +"<< /Type /Mask /S /Luminosity /G #{@n - 1} 0 R >> endobj"
+        out(out)
+        # ExtGState
+        newobj()
+        out = +"<< /Type /ExtGState /SMask #{@n - 1} 0 R /AIS false >> endobj"
+        out(out)
+        @extgstates << {'n' => @n, 'name' => "TGS#{id}"}
+      end
+    end
+  end
+  protected :putshaders
+
   #
   # Draw the sector of a circle.
   # It can be used for instance to render pie charts.
@@ -11112,7 +12522,6 @@ protected
     if dom[key]['attribute'] and dom[key]['attribute']['class'] and !dom[key]['attribute']['class'].empty?
       selector_class = dom[key]['attribute']['class'].downcase
     end
-    id = ''
     if dom[key]['attribute'] and dom[key]['attribute']['id'] and !dom[key]['attribute']['id'].empty?
       selector_id = dom[key]['attribute']['id'].downcase
     end
@@ -11229,7 +12638,7 @@ protected
   # [@since 5.1.000 (2010-05-25)]
   #
   def getTagStyleFromCSS(dom, key, css)
-    tagstyle = '' # style to be returned
+    tagstyle = +'' # style to be returned
     # get all styles that apply
     css.each { |selector, style|
       # remove specificity
@@ -11299,7 +12708,7 @@ protected
             uri.split('/').each {|path|
               uri_path = uri_path.join(path)
             }
-            cssdata = ''
+            cssdata = +''
             next unless File.exist?(uri_path)
 
             open(uri_path) do |f|
@@ -11378,7 +12787,39 @@ protected
       html = html_a + html_b + html[(pos + 6)..-1]
       offset = (html_a + html_b).length
     end
+
+    offset = 0
+    while (offset < html.length) && (pos = html.index('</textarea>', offset))
+      html_a = html[0, offset]
+      html_b = html[offset, pos - offset + 11]
+      while html_b =~ %r@<textarea([^\>]*)>(.*?)\n(.*?)</textarea>@mi
+        # preserve newlines on <textarea> tag
+        html_b.gsub!(%r@<textarea([^\>]*)>(.*?)\n(.*?)</textarea>@mi, "<textarea\\1>\\2<TBR>\\3</textarea>")
+        html_b.gsub!(%r@<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>@mi, "<textarea\\1>\\2''\\3</textarea>")
+      end
+      html = html_a + html_b + html[(pos + 11)..-1]
+      offset = html_a.length + html_b.length
+    end
+    html.gsub!(/([\s]*)<option/mi, "<option")
+    html.gsub!(%r@</option>([\s]*)@mi, "</option>")
+    offset = 0
+    while (offset < html.length) && (pos = html.index('</option>', offset))
+      html_a = html[0, offset]
+      html_b = html[offset, pos - offset + 9]
+      while html_b =~ %r@<option([^\>]*)>(.*?)</option>@mi
+        html_b.gsub!(%r@<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>@mi, "\\2\t\\4\r")
+        html_b.gsub!(%r@<option([^\>]*)>(.*?)</option>@mi, "\\2\r")
+      end
+      html = html_a + html_b + html[(pos + 9)..-1]
+      offset = html_a.length + html_b.length
+    end
+    html.gsub!(/<select([^\>]*)>/mi, "<select\\1 opt=\"")
+    html.gsub!(%r@([\s]+)</select>@mi, "\" />")
     html.gsub!(/[\n]/, " ")
+
+    # restore textarea newlines
+    html.gsub!('<TBR>', "\n")
+
     # remove extra spaces from code
     html.gsub!(/[\s]+<\/(table|tr|td|th|ul|ol|li|dl|dt|dd)>/, '</\\1>')
     html.gsub!(/[\s]+<(tr|td|th|ul|ol|li|dl|dt|dd|br)/, '<\\1')
@@ -11389,6 +12830,8 @@ protected
     html.gsub!(/[\s]*<img/, ' <img')
     html.gsub!(/<img([^\>]*)>/xi, '<img\\1><span><marker style="font-size:0"/></span>')
     html.gsub!(/<xre/, '<pre') # restore pre tag
+    html.gsub!(/<textarea([^\>]*)>/xi, '<textarea\\1 value="')
+    html.gsub!(/<\/textarea>/, '" />')
 
     # trim string
     html.gsub!(/^[\s]+/, '')
@@ -11418,7 +12861,7 @@ protected
     dom[key]['fill'] = ((@textrendermode % 2) == 0)
     dom[key]['clip'] = (@textrendermode > 3)
     dom[key]['line-height'] = @cell_height_ratio
-    dom[key]['bgcolor'] = ActiveSupport::OrderedHash.new
+    dom[key]['bgcolor'] = []
     dom[key]['fgcolor'] = @fgcolor.dup # color
     dom[key]['strokecolor'] = @strokecolor.dup
 
@@ -11483,7 +12926,7 @@ protected
             dom[grandparent]['cols'] = dom[(dom[key]['parent'])]['cols']
           end
           if (dom[key]['value'] == 'td') or (dom[key]['value'] == 'th')
-            dom[(dom[key]['parent'])]['content'] = ''
+            dom[(dom[key]['parent'])]['content'] = +''
             (dom[key]['parent'] + 1).upto(key - 1) do |i|
               dom[(dom[key]['parent'])]['content'] << a[dom[i]['elkey']]
             end
@@ -11520,7 +12963,7 @@ protected
           # *** opening html tag
           dom[key]['opening'] = true
           dom[key]['parent'] = level[-1]
-          if element[-1, 1] == '/' or (dom[key]['value'] =~ /(br|img|hr)/)
+          if element[-1, 1] == '/' or (dom[key]['value'] =~ /(br|img|hr|input)/)
             # self-closing tag
             dom[key]['self'] = true
           else
@@ -11546,7 +12989,7 @@ protected
             dom[key]['text-indent'] = dom[parentkey]['text-indent']
           end
           # get attributes
-          attr_array = element.scan(/([^=\s]*)[\s]*=[\s]*"([^"]*)"/)
+          attr_array = element.scan(/([^=\s]+)[\s]*(?:=[\s]*"([^"]*)")*/)[1..-1]
           dom[key]['attribute'] = {} # reset attribute array
           attr_array.each do |name, value|
             dom[key]['attribute'][name.downcase] = value
@@ -11636,7 +13079,7 @@ protected
               end
             end
             # font style
-            dom[key]['fontstyle'] ||= ""
+            dom[key]['fontstyle'] ||= +""
             if !dom[key]['style']['font-weight'].nil? and (dom[key]['style']['font-weight'][0,1].downcase == 'b')
               dom[key]['fontstyle'] << 'B'
             end
@@ -11645,13 +13088,13 @@ protected
             end
             # font color
             if !empty_string(dom[key]['style']['color'])
-              dom[key]['fgcolor'] = convertHTMLColorToDec(dom[key]['style']['color'])
+              dom[key]['fgcolor'] = convert_html_color_to_dec_array(dom[key]['style']['color'])
             elsif dom[key]['value'] == 'a'
               dom[key]['fgcolor'] = @html_link_color_array
             end
             # background color
             if !empty_string(dom[key]['style']['background-color'])
-              dom[key]['bgcolor'] = convertHTMLColorToDec(dom[key]['style']['background-color'])
+              dom[key]['bgcolor'] = convert_html_color_to_dec_array(dom[key]['style']['background-color'])
             end
             # text-decoration
             if !dom[key]['style']['text-decoration'].nil?
@@ -11814,17 +13257,17 @@ protected
           end
           # set foreground color attribute
           if !empty_string(dom[key]['attribute']['color'])
-            dom[key]['fgcolor'] = convertHTMLColorToDec(dom[key]['attribute']['color'])
+            dom[key]['fgcolor'] = convert_html_color_to_dec_array(dom[key]['attribute']['color'])
           elsif (dom[key]['style'].nil? or dom[key]['style']['color'].nil?) and (dom[key]['value'] == 'a')
             dom[key]['fgcolor'] = @html_link_color_array
           end
           # set background color attribute
           if !empty_string(dom[key]['attribute']['bgcolor'])
-            dom[key]['bgcolor'] = convertHTMLColorToDec(dom[key]['attribute']['bgcolor'])
+            dom[key]['bgcolor'] = convert_html_color_to_dec_array(dom[key]['attribute']['bgcolor'])
           end
           # set stroke color attribute
           if !empty_string(dom[key]['attribute']['strokecolor'])
-            dom[key]['strokecolor'] = convertHTMLColorToDec(dom[key]['attribute']['strokecolor'])
+            dom[key]['strokecolor'] = convert_html_color_to_dec_array(dom[key]['attribute']['strokecolor'])
           end
           # check for width attribute
           if !dom[key]['attribute']['width'].nil?
@@ -11982,8 +13425,9 @@ public
   def sanitize_html(html)
     # Escape '<' character for not tag case.
     html = html.gsub(%r{(<+)([^/a-zA-Z])}){CGI.escapeHTML($1) + $2}.gsub(%r{</([^a-zA-Z])}){'&lt;/' +  $1}
-
-    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 name dir class id nobr stroke strokecolor fill nested tablehead))
+    "%s" % sanitize(html,
+            :tags=> %w(a b blockquote body br dd del div dl dt em font form h1 h2 h3 h4 h5 h6 hr i img input label li ol option p pre select small span strong sub sup table td textarea 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 name dir class id nobr stroke strokecolor fill nested tablehead cols rows type action enctype method maxlength onclick multiple checked disabled))
   end
   protected :sanitize_html
 
@@ -12083,6 +13527,7 @@ public
     prev_listordered = @listordered
     prev_listcount = @listcount
     prev_lispacer = @lispacer
+    prev_li_position_x = @li_position_x
     @listnum = 0
     @listordered = []
     @listcount = []
@@ -12172,8 +13617,8 @@ public
             # restore previous object
             rollbackTransaction(true)
             # restore previous values
-            this_method_vars.each {|vkey , vval|
-              eval("#{vkey} = vval")
+            this_method_vars.each {|vkey, vval|
+              binding.local_variable_set(vkey, vval)
             }
             # add a page (or trig AcceptPageBreak() for multicolumn mode)
             pre_y = @y
@@ -12946,7 +14391,7 @@ public
           len1 = dom[key]['value'].length
           lsp = len1 - dom[key]['value'].lstrip.length
           rsp = len1 - dom[key]['value'].rstrip.length
-          tmpstr = ''
+          tmpstr = +''
           if rsp > 0
             tmpstr << dom[key]['value'][-rsp..-1]
           end
@@ -13036,7 +14481,7 @@ public
           rollbackTransaction(true)
           # restore previous values
           this_method_vars.each {|vkey , vval|
-            eval("#{vkey} = vval")
+            binding.local_variable_set(vkey, vval)
           }
           # add a page (or trig AcceptPageBreak() for multicolumn mode)
           pre_y = @y
@@ -13155,6 +14600,7 @@ public
     @listordered = prev_listordered
     @listcount = prev_listcount
     @lispacer = prev_lispacer
+    @li_position_x = prev_li_position_x
     dom = nil
   rescue => err
     Error('writeHTML Error.', err)
@@ -13471,6 +14917,7 @@ public
           @lispacer = '!'
         end
       end
+      @li_position_x = @x
     when 'blockquote'
       if @rtl
         @r_margin += @listindent
@@ -13494,6 +14941,166 @@ public
       SetXY(GetX(), GetY() + ((0.3 * @font_size_pt) / @k))
     when 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
       addHTMLVertSpace(hbz, hb, cell, firstorlast)
+
+    # Form fields (since 4.8.000 - 2009-09-07)
+    when 'form'
+      if tag['attribute']['action']
+        @form_action = tag['attribute']['action']
+      else
+        @form_action = @@k_path_url + request&.base_url.to_s
+      end
+      if tag['attribute']['enctype']
+        @form_enctype = tag['attribute']['enctype']
+      else
+        @form_enctype = 'application/x-www-form-urlencoded'
+      end
+      if tag['attribute']['method']
+        @form_mode = tag['attribute']['method']
+      else
+        @form_mode = 'post'
+      end
+    when 'input'
+      if tag['attribute']['type'] == 'checkbox' || (tag['attribute']['name'] && !empty_string(tag['attribute']['name']))
+        name = tag['attribute']['name'] || rand.to_s
+        prop = {}
+        opt = {}
+        if tag['attribute']['value'] && !empty_string(tag['attribute']['value'])
+          value = tag['attribute']['value']
+        end
+        if tag['attribute']['maxlength'] && !empty_string(tag['attribute']['maxlength'])
+          opt['maxlen'] = tag['attribute']['maxlength'].to_i
+        end
+        h = @font_size * @cell_height_ratio
+        if tag['attribute']['size'] && !empty_string(tag['attribute']['size'])
+          w = tag['attribute']['size'].to_i * GetStringWidth(32.chr) * 2
+        else
+          w = h
+        end
+        if tag['attribute'].key? 'disabled'
+          prop['readonly'] = 'true'
+        end
+        if tag['attribute'].key? 'checked'
+          checked = true
+        else
+          checked = false
+        end
+
+        case tag['attribute']['type']
+        when 'text'
+          opt['v'] = value if value
+          TextField(name, w, h, prop, opt, '', '', false)
+        when 'password'
+          opt['v'] = value if value
+          prop['password'] = 'true'
+          TextField(name, w, h, prop, opt, '', '', false)
+        when 'checkbox'
+          CheckBox(name, w, checked, prop, opt, value, '', '', false)
+        when 'radio'
+          RadioButton(name, w, prop, opt, value, checked, '', '', false)
+        when 'submit'
+          w = GetStringWidth(value) * 1.5
+          h *= 1.6
+          prop = {'lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>[196, 196, 196], 'strokeColor'=>[255, 255, 255]}
+          action = {}
+          action['S'] = 'SubmitForm'
+          action['F'] = @form_action
+          action['Flags'] = ['ExportFormat'] unless @form_enctype == 'FDF'
+          action['Flags'] = ['GetMethod'] if @form_mode == 'get'
+          Button(name, w, h, value, action, prop, opt, '', '', false)
+        when 'reset'
+          w = GetStringWidth(value) * 1.5
+          h *= 1.6
+          prop = {'lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>[196, 196, 196], 'strokeColor'=>[255, 255, 255]}
+          Button(name, w, h, value, {'S'=>'ResetForm'}, prop, opt, '', '', false)
+        when 'file'
+          prop['fileSelect'] = 'true'
+          TextField(name, w, h, prop, opt, '', '', false)
+          value ||= '*'
+          w = GetStringWidth(value) * 2
+          h *= 1.2
+          prop = {'lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>[196, 196, 196], 'strokeColor'=>[255, 255, 255]}
+          jsaction = "var f=this.getField('#{name}'); f.browseForFileToSubmit();"
+          Button('FB_' + name, w, h, value, jsaction, prop, opt, '', '', false)
+        when 'hidden'
+          opt['v'] = value if value
+          opt['f'] = ['invisible', 'hidden']
+          TextField(name, 0, 0, prop, opt, '', '', false)
+        when 'image'
+          # THIS TYPE MUST BE FIXED
+          if tag['attribute']['src'] && !empty_string(tag['attribute']['src'])
+            img = tag['attribute']['src']
+            value = 'img'
+            #opt['mk'] = {'i'=>img, 'tp'=>1, 'if'=>{'sw'=>'A', 's'=>'A', 'fb'=>false}}
+            if tag['attribute']['onclick'] && !tag['attribute']['onclick'].empty?
+              jsaction = tag['attribute']['onclick']
+            else
+              jsaction = ''
+            end
+            Button(name, w, h, value, jsaction, prop, opt, '', '', false)
+          end
+        when 'button'
+          w = GetStringWidth(value) * 1.5
+          h *= 1.6
+          prop = {'lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>[196, 196, 196], 'strokeColor'=>[255, 255, 255]}
+          if tag['attribute']['onclick'] && !tag['attribute']['onclick'].empty?
+            jsaction = tag['attribute']['onclick']
+          else
+            jsaction = ''
+          end
+          Button(name, w, h, value, jsaction, prop, opt, '', '', false)
+        end
+      end
+    when 'textarea'
+      if tag['attribute']['name'] && !empty_string(tag['attribute']['name'])
+        prop = {}
+        opt = {}
+        name = tag['attribute']['name']
+        if tag['attribute']['value'] && !empty_string(tag['attribute']['value'])
+          opt['v'] = tag['attribute']['value']
+        end
+        if tag['attribute']['cols'] && !empty_string(tag['attribute']['cols'])
+          w = tag['attribute']['cols'].to_i * GetStringWidth(32.chr) * 2
+        else
+          w = 40
+        end
+        if tag['attribute']['rows'] && !empty_string(tag['attribute']['rows'])
+          h = tag['attribute']['rows'].to_i * @font_size * @cell_height_ratio
+        else
+          h = 10
+        end
+        prop['multiline'] = 'true'
+        TextField(name, w, h, prop, opt, '', '', false)
+      end
+    when 'select'
+      if tag['attribute']['name'] && !empty_string(tag['attribute']['name']) && tag['attribute']['opt'] && !empty_string(tag['attribute']['opt'])
+        h = @font_size * @cell_height_ratio
+        if tag['attribute']['size'] && !empty_string(tag['attribute']['size'])
+          h *= (tag['attribute']['size'].to_i + 1)
+        end
+        prop = {}
+        opt = {}
+        name = tag['attribute']['name']
+        w = 0
+        options = tag['attribute']['opt'].split("\r")
+        values = []
+        options.each {|val|
+          if val.index("\t")
+            opts = val.split("\t")
+            values << opts
+            w = [w, GetStringWidth(opts[1])].max
+          else
+            values << val
+            w = [w, GetStringWidth(val)].max
+          end
+        }
+        w *= 2
+        if tag['attribute'].key? 'multiple'
+          prop['multipleSelection'] = 'true'
+          ListBox(name, w, h, values, prop, opt, '', '', false)
+        else
+          ComboBox(name, w, h, values, prop, opt, '', '', false)
+        end
+      end
     end
 
     if dom[key]['self'] and dom[key]['attribute']['pagebreakafter']
@@ -13569,317 +15176,325 @@ public
     end
     # Closing tag
     case (tag['value'])
-      when 'tr'
-        table_el = dom[(dom[key]['parent'])]['parent']
-        if parent['endy'].nil?
-          dom[(dom[key]['parent'])]['endy'] = @y
-          parent['endy'] = @y
+    when 'tr'
+      table_el = dom[(dom[key]['parent'])]['parent']
+      if parent['endy'].nil?
+        dom[(dom[key]['parent'])]['endy'] = @y
+        parent['endy'] = @y
+      end
+      if parent['endpage'].nil?
+        dom[(dom[key]['parent'])]['endpage'] = @page
+        parent['endpage'] = @page
+      end
+      # update row-spanned cells
+      if !dom[table_el]['rowspans'].nil?
+        dom[table_el]['rowspans'].each_with_index { |trwsp, k|
+          dom[table_el]['rowspans'][k]['rowspan'] -= 1
+          if dom[table_el]['rowspans'][k]['rowspan'] == 0
+            if dom[table_el]['rowspans'][k]['endpage'] == parent['endpage']
+              dom[(dom[key]['parent'])]['endy'] = [dom[table_el]['rowspans'][k]['endy'], parent['endy']].max
+            elsif dom[table_el]['rowspans'][k]['endpage'] > parent['endpage']
+              dom[(dom[key]['parent'])]['endy'] = dom[table_el]['rowspans'][k]['endy']
+              dom[(dom[key]['parent'])]['endpage'] = dom[table_el]['rowspans'][k]['endpage']
+            end
+          end
+        }
+        # report new endy and endpage to the rowspanned cells
+        dom[table_el]['rowspans'].each_with_index { |trwsp, k|
+          if dom[table_el]['rowspans'][k]['rowspan'] == 0
+            dom[table_el]['rowspans'][k]['endpage'] = [dom[table_el]['rowspans'][k]['endpage'], dom[(dom[key]['parent'])]['endpage']].max
+            dom[(dom[key]['parent'])]['endpage'] = dom[table_el]['rowspans'][k]['endpage']
+            dom[table_el]['rowspans'][k]['endy'] = [dom[table_el]['rowspans'][k]['endy'], dom[(dom[key]['parent'])]['endy']].max
+            dom[(dom[key]['parent'])]['endy'] = dom[table_el]['rowspans'][k]['endy']
+          end
+        }
+        # update remaining rowspanned cells
+        dom[table_el]['rowspans'].each_with_index { |trwsp, k|
+          if dom[table_el]['rowspans'][k]['rowspan'] == 0
+            dom[table_el]['rowspans'][k]['endpage'] = dom[(dom[key]['parent'])]['endpage']
+            dom[table_el]['rowspans'][k]['endy'] = dom[(dom[key]['parent'])]['endy']
+          end
+        }
+      end
+      if (@num_columns > 1) and (dom[(dom[key]['parent'])]['endy'] >= (@page_break_trigger - @lasth)) and (@y < dom[(dom[key]['parent'])]['endy'])
+        Ln(0, cell)
+      else
+        setPage(dom[(dom[key]['parent'])]['endpage']);
+        @y = dom[(dom[key]['parent'])]['endy']
+        if !dom[table_el]['attribute']['cellspacing'].nil?
+          cellspacing = getHTMLUnitToUnits(dom[table_el]['attribute']['cellspacing'], 1, 'px')
+          @y += cellspacing
         end
-        if parent['endpage'].nil?
-          dom[(dom[key]['parent'])]['endpage'] = @page
-          parent['endpage'] = @page
+        Ln(0, cell)
+        @x = parent['startx']
+        # account for booklet mode
+        if parent['startpage'] and @page > parent['startpage']
+          if @rtl and (@pagedim[@page]['orm'] != @pagedim[parent['startpage']]['orm'])
+            @x -= @pagedim[@page]['orm'] - @pagedim[parent['startpage']]['orm']
+          elsif !@rtl and (@pagedim[@page]['olm'] != @pagedim[parent['startpage']]['olm'])
+            @x += @pagedim[@page]['olm'] - @pagedim[parent['startpage']]['olm']
+          end
         end
+      end
+    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
+      end
+
+      table_el = parent
+      # draw borders
+      if (!table_el['attribute']['border'].nil? and (table_el['attribute']['border'].to_i > 0)) or (!table_el['style'].nil? and !table_el['style']['border'].nil? and (table_el['style']['border'].to_i > 0))
+        border = 1
+      else
+        border = 0
+      end
+
+      startpage = 0
+      end_page = 0
+      # fix bottom line alignment of last line before page break
+      dom[(dom[key]['parent'])]['trids'].each_with_index { |trkey, j|
         # update row-spanned cells
-        if !dom[table_el]['rowspans'].nil?
-          dom[table_el]['rowspans'].each_with_index { |trwsp, k|
-            dom[table_el]['rowspans'][k]['rowspan'] -= 1
-            if dom[table_el]['rowspans'][k]['rowspan'] == 0
-              if dom[table_el]['rowspans'][k]['endpage'] == parent['endpage']
-                dom[(dom[key]['parent'])]['endy'] = [dom[table_el]['rowspans'][k]['endy'], parent['endy']].max
-              elsif dom[table_el]['rowspans'][k]['endpage'] > parent['endpage']
-                dom[(dom[key]['parent'])]['endy'] = dom[table_el]['rowspans'][k]['endy']
-                dom[(dom[key]['parent'])]['endpage'] = dom[table_el]['rowspans'][k]['endpage']
-              end
-            end
-          }
-          # report new endy and endpage to the rowspanned cells
-          dom[table_el]['rowspans'].each_with_index { |trwsp, k|
-            if dom[table_el]['rowspans'][k]['rowspan'] == 0
-              dom[table_el]['rowspans'][k]['endpage'] = [dom[table_el]['rowspans'][k]['endpage'], dom[(dom[key]['parent'])]['endpage']].max
-              dom[(dom[key]['parent'])]['endpage'] = dom[table_el]['rowspans'][k]['endpage']
-              dom[table_el]['rowspans'][k]['endy'] = [dom[table_el]['rowspans'][k]['endy'], dom[(dom[key]['parent'])]['endy']].max
-              dom[(dom[key]['parent'])]['endy'] = dom[table_el]['rowspans'][k]['endy']
+        if !dom[(dom[key]['parent'])]['rowspans'].nil?
+          dom[(dom[key]['parent'])]['rowspans'].each_with_index { |trwsp, k|
+            if trwsp['trid'] == trkey
+              dom[(dom[key]['parent'])]['rowspans'][k]['mrowspan'] -= 1
             end
-          }
-          # update remaining rowspanned cells
-          dom[table_el]['rowspans'].each_with_index { |trwsp, k|
-            if dom[table_el]['rowspans'][k]['rowspan'] == 0
-              dom[table_el]['rowspans'][k]['endpage'] = dom[(dom[key]['parent'])]['endpage']
-              dom[table_el]['rowspans'][k]['endy'] = dom[(dom[key]['parent'])]['endy']
+            if defined?(prevtrkey) and (trwsp['trid'] == prevtrkey) and (trwsp['mrowspan'] >= 0)
+              dom[(dom[key]['parent'])]['rowspans'][k]['trid'] = trkey
             end
           }
         end
-        if (@num_columns > 1) and (dom[(dom[key]['parent'])]['endy'] >= (@page_break_trigger - @lasth)) and (@y < dom[(dom[key]['parent'])]['endy'])
-          Ln(0, cell)
-        else
-          setPage(dom[(dom[key]['parent'])]['endpage']);
-          @y = dom[(dom[key]['parent'])]['endy']
-          if !dom[table_el]['attribute']['cellspacing'].nil?
-            cellspacing = getHTMLUnitToUnits(dom[table_el]['attribute']['cellspacing'], 1, 'px')
-            @y += cellspacing
-          end
-          Ln(0, cell)
-          @x = parent['startx']
-          # account for booklet mode
-          if parent['startpage'] and @page > parent['startpage']
-            if @rtl and (@pagedim[@page]['orm'] != @pagedim[parent['startpage']]['orm'])
-              @x -= @pagedim[@page]['orm'] - @pagedim[parent['startpage']]['orm']
-            elsif !@rtl and (@pagedim[@page]['olm'] != @pagedim[parent['startpage']]['olm'])
-              @x += @pagedim[@page]['olm'] - @pagedim[parent['startpage']]['olm']
-            end
-          end
-        end
-      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
-        end
-
-        table_el = parent
-        # draw borders
-        if (!table_el['attribute']['border'].nil? and (table_el['attribute']['border'].to_i > 0)) or (!table_el['style'].nil? and !table_el['style']['border'].nil? and (table_el['style']['border'].to_i > 0))
-          border = 1
-        else
-          border = 0
-        end
-
-        startpage = 0
-        end_page = 0
-        # fix bottom line alignment of last line before page break
-        dom[(dom[key]['parent'])]['trids'].each_with_index { |trkey, j|
+        if defined?(prevtrkey) and (dom[trkey]['startpage'] > dom[prevtrkey]['endpage'])
+          pgendy = @pagedim[dom[prevtrkey]['endpage']]['hk'] - @pagedim[dom[prevtrkey]['endpage']]['bm']
+          dom[prevtrkey]['endy'] = pgendy
           # update row-spanned cells
           if !dom[(dom[key]['parent'])]['rowspans'].nil?
             dom[(dom[key]['parent'])]['rowspans'].each_with_index { |trwsp, k|
-              if trwsp['trid'] == trkey
-                dom[(dom[key]['parent'])]['rowspans'][k]['mrowspan'] -= 1
-              end
-              if defined?(prevtrkey) and (trwsp['trid'] == prevtrkey) and (trwsp['mrowspan'] >= 0)
-                dom[(dom[key]['parent'])]['rowspans'][k]['trid'] = trkey
+              if (trwsp['trid'] == trkey) and (trwsp['mrowspan'] > 1) and (trwsp['endpage'] == dom[prevtrkey]['endpage'])
+                dom[(dom[key]['parent'])]['rowspans'][k]['endy'] = pgendy
+                dom[(dom[key]['parent'])]['rowspans'][k]['mrowspan'] = -1
               end
             }
           end
-          if defined?(prevtrkey) and (dom[trkey]['startpage'] > dom[prevtrkey]['endpage'])
-            pgendy = @pagedim[dom[prevtrkey]['endpage']]['hk'] - @pagedim[dom[prevtrkey]['endpage']]['bm']
-            dom[prevtrkey]['endy'] = pgendy
-            # update row-spanned cells
-            if !dom[(dom[key]['parent'])]['rowspans'].nil?
-              dom[(dom[key]['parent'])]['rowspans'].each_with_index { |trwsp, k|
-                if (trwsp['trid'] == trkey) and (trwsp['mrowspan'] > 1) and (trwsp['endpage'] == dom[prevtrkey]['endpage'])
-                  dom[(dom[key]['parent'])]['rowspans'][k]['endy'] = pgendy
-                  dom[(dom[key]['parent'])]['rowspans'][k]['mrowspan'] = -1
-                end
-              }
-            end
+        end
+        prevtrkey = trkey
+        table_el = dom[(dom[key]['parent'])].dup
+      }
+      # for each row
+      table_el['trids'].each_with_index { |trkey, j|
+        parent = dom[trkey]
+        # for each cell on the row
+        parent['cellpos'].each_with_index { |cellpos, k|
+          if !cellpos['rowspanid'].nil? and (cellpos['rowspanid'] >= 0)
+            cellpos['startx'] = table_el['rowspans'][(cellpos['rowspanid'])]['startx']
+            cellpos['endx'] = table_el['rowspans'][(cellpos['rowspanid'])]['endx']
+            endy = table_el['rowspans'][(cellpos['rowspanid'])]['endy']
+            startpage = table_el['rowspans'][(cellpos['rowspanid'])]['startpage']
+            end_page = table_el['rowspans'][(cellpos['rowspanid'])]['endpage']
+          else
+            endy = parent['endy']
+            startpage = parent['startpage']
+            end_page = parent['endpage']
           end
-          prevtrkey = trkey
-          table_el = dom[(dom[key]['parent'])].dup
-        }
-        # for each row
-        table_el['trids'].each_with_index { |trkey, j|
-          parent = dom[trkey]
-          # for each cell on the row
-          parent['cellpos'].each_with_index { |cellpos, k|
-            if !cellpos['rowspanid'].nil? and (cellpos['rowspanid'] >= 0)
-              cellpos['startx'] = table_el['rowspans'][(cellpos['rowspanid'])]['startx']
-              cellpos['endx'] = table_el['rowspans'][(cellpos['rowspanid'])]['endx']
-              endy = table_el['rowspans'][(cellpos['rowspanid'])]['endy']
-              startpage = table_el['rowspans'][(cellpos['rowspanid'])]['startpage']
-              end_page = table_el['rowspans'][(cellpos['rowspanid'])]['endpage']
-            else
-              endy = parent['endy']
-              startpage = parent['startpage']
-              end_page = parent['endpage']
-            end
-            cellpos['startx'] ||= 0
-            if end_page > startpage
-              # design borders around HTML cells.
-              startpage.upto(end_page) do |page|
-                setPage(page)
-                if page == startpage
-                  @y = parent['starty'] # put cursor at the beginning of row on the first page
-                  ch = getPageHeight() - parent['starty'] - getBreakMargin()
-                  cborder = getBorderMode(border, position='start')
-                elsif page == end_page
-                  @y = @t_margin # put cursor at the beginning of last page
-                  ch = endy - @t_margin
-                  cborder = getBorderMode(border, position='end')
-                else
-                  @y = @t_margin # put cursor at the beginning of the current page
-                  ch = getPageHeight() - @t_margin - getBreakMargin()
-                  cborder = getBorderMode(border, position='middle')
-                end
-                if !cellpos['bgcolor'].nil? and (cellpos['bgcolor'] != false)
-                  SetFillColorArray(cellpos['bgcolor'])
-                  fill = 1
-                else
-                  fill = 0
-                end
-                cw = (cellpos['endx'] - cellpos['startx']).abs
-                @x = cellpos['startx']
-                # account for margin changes
-                if page > startpage
-                  if @rtl and (@pagedim[page]['orm'] != @pagedim[startpage]['orm'])
-                    @x -= @pagedim[page]['orm'] - @pagedim[startpage]['orm']
-                  elsif !@rtl and (@pagedim[page]['lm'] != @pagedim[startpage]['olm'])
-                    @x += @pagedim[page]['olm'] - @pagedim[startpage]['olm']
-                  end
-                end
-
-                prevLastH = @lasth
-                # design a cell around the text
-                ccode = @fill_color + "\n" + getCellCode(cw, ch, '', cborder, 1, '', fill, '', 0, true)
-                @lasth = prevLastH
-
-                if (cborder != 0) or (fill == 1)
-                  pagebuff = getPageBuffer(@page)
-                  pstart = pagebuff[0, @intmrk[@page]]
-                  pend = pagebuff[@intmrk[@page]..-1]
-                  setPageBuffer(@page, pstart + ccode + "\n" + pend)
-                  @intmrk[@page] += (ccode + "\n").length
-                end
+          cellpos['startx'] ||= 0
+          if end_page > startpage
+            # design borders around HTML cells.
+            startpage.upto(end_page) do |page|
+              setPage(page)
+              if page == startpage
+                @y = parent['starty'] # put cursor at the beginning of row on the first page
+                ch = getPageHeight() - parent['starty'] - getBreakMargin()
+                cborder = getBorderMode(border, position='start')
+              elsif page == end_page
+                @y = @t_margin # put cursor at the beginning of last page
+                ch = endy - @t_margin
+                cborder = getBorderMode(border, position='end')
+              else
+                @y = @t_margin # put cursor at the beginning of the current page
+                ch = getPageHeight() - @t_margin - getBreakMargin()
+                cborder = getBorderMode(border, position='middle')
               end
-            else
-              setPage(startpage)
               if !cellpos['bgcolor'].nil? and (cellpos['bgcolor'] != false)
                 SetFillColorArray(cellpos['bgcolor'])
                 fill = 1
               else
                 fill = 0
               end
-              @x = cellpos['startx']
-              @y = parent['starty']
               cw = (cellpos['endx'] - cellpos['startx']).abs
-              ch = endy - parent['starty']
+              @x = cellpos['startx']
+              # account for margin changes
+              if page > startpage
+                if @rtl and (@pagedim[page]['orm'] != @pagedim[startpage]['orm'])
+                  @x -= @pagedim[page]['orm'] - @pagedim[startpage]['orm']
+                elsif !@rtl and (@pagedim[page]['lm'] != @pagedim[startpage]['olm'])
+                  @x += @pagedim[page]['olm'] - @pagedim[startpage]['olm']
+                end
+              end
 
               prevLastH = @lasth
               # design a cell around the text
-              ccode = @fill_color + "\n" + getCellCode(cw, ch, '', border, 1, '', fill, '', 0, true)
+              ccode = @fill_color + "\n" + getCellCode(cw, ch, '', cborder, 1, '', fill, '', 0, true)
               @lasth = prevLastH
 
-              if (border != 0) or (fill == 1)
-                if !@transfmrk[@page].nil?
-                  pagemark = @transfmrk[@page]
-                  @transfmrk[@page] += (ccode + "\n").length
-                elsif @in_footer
-                  pagemark = @footerpos[@page]
-                  @footerpos[@page] += (ccode + "\n").length
-                else
-                  pagemark = @intmrk[@page]
-                  @intmrk[@page] += (ccode + "\n").length
-                end
+              if (cborder != 0) or (fill == 1)
                 pagebuff = getPageBuffer(@page)
-                pstart = pagebuff[0, pagemark]
-                pend = pagebuff[pagemark..-1]
+                pstart = pagebuff[0, @intmrk[@page]]
+                pend = pagebuff[@intmrk[@page]..-1]
                 setPageBuffer(@page, pstart + ccode + "\n" + pend)
+                @intmrk[@page] += (ccode + "\n").length
               end
             end
-          }
-          if !table_el['attribute']['cellspacing'].nil?
-            cellspacing = getHTMLUnitToUnits(table_el['attribute']['cellspacing'], 1, 'px')
-            @y += cellspacing
-          end
-          Ln(0, cell)
-          @x = parent['startx']
-          if end_page > startpage
-            if @rtl and (@pagedim[end_page]['orm'] != @pagedim[startpage]['orm'])
-              @x += @pagedim[end_page]['orm'] - @pagedim[startpage]['orm']
-            elsif !@rtl and (@pagedim[end_page]['olm'] != @pagedim[startpage]['olm'])
-              @x += @pagedim[end_page]['olm'] - @pagedim[startpage]['olm']
+          else
+            setPage(startpage)
+            if !cellpos['bgcolor'].nil? and (cellpos['bgcolor'] != false)
+              SetFillColorArray(cellpos['bgcolor'])
+              fill = 1
+            else
+              fill = 0
+            end
+            @x = cellpos['startx']
+            @y = parent['starty']
+            cw = (cellpos['endx'] - cellpos['startx']).abs
+            ch = endy - parent['starty']
+
+            prevLastH = @lasth
+            # design a cell around the text
+            ccode = @fill_color + "\n" + getCellCode(cw, ch, '', border, 1, '', fill, '', 0, true)
+            @lasth = prevLastH
+
+            if (border != 0) or (fill == 1)
+              if !@transfmrk[@page].nil?
+                pagemark = @transfmrk[@page]
+                @transfmrk[@page] += (ccode + "\n").length
+              elsif @in_footer
+                pagemark = @footerpos[@page]
+                @footerpos[@page] += (ccode + "\n").length
+              else
+                pagemark = @intmrk[@page]
+                @intmrk[@page] += (ccode + "\n").length
+              end
+              pagebuff = getPageBuffer(@page)
+              pstart = pagebuff[0, pagemark]
+              pend = pagebuff[pagemark..-1]
+              setPageBuffer(@page, pstart + ccode + "\n" + pend)
             end
           end
         }
-        if !in_table_head
-          # we are not inside a thead section
-          if dom[(parent['parent'])]['attribute']['cellpadding'] ### fix ###
-            @c_margin = @old_c_margin
+        if !table_el['attribute']['cellspacing'].nil?
+          cellspacing = getHTMLUnitToUnits(table_el['attribute']['cellspacing'], 1, 'px')
+          @y += cellspacing
+        end
+        Ln(0, cell)
+        @x = parent['startx']
+        if end_page > startpage
+          if @rtl and (@pagedim[end_page]['orm'] != @pagedim[startpage]['orm'])
+            @x += @pagedim[end_page]['orm'] - @pagedim[startpage]['orm']
+          elsif !@rtl and (@pagedim[end_page]['olm'] != @pagedim[startpage]['olm'])
+            @x += @pagedim[end_page]['olm'] - @pagedim[startpage]['olm']
           end
-          @lasth = @font_size * @cell_height_ratio
-          if (@page == @numpages - 1) and @pageopen[@numpages]
-            # remove last blank page
-            deletePage(@numpages)
-          end
-          if !@thead_margins['top'].nil?
-            # restore top margin
-            @t_margin = @thead_margins['top']
-            @pagedim[@page]['tm'] = @t_margin
-          end
-          if table_el['attribute']['nested'].nil? or (table_el['attribute']['nested'] != 'true')
-            # reset main table header
-            @thead = ''
-            @thead_margins = {}
-          end
-        end
-        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 = {}
-        @html_anchor = nil
-      when 'sup'
-        SetXY(GetX(), GetY() + (0.7 * parent['fontsize'] / @k))
-      when 'sub'
-        SetXY(GetX(), GetY() - (0.3 * parent['fontsize'] / @k))
-      when 'div'
-        addHTMLVertSpace(hbz, 0, cell, firstorlast)
-      when 'blockquote'
-        if @rtl
-          @r_margin -= @listindent
-        else
-          @l_margin -= @listindent
         end
-        @listindentlevel -= 1
-        addHTMLVertSpace(hbz, hb, cell, firstorlast)
-      when 'p'
-        addHTMLVertSpace(hbz, hb, cell, firstorlast)
-      when 'pre'
-        addHTMLVertSpace(hbz, hb, cell, firstorlast)
-        @premode = false
-      when 'dl'
-        @listnum -= 1
-        if @listnum <= 0
-          @listnum = 0
-          addHTMLVertSpace(hbz, hb, cell, firstorlast)
-        else
-          addHTMLVertSpace(0, 0, cell, firstorlast)
+      }
+      if !in_table_head
+        # we are not inside a thead section
+        if dom[(parent['parent'])]['attribute']['cellpadding'] ### fix ###
+          @c_margin = @old_c_margin
         end
         @lasth = @font_size * @cell_height_ratio
-      when 'dt'
-        @lispacer = ''
-        addHTMLVertSpace(0, 0, cell, firstorlast)
-      when 'dd'
-        @lispacer = ''
-        if @rtl
-          @r_margin -= @listindent
-        else
-          @l_margin -= @listindent
+        if (@page == @numpages - 1) and @pageopen[@numpages]
+          # remove last blank page
+          deletePage(@numpages)
         end
-        @listindentlevel -= 1
-        addHTMLVertSpace(0, 0, cell, firstorlast)
-      when 'ul', 'ol'
-        @listnum -= 1
-        @lispacer = ''
-        if @rtl
-          @r_margin -= @listindent
-        else
-          @l_margin -= @listindent
+        if !@thead_margins['top'].nil?
+          # restore top margin
+          @t_margin = @thead_margins['top']
+          @pagedim[@page]['tm'] = @t_margin
         end
-        @listindentlevel -= 1
-        if @listnum <= 0
-          @listnum = 0
-          addHTMLVertSpace(hbz, hb, cell, firstorlast)
-        else
-          addHTMLVertSpace(0, 0, cell, firstorlast)
+        if table_el['attribute']['nested'].nil? or (table_el['attribute']['nested'] != 'true')
+          # reset main table header
+          @thead = ''
+          @thead_margins = {}
         end
-        @lasth = @font_size * @cell_height_ratio
-      when 'li'
-        @lispacer = ''
+      end
+      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 = {}
+      @html_anchor = nil
+    when 'sup'
+      SetXY(GetX(), GetY() + (0.7 * parent['fontsize'] / @k))
+    when 'sub'
+      SetXY(GetX(), GetY() - (0.3 * parent['fontsize'] / @k))
+    when 'div'
+      addHTMLVertSpace(hbz, 0, cell, firstorlast)
+    when 'blockquote'
+      if @rtl
+        @r_margin -= @listindent
+      else
+        @l_margin -= @listindent
+      end
+      @listindentlevel -= 1
+      addHTMLVertSpace(hbz, hb, cell, firstorlast)
+    when 'p'
+      addHTMLVertSpace(hbz, hb, cell, firstorlast)
+    when 'pre'
+      addHTMLVertSpace(hbz, hb, cell, firstorlast)
+      @premode = false
+    when 'dl'
+      @listnum -= 1
+      if @listnum <= 0
+        @listnum = 0
+        addHTMLVertSpace(hbz, hb, cell, firstorlast)
+      else
         addHTMLVertSpace(0, 0, cell, firstorlast)
-      when 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
+      end
+      @lasth = @font_size * @cell_height_ratio
+    when 'dt'
+      @lispacer = ''
+      @li_position_x = nil
+      addHTMLVertSpace(0, 0, cell, firstorlast)
+    when 'dd'
+      @lispacer = ''
+      @li_position_x = nil
+      if @rtl
+        @r_margin -= @listindent
+      else
+        @l_margin -= @listindent
+      end
+      @listindentlevel -= 1
+      addHTMLVertSpace(0, 0, cell, firstorlast)
+    when 'ul', 'ol'
+      @listnum -= 1
+      @lispacer = ''
+      @li_position_x = nil
+      if @rtl
+        @r_margin -= @listindent
+      else
+        @l_margin -= @listindent
+      end
+      @listindentlevel -= 1
+      if @listnum <= 0
+        @listnum = 0
         addHTMLVertSpace(hbz, hb, cell, firstorlast)
+      else
+        addHTMLVertSpace(0, 0, cell, firstorlast)
+      end
+      @lasth = @font_size * @cell_height_ratio
+    when 'li'
+      @lispacer = ''
+      @li_position_x = nil
+      addHTMLVertSpace(0, 0, cell, firstorlast)
+    when 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
+      addHTMLVertSpace(hbz, hb, cell, firstorlast)
+    when 'form' # Form fields (since 4.8.000 - 2009-09-07)
+      @form_action = ''
+      @form_enctype = 'application/x-www-form-urlencoded'
     end
+
     if dom[(dom[key]['parent'])]['attribute']['pagebreakafter']
       pba = dom[(dom[key]['parent'])]['attribute']['pagebreakafter']
       # check for pagebreak
@@ -14114,11 +15729,12 @@ protected
   #
   def putHtmlListBullet(listdepth, listtype='', size=10)
     size /= @k
-    fill = ''
+    fill = +''
     color = @fgcolor
     width = 0
     textitem = ''
     tmpx = @x
+    @x = @li_position_x
     lspace = GetStringWidth('  ')
     if listtype == '!'
       # set default list type for unordered list
@@ -14132,7 +15748,7 @@ protected
       # unordered types
     when 'none'
     when 'disc', 'circle'
-      fill = 'F' if listtype == 'disc'
+      fill = +'F' if listtype == 'disc'
       fill << 'D'
       r = size / 6.0
       lspace += 2 * r
@@ -14190,6 +15806,7 @@ protected
     end
     @x = tmpx
     @lispacer = ''
+    @li_position_x = nil
   end
 
   #
@@ -14206,6 +15823,7 @@ protected
       'rMargin' => @r_margin,
       'lMargin' => @l_margin,
       'cMargin' => @c_margin,
+      'tMargin' => @t_margin,
       'LineWidth' => @line_width,
       'linestyleWidth' => @linestyle_width,
       'linestyleCap' => @linestyle_cap,
@@ -14226,24 +15844,31 @@ protected
       'listordered' => @listordered,
       'listcount' => @listcount,
       'lispacer' => @lispacer,
-      'lasth' => @lasth
+      'li_position_x' => @li_position_x,
+      'lasth' => @lasth,
+      'h' => @h,
+      'w' => @w,
+      'x' => @x,
+      'y' => @y,
     }
     return grapvars
   end
 
   #
   # Set graphic variables.
-  # [@param :gvars] array graphic variables
+  # [@param array :gvars] graphic variables
+  # [@param bool :option] set additional parameters
   # [@access protected]
   # [@since 4.2.010 (2008-11-14)]
   #
-  def setGraphicVars(gvars)
+  def setGraphicVars(gvars, option = false)
     @font_family = gvars['FontFamily']
     @font_style = gvars['FontStyle']
     @font_size_pt = gvars['FontSizePt']
     @r_margin = gvars['rMargin']
     @l_margin = gvars['lMargin']
     @c_margin = gvars['cMargin']
+    @t_margin = gvars['tMargin']
     @line_width = gvars['LineWidth']
     @linestyle_width = gvars['linestyleWidth']
     @linestyle_cap = gvars['linestyleCap']
@@ -14264,7 +15889,14 @@ protected
     @listordered = gvars['listordered']
     @listcount = gvars['listcount']
     @lispacer = gvars['lispacer']
-    #@lasth = gvars['lasth']
+    @li_position_x = gvars['li_position_x']
+    if option
+      @lasth = gvars['lasth']
+      @h = gvars['h']
+      @w = gvars['w']
+      @x = gvars['x']
+      @y = gvars['y']
+    end
     out('' + @linestyle_width + ' ' + @linestyle_cap + ' ' + @linestyle_join + ' ' + @linestyle_dash + ' ' + @draw_color + ' ' + @fill_color + '')
     unless empty_string(@font_family)
       SetFont(@font_family, @font_style, @font_size_pt)
@@ -14329,7 +15961,7 @@ protected
   #
   def readDiskCache(filename)
     filename = filename.path
-    data = ''
+    data = +''
     open( filename,'rb') do |f|
       data << f.read()
     end
@@ -14671,18 +16303,17 @@ public
     #global jfrompage, jtopage
     #jfrompage = frompage
     #jtopage = topage
-    #@javascript = preg_replace_callback('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/',
-    #create_function('$matches', 'global $jfrompage, $jtopage;
-    #  pagenum = matches[3].to_i + 1
-    #  if (pagenum >= jtopage) and (pagenum < jfrompage)
-    #    newpage = pagenum + 1
-    #  elsif pagenum == jfrompage
-    #    newpage = jtopage
-    #  else
-    #    newpage = pagenum
-    #  end
-    #  newpage -= 1
-    #  return "this.addField(\'".$matches[1]."\',\'".$matches[2]."\',".$newpage."";'), $tmpjavascript);
+    #tmpjavascript =~ /this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/
+    #pagenum = $3.to_i + 1
+    #if (pagenum >= jtopage) && (pagenum < jfrompage)
+    #  newpage = pagenum + 1
+    #elsif pagenum == jfrompage
+    #  newpage = jtopage
+    #else
+    #  newpage = pagenum
+    #end
+    #newpage -= 1
+    #@javascript = "this.addField(\'" + $1 + "\',\'" + $2 + "\'," + newpage + ""
 
     # return to last page
     lastPage(true)
@@ -15156,7 +16787,7 @@ public
       if this_self
         objvars = @objcopy.instance_variables
         objvars.each {|key|
-          eval("#{key} = @objcopy.instance_variable_get(key)") if key.to_s != '@objcopy'
+          instance_variable_set(key, @objcopy.instance_variable_get(key)) if key.to_s != '@objcopy'
         }
       end
       return @objcopy
@@ -15293,7 +16924,7 @@ public
   # [@param string :default] default style
   # [@param boolean :mode] if true enable rasterization, false otherwise.
   # [@author] Nicola Asuni
-  # [@access protected:
+  # [@access protected]
   # [@since 5.0.000 (2010-04-30)]
   #
   def getPathPaintOperator(style, default='S')