write_xlsx 0.99.0 → 1.07.0

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.99.0"
+WriteXLSX_VERSION = "1.07.0"

data/lib/write_xlsx/workbook.rb

@@ -49,6 +49,7 @@ class Workbook
     attr_reader :shared_strings  # :nodoc:
     attr_reader :vba_project  # :nodoc:
     attr_reader :excel2003_style # :nodoc:
+    attr_reader :max_url_length # :nodoc:
     attr_reader :strings_to_urls # :nodoc:
     attr_reader :default_url_format # :nodoc:
 
@@ -130,6 +131,13 @@ def initialize(file, *option_params)
       @images              = []
       @strings_to_urls     = (options[:strings_to_urls].nil? || options[:strings_to_urls]) ? true : false
 
+      @max_url_length      = 2079
+      @has_comments        = false
+      if options[:max_url_length]
+        @max_url_length = options[:max_url_length]
+
+        @max_url_length = 2079 if @max_url_length < 250
+      end
       # Structures for the shared strings data.
       @shared_strings = Package::SharedStrings.new
 
@@ -1108,7 +1116,8 @@ def style_properties
        @border_count,
        @fill_count,
        @custom_colors,
-       @dxf_formats
+       @dxf_formats,
+       @has_comments
       ]
     end
 
@@ -1704,11 +1713,14 @@ def prepare_vml_objects  #:nodoc:
           if sheet.has_comments?
             comment_files += 1
             comment_id    += 1
+            @has_comments = true
           end
           vml_drawing_id += 1
 
-          sheet.prepare_vml_objects(vml_data_id, vml_shape_id,
-                                    vml_drawing_id, comment_id)
+          sheet.prepare_vml_objects(
+            vml_data_id, vml_shape_id,
+            vml_drawing_id, comment_id
+          )
 
           # Each VML file should start with a shape id incremented by 1024.
           vml_data_id  +=    1 * ( 1 + sheet.num_comments_block )
@@ -1731,8 +1743,6 @@ def prepare_vml_objects  #:nodoc:
         end
       end
 
-      add_font_format_for_cell_comments if num_comment_files > 0
-
       # Set the workbook vba_codename if one of the sheets has a button and
       # the workbook has a vbaProject binary.
       if has_button && @vba_project && !@vba_codename
@@ -1752,19 +1762,6 @@ def prepare_tables
       end
     end
 
-    def add_font_format_for_cell_comments
-      format = Format.new(
-                          @formats,
-                          :font          => 'Tahoma',
-                          :size          => 8,
-                          :color_indexed => 81,
-                          :font_only     => 1
-                          )
-
-      format.get_xf_index
-      @formats.formats << format
-    end
-
     #
     # Add "cached" data to charts to provide the numCache and strCache data for
     # series and title/axis ranges.
@@ -1915,16 +1912,19 @@ def extract_named_ranges(defined_names) #:nodoc:
     # Iterate through the worksheets and set up any chart or image drawings.
     #
     def prepare_drawings #:nodoc:
-      chart_ref_id = 0
-      image_ref_id = 0
-      drawing_id   = 0
+      chart_ref_id     = 0
+      image_ref_id     = 0
+      drawing_id       = 0
+      ref_id           = 0
+      image_ids        = {}
+      header_image_ids = {}
       @worksheets.each do |sheet|
         chart_count = sheet.charts.size
         image_count = sheet.images.size
         shape_count = sheet.shapes.size
         header_image_count = sheet.header_images.size
         footer_image_count = sheet.footer_images.size
-        has_drawing = false
+        has_drawings = false
 
         # Check that some image or drawing needs to be processed.
         next if chart_count + image_count + shape_count + header_image_count + footer_image_count == 0
@@ -1932,7 +1932,24 @@ def prepare_drawings #:nodoc:
         # Don't increase the drawing_id header/footer images.
         if chart_count + image_count + shape_count > 0
           drawing_id += 1
-          has_drawing = true
+          has_drawings = true
+        end
+
+        # Prepare the worksheet images.
+        sheet.images.each_with_index do |image, index|
+          filename = image[2]
+          type, width, height, name, x_dpi, y_dpi, md5 = get_image_properties(image[2])
+          if image_ids[md5]
+            ref_id = image_ids[md5]
+          else
+            image_ref_id += 1
+            image_ids[md5] = ref_id = image_ref_id
+            @images << [filename, type]
+          end
+          sheet.prepare_image(
+            index, ref_id, drawing_id, width, height,
+            name,  type,   x_dpi,      y_dpi, md5
+          )
         end
 
         # Prepare the worksheet charts.
@@ -1941,13 +1958,6 @@ def prepare_drawings #:nodoc:
           sheet.prepare_chart(index, chart_ref_id, drawing_id)
         end
 
-        # Prepare the worksheet images.
-        sheet.images.each_with_index do |image, index|
-          type, width, height, name, x_dpi, y_dpi = get_image_properties(image[2])
-          image_ref_id += 1
-          sheet.prepare_image(index, image_ref_id, drawing_id, width, height, name, type, x_dpi, y_dpi)
-        end
-
         # Prepare the worksheet shapes.
         sheet.shapes.each_with_index do |shape, index|
           sheet.prepare_shape(index, drawing_id)
@@ -1958,13 +1968,21 @@ def prepare_drawings #:nodoc:
           filename = sheet.header_images[index][0]
           position = sheet.header_images[index][1]
 
-          type, width, height, name, x_dpi, y_dpi =
+          type, width, height, name, x_dpi, y_dpi, md5 =
             get_image_properties(filename)
 
-          image_ref_id += 1
+          if header_image_ids[md5]
+            ref_id = header_image_ids[md5]
+          else
+            image_ref_id += 1
+            header_image_ids[md5] = ref_id = image_ref_id
+            @images << [filename, type]
+          end
 
-          sheet.prepare_header_image(image_ref_id, width, height,
-                                     name, type, position, x_dpi, y_dpi)
+          sheet.prepare_header_image(
+            ref_id,   width, height, name, type,
+            position, x_dpi, y_dpi,  md5
+          )
         end
 
         # Prepare the footer images.
@@ -1972,18 +1990,26 @@ def prepare_drawings #:nodoc:
           filename = sheet.footer_images[index][0]
           position = sheet.footer_images[index][1]
 
-          type, width, height, name, x_dpi, y_dpi =
+          type, width, height, name, x_dpi, y_dpi, md5 =
             get_image_properties(filename)
 
-          image_ref_id += 1
+          if header_image_ids[md5]
+            ref_id = header_image_ids[md5]
+          else
+            image_ref_id += 1
+            header_image_ids[md5] = ref_id = image_ref_id
+            @images << [filename, type]
+          end
 
-          sheet.prepare_header_image(image_ref_id, width, height,
-                                     name, type, position, x_dpi, y_dpi)
+          sheet.prepare_header_image(
+            ref_id,   width, height, name, type,
+            position, x_dpi, y_dpi,  md5
+          )
         end
 
-        if has_drawing
-          drawing = sheet.drawing
-          @drawings << drawing
+        if has_drawings
+          drawings = sheet.drawings
+          @drawings << drawings
         end
       end
 
@@ -2007,6 +2033,7 @@ def get_image_properties(filename)
 
       # Open the image file and import the data.
       data = File.binread(filename)
+      md5  = Digest::MD5.hexdigest(data)
       if data.unpack('x A3')[0] == 'PNG'
         # Test for PNGs.
         type, width, height, x_dpi, y_dpi = process_png(data)
@@ -2024,13 +2051,11 @@ def get_image_properties(filename)
         raise "Unsupported image format for file: #{filename}\n"
       end
 
-      @images << [filename, type]
-
       # Set a default dpi for images with 0 dpi.
       x_dpi = 96 if x_dpi == 0
       y_dpi = 96 if y_dpi == 0
 
-      [type, width, height, File.basename(filename), x_dpi, y_dpi]
+      [type, width, height, File.basename(filename), x_dpi, y_dpi, md5]
     end
 
     #

data/lib/write_xlsx/worksheet.rb

@@ -285,7 +285,7 @@ class Worksheet
     PADDING         = 5                       # :nodoc:
 
     attr_reader :index # :nodoc:
-    attr_reader :charts, :images, :tables, :shapes, :drawing # :nodoc:
+    attr_reader :charts, :images, :tables, :shapes, :drawings # :nodoc:
     attr_reader :header_images, :footer_images # :nodoc:
     attr_reader :vml_drawing_links # :nodoc:
     attr_reader :vml_data_id # :nodoc:
@@ -309,6 +309,7 @@ def initialize(workbook, index, name) #:nodoc:
       @excel_version = 2007
       @palette = workbook.palette
       @default_url_format = workbook.default_url_format
+      @max_url_length = workbook.max_url_length
 
       @page_setup = PageSetup.new
 
@@ -356,6 +357,10 @@ def initialize(workbook, index, name) #:nodoc:
       @sparklines             = []
       @shapes                 = []
       @shape_hash             = {}
+      @drawing_rels           = {}
+      @drawing_rels_id        = 0
+      @vml_drawing_rels       = {}
+      @vml_drawing_rels_id    = 0
       @header_images          = []
       @footer_images          = []
 
@@ -365,6 +370,7 @@ def initialize(workbook, index, name) #:nodoc:
       @original_row_height    = 15
       @default_row_height     = 15
       @default_row_pixels     = 20
+      @default_col_width      = 8.43
       @default_col_pixels     = 64
       @default_row_rezoed     = 0
 
@@ -768,10 +774,10 @@ def set_column(*args)
 
       # Store the col sizes for use when calculating image vertices taking
       # hidden columns into account. Also store the column formats.
-      width = 0 if ptrue?(hidden)         # Set width to zero if hidden
+      width = @default_col_width unless width
 
       (firstcol .. lastcol).each do |col|
-        @col_sizes[col]   = width
+        @col_sizes[col]   = [width, hidden]
         @col_formats[col] = format if format
       end
     end
@@ -2169,7 +2175,7 @@ def write_comment(*args)
       @has_vml = true
 
       # Process the properties of the cell comment.
-      @comments.add(Package::Comment.new(@workbook, self, row, col, string, options))
+      @comments.add(@workbook, self, row, col, string, options)
     end
 
     #
@@ -2508,7 +2514,9 @@ def write_array_formula(*args)
       col1, col2 = col2, col1 if col1 > col2
 
       # Check that row and col are valid and store max and min values
+      check_dimensions(row1, col1)
       check_dimensions(row2, col2)
+      store_row_col_max_min_values(row1, col1)
       store_row_col_max_min_values(row2, col2)
 
       # Define array range
@@ -2781,7 +2789,7 @@ def write_url(*args)
       store_hyperlink(row, col, hyperlink)
 
       if hyperlinks_count > 65_530
-        raise "URL '#{url}' added but number of URLS is over Excel's limit of 65,530 URLS per worksheet."
+        raise "URL '#{url}' added but URL exceeds Excel's limit of 65,530 URLs per worksheet."
       end
 
       # Add the default URL format.
@@ -2990,13 +2998,25 @@ def write_date_time(*args)
     #
     def insert_chart(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, chart, x_offset, y_offset, x_scale, y_scale = row_col_notation(args)
+      row, col, chart, *options = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, chart].include?(nil)
 
+      if options.first.class == Hash
+        params = options.first
+        x_offset = params[:x_offset]
+        y_offset = params[:y_offset]
+        x_scale  = params[:x_scale]
+        y_scale  = params[:y_scale]
+        anchor   = params[:object_position]
+
+      else
+        x_offset, y_offset, x_scale, y_scale, anchor = options
+      end
       x_offset ||= 0
       y_offset ||= 0
       x_scale  ||= 1
       y_scale  ||= 1
+      anchor   ||= 1
 
       raise "Not a Chart object in insert_chart()" unless chart.is_a?(Chart) || chart.is_a?(Chartsheet)
       raise "Not a embedded style Chart object in insert_chart()" if chart.respond_to?(:embedded) && chart.embedded == 0
@@ -3014,61 +3034,41 @@ def insert_chart(*args)
       x_offset = chart.x_offset if ptrue?(chart.x_offset)
       y_offset = chart.y_offset if ptrue?(chart.y_offset)
 
-      @charts << [row, col, chart, x_offset, y_offset, x_scale, y_scale]
+      @charts << [row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor]
     end
 
     #
     # :call-seq:
-    #   insert_image(row, column, filename, x=0, y=0, x_scale=1, y_scale=1)
-    #
-    # Partially supported. Currently only works for 96 dpi images.
-    #
-    # This method can be used to insert a image into a worksheet. The image
-    # can be in PNG, JPEG or BMP format. The x, y, x_scale and y_scale
-    # parameters are optional.
-    #
-    #     worksheet1.insert_image('A1', 'ruby.bmp')
-    #     worksheet2.insert_image('A1', '../images/ruby.bmp')
-    #     worksheet3.insert_image('A1', '.c:\images\ruby.bmp')
-    #
-    # The parameters +x+ and +y+ can be used to specify an offset from the top
-    # left hand corner of the cell specified by +row+ and +column+. The offset
-    # values are in pixels.
-    #
-    #     worksheet1.insert_image('A1', 'ruby.bmp', 32, 10)
-    #
-    # The offsets can be greater than the width or height of the underlying
-    # cell. This can be occasionally useful if you wish to align two or more
-    # images relative to the same cell.
-    #
-    # The parameters +x_scale+ and +y_scale+ can be used to scale the inserted
-    # image horizontally and vertically:
-    #
-    #     # Scale the inserted image: width x 2.0, height x 0.8
-    #     worksheet.insert_image('A1', 'perl.bmp', 0, 0, 2, 0.8)
-    #
-    # Note: you must call set_row() or set_column() before insert_image()
-    # if you wish to change the default dimensions of any of the rows or
-    # columns that the image occupies. The height of a row can also change
-    # if you use a font that is larger than the default. This in turn will
-    # affect the scaling of your image. To avoid this you should explicitly
-    # set the height of the row using set_row() if it contains a font size
-    # that will change the row height.
-    #
-    # BMP images must be 24 bit, true colour, bitmaps. In general it is
-    # best to avoid BMP images since they aren't compressed.
+    #   insert_image(row, column, filename, options)
     #
     def insert_image(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, image, x_offset, y_offset, x_scale, y_scale = row_col_notation(args)
+      row, col, image, *options = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, image].include?(nil)
 
+      if options.first.class == Hash
+        # Newer hash bashed options
+        params = options.first
+        x_offset = params[:x_offset]
+        y_offset = params[:y_offset]
+        x_scale  = params[:x_scale]
+        y_scale  = params[:y_scale]
+        anchor   = params[:object_position]
+        url      = params[:url]
+        tip      = params[:tip]
+      else
+        x_offset, y_offset, x_scale, y_scale, anchor = options
+      end
       x_offset ||= 0
       y_offset ||= 0
       x_scale  ||= 1
       y_scale  ||= 1
+      anchor   ||= 2
 
-      @images << [row, col, image, x_offset, y_offset, x_scale, y_scale]
+      @images << [
+        row, col, image, x_offset, y_offset,
+        x_scale, y_scale, url, tip, anchor
+      ]
     end
 
     #
@@ -3306,10 +3306,8 @@ def set_row(*args)
       # Store the row change to allow optimisations.
       @row_size_changed = true
 
-      height = 0 if ptrue?(hidden)
-
       # Store the row sizes for use when calculating image vertices.
-      @row_sizes[row] = height
+      @row_sizes[row] = [height, hidden]
     end
 
     #
@@ -3367,9 +3365,11 @@ def merge_range(*args)
       row_first,  row_last  = row_last,  row_first  if row_first > row_last
       col_first, col_last = col_last, col_first if col_first > col_last
 
-      # Check that column number is valid and store the max value
-      check_dimensions(row_last, col_last)
-      store_row_col_max_min_values(row_last, col_last)
+      # Check that the data range is valid and store the max and min values.
+      check_dimensions(row_first, col_first)
+      check_dimensions(row_last,  col_last)
+      store_row_col_max_min_values(row_first, col_first)
+      store_row_col_max_min_values(row_last,  col_last)
 
       # Store the merge range.
       @merge << [row_first, col_first, row_last, col_last]
@@ -3432,9 +3432,11 @@ def merge_range_type(type, *args)
       row_first, row_last = row_last, row_first if row_first > row_last
       col_first, col_last = col_last, col_first if col_first > col_last
 
-      # Check that column number is valid and store the max value
-      check_dimensions(row_last, col_last)
-      store_row_col_max_min_values(row_last, col_last)
+      # Check that the data range is valid and store the max and min values.
+      check_dimensions(row_first, col_first)
+      check_dimensions(row_last,  col_last)
+      store_row_col_max_min_values(row_first, col_first)
+      store_row_col_max_min_values(row_last,  col_last)
 
       # Store the merge range.
       @merge << [row_first, col_first, row_last, col_last]
@@ -5724,7 +5726,7 @@ def set_external_comment_links(comment_id) # :nodoc:
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       drawing_type = 1
 
-      row, col, chart, x_offset, y_offset, x_scale, y_scale  = @charts[index]
+      row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor  = @charts[index]
       chart.id = chart_id - 1
       x_scale ||= 0
       y_scale ||= 0
@@ -5736,22 +5738,21 @@ def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       width  = (0.5 + (width  * x_scale)).to_i
       height = (0.5 + (height * y_scale)).to_i
 
-      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height)
+      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height, anchor)
 
       # Set the chart name for the embedded object if it has been specified.
       name = chart.name
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      if !drawing?
-        drawing = Drawing.new
-        drawing.add_drawing_object(drawing_type, dimensions, 0, 0, name)
-        drawing.embedded = 1
-
-        @drawing = drawing
+      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor, drawing_rel_index, 0, nil)
+      if !drawings?
+        @drawings = Drawings.new
+        @drawings.add_drawing_object(drawing)
+        @drawings.embedded = 1
 
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml" ]
       else
-        @drawing.add_drawing_object(drawing_type, dimensions, 0, 0, name)
+        @drawings.add_drawing_object(drawing)
       end
       @drawing_links << ['/chart', "../charts/chart#{chart_id}.xml"]
     end
@@ -5822,6 +5823,10 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     # The values of col_start and row_start are passed in from the calling
     # function. The values of col_end and row_end are calculated by subtracting
     # the width and height of the object from the width and height of the
+    # The anchor/object position defines how images are scaled for hidden rows and
+    # columns. For option 1 "Move and size with cells" the size of the hidden
+    # row/column is subtracted from the image.
+    #
     # underlying cells.
     #
     #    col_start    # Col containing upper left corner of object.
@@ -5834,7 +5839,7 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     #    y2           # Distance to bottom of object.
     #    width        # Width of object frame.
     #    height       # Height of object frame.
-    def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
+    def position_object_pixels(col_start, row_start, x1, y1, width, height, anchor = nil) #:nodoc:
       # Adjust start column for negative offsets.
       while x1 < 0 && col_start > 0
         x1 += size_col(col_start - 1)
@@ -5853,7 +5858,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
 
       # Calculate the absolute x offset of the top-left vertex.
       if @col_size_changed
-        x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col)}
+        x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col, anchor)}
       else
         # Optimisation for when the column widths haven't changed.
         x_abs = @default_col_pixels * col_start
@@ -5863,7 +5868,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       # Calculate the absolute y offset of the top-left vertex.
       # Store the column change to allow optimisations.
       if @row_size_changed
-        y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row)}
+        y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row, anchor)}
       else
         # Optimisation for when the row heights haven't changed.
         y_abs = @default_row_pixels * row_start
@@ -5871,23 +5876,36 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       y_abs += y1
 
       # Adjust start column for offsets that are greater than the col width.
-      x1, col_start = adjust_column_offset(x1, col_start)
+      while x1 >= size_col(col_start, anchor)
+        x1 -= size_col(col_start)
+        col_start += 1
+      end
 
       # Adjust start row for offsets that are greater than the row height.
-      y1, row_start = adjust_row_offset(y1, row_start)
+      while y1 >= size_row(row_start, anchor)
+        y1 -= size_row(row_start)
+        row_start += 1
+      end
 
       # Initialise end cell to the same as the start cell.
       col_end = col_start
       row_end = row_start
 
-      width  += x1
-      height += y1
+      # Only offset the image in the cell if the row/col isn't hidden.
+      width  += x1 if size_col(col_start, anchor) > 0
+      height += y1 if size_row(row_start, anchor) > 0
 
       # Subtract the underlying cell widths to find the end cell of the object.
-      width, col_end = adjust_column_offset(width, col_end)
+      while width >= size_col(col_end, anchor)
+        width -= size_col(col_end, anchor)
+        col_end += 1
+      end
 
       # Subtract the underlying cell heights to find the end cell of the object.
-      height, row_end = adjust_row_offset(height, row_end)
+      while height >= size_row(row_end, anchor)
+        height -= size_row(row_end, anchor)
+        row_end += 1
+      end
 
       # The end vertices are whatever is left from the width and height.
       x2 = width
@@ -6072,6 +6090,33 @@ def write_sparkline_groups
 
     private
 
+    #
+    # Get the index used to address a drawing rel link.
+    #
+    def drawing_rel_index(target = nil)
+      if !target
+        # Undefined values for drawings like charts will always be unique.
+        @drawing_rels_id += 1
+      elsif ptrue?(@drawing_rels[target])
+        @drawing_rels[target]
+      else
+        @drawing_rels_id += 1
+        @drawing_rels[target] = @drawing_rels_id
+      end
+    end
+
+    #
+    # Get the index used to address a vml_drawing rel link.
+    #
+    def get_vml_drawing_rel_index(target)
+      if @vml_drawing_rels[target]
+        @vml_drawing_rels[target]
+      else
+        @vml_drawing_rels_id += 1
+        @vml_drawing_rels[target] = @vml_drawing_rels_id
+      end
+    end
+
     def hyperlinks_count
       @hyperlinks.keys.inject(0) { |s, n| s += @hyperlinks[n].keys.size }
     end
@@ -6347,32 +6392,16 @@ def sort_pagebreaks(*args) #:nodoc:
       end
     end
 
-    def adjust_column_offset(x, column)
-      while x >= size_col(column)
-        x -= size_col(column)
-        column += 1
-      end
-      [x, column]
-    end
-
-    def adjust_row_offset(y, row)
-      while y >= size_row(row)
-        y -= size_row(row)
-        row += 1
-      end
-      [y, row]
-    end
-
     #
     # Calculate the vertices that define the position of a graphical object within
     # the worksheet in EMUs.
     #
     # The vertices are expressed as English Metric Units (EMUs). There are 12,700
-    # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per pixel.
+    # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per el.
     #
-    def position_object_emus(col_start, row_start, x1, y1, width, height, x_dpi = 96, y_dpi = 96) #:nodoc:
+    def position_object_emus(col_start, row_start, x1, y1, width, height, anchor = nil) #:nodoc:
       col_start, row_start, x1, y1, col_end, row_end, x2, y2, x_abs, y_abs =
-        position_object_pixels(col_start, row_start, x1, y1, width, height)
+        position_object_pixels(col_start, row_start, x1, y1, width, height, anchor)
 
       # Convert the pixel values to EMUs. See above.
       x1    = (0.5 + 9_525 * x1).to_i
@@ -6388,15 +6417,16 @@ def position_object_emus(col_start, row_start, x1, y1, width, height, x_dpi = 96
     #
     # Convert the width of a cell from user's units to pixels. Excel rounds the
     # column width to the nearest pixel. If the width hasn't been set by the user
-    # we use the default value. If the column is hidden it has a value of zero.
+    # we use the default value. A hidden column is treated as having a width of
+    # zero unless it has the special "object_position" of 4 (size with cells).
     #
-    def size_col(col) #:nodoc:
+    def size_col(col, anchor = 0) #:nodoc:
       # Look up the cell value to see if it has been changed.
       if @col_sizes[col]
-        width = @col_sizes[col]
+        width, hidden = @col_sizes[col]
 
         # Convert to pixels.
-        if width == 0
+        if hidden == 1 && anchor != 4
           pixels = 0
         elsif width < 1
           pixels = (width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i
@@ -6411,15 +6441,16 @@ def size_col(col) #:nodoc:
 
     #
     # Convert the height of a cell from user's units to pixels. If the height
-    # hasn't been set by the user we use the default value. If the row is hidden
-    # it has a value of zero.
+    # hasn't been set by the user we use the default value. A hidden row is
+    # treated as having a height of zero unless it has the special
+    # "object_position" of 4 (size with cells).
     #
-    def size_row(row) #:nodoc:
+    def size_row(row, anchor = 0) #:nodoc:
       # Look up the cell value to see if it has been changed
       if @row_sizes[row]
-        height = @row_sizes[row]
+        height, hidden = @row_sizes[row]
 
-        if height == 0
+        if hidden == 1 && anchor != 4
           pixels = 0
         else
           pixels = (4 / 3.0 * height).to_i
@@ -6433,13 +6464,13 @@ def size_row(row) #:nodoc:
     #
     # Set up image/drawings.
     #
-    def prepare_image(index, image_id, drawing_id, width, height, name, image_type, x_dpi = 96, y_dpi = 96) #:nodoc:
+    def prepare_image(index, image_id, drawing_id, width, height, name, image_type, x_dpi = 96, y_dpi = 96, md5 = nil) #:nodoc:
       x_dpi ||= 96
       y_dpi ||= 96
       drawing_type = 2
-      drawing
 
-      row, col, image, x_offset, y_offset, x_scale, y_scale = @images[index]
+      row, col, image, x_offset, y_offset,
+      x_scale, y_scale, url, tip, anchor = @images[index]
 
       width  *= x_scale
       height *= y_scale
@@ -6447,36 +6478,72 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       width  *= 96.0 / x_dpi
       height *= 96.0 / y_dpi
 
-      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height)
+      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height, anchor)
 
       # Convert from pixels to emus.
       width  = (0.5 + (width  * 9_525)).to_i
       height = (0.5 + (height * 9_525)).to_i
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      if !drawing?
-        drawing = Drawing.new
-        drawing.embedded = 1
+      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor, 0, 0, tip)
+      if !drawings?
+        drawings = Drawings.new
+        drawings.embedded = 1
 
-        @drawing = drawing
+        @drawings = drawings
 
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
       else
-        drawing = @drawing
+        drawings = @drawings
+      end
+      drawings.add_drawing_object(drawing)
+
+      if url
+        rel_type = '/hyperlink'
+        target_mode = 'External'
+        if url =~ %r!^[fh]tt?ps?://! || url =~ /^mailto:/
+          target = escape_url(url)
+        end
+        if url =~ /^external:/
+          target = escape_url(url.sub(/^external:/, 'file:///'))
+          # Additional escape not required in worksheet hyperlinks
+          target = target.gsub(/#/, '%23')
+        end
+        if url =~ /^internal:/
+          target      = url.sub(/^internal:/, '#')
+          target_mode = nil
+        end
+
+        if target.length > 255
+          raise <<"EOS"
+Ignoring URL #{target} where link or anchor > 255 characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the WriteXLSX documentation.
+EOS
+        end
+
+        if target && !@drawing_rels[url]
+          @drawing_links << [rel_type, target, target_mode]
+        end
+        drawing.url_rel_index = drawing_rel_index(url)
       end
-      drawing.add_drawing_object(drawing_type, dimensions, width, height, name)
 
-      @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"]
+      if !@drawing_rels[md5]
+        @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"]
+      end
+      drawing.rel_index = drawing_rel_index(md5)
     end
     public :prepare_image
 
-    def prepare_header_image(image_id, width, height, name, image_type, position, x_dpi, y_dpi)
+    def prepare_header_image(image_id, width, height, name, image_type, position, x_dpi, y_dpi, md5)
       # Strip the extension from the filename.
       body = name.dup
       body[/\.[^\.]+$/, 0] = ''
 
-      @header_images_array << [width, height, body, position, x_dpi, y_dpi]
-      @vml_drawing_links   << ['/image', "../media/image#{image_id}.#{image_type}" ]
+      if !@vml_drawing_rels[md5]
+        @vml_drawing_links   << ['/image', "../media/image#{image_id}.#{image_type}" ]
+      end
+
+      ref_id = get_vml_drawing_rel_index(md5)
+      @header_images_array << [width, height, body, position, x_dpi, y_dpi, ref_id]
     end
     public :prepare_header_image
 
@@ -6519,16 +6586,16 @@ def prepare_header_image(image_id, width, height, name, image_type, position, x_
     #
     def insert_shape(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row_start, column_start, shape, x_offset, y_offset, x_scale, y_scale =
+      row_start, column_start, shape, x_offset, y_offset, x_scale, y_scale, anchor =
         row_col_notation(args)
       if [row_start, column_start, shape].include?(nil)
         raise "Insufficient arguments in insert_shape()"
       end
 
       shape.set_position(
-                           row_start, column_start, x_offset, y_offset,
-                           x_scale, y_scale
-                           )
+        row_start, column_start, x_offset, y_offset,
+        x_scale, y_scale, anchor
+      )
       # Assign a shape ID.
       while true
         id = shape.id || 0
@@ -6572,9 +6639,9 @@ def prepare_shape(index, drawing_id)
       shape = @shapes[index]
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      unless drawing?
-        @drawing = Drawing.new
-        @drawing.embedded = 1
+      unless drawings?
+        @drawings = Drawings.new
+        @drawings.embedded = 1
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
         @has_shapes = true
       end
@@ -6584,13 +6651,14 @@ def prepare_shape(index, drawing_id)
       shape.calc_position_emus(self)
 
       drawing_type = 3
-      drawing.add_drawing_object(drawing_type, shape.dimensions, shape.name, shape)
+      drawing = Drawing.new(drawing_type, shape.dimensions, shape.width_emu, shape.height_emu, shape.name, shape, shape.anchor, drawing_rel_index, 0, nil)
+      drawings.add_drawing_object(drawing)
     end
     public :prepare_shape
 
     #
     # This method handles the parameters passed to insert_button as well as
-    # calculating the comment object position and vertices.
+    # calculating the button object position and vertices.
     #
     def button_params(row, col, params)
       button = Writexlsx::Package::Button.new
@@ -6619,7 +6687,7 @@ def button_params(row, col, params)
       params[:x_offset] = 0 if !params[:x_offset]
       params[:y_offset] = 0 if !params[:y_offset]
 
-      # Scale the size of the comment box if required.
+      # Scale the size of the button box if required.
       if params[:x_scale]
         params[:width] = params[:width] * params[:x_scale]
       end
@@ -6634,15 +6702,15 @@ def button_params(row, col, params)
       params[:start_row] = row
       params[:start_col] = col
 
-      # Calculate the positions of comment object.
+      # Calculate the positions of button object.
       vertices = position_object_pixels(
-                                        params[:start_col],
-                                        params[:start_row],
-                                        params[:x_offset],
-                                        params[:y_offset],
-                                        params[:width],
-                                        params[:height]
-                                        )
+        params[:start_col],
+        params[:start_row],
+        params[:x_offset],
+        params[:y_offset],
+        params[:width],
+        params[:height]
+      )
 
       # Add the width and height for VML.
       vertices << [params[:width], params[:height]]
@@ -6882,7 +6950,7 @@ def col_info_attributes(args)
       custom_width = false if width.nil? && hidden == 0
       custom_width = false if width == 8.43
 
-      width = hidden == 0 ? 8.43 : 0 unless width
+      width = hidden == 0 ? @default_col_width : 0 unless width
 
       # Convert column width from user units to character width.
       if width && width < 1
@@ -7492,7 +7560,7 @@ def write_sheet_protection #:nodoc:
     # Write the <drawing> elements.
     #
     def write_drawings #:nodoc:
-      increment_rel_id_and_write_r_id('drawing') if drawing?
+      increment_rel_id_and_write_r_id('drawing') if drawings?
     end
 
     #
@@ -7970,8 +8038,8 @@ def autofilter_ref? #:nodoc:
       !!@autofilter_ref
     end
 
-    def drawing? #:nodoc:
-      !!@drawing
+    def drawings? #:nodoc:
+      !!@drawings
     end
 
     def remove_white_space(margin) #:nodoc: