rbpdf 1.18.5 → 1.18.6

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 58ee6415442d443f581733352686a7ce871a2cfe04b5bf683544ba7e8202b934f7258d0c403942b07c52c2a56ad6288f02fb1bb210c1ca94401ca092729da139
-  metadata.gz: fca83b46f3d2abdc1efea548a5a7c7963b1fbbbbdde7e6dbf7a1b279a80cb25bb628a4eba853eb064cdef79ea4ad514928b6d243f3b4c01bf42f03046c2a122f
-SHA1: 
-  data.tar.gz: a973c8fae4a4b576b68cd8e5a7dc3b73211e26ab
-  metadata.gz: c27e1dfa12f3cbfbf8cee92658d17a99cff0a1e0
+---
+SHA1:
+  metadata.gz: da1bf9dca7775d7e0b454cccc03c92e8983e9075
+  data.tar.gz: 2aa1f90e5d0e58774ef811a25a845085370e044a
+SHA512:
+  metadata.gz: 8d42d61a6222d2b8cfd520ad9a200c0dac5415ef029bc0a69522cbe1947ac4fda75b6e21b46f8b17a579fbba2e781b0f2109538092f857bf9f881b0fb56d8b55
+  data.tar.gz: 9cff8bf012066f9954963282d66c976b403e24aa3458aac9e931149ab7f60b63d7103c13ee40469018ff97c1dcdcf1216e775152cdd4e80a9076c784c7551133

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.18.6 2015-06-20
+       - Fixed page boxes problem for iOS.
+       - The dependence to the Rails environment was reduced.
+       - Fixed Image tag's style attribute width/height parameter problem.
+       - Open angled bracket '<' by HTML sanitize bug fixed.
+
 1.18.5 2015-01-24
        - Rails 4.2 and Ruby 2.2 supported.
        - Fix Rails 4.2 (new HTML sanitizer) compatible.

data/lib/rbpdf.rb

@@ -11,22 +11,22 @@
 #      it under the terms of the GNU Lesser General Public License as published by
 #      the Free Software Foundation, either version 2.1 of the License, or
 #      (at your option) any later version.
-#      
+#
 #      This program is distributed in the hope that it will be useful,
 #      but WITHOUT ANY WARRANTY; without even the implied warranty of
 #      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #      GNU Lesser General Public License for more details.
-#      
+#
 #      You should have received a copy of the GNU Lesser General Public License
 #      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #  ----------------------------------------------------------------------------
 #
-# Description : This is a Ruby class for generating PDF files 
-#               on-the-fly without requiring external 
+# Description : This is a Ruby class for generating PDF files
+#               on-the-fly without requiring external
 #               extensions.
 #
 # IMPORTANT:
-# This class is an extension and improvement of the Public Domain 
+# This class is an extension and improvement of the Public Domain
 # FPDF class by Olivier Plathey (http://www.fpdf.org).
 #
 # Main changes by Nicola Asuni:
@@ -49,10 +49,20 @@
 require "rbpdf/version"
 
 begin
-  require('htmlentities') 
+  require('htmlentities')
 rescue LoadError
   # This gem is not required - just nice to have.
 end
+
+begin
+  # RMagick 2.14.0
+  # [DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead
+  # https://github.com/gemhome/rmagick/pull/141
+  require 'rmagick' unless Object.const_defined?(:Magick)
+rescue LoadError
+  # RMagick is not available
+end
+
 begin
   require 'RMagick' unless Object.const_defined?(:Magick)
 rescue LoadError
@@ -61,11 +71,16 @@ end
 
 require 'core/rmagick'
 
+# Needed to run the test suite outside of a Rails environment.
+require 'action_view'
+require 'tempfile'
+require 'uri'
+
 #
 # RBPDF Class.
 #
 
- 
+
 PDF_PRODUCER = 'RBPDF 5.1.002'
 
 module RBPDFFontDescriptor
@@ -103,7 +118,14 @@ class RBPDF
   include Html_colors
 
   def logger
-    Rails.logger
+    if defined? Rails.logger
+      Rails.logger
+    else
+      # This particular error will occur when the test suite is run from outside a Rails environment.
+      # We use the standard Ruby stdout logger in that case.
+      require 'logger'
+      return Logger.new(STDOUT)
+    end
   end
 
   @@version = "5.1.002"
@@ -115,13 +137,13 @@ class RBPDF
   cattr_accessor :k_blank_image
   @@k_blank_image = ""
 
-  cattr_accessor :k_small_ratio  
+  cattr_accessor :k_small_ratio
   @@k_small_ratio = 2/3.0
 
   cattr_accessor :k_path_cache
 
   cattr_accessor :k_path_main
-  
+
   cattr_accessor :k_path_url
 
   @@k_path_images = ""
@@ -130,90 +152,90 @@ class RBPDF
   cattr_accessor :decoder
 
   attr_accessor :barcode
-  
+
   attr_accessor :buffer
-  
+
   attr_accessor :diffs
-  
+
   attr_accessor :color_flag
-  
+
   attr_accessor :default_font
 
   attr_accessor :draw_color
-  
+
   attr_accessor :encoding
-  
+
   attr_accessor :fill_color
-  
+
   attr_accessor :fonts
-  
+
   attr_accessor :font_family
-  
+
   attr_accessor :font_files
-  
+
   cattr_accessor :k_path_fonts
-  
+
   attr_accessor :font_style
-  
+
   attr_accessor :font_size_pt
-  
+
   attr_accessor :header_width
-  
+
   attr_accessor :header_logo
-  
+
   attr_accessor :header_logo_width
-  
+
   attr_accessor :header_title
-  
+
   attr_accessor :header_string
-  
+
   attr_accessor :images
-  
+
   attr_accessor :img_scale
-  
+
   attr_accessor :in_footer
-  
+
   attr_accessor :is_unicode
 
   attr_accessor :lasth
-  
+
   attr_accessor :links
-  
+
   attr_accessor :listordered
-  
+
   attr_accessor :listcount
-  
+
   attr_accessor :lispacer
-  
+
   attr_accessor :n
-  
+
   attr_accessor :offsets
-  
+
   attr_accessor :page
-  
+
   attr_accessor :pages
-  
+
   attr_accessor :pdf_version
-  
+
   attr_accessor :print_header
-  
+
   attr_accessor :print_footer
-  
+
   attr_accessor :state
-  
+
   attr_accessor :text_color
-  
+
   attr_accessor :underline
-  
+
   attr_accessor :diskcache
 
   attr_accessor :cache_file_length
 
   attr_accessor :prev_pages
-  
+
   #
-  # This is the class constructor. 
-  # It allows to set up the page format, the orientation and 
+  # 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
   # [@param string :orientation]
@@ -242,27 +264,36 @@ class RBPDF
   # [@access public]
   #
   def initialize(orientation = 'P',  unit = 'mm', format = 'A4', unicode = true, encoding = "UTF-8", diskcache = false)
-    
+
     # Set internal character encoding to ASCII#
-    #FIXME 2007-05-25 (EJM) Level=0 - 
+    #FIXME 2007-05-25 (EJM) Level=0 -
     # if (respond_to?("mb_internal_encoding") and mb_internal_encoding())
     #   @internal_encoding = mb_internal_encoding();
     #   mb_internal_encoding("ASCII");
     # }
 
-    @@k_path_cache = Rails.root.join('tmp').to_s
-    @@k_path_main = Rails.root.join('tmp').to_s
-    @@k_path_url = Rails.root.join('tmp').to_s
+   if defined? Rails.root
+      @@k_path_cache = Rails.root.join('tmp').to_s
+      @@k_path_main = Rails.root.join('tmp').to_s
+      @@k_path_url = Rails.root.join('tmp').to_s
+    else
+      # This particular error will occur when the test suite is run from outside a Rails environment.
+      # We want to use the system's temp directory in that case.
+      require 'tmpdir'
+      @@k_path_cache = Dir.tmpdir
+      @@k_path_main = Dir.tmpdir
+      @@k_path_url = Dir.tmpdir
+    end
 
     # set disk caching
     @diskcache = diskcache ? true : false
- 
+
     # set language direction
     @rtl = false
     @tmprtl = false
 
-    @x ||= 0 
-    @y ||= 0 
+    @x ||= 0
+    @y ||= 0
 
     #######################
     @offsets ||= []
@@ -351,7 +382,7 @@ class RBPDF
     @cache_utf8_string_to_array = {}
     @cache_maxsize_utf8_string_to_array = 8
     @cache_size_utf8_string_to_array = 0
-    
+
     @signature_data ||= {}
     @sig_annot_ref ||= '***SIGANNREF*** 0 R'
     @page_obj_id ||= []
@@ -371,7 +402,7 @@ class RBPDF
     @current_column ||= 0
     @column_start_page ||= 0
 
-    # Text rendering mode: 
+    # Text rendering mode:
     # 0 = Fill text;
     # 1 =            Stroke text;
     # 2 = Fill, then stroke text;
@@ -390,13 +421,13 @@ class RBPDF
 
     #Some checks
     dochecks();
-    
+
     begin
-      @@decoder = HTMLEntities.new 
+      @@decoder = HTMLEntities.new
     rescue
       @@decoder = nil
     end
-    
+
     #Initialization of properties
     @is_unicode = unicode
     @page ||= 0
@@ -433,7 +464,7 @@ class RBPDF
     # encryption values
     @encrypted ||= false
     @last_enc_key ||= ''
-     
+
     # Standard Unicode fonts
     @core_fonts = {
     'courier'=>'Courier',
@@ -513,7 +544,7 @@ class RBPDF
     @curr_annot_obj_id ||= @annots_start_obj_id
     @apxo_obj_id ||= @apxo_start_obj_id
   end
-  
+
   #
   # Set the units of measure for the document.
   # [@param string :unit]
@@ -704,9 +735,9 @@ class RBPDF
           end
           pf = getPageSizeFromFormat(format['format'])
         end
-        setPageBoxes(@page, 'MediaBox', 0, 0, pf[0], pf[1])
-        @fw_pt = pf[0] * @k
-        @fh_pt = pf[1] * @k
+        @fw_pt = pf[0]
+        @fh_pt = pf[1]
+        setPageBoxes(@page, 'MediaBox', 0, 0, @fw_pt, @fh_pt, true)
       end
       # the visible region of default user space
       if format['CropBox']
@@ -788,7 +819,7 @@ class RBPDF
   # Set page boundaries.
   # [@param int :page] page number
   # [@param string :type]
-  #   valid values are: 
+  #   valid values are:
   #   * 'MediaBox' : the boundaries of the physical medium on which the page shall be displayed or printed
   #   * 'CropBox' : the visible region of default user space
   #   * 'BleedBox' : the region to which the contents of the page shall be clipped when output in a production environment
@@ -798,23 +829,26 @@ class RBPDF
   # [@param float :lly] lower-left y coordinate in user units
   # [@param float :urx] upper-right x coordinate in user units
   # [@param float :ury] upper-right y coordinate in user units
+  # [@param boolean :points] if true uses user units as unit of measure, if false uses PDF points
   # [@access public]
   # [@since 5.0.010 (2010-05-17)]
   #
-  def setPageBoxes(page, type, llx, lly, urx, ury)
-    if @pagedim[@page].nil?
-      # initialize array
-      @pagedim[@page] = {}
-    end
+  def setPageBoxes(page, type, llx, lly, urx, ury, points=false)
     pageboxes = ['MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox']
     unless pageboxes.include?(type)
       return
     end
+    if @pagedim[page].nil?
+      # initialize array
+      @pagedim[page] = {}
+    end
+
+    points ? k = 1 : k = @k
     @pagedim[page][type] = {}
-    @pagedim[page][type]['llx'] = llx * @k
-    @pagedim[page][type]['lly'] = lly * @k
-    @pagedim[page][type]['urx'] = urx * @k
-    @pagedim[page][type]['ury'] = ury * @k
+    @pagedim[page][type]['llx'] = llx * k
+    @pagedim[page][type]['lly'] = lly * k
+    @pagedim[page][type]['urx'] = urx * k
+    @pagedim[page][type]['ury'] = ury * k
   end
   alias_method :set_page_boxes, :setPageBoxes
 
@@ -854,23 +888,23 @@ class RBPDF
   def setPageOrientation(orientation, autopagebreak='', bottommargin='')
     if @pagedim[@page].nil? or @pagedim[@page]['MediaBox'].nil?
       # the boundaries of the physical medium on which the page shall be displayed or printed
-      setPageBoxes(@page, 'MediaBox', 0, 0, (@fw_pt / @k), (@fh_pt / @k))
+      setPageBoxes(@page, 'MediaBox', 0, 0, @fw_pt, @fh_pt, true)
     end
     if @pagedim[@page]['CropBox'].nil?
       # the visible region of default user space
-      setPageBoxes(@page, 'CropBox', @pagedim[@page]['MediaBox']['llx'], @pagedim[@page]['MediaBox']['lly'], @pagedim[@page]['MediaBox']['urx'], @pagedim[@page]['MediaBox']['ury'])
+      setPageBoxes(@page, 'CropBox', @pagedim[@page]['MediaBox']['llx'], @pagedim[@page]['MediaBox']['lly'], @pagedim[@page]['MediaBox']['urx'], @pagedim[@page]['MediaBox']['ury'], true)
     end
     if @pagedim[@page]['BleedBox'].nil?
       # the region to which the contents of the page shall be clipped when output in a production environment
-      setPageBoxes(@page, 'BleedBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'])
+      setPageBoxes(@page, 'BleedBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'], true)
     end
     if @pagedim[@page]['TrimBox'].nil?
       # the intended dimensions of the finished page after trimming
-      setPageBoxes(@page, 'TrimBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'])
+      setPageBoxes(@page, 'TrimBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'], true)
     end
     if @pagedim[@page]['ArtBox'].nil?
       # the page's meaningful content (including potential white space)
-      setPageBoxes(@page, 'ArtBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'])
+      setPageBoxes(@page, 'ArtBox', @pagedim[@page]['CropBox']['llx'], @pagedim[@page]['CropBox']['lly'], @pagedim[@page]['CropBox']['urx'], @pagedim[@page]['CropBox']['ury'], true)
     end
     if @pagedim[@page]['Rotate'].nil?
       # The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
@@ -1054,7 +1088,7 @@ class RBPDF
     warn "[DEPRECATION] 'SetImageScale' is deprecated. Please use 'set_image_scale' instead."
     setImageScale(scale)
   end
-  
+
   #
   # Returns the adjusting factor to convert pixels to user units.
   # [@return float] adjusting factor to convert pixels to user units.
@@ -1066,7 +1100,7 @@ class RBPDF
     return @img_scale;
   end
   alias_method :get_image_scale, :getImageScale
-  
+
   def GetImageScale()
     warn "[DEPRECATION] 'GetImageScale' is deprecated. Please use 'get_image_scale' instead."
     getImageScale()
@@ -1095,7 +1129,7 @@ class RBPDF
   #     @pagedim[@page]['trans']['Dm'] = (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.
   #     @pagedim[@page]['trans']['M'] = (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.
   #     @pagedim[@page]['trans']['Di'] = (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.
-  #     @pagedim[@page]['trans']['SS'] = (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0. 
+  #     @pagedim[@page]['trans']['SS'] = (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.
   #     @pagedim[@page]['trans']['B'] = (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.
   #   @pagedim[@page]['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed
   #     @pagedim[@page]['MediaBox']['llx'] = lower-left x coordinate in points
@@ -1152,7 +1186,7 @@ class RBPDF
     warn "[DEPRECATION] 'GetPageWidth' is deprecated. Please use 'get_page_width' instead."
     getPageWidth()
   end
-  
+
   #
   # Returns the page height in units.
   # [@return int] page height.
@@ -1164,7 +1198,7 @@ class RBPDF
     return @h;
   end
   alias_method :get_page_height, :getPageHeight
-  
+
   def GetPageHeight()
     warn "[DEPRECATION] 'GetPageHeight' is deprecated. Please use 'get_page_height' instead."
     getPageHeight()
@@ -1696,7 +1730,7 @@ class RBPDF
     end
   end
   alias_method :end_page, :endPage
-  
+
   #
   # Starts a new page to the document. The page must be closed using the endPage() function.
   # The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
@@ -1803,7 +1837,7 @@ class RBPDF
     @header_string = hs || ""
   end
   alias_method :set_header_data, :setHeaderData
-  
+
   def SetHeaderData(ln="", lw=0, ht="", hs="")
     warn "[DEPRECATION] 'SetHeaderData' is deprecated. Please use 'set_header_data' instead."
     setHeaderData(ln, lw, ht, hs)
@@ -1839,7 +1873,7 @@ class RBPDF
     @header_margin = hm;
   end
   alias_method :set_header_margin, :setHeaderMargin
-  
+
   def SetHeaderMargin(hm=10)
     warn "[DEPRECATION] 'SetHeaderMargin' is deprecated. Please use 'set_header_margin' instead."
     setHeaderMargin(hm)
@@ -1866,7 +1900,7 @@ class RBPDF
     @footer_margin = fm;
   end
   alias_method :set_footer_margin, :setFooterMargin
-  
+
   def SetFooterMargin(fm=10)
     warn "[DEPRECATION] 'SetFooterMargin' is deprecated. Please use 'set_footer_margin' instead."
     setFooterMargin(fm)
@@ -1885,14 +1919,14 @@ class RBPDF
 
   #
   # Set a flag to print page header.
-  # [@param boolean :val] set to true to print the page header (default), false otherwise. 
+  # [@param boolean :val] set to true to print the page header (default), false otherwise.
   # [@access public]
   #
   def setPrintHeader(val=true)
     @print_header = val;
   end
   alias_method :set_print_header, :setPrintHeader
-  
+
   def SetPrintHeader(val=true)
     warn "[DEPRECATION] 'SetPrintHeader' is deprecated. Please use 'set_print_header' instead."
     setPrintHeader(val)
@@ -1900,14 +1934,14 @@ class RBPDF
 
   #
   # Set a flag to print page footer.
-  # [@param boolean :value] set to true to print the page footer (default), false otherwise. 
+  # [@param boolean :value] set to true to print the page footer (default), false otherwise.
   # [@access public]
   #
   def setPrintFooter(val=true)
     @print_footer = val;
   end
   alias_method :set_print_footer, :setPrintFooter
-  
+
   def SetPrintFooter(val=true)
     warn "[DEPRECATION] 'SetPrintFooter' is deprecated. Please use 'set_print_footer' instead."
     setPrintFooter(val)
@@ -1983,9 +2017,9 @@ class RBPDF
     Cell(0, 0, '', 'T', 0, 'C')
   end
   alias_method :header, :Header
-  
+
   #
-  # This method is used to render the page footer. 
+  # This method is used to render the page footer.
   # It is automatically called by AddPage() and could be overwritten in your own inherited class.
   # [@access public]
   #
@@ -2020,9 +2054,9 @@ class RBPDF
     end
   end
   alias_method :footer, :Footer
-  
+
   #
-  # This method is used to render the page header. 
+  # This method is used to render the page header.
   # [@access protected]
   # [@since 4.0.012 (2008-07-24)]
   #
@@ -2059,7 +2093,7 @@ class RBPDF
   protected :setHeader
 
   #
-  # This method is used to render the page footer. 
+  # This method is used to render the page footer.
   # [@access protected]
   # [@since 4.0.012 (2008-07-24)]
   #
@@ -2106,7 +2140,7 @@ class RBPDF
   protected :setFooter
 
   #
-  # This method is used to render the table header on new page (if any). 
+  # This method is used to render the table header on new page (if any).
   # [@access protected]
   # [@since 4.5.030 (2009-03-25)]
   #
@@ -2184,8 +2218,8 @@ class RBPDF
   alias_method :add_spot_color, :AddSpotColor
 
   #
-  # Defines the color used for all drawing operations (lines, rectangles and cell borders). 
-  # It can be expressed in RGB components or gray scale. 
+  # Defines the color used for all drawing operations (lines, rectangles and cell borders).
+  # It can be expressed in RGB components or gray scale.
   # The method can be called before the first page is created and the value is retained from page to page.
   # [@param array or ordered hash :color] array(or ordered hash) of colors
   # [@access public]
@@ -2256,8 +2290,8 @@ class RBPDF
   alias_method :set_draw_color, :SetDrawColor
 
   #
-  # Defines the color used for all filling operations (filled rectangles and cell backgrounds). 
-  # It can be expressed in RGB components or gray scale. 
+  # Defines the color used for all filling operations (filled rectangles and cell backgrounds).
+  # It can be expressed in RGB components or gray scale.
   # The method can be called before the first page is created and the value is retained from page to page.
   # [@param array or ordered hash :color] array(or ordered hash) of colors
   # [@access public]
@@ -2347,7 +2381,7 @@ class RBPDF
   alias_method :set_cmyk_fill_color, :SetCmykFillColor
 =end
   #
-  # Defines the color used for text. It can be expressed in RGB components or gray scale. 
+  # Defines the color used for text. It can be expressed in RGB components or gray scale.
   # The method can be called before the first page is created and the value is retained from page to page.
   # [@param array or ordered hash :color] array(or ordered hash) of colors
   # [@access public]
@@ -2429,7 +2463,7 @@ class RBPDF
   end
   alias_method :set_cmyk_text_color, :SetCmykTextColor
 =end
-  
+
   #
   # Returns the length of a string in user unit. A font must be selected.
   # [@param string :s] The string whose length is to be computed
@@ -2543,7 +2577,7 @@ class RBPDF
   def GetNumChars(s)
     if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
       return UTF8StringToArray(s).length
-    end 
+    end
     return s.length
   end
   alias_method :get_num_chars, :GetNumChars
@@ -2562,9 +2596,9 @@ class RBPDF
   # Imports a TrueType, Type1, core, or CID0 font and makes it available.
   # It is necessary to generate a font definition file first with the makefont.rb utility.
   # The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by FPDF_FONTPATH if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-  # 
+  #
   # === Example
-  # 
+  #
   #   :pdf.add_font('Comic','I')
   #   # is equivalent to:
   #   :pdf.add_font('Comic','I','comici.rb')
@@ -2732,7 +2766,7 @@ class RBPDF
         if desc['ItalicAngle']
           desc['ItalicAngle'] -= 11
         else
-          desc['ItalicAngle'] = -11 
+          desc['ItalicAngle'] = -11
         end
       end
       setFontBuffer(fontkey, {'i' => @numfonts, 'type' => font_desc[:type], 'name' => sname, 'desc' => desc, 'cidinfo' => font_desc[:cidinfo], 'up' => font_desc[:up], 'ut' => font_desc[:ut], 'cw' => font_desc[:cw], 'dw' => font_desc[:dw], 'enc' => font_desc[:enc]})
@@ -3111,7 +3145,7 @@ class RBPDF
   # [@param int :fill] Indicates if the cell background must be painted (1) or transparent (0). Default value: 0.
   # [@param mixed :link] URL or identifier returned by AddLink().
   # [@param int :stretch]
-  #   stretch carachter mode: 
+  #   stretch carachter mode:
   #   * 0 = disabled
   #   * 1 = horizontal scaling only if necessary
   #   * 2 = forced horizontal scaling
@@ -3767,7 +3801,7 @@ class RBPDF
   # [@param float :y] y position in user units
   # [@param boolean :reseth] if true reset the last cell height (default true).
   # [@param int :stretch]
-  #   stretch carachter mode: 
+  #   stretch carachter mode:
   #   * 0 = disabled
   #   * 1 = horizontal scaling only if necessary
   #   * 2 = forced horizontal scaling
@@ -3790,7 +3824,7 @@ class RBPDF
       # set row height
       @lasth = @font_size * @cell_height_ratio
     end
-     
+
     if !empty_string(y)
       SetY(y)
     else
@@ -3950,7 +3984,7 @@ class RBPDF
         setPageBuffer(@page, pstart + ccode + "\n" + pend)
       end
     end
-    
+
     # Get end-of-cell Y position
     currentY = GetY()
 
@@ -4133,7 +4167,7 @@ class RBPDF
   #
   # This method return the estimated needed height for print a simple text string in Multicell() method.
   # Generally, if you want to know the exact height for a block of content you can use the following technique:
-  # 
+  #
   #   # store current object
   #   pdf.start_transaction()
   #   # store starting values
@@ -4166,7 +4200,7 @@ class RBPDF
   #   end
   #   # restore previous object
   #   pdf = pdf.rollbackTransaction()
-  # 
+  #
   # [@param float :w] Width of cells. If 0, they extend up to the right margin of the page.
   # [@param string :txt] String for calculating his height
   # [@param boolean :reseth] if true reset the last cell height (default false).
@@ -4282,7 +4316,7 @@ class RBPDF
     else
       w = @w - @r_margin - @x
     end
-    
+
     # max column width
     wmax = w - (2 * @c_margin)
     if !firstline and (chrwidth > wmax or (GetCharWidth(chars[0]) > wmax))
@@ -4357,7 +4391,7 @@ class RBPDF
         end
         w = getRemainingWidth()
         wmax = w - (2 * @c_margin)
-      else 
+      else
         # 160 is the non-breaking space, 173 is SHY (Soft Hypen)
         if (c != 160) and ((unichr(c) =~ /\s/) or (c == 173))
           # update last blank space position
@@ -4372,7 +4406,7 @@ class RBPDF
               tmp_shy_replacement_width = shy_replacement_width
               tmp_shy_replacement_char = shy_replacement_char
             end
-          else 
+          else
             shy = false
           end
         end
@@ -4688,8 +4722,8 @@ class RBPDF
   alias_method :get_image_file_type, :getImageFileType
 
   #
-  # Puts an image in the page. 
-  # The upper-left corner must be given. 
+  # Puts an image in the page.
+  # The upper-left corner must be given.
   # The dimensions can be specified in different ways:
   # * explicit width and height (expressed in user unit)
   # * one explicit dimension, the other being calculated automatically in order to keep the original proportions
@@ -5037,7 +5071,7 @@ class RBPDF
     #Read whole file
     data='';
     open(file,'rb') do |f|
-      data<<f.read();
+      data << f.read()
     end
     return {'w' => a[0],'h' => a[1],'cs' => colspace,'bpc' => bpc,'f'=>'DCTDecode','data' => data}
   end
@@ -5045,10 +5079,10 @@ class RBPDF
 
   def imageToPNG(file)
     img = Magick::ImageList.new(file)
-    img.format = 'PNG'       # convert to PNG from gif 
-    if img.alpha? 
+    img.format = 'PNG'       # convert to PNG from gif
+    if img.alpha?
       img.opacity = 0          # PNG alpha channel delete
-      if img.alpha? 
+      if img.alpha?
         return false
       end
     end
@@ -5244,7 +5278,7 @@ class RBPDF
   protected :ImagePngAlpha
 
   #
-  # Performs a line break. 
+  # Performs a line break.
   # The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
   # [@param float :h] The height of the break. By default, the value equals the height of the last printed cell.
   # [@param boolean :cell] if true add a c_margin to the x coordinate
@@ -6238,7 +6272,7 @@ protected
                   annots << ' /SW /' + pl['opt']['mk']['if']['sw']
                 end
                 if_s = ['A', 'P']
-                if pl['opt']['mk']['if']['s'] and if_s.include?(pl['opt']['mk']['if']['s']) 
+                if pl['opt']['mk']['if']['s'] and if_s.include?(pl['opt']['mk']['if']['s'])
                   annots << ' /S /' + pl['opt']['mk']['if']['s']
                 end
                 if pl['opt']['mk']['if']['a'] and pl['opt']['mk']['if']['a'].is_a?(Array) and !pl['opt']['mk']['if']['a'].empty?
@@ -6707,14 +6741,14 @@ protected
     out << ' >>'
     out << ' endobj'
     out(out)
-    
+
     # CIDFontType2
     # A CIDFont whose glyph descriptions are based on TrueType font technology
     newobj();
     out = '<</Type /Font'
     out << ' /Subtype /CIDFontType2'
     out << ' /BaseFont /' + font['name']
-    
+
     # A dictionary containing entries that define the character collection of the CIDFont.
 
     cidinfo = '/Registry ' + datastring(font['cidinfo']['Registry'])
@@ -6727,7 +6761,7 @@ protected
     out << "\n" + putfontwidths(font, 0)
     out << ' /CIDToGIDMap ' + (@n + 2).to_s + ' 0 R >> endobj'
     out(out)
-    
+
     # Font descriptor
     # A font descriptor describing the CIDFont default metrics other than its glyph widths
     newobj();
@@ -6771,8 +6805,8 @@ protected
       size = File.size(fontfile)
       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 
+        # Decompresses data encoded using the public-domain
+        # zlib/deflate compression method, reproducing the
         # original text or binary data
         out << ' /Filter /FlateDecode'
       end
@@ -6955,7 +6989,7 @@ protected
     out << ' /Properties <</OC1 ' + @n_ocg_print.to_s + ' 0 R /OC2 ' + @n_ocg_view.to_s + ' 0 R>>'
     # transparency
     out << ' /ExtGState <<'
-    @extgstates.each_with_index { |extgstate, k| 
+    @extgstates.each_with_index { |extgstate, k|
       if extgstate
       if extgstate['name']
         out << ' /' + extgstate['name']
@@ -7016,7 +7050,7 @@ protected
 
     ### T.B.D ### TCPDF 5.0.000 ###
   end
-  
+
   #
   # Adds some Metadata information (Document Information Dictionary)
   # * (see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference)
@@ -7118,7 +7152,7 @@ protected
   # [@since 3.1.000 (2008-06-09)]
   # [@access protected]
   #
-  def putviewerpreferences() 
+  def putviewerpreferences()
     out = '/ViewerPreferences <<'
     if @rtl
       out << ' /Direction /R2L'
@@ -7576,7 +7610,7 @@ protected
   # Converts UTF-8 strings to codepoints array.
   # Invalid byte sequences will be replaced with 0xFFFD (replacement character)
   # * Based on: http://www.faqs.org/rfcs/rfc3629.html
-  # 
+  #
   #   Char. number range  |        UTF-8 octet sequence
   #      (hexadecimal)    |              (binary)
   #   --------------------+------------------------------------------------
@@ -7634,17 +7668,17 @@ protected
     numbytes  = 1; # number of octetc needed to represent the UTF-8 character
 
     str = str.to_s; # force :str to be a string
-    
+
     str.each_byte do |char|
       if (bytes.length == 0) # get starting octect
         if (char <= 0x7F)
           unicode << char # use the character "as is" because is ASCII
           numbytes = 1
         elsif ((char >> 0x05) == 0x06) # 2 bytes character (0x06 = 110 BIN)
-          bytes << ((char - 0xC0) << 0x06) 
+          bytes << ((char - 0xC0) << 0x06)
           numbytes = 2
         elsif ((char >> 0x04) == 0x0E) # 3 bytes character (0x0E = 1110 BIN)
-          bytes << ((char - 0xE0) << 0x0C) 
+          bytes << ((char - 0xE0) << 0x0C)
           numbytes = 3
         elsif ((char >> 0x03) == 0x1E) # 4 bytes character (0x1E = 11110 BIN)
           bytes << ((char - 0xF0) << 0x12)
@@ -7687,7 +7721,7 @@ protected
     @cache_utf8_string_to_array[str] = unicode.dup
     return unicode;
   end
-  
+
   #
   # Converts UTF-8 strings to UTF16-BE.
   # [@param string :str] string to process.
@@ -7768,26 +7802,26 @@ protected
   # * Based on: http://www.faqs.org/rfcs/rfc2781.html
   #
   #   Encoding UTF-16:
-  # 
+  #
   #   Encoding of a single character from an ISO 10646 character value to
   #    UTF-16 proceeds as follows. Let U be the character number, no greater
   #    than 0x10FFFF.
-  # 
+  #
   #    1) If U < 0x10000, encode U as a 16-bit unsigned integer and
   #       terminate.
-  # 
+  #
   #    2) Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
   #       U' must be less than or equal to 0xFFFFF. That is, U' can be
   #       represented in 20 bits.
-  # 
+  #
   #    3) Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
   #       0xDC00, respectively. These integers each have 10 bits free to
   #       encode the character value, for a total of 20 bits.
-  # 
+  #
   #    4) Assign the 10 high-order bits of the 20-bit U' to the 10 low-order
   #       bits of W1 and the 10 low-order bits of U' to the 10 low-order
   #       bits of W2. Terminate.
-  # 
+  #
   #    Graphically, steps 2 through 4 look like:
   #    U' = yyyyyyyyyyxxxxxxxxxx
   #    W1 = 110110yyyyyyyyyy
@@ -7824,10 +7858,10 @@ protected
     end
     return outstr;
   end
-  
+
   # ====================================================
 public
-  
+
   #
   # Set header font.
   # [@param array :font] font
@@ -7838,7 +7872,7 @@ public
     @header_font = font;
   end
   alias_method :set_header_font, :setHeaderFont
-  
+
   def SetHeaderFont(font)
     warn "[DEPRECATION] 'SetHeaderFont' is deprecated. Please use 'set_header_font' instead."
     setHeaderFont(font)
@@ -7865,7 +7899,7 @@ public
     @footer_font = font;
   end
   alias_method :set_footer_font, :setFooterFont
-  
+
   def SetFooterFont(font)
     warn "[DEPRECATION] 'SetFooterFont' is deprecated. Please use 'set_footer_font' instead."
     setFooterFont(font)
@@ -7913,7 +7947,7 @@ public
     return @buffer;
   end
   alias_method :get_pdf_data, :getPDFData
-  
+
   def GetPDFData()
     warn "[DEPRECATION] 'GetPDFData' is deprecated. Please use 'get_pdf_data' instead."
     getPDFData()
@@ -7958,10 +7992,10 @@ public
     return ret
   end
   alias_method :add_html_link, :addHtmlLink
-  
+
   #
   # Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).
-  # [@param string :color] html color 
+  # [@param string :color] html color
   # [@return array] RGB color or empty array in case of error.
   # [@access public]
   #
@@ -7977,7 +8011,7 @@ public
     end
     returncolor = ActiveSupport::OrderedHash.new
     #  RGB ARRAY
-    if color[0,3] == 'rgb' 
+    if color[0,3] == 'rgb'
       codes = color.sub(/^rgb\(/, '')
       codes = codes.gsub(')', '')
       returncolor = codes.split(',', 3)
@@ -7987,7 +8021,7 @@ public
       return returncolor
     end
     # CMYK ARRAY
-    if color[0,4] == 'cmyk' 
+    if color[0,4] == 'cmyk'
       codes = color.sub(/^cmyk\(/, '')
       codes = codes.gsub(')', '')
       returncolor[0] = returncolor[0].to_i
@@ -8028,7 +8062,7 @@ public
     return returncolor
   end
   alias_method :convert_html_color_to_dec, :convertHTMLColorToDec
-  
+
   #
   # Converts pixels to Units.
   # [@param int] :px pixels
@@ -8040,7 +8074,7 @@ public
     return (px.to_f / (@img_scale * @k))
   end
   alias_method :pixels_to_units, :pixelsToUnits
-    
+
   #
   # Reverse function for htmlentities.
   # Convert entities in UTF-8.
@@ -8073,7 +8107,7 @@ public
       return s
     #end
     #case @encryptdata['mode']
-    #when 0, 1:   # 0: RC4 40 bit, 1: RC4 128 bit 
+    #when 0, 1:   # 0: RC4 40 bit, 1: RC4 128 bit
     #  s = _RC4(objectkey(n), s)
     #when 2:      # AES 128 bit
     #  s = _AES(objectkey(n), s)
@@ -8101,7 +8135,7 @@ public
     @transfmatrix[@transfmatrix_key] = []
   end
   alias_method :start_transform, :StartTransform
-  
+
   #
   # Stops a 2D tranformation restoring previous graphic state.
   # This function must be called after scaling, mirroring, translation, rotation and skewing.
@@ -8119,7 +8153,7 @@ public
     @transfmrk[@page] = nil
   end
   alias_method :stop_transform, :StopTransform
-  
+
   #
   # Rotate object.
   # [@param float :angle] angle in degrees for counter-clockwise rotation
@@ -8133,11 +8167,11 @@ public
     if (x == '')
       x = @x
     end
-    
+
     if (y == '')
       y = @y
     end
-    
+
     y = (@h - y) * @k
     x *= @k
 
@@ -8154,7 +8188,7 @@ public
     Transform(tm)
   end
   alias_method :rotate, :Rotate
-  
+
   #
   # Apply graphic transformations.
   # [@param array :tm] transformation matrix
@@ -8381,7 +8415,7 @@ public
     out('S')
   end
   alias_method :line, :Line
-                
+
   #
   # Draws a rectangle.
   # [@param float :x] Abscissa of upper-left corner (or upper-right corner for RTL language).
@@ -9044,7 +9078,7 @@ public
       # create string from array
       str = UTF8ArrSubString(ta)
     end
-      
+
     # check if string contains arabic text
     str.force_encoding('ASCII-8BIT') if str.respond_to?(:force_encoding)
     if str =~ @@k_re_pattern_arabic
@@ -9057,10 +9091,10 @@ public
     unless forcertl or arabic or (str =~ @@k_re_pattern_rtl)
       return ta
     end
-      
+
     # get number of chars
     numchars = ta.length
-      
+
     if forcertl == 'R'
       pel = 1
     elsif forcertl == 'L'
@@ -9079,7 +9113,7 @@ public
         end
       end
     end
-      
+
     # Current Embedding Level
     cel = pel
     # directional override status
@@ -9088,10 +9122,10 @@ public
     # start-of-level-run
     sor = (pel % 2 == 1) ? 'R' : 'L'
     eor = sor
-      
+
     # Array of characters data
     chardata = []
-      
+
     # X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
     #   In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
     reg_KRP = /^(@@k_rle|@@k_lre|@@k_rlo|@@k_lro|@@k_pdf)$/
@@ -9175,16 +9209,16 @@ public
         end
       end
     end # end for each char
-      
+
     # X8. All explicit directional embeddings and overrides are completely terminated at the end of each paragraph. Paragraph separators are not included in the embedding.
     # X9. Remove all RLE, LRE, RLO, LRO, PDF, and BN codes.
     # X10. The remaining rules are applied to each run of characters at the same level. For each run, determine the start-of-level-run (sor) and end-of-level-run (eor) type, either L or R. This depends on the higher of the two levels on either side of the boundary (at the start or end of the paragraph, the level of the 'other' run is the base embedding level). If the higher level is odd, the type is R; otherwise, it is L.
-    
+
     # 3.3.3 Resolving Weak Types
     # Weak types are now resolved one level run at a time. At level run boundaries where the type of the character on the other side of the boundary is required, the type assigned to sor or eor is used.
     # Nonspacing marks are now resolved based on the previous characters.
     numchars = chardata.length
-      
+
     # W1. Examine each nonspacing mark (NSM) in the level run, and change the type of the NSM to the type of the previous character. If the NSM is at the start of the level run, it will get the type of sor.
     prevlevel = -1 # track level changes
     levcount = 0 # counts consecutive chars at the same level
@@ -9203,7 +9237,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-      
+
     # W2. Search backward from each instance of a European number until the first strong type (R, L, AL, or sor) is found. If an AL is found, change the type of the European number to Arabic number.
     prevlevel = -1
     levcount = 0
@@ -9224,14 +9258,14 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # W3. Change all ALs to R.
     numchars.times do |i|
       if chardata[i][:type] == 'AL'
         chardata[i][:type] = 'R'
       end
     end
-    
+
     # W4. A single European separator between two European numbers changes to a European number. A single common separator between two numbers of the same type changes to that type.
     prevlevel = -1
     levcount = 0
@@ -9252,7 +9286,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
     prevlevel = -1
     levcount = 0
@@ -9280,7 +9314,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # W6. Otherwise, separators and terminators change to Other Neutral.
     prevlevel = -1
     levcount = 0
@@ -9296,7 +9330,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # W7. Search backward from each instance of a European number until the first strong type (R, L, or sor) is found. If an L is found, then change the type of the European number to L.
     prevlevel = -1
     levcount = 0
@@ -9317,7 +9351,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # N1. A sequence of neutrals takes the direction of the surrounding strong text if the text on both sides has the same direction. European and Arabic numbers act as if they were R in terms of their influence on neutrals. Start-of-level-run (sor) and end-of-level-run (eor) are used at level run boundaries.
     prevlevel = -1
     levcount = 0
@@ -9385,7 +9419,7 @@ public
       end
       prevlevel = chardata[i][:level]
     end
-    
+
     # I1. For all characters with an even (left-to-right) embedding direction, those of type R go up one level and those of type AN or EN go up two levels.
     # I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
     prevlevel = -1
@@ -9410,7 +9444,7 @@ public
       prevlevel = chardata[i][:level]
       maxlevel = [chardata[i][:level],maxlevel].max
     end
-    
+
     # L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
     #  1. Segment separators,
     #  2. Paragraph separators,
@@ -9434,9 +9468,9 @@ public
         end
       end
     end
-    
+
     # Arabic Shaping
-    # Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run. 
+    # Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run.
     if arabic
       endedletter = [1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688]
       alfletter = [1570,1571,1573,1575]
@@ -9528,7 +9562,7 @@ public
               # Allah Word
               # mark characters to delete with false
               chardata2[i-2][:char] = false
-              chardata2[i-1][:char] = false 
+              chardata2[i-1][:char] = false
               chardata2[i][:char] = 65010
             else
               if (prevchar != false) and endedletter.include?(prevchar[:char])
@@ -9555,7 +9589,7 @@ public
         end # end if AL (Arabic Letter)
       end # end for each char
 
-      # 
+      #
       # Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
       # Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
       #
@@ -9582,7 +9616,7 @@ public
       laaletter = nil
       charAL = nil
     end
-    
+
     # L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
     maxlevel.downto(1) do |j|
       ordarray = []
@@ -9613,16 +9647,16 @@ public
       end
       chardata = ordarray
     end
-    
+
     ordarray = []
     numchars.times do |i|
       ordarray.push chardata[i][:char]
     end
-    
+
     return ordarray
   end
   protected :utf8Bidi
-    
+
   # END OF BIDIRECTIONAL TEXT SECTION -------------------
 
   #
@@ -9783,7 +9817,7 @@ public
     @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.
@@ -10028,8 +10062,8 @@ public
   # [@access public]
   # [@since 3.0.014 (2008-06-04)]
   #
-  def setCellHeightRatio(h) 
-    @cell_height_ratio = h 
+  def setCellHeightRatio(h)
+    @cell_height_ratio = h
   end
   alias_method :set_cell_height_ratio, :setCellHeightRatio
 
@@ -10093,7 +10127,7 @@ public
   #   * BleedBox
   #   * TrimBox
   #   * ArtBox
-  # * PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are: 
+  # * PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are:
   #   * None, which indicates that the print dialog should reflect no page scaling
   #   * AppDefault (default), which indicates that applications should use the current print scaling
   # * Duplex name (Optional; PDF 1.7) The paper handling option to use when printing the file from the print dialog. The following values are valid:
@@ -10183,7 +10217,7 @@ public
     @barcode = bc;
   end
   alias_method :set_barcode, :setBarcode
-  
+
   def SetBarcode(bc="")
      warn "[DEPRECATION] 'SetBarcode' is deprecated. Please use 'set_barcode' instead."
      setBarcode(bc)
@@ -10199,7 +10233,7 @@ public
     return @barcode
   end
   alias_method :get_barcode, :getBarcode
-  
+
   #
   # Print Barcode.
   # [@param int :x] x position in user units
@@ -10220,11 +10254,11 @@ public
     require(File.dirname(__FILE__) + "/barcode/c128aobject.rb");
     require(File.dirname(__FILE__) + "/barcode/c128bobject.rb");
     require(File.dirname(__FILE__) + "/barcode/c128cobject.rb");
-    
+
     if (code.empty?)
       return;
     end
-    
+
     if (style.empty?)
       style  = BCS_ALIGN_LEFT;
       style |= BCS_IMAGE_PNG;
@@ -10236,11 +10270,11 @@ public
     end
     if (font.empty?) then font = BCD_DEFAULT_FONT; end
     if (xres.empty?) then xres = BCD_DEFAULT_XRES; end
-    
+
     scale_factor = 1.5 * xres * @k;
     bc_w = (w * scale_factor).round #width in points
     bc_h = (h * scale_factor).round #height in points
-    
+
     case (type.upcase)
       when "I25"
         obj = I25Object.new(bc_w, bc_h, style, code);
@@ -10253,10 +10287,10 @@ public
       when "C39"
         obj = C39Object.new(bc_w, bc_h, style, code);
     end
-    
-    obj.SetFont(font);   
+
+    obj.SetFont(font);
     obj.DrawObject(xres);
-    
+
     #use a temporary file....
     tmpName = tempnam(@@k_path_cache,'img');
     imagepng(obj.getImage(), tmpName);
@@ -10267,7 +10301,7 @@ public
   end
   alias_method :write_barcode, :writeBarcode
 =end
-  
+
   #
   # Returns an array containing current margins:
   #
@@ -10301,7 +10335,7 @@ public
   # Returns an array containing original margins:
   #   ret['left'] = left  margin
   #   ret['right'] = right margin
-  # [@return array] containing all margins measures 
+  # [@return array] containing all margins measures
   # [@access public]
   # [@since 4.0.012 (2008-07-24)]
   #
@@ -10824,7 +10858,7 @@ protected
           # store header rows on a new table
           if (dom[key]['value'] == 'tr') and (dom[(dom[key]['parent'])]['thead'] == true)
             if empty_string(dom[grandparent]['thead'])
-              if dom[grandparent]['attribute'].nil? or dom[grandparent]['attribute']['style'].nil? 
+              if dom[grandparent]['attribute'].nil? or dom[grandparent]['attribute']['style'].nil?
                 dom[grandparent]['thead'] = a[dom[grandparent]['elkey']].dup
               else
                 dom[grandparent]['thead'] = '<style>' + dom[grandparent]['value'] + ' {' + dom[grandparent]['attribute']['style'] + '}</style>' + a[dom[grandparent]['elkey']].dup
@@ -11219,7 +11253,7 @@ protected
   #
   def get_sever_url(url)
     if !empty_string(url) and (url[0, 1] == '/')
-      '' 
+      ''
     else
       url
     end
@@ -11285,6 +11319,9 @@ public
   alias_method :write_html_cell, :writeHTMLCell
 
   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 dir class id nobr stroke strokecolor fill nested tablehead))
   end
   protected :sanitize_html
@@ -11312,9 +11349,9 @@ public
     cell = false if cell == 0
     case fill
     when true
-      fill = 1 
+      fill = 1
     when false
-      fill = 0 
+      fill = 0
     end
 
     gvars = getGraphicVars()
@@ -11398,7 +11435,7 @@ public
     key = 0
     while key < maxel
       if dom[key]['tag'] and dom[key]['attribute'] and dom[key]['attribute']['pagebreak']
-        # check for pagebreak 
+        # check for pagebreak
         if (dom[key]['attribute']['pagebreak'] == 'true') or (dom[key]['attribute']['pagebreak'] == 'left') or (dom[key]['attribute']['pagebreak'] == 'right')
           # add a page (or trig AcceptPageBreak() for multicolumn mode)
           checkPageBreak(@page_break_trigger + 1)
@@ -11475,7 +11512,7 @@ public
             rollbackTransaction(true)
             # restore previous values
             this_method_vars.each {|vkey , vval|
-              eval("#{vkey} = vval") 
+              eval("#{vkey} = vval")
             }
             # add a page (or trig AcceptPageBreak() for multicolumn mode)
             pre_y = @y
@@ -11502,13 +11539,13 @@ public
           dom[key]['align'] = @rtl ? 'R' : 'L'
         end
         # vertically align image in line
-        if !@newline and (dom[key]['value'] == 'img') and !dom[key]['attribute']['height'].nil? and (dom[key]['attribute']['height'].to_i > 0)
+        if !@newline and (dom[key]['value'] == 'img') and dom[key]['height'] and (dom[key]['height'].to_i > 0)
           # get image height
-          imgh = getHTMLUnitToUnits(dom[key]['attribute']['height'], @lasth, 'px')
+          imgh = getHTMLUnitToUnits(dom[key]['height'], @lasth, 'px')
           # check for automatic line break
           autolinebreak = false
-          if dom[key]['attribute']['width'] and (dom[key]['attribute']['width'].to_i > 0)
-            imgw = getHTMLUnitToUnits(dom[key]['attribute']['width'], 1, 'px', false)
+          if dom[key]['width'] and (dom[key]['width'].to_i > 0)
+            imgw = getHTMLUnitToUnits(dom[key]['width'], 1, 'px', false)
             if (@rtl and (@x - imgw < @l_margin + @c_margin)) or (!@rtl and (@x + imgw > @w - @r_margin - @c_margin))
               # add automatic line break
               autolinebreak = true
@@ -11645,7 +11682,7 @@ public
         end
         # set text rendering mode
         textstroke = !dom[key]['stroke'].nil? ? dom[key]['stroke'] : @textstrokewidth
-        textfill = !dom[key]['fill'].nil? ? dom[key]['fill'] : ((@textrendermode % 2) == 0) 
+        textfill = !dom[key]['fill'].nil? ? dom[key]['fill'] : ((@textrendermode % 2) == 0)
         textclip = !dom[key]['clip'].nil? ? dom[key]['clip'] : (@textrendermode > 3)
         setTextRenderingMode(textstroke, textfill, textclip)
         if (plalign == 'J') and dom[key]['block']
@@ -11809,7 +11846,7 @@ public
                   # check if we are inside a string section '[( ... )]'
                   stroffset = pmid.index('[(', offset)
                   if (stroffset != nil) and (stroffset <= pmid_offset)
-                    # set offset to the end of string section 
+                    # set offset to the end of string section
                     offset = pmid.index(')]', stroffset)
                     while (offset != nil) and (pmid[offset - 1, 1] == '\\')
                       offset = pmid.index(')]', offset + 1)
@@ -12012,7 +12049,7 @@ public
         opentagpos = nil
       end
       if dom[key]['tag']
-        if dom[key]['opening']    
+        if dom[key]['opening']
           # get text indentation (if any)
           if dom[key]['text-indent'] and dom[key]['block']
             @textindent = dom[key]['text-indent']
@@ -12180,7 +12217,7 @@ public
               # account for row-spanned cells
               dom[table_el]['rowspans'][trsid - 1]['endx'] = @x
               dom[table_el]['rowspans'][trsid - 1]['endy'] = @y
-              dom[table_el]['rowspans'][trsid - 1]['endpage'] = @page                             
+              dom[table_el]['rowspans'][trsid - 1]['endpage'] = @page
             end
             if !dom[table_el]['rowspans'].nil?
               # update endy and endpage on rowspanned cells
@@ -12337,7 +12374,7 @@ public
           rollbackTransaction(true)
           # restore previous values
           this_method_vars.each {|vkey , vval|
-            eval("#{vkey} = vval") 
+            eval("#{vkey} = vval")
           }
           # add a page (or trig AcceptPageBreak() for multicolumn mode)
           pre_y = @y
@@ -12462,7 +12499,7 @@ public
 
   #
   # Process opening tags.
-  # [@param array :dom] html dom array 
+  # [@param array :dom] html dom array
   # [@param int :key] current element id
   # [@param boolean :cell] if true add the default c_margin space to each new line (default false).
   # [@access protected]
@@ -12568,8 +12605,8 @@ public
       if cell
         wtmp -= 2 * @c_margin
       end
-      if !tag['attribute']['width'].nil? and (tag['attribute']['width'] != '')
-        hrWidth = getHTMLUnitToUnits(tag['attribute']['width'], wtmp, 'px')
+      if tag['width'] and (tag['width'] != '')
+        hrWidth = getHTMLUnitToUnits(tag['width'], wtmp, 'px')
       else
         hrWidth = wtmp
       end
@@ -12598,11 +12635,11 @@ public
         # tag['attribute']['src'] = CGI.escape(tag['attribute']['src'])
         type = getImageFileType(tag['attribute']['src'])
         tag['attribute']['src'] = get_image_filename(tag['attribute']['src'])
-        if tag['attribute']['width'].nil?
-          tag['attribute']['width'] = 0
+        if tag['width'].nil?
+          tag['width'] = 0
         end
-        if tag['attribute']['height'].nil?
-          tag['attribute']['height'] = 0
+        if tag['height'].nil?
+          tag['height'] = 0
         end
         #if tag['attribute']['align'].nil?
           # the only alignment supported is "bottom"
@@ -12654,12 +12691,12 @@ public
           end
         end
         iw = 0
-        if !tag['attribute']['width'].nil?
-          iw = getHTMLUnitToUnits(tag['attribute']['width'], 1, 'px', false)
+        if tag['width']
+          iw = getHTMLUnitToUnits(tag['width'], 1, 'px', false)
         end
         ih = 0
-        if !tag['attribute']['height'].nil?
-          ih = getHTMLUnitToUnits(tag['attribute']['height'], 1, 'px', false)
+        if tag['height']
+          ih = getHTMLUnitToUnits(tag['height'], 1, 'px', false)
         end
 
         # store original margin values
@@ -12730,7 +12767,7 @@ public
       end
       if !tag['attribute']['start'].nil?
         @listcount[@listnum] = tag['attribute']['start'].to_i - 1
-      else 
+      else
         @listcount[@listnum] = 0
       end
       if @rtl
@@ -12802,7 +12839,7 @@ public
 
     if dom[key]['self'] and dom[key]['attribute']['pagebreakafter']
       pba = dom[key]['attribute']['pagebreakafter']
-      # check for pagebreak 
+      # check for pagebreak
       if (pba == 'true') or (pba == 'left') or (pba == 'right')
         # add a page (or trig AcceptPageBreak() for multicolumn mode)
         checkPageBreak(@page_break_trigger + 1)
@@ -12815,10 +12852,10 @@ public
     dom
   end
   protected :openHTMLTagHandler
-  
+
   #
   # Process closing tags.
-  # [@param array :dom] html dom array 
+  # [@param array :dom] html dom array
   # [@param int :key] current element id
   # [@param boolean :cell] if true add the default c_margin space to each new line (default false).
   # [@param int :maxbottomliney] maximum y value of current line
@@ -13050,7 +13087,7 @@ public
                 setPageBuffer(@page, pstart + ccode + "\n" + pend)
               end
             end
-          }                                       
+          }
           if !table_el['attribute']['cellspacing'].nil?
             cellspacing = getHTMLUnitToUnits(table_el['attribute']['cellspacing'], 1, 'px')
             @y += cellspacing
@@ -13157,7 +13194,7 @@ public
     end
     if dom[(dom[key]['parent'])]['attribute']['pagebreakafter']
       pba = dom[(dom[key]['parent'])]['attribute']['pagebreakafter']
-      # check for pagebreak 
+      # check for pagebreak
       if (pba == 'true') or (pba == 'left') or (pba == 'right')
         # add a page (or trig AcceptPageBreak() for multicolumn mode)
         checkPageBreak(@page_break_trigger + 1)
@@ -13171,7 +13208,7 @@ public
     dom
   end
   protected :closeHTMLTagHandler
-  
+
   #
   # Add vertical spaces if needed.
   # [@param string :hbz] Distance between current y and line bottom.
@@ -13393,7 +13430,7 @@ protected
     color = @fgcolor
     width = 0
     textitem = ''
-    tmpx = @x           
+    tmpx = @x
     lspace = GetStringWidth('  ')
     if listtype == '!'
       # set default list type for unordered list
@@ -13734,7 +13771,7 @@ protected
       @images[image][key] = data
     end
   end
-                
+
   #
   # Get image buffer content.
   # [@param string :image] image key
@@ -14270,7 +14307,7 @@ public
     @outlines.each_with_index do |outline, key|
       if empty_string(page)
         pagenum = outline[:p].to_s
-      else 
+      else
         # placemark to be replaced with the correct number
         pagenum = '{#' + outline[:p].to_s + '}'
         if (@current_font['type'] == 'TrueTypeUnicode') or (@current_font['type'] == 'cidfont0')
@@ -14321,7 +14358,7 @@ public
             sdiffu = ku.length - ns.length
             sfill = ' ' * sdiff
             sfillu = ' ' * sdiffu
-            if @rtl 
+            if @rtl
               ns = ns + sfill
               nu = nu + sfillu
             else
@@ -14460,7 +14497,7 @@ public
   # [@param string :haystack] The string to search in.
   # [@param string :needle] substring to search.
   # [@param int :offset] May be specified to begin searching an arbitrary number of characters into the string.
-  # [@return] Returns the position where the needle exists. Returns FALSE if the needle was not found. 
+  # [@return] Returns the position where the needle exists. Returns FALSE if the needle was not found.
   # [@access public]
   # [@since 4.8.038 (2010-03-13)]
   #
@@ -14594,7 +14631,7 @@ public
   # -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
 end # END OF RBPDF CLASS
 
-#TODO 2007-05-25 (EJM) Level=0 - 
+#TODO 2007-05-25 (EJM) Level=0 -
 #Handle special IE contype request
 # if (!_SERVER['HTTP_USER_AGENT'].nil? and (_SERVER['HTTP_USER_AGENT']=='contype'))
 #   header('Content-Type: application/pdf');