write_xlsx 1.09.3 → 1.11.2

data/lib/write_xlsx/worksheet.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
+
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/package/button'
 require 'write_xlsx/colors'
@@ -14,6 +15,7 @@ require 'write_xlsx/worksheet/data_validation'
 require 'write_xlsx/worksheet/hyperlink'
 require 'write_xlsx/worksheet/page_setup'
 require 'tempfile'
+require 'date'
 
 module Writexlsx
   class Worksheet
@@ -21,6 +23,7 @@ module Writexlsx
 
     MAX_DIGIT_WIDTH = 7    # For Calabri 11.  # :nodoc:
     PADDING         = 5                       # :nodoc:
+    COLINFO         = Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
 
     attr_reader :index                                            # :nodoc:
     attr_reader :charts, :images, :tables, :shapes, :drawings     # :nodoc:
@@ -29,21 +32,26 @@ module Writexlsx
     attr_reader :vml_data_id                                      # :nodoc:
     attr_reader :vml_header_id                                    # :nodoc:
     attr_reader :autofilter_area                                  # :nodoc:
-    attr_reader :writer, :set_rows, :col_formats                  # :nodoc:
+    attr_reader :writer, :set_rows, :col_info                     # :nodoc:
     attr_reader :vml_shape_id                                     # :nodoc:
     attr_reader :comments, :comments_author                       # :nodoc:
     attr_accessor :data_bars_2010, :dxf_priority                  # :nodoc:
     attr_reader :vba_codename                                     # :nodoc:
-    attr_writer :excel_version
+    attr_writer :excel_version                                    # :nodoc:
+    attr_reader :filter_cells                                     # :nodoc:
+
+    def initialize(workbook, index, name) # :nodoc:
+      rowmax   = 1_048_576
+      colmax   = 16_384
+      strmax   = 32_767
 
-    def initialize(workbook, index, name) #:nodoc:
       @writer = Package::XMLWriterSimple.new
 
       @workbook = workbook
       @index = index
       @name = name
-      @colinfo = {}
-      @cell_data_table = {}
+      @col_info = {}
+      @cell_data_table = []
       @excel_version = 2007
       @palette = workbook.palette
       @default_url_format = workbook.default_url_format
@@ -53,6 +61,10 @@ module Writexlsx
 
       @screen_gridlines     = true
       @show_zeros           = true
+
+      @xls_rowmax           = rowmax
+      @xls_colmax           = colmax
+      @xls_strmax           = strmax
       @dim_rowmin           = nil
       @dim_rowmax           = nil
       @dim_colmin           = nil
@@ -60,6 +72,7 @@ module Writexlsx
       @selections           = []
       @panes                = []
       @hide_row_col_headers = 0
+      @top_left_cell        = ''
 
       @tab_color  = 0
 
@@ -74,11 +87,10 @@ module Writexlsx
       @filter_on    = false
       @filter_range = []
       @filter_cols  = {}
+      @filter_cells = {}
       @filter_type  = {}
 
-      @col_sizes = {}
       @row_sizes = {}
-      @col_formats = {}
 
       @last_shape_id          = 1
       @rel_count              = 0
@@ -87,8 +99,8 @@ module Writexlsx
       @external_drawing_links = []
       @external_comment_links = []
       @external_vml_links     = []
-      @external_table_links   = []
       @external_background_links = []
+      @external_table_links   = []
       @drawing_links          = []
       @vml_drawing_links      = []
       @charts                 = []
@@ -102,6 +114,9 @@ module Writexlsx
       @vml_drawing_rels       = {}
       @vml_drawing_rels_id    = 0
       @has_dynamic_arrays     = false
+
+      @use_future_functions  = false
+
       @header_images          = []
       @footer_images          = []
       @background_image       = ''
@@ -115,6 +130,7 @@ module Writexlsx
       @default_col_width      = 8.43
       @default_col_pixels     = 64
       @default_row_rezoed     = 0
+      @default_date_pixels    = 68
 
       @merge = []
 
@@ -138,19 +154,19 @@ module Writexlsx
         @original_row_height      = 12.75
         @default_row_height       = 12.75
         @default_row_pixels       = 17
-        self::margins_left_right  = 0.75
-        self::margins_top_bottom  = 1
+        self.margins_left_right  = 0.75
+        self.margins_top_bottom  = 1
         @page_setup.margin_header = 0.5
         @page_setup.margin_footer = 0.5
         @page_setup.header_footer_aligns = false
       end
     end
 
-    def set_xml_writer(filename) #:nodoc:
+    def set_xml_writer(filename) # :nodoc:
       @writer.set_xml_writer(filename)
     end
 
-    def assemble_xml_file #:nodoc:
+    def assemble_xml_file # :nodoc:
       write_xml_declaration do
         @writer.tag_elements('worksheet', write_worksheet_attributes) do
           write_sheet_pr
@@ -188,9 +204,7 @@ module Writexlsx
     #
     # The name method is used to retrieve the name of a worksheet.
     #
-    def name
-      @name
-    end
+    attr_reader :name
 
     #
     # Set this worksheet as a selected worksheet, i.e. the worksheet has its tab
@@ -214,15 +228,26 @@ module Writexlsx
     #
     # Hide this worksheet.
     #
-    def hide
-      @hidden = true
+    def hide(hidden = :hidden)
+      @hidden = hidden
       @selected = false
       @workbook.activesheet = 0 if @workbook.activesheet == @index
       @workbook.firstsheet  = 0 if @workbook.firstsheet  == @index
     end
 
+    #
+    # Hide this worksheet. This can only be unhidden from VBA.
+    #
+    def very_hidden
+      hide(:very_hidden)
+    end
+
     def hidden? # :nodoc:
-      @hidden
+      @hidden == :hidden
+    end
+
+    def very_hidden? # :nodoc:
+      @hidden == :very_hidden
     end
 
     #
@@ -244,8 +269,10 @@ module Writexlsx
       @protect = protect_default_settings.merge(options)
 
       # Set the password after the user defined values.
-      @protect[:password] =
-        encode_password(password) if password && password != ''
+      if password && password != ''
+        @protect[:password] =
+          encode_password(password)
+      end
     end
 
     #
@@ -255,8 +282,8 @@ module Writexlsx
       if range.nil?
         raise "The range must be defined in unprotect_range())\n"
       else
-        range.gsub!(/\$/, "")
-        range.sub!(/^=/, "")
+        range = range.gsub("$", "")
+        range = range.sub(/^=/, "")
         @num_protected_ranges += 1
       end
 
@@ -268,23 +295,23 @@ module Writexlsx
 
     def protect_default_settings  # :nodoc:
       {
-        :sheet                 => true,
-        :content               => false,
-        :objects               => false,
-        :scenarios             => false,
-        :format_cells          => false,
-        :format_columns        => false,
-        :format_rows           => false,
-        :insert_columns        => false,
-        :insert_rows           => false,
-        :insert_hyperlinks     => false,
-        :delete_columns        => false,
-        :delete_rows           => false,
-        :select_locked_cells   => true,
-        :sort                  => false,
-        :autofilter            => false,
-        :pivot_tables          => false,
-        :select_unlocked_cells => true
+        sheet:                 true,
+        content:               false,
+        objects:               false,
+        scenarios:             false,
+        format_cells:          false,
+        format_columns:        false,
+        format_rows:           false,
+        insert_columns:        false,
+        insert_rows:           false,
+        insert_hyperlinks:     false,
+        delete_columns:        false,
+        delete_rows:           false,
+        select_locked_cells:   true,
+        sort:                  false,
+        autofilter:            false,
+        pivot_tables:          false,
+        select_unlocked_cells: true
       }
     end
     private :protect_default_settings
@@ -299,8 +326,9 @@ module Writexlsx
     #
     def set_column(*args)
       # Check for a cell reference in A1 notation and substitute row and column
-      if args[0].to_s =~ /^\D/
-        row1, firstcol, row2, lastcol, *data = substitute_cellref(*args)
+      # ruby 3.2 no longer handles =~ for various types
+      if args[0].respond_to?(:=~) && args[0].to_s =~ /^\D/
+        _row1, firstcol, _row2, lastcol, *data = substitute_cellref(*args)
       else
         firstcol, lastcol, *data = args
       end
@@ -315,6 +343,7 @@ module Writexlsx
       firstcol, lastcol = lastcol, firstcol if firstcol > lastcol
 
       width, format, hidden, level, collapsed = data
+      autofit = 0
 
       # Check that cols are valid and store max and min values with default row.
       # NOTE: The check shouldn't modify the row dimensions and should only modify
@@ -332,22 +361,19 @@ module Writexlsx
       level = 0 if level < 0
       level = 7 if level > 7
 
+      # Excel has a maximum column width of 255 characters.
+      width = 255.0 if width && width > 255.0
+
       @outline_col_level = level if level > @outline_col_level
 
       # Store the column data based on the first column. Padded for sorting.
-      @colinfo[sprintf("%05d", firstcol)] = [firstcol, lastcol, width, format, hidden, level, collapsed]
+      (firstcol..lastcol).each do |col|
+        @col_info[col] =
+          COLINFO.new(width, format, hidden, level, collapsed, autofit)
+      end
 
       # Store the column change to allow optimisations.
       @col_size_changed = 1
-
-      # Store the col sizes for use when calculating image vertices taking
-      # hidden columns into account. Also store the column formats.
-      width = @default_col_width unless width
-
-      (firstcol .. lastcol).each do |col|
-        @col_sizes[col]   = [width, hidden]
-        @col_formats[col] = format if format
-      end
     end
 
     #
@@ -376,13 +402,117 @@ module Writexlsx
       hidden    = data[4] || 0
       level     = data[5]
 
-      if ptrue?(pixels)
-        width = pixels_to_width(pixels)
-      end
+      width = pixels_to_width(pixels) if ptrue?(pixels)
 
       set_column(first_col, last_col, width, format, hidden, level)
     end
 
+    #
+    # autofit()
+    #
+    # Simulate autofit based on the data, and datatypes in each column. We do this
+    # by estimating a pixel width for each cell data.
+    #
+    def autofit
+      col_width = {}
+
+      # Iterate through all the data in the worksheet.
+      (@dim_rowmin..@dim_rowmax).each do |row_num|
+        # Skip row if it doesn't contain cell data.
+        next unless @cell_data_table[row_num]
+
+        (@dim_colmin..@dim_colmax).each do |col_num|
+          length = 0
+          case (cell_data = @cell_data_table[row_num][col_num])
+          when StringCellData, RichStringCellData
+            # Handle strings and rich strings.
+            #
+            # For standard shared strings we do a reverse lookup
+            # from the shared string id to the actual string. For
+            # rich strings we use the unformatted string. We also
+            # split multiline strings and handle each part
+            # separately.
+            string = cell_data.raw_string
+
+            if string =~ /\n/
+              # Handle multiline strings.
+              length = max = string.split("\n").collect do |str|
+                xl_string_pixel_width(str)
+              end.max
+            else
+              length = xl_string_pixel_width(string)
+            end
+          when DateTimeCellData
+
+            # Handle dates.
+            #
+            # The following uses the default width for mm/dd/yyyy
+            # dates. It isn't feasible to parse the number format
+            # to get the actual string width for all format types.
+            length = @default_date_pixels
+          when NumberCellData
+
+            # Handle numbers.
+            #
+            # We use a workaround/optimization for numbers since
+            # digits all have a pixel width of 7. This gives a
+            # slightly greater width for the decimal place and
+            # minus sign but only by a few pixels and
+            # over-estimation is okay.
+            length = 7 * cell_data.token.to_s.length
+          when BooleanCellData
+
+            # Handle boolean values.
+            #
+            # Use the Excel standard widths for TRUE and FALSE.
+            if ptrue?(cell_data.token)
+              length = 31
+            else
+              length = 36
+            end
+          when FormulaCellData, FormulaArrayCellData, DynamicFormulaArrayCellData
+            # Handle formulas.
+            #
+            # We only try to autofit a formula if it has a
+            # non-zero value.
+            if ptrue?(cell_data.data)
+              length = xl_string_pixel_width(cell_data.data)
+            end
+          end
+
+          # If the cell is in an autofilter header we add an
+          # additional 16 pixels for the dropdown arrow.
+          if length > 0 &&
+             @filter_cells["#{row_num}:#{col_num}"]
+            length += 16
+          end
+
+          # Add the string lenght to the lookup hash.
+          max                = col_width[col_num] || 0
+          col_width[col_num] = length if length > max
+        end
+      end
+
+      # Apply the width to the column.
+      col_width.each do |col_num, pixel_width|
+        # Convert the string pixel width to a character width using an
+        # additional padding of 7 pixels, like Excel.
+        width = pixels_to_width(pixel_width + 7)
+
+        # The max column character width in Excel is 255.
+        width = 255.0 if width > 255.0
+
+        # Add the width to an existing col info structure or add a new one.
+        if @col_info[col_num]
+          @col_info[col_num].width   = width
+          @col_info[col_num].autofit = 1
+        else
+          @col_info[col_num] =
+            COLINFO.new(width, nil, 0, 0, 0, 1)
+        end
+      end
+    end
+
     #
     # :call-seq:
     #   set_selection(cell_or_cell_range)
@@ -392,7 +522,12 @@ module Writexlsx
     def set_selection(*args)
       return if args.empty?
 
-      row_first, col_first, row_last, col_last = row_col_notation(args)
+      if (row_col_array = row_col_notation(args.first))
+        row_first, col_first, row_last, col_last = row_col_array
+      else
+        row_first, col_first, row_last, col_last = args
+      end
+
       active_cell = xl_rowcol_to_cell(row_first, col_first)
 
       if row_last  # Range selection.
@@ -408,7 +543,24 @@ module Writexlsx
       # Selection isn't set for cell A1.
       return if sqref == 'A1'
 
-      @selections = [ [ nil, active_cell, sqref ] ]
+      @selections = [[nil, active_cell, sqref]]
+    end
+
+    ###############################################################################
+    #
+    # set_top_left_cell()
+    #
+    # Set the first visible cell at the top left of the worksheet.
+    #
+    def set_top_left_cell(row, col = nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+      else
+        _row = row
+        _col = col
+      end
+
+      @top_left_cell = xl_rowcol_to_cell(_row, _col)
     end
 
     #
@@ -424,14 +576,19 @@ module Writexlsx
       return if args.empty?
 
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, top_row, left_col, type = row_col_notation(args)
+      if (row_col_array = row_col_notation(args.first))
+        row, col, top_row, left_col = row_col_array
+        type = args[1]
+      else
+        row, col, top_row, left_col, type = args
+      end
 
       col      ||= 0
       top_row  ||= row
       left_col ||= col
       type     ||= 0
 
-      @panes   = [row, col, top_row, left_col, type ]
+      @panes   = [row, col, top_row, left_col, type]
     end
 
     #
@@ -466,8 +623,17 @@ module Writexlsx
     #
     # This method is used to display the worksheet in "Page View/Layout" mode.
     #
-    def set_page_view(flag = true)
-      @page_view = !!flag
+    def set_page_view(flag = 1)
+      @page_view = flag
+    end
+
+    #
+    # set_pagebreak_view
+    #
+    # Set the page view mode.
+    #
+    def set_pagebreak_view
+      @page_view = 2
     end
 
     #
@@ -492,7 +658,7 @@ module Writexlsx
 
     def set_paper(paper_size)
       put_deprecate_message("#{self}.set_paper")
-      self::paper = paper_size
+      self.paper = paper_size
     end
 
     #
@@ -500,36 +666,29 @@ module Writexlsx
     #
     def set_header(string = '', margin = 0.3, options = {})
       raise 'Header string must be less than 255 characters' if string.length > 255
+
       # Replace the Excel placeholder &[Picture] with the internal &G.
-      @page_setup.header = string.gsub(/&\[Picture\]/, '&G')
+      @page_setup.header = string.gsub("&[Picture]", '&G')
 
-      if options[:align_with_margins]
-        @page_setup.header_footer_aligns = options[:align_with_margins]
-      end
+      @page_setup.header_footer_aligns = options[:align_with_margins] if options[:align_with_margins]
 
-      if options[:scale_with_doc]
-        @page_setup.header_footer_scales = options[:scale_with_doc]
-      end
+      @page_setup.header_footer_scales = options[:scale_with_doc] if options[:scale_with_doc]
 
       # Reset the array in case the function is called more than once.
       @header_images = []
 
       [
-       [:image_left, 'LH'], [:image_center, 'CH'], [:image_right, 'RH']
+        [:image_left, 'LH'], [:image_center, 'CH'], [:image_right, 'RH']
       ].each do |p|
-        if options[p.first]
-          @header_images << [options[p.first], p.last]
-        end
+        @header_images << [options[p.first], p.last] if options[p.first]
       end
 
       # placeholeder /&G/ の数
-      placeholder_count = @page_setup.header.scan(/&G/).count
+      placeholder_count = @page_setup.header.scan("&G").count
 
       image_count = @header_images.count
 
-      if image_count != placeholder_count
-        raise "Number of header image (#{image_count}) doesn't match placeholder count (#{placeholder_count}) in string: #{@page_setup.header}"
-      end
+      raise "Number of header image (#{image_count}) doesn't match placeholder count (#{placeholder_count}) in string: #{@page_setup.header}" if image_count != placeholder_count
 
       @has_header_vml = true if image_count > 0
 
@@ -543,38 +702,30 @@ module Writexlsx
     def set_footer(string = '', margin = 0.3, options = {})
       raise 'Footer string must be less than 255 characters' if string.length > 255
 
-      @page_setup.footer                = string.dup
+      @page_setup.footer = string.dup
 
       # Replace the Excel placeholder &[Picture] with the internal &G.
-      @page_setup.footer = string.gsub(/&\[Picture\]/, '&G')
+      @page_setup.footer = string.gsub("&[Picture]", '&G')
 
-      if options[:align_with_margins]
-        @page_setup.header_footer_aligns = options[:align_with_margins]
-      end
+      @page_setup.header_footer_aligns = options[:align_with_margins] if options[:align_with_margins]
 
-      if options[:scale_with_doc]
-        @page_setup.header_footer_scales = options[:scale_with_doc]
-      end
+      @page_setup.header_footer_scales = options[:scale_with_doc] if options[:scale_with_doc]
 
       # Reset the array in case the function is called more than once.
       @footer_images = []
 
       [
-       [:image_left, 'LF'], [:image_center, 'CF'], [:image_right, 'RF']
+        [:image_left, 'LF'], [:image_center, 'CF'], [:image_right, 'RF']
       ].each do |p|
-        if options[p.first]
-          @footer_images << [options[p.first], p.last]
-        end
+        @footer_images << [options[p.first], p.last] if options[p.first]
       end
 
       # placeholeder /&G/ の数
-      placeholder_count = @page_setup.footer.scan(/&G/).count
+      placeholder_count = @page_setup.footer.scan("&G").count
 
       image_count = @footer_images.count
 
-      if image_count != placeholder_count
-        raise "Number of footer image (#{image_count}) doesn't match placeholder count (#{placeholder_count}) in string: #{@page_setup.footer}"
-      end
+      raise "Number of footer image (#{image_count}) doesn't match placeholder count (#{placeholder_count}) in string: #{@page_setup.footer}" if image_count != placeholder_count
 
       @has_header_vml = true if image_count > 0
 
@@ -600,10 +751,10 @@ module Writexlsx
     # Set all the page margins to the same value in inches.
     #
     def margins=(margin)
-      self::margin_left   = margin
-      self::margin_right  = margin
-      self::margin_top    = margin
-      self::margin_bottom = margin
+      self.margin_left   = margin
+      self.margin_right  = margin
+      self.margin_top    = margin
+      self.margin_bottom = margin
     end
 
     #
@@ -611,8 +762,8 @@ module Writexlsx
     # See set_margins
     #
     def margins_left_right=(margin)
-      self::margin_left  = margin
-      self::margin_right = margin
+      self.margin_left  = margin
+      self.margin_right = margin
     end
 
     #
@@ -620,8 +771,8 @@ module Writexlsx
     # See set_margins
     #
     def margins_top_bottom=(margin)
-      self::margin_top    = margin
-      self::margin_bottom = margin
+      self.margin_top    = margin
+      self.margin_bottom = margin
     end
 
     #
@@ -661,7 +812,7 @@ module Writexlsx
     #
     def set_margins(margin)
       put_deprecate_message("#{self}.set_margins")
-      self::margins = margin
+      self.margins = margin
     end
 
     #
@@ -670,7 +821,7 @@ module Writexlsx
     #
     def set_margins_LR(margin)
       put_deprecate_message("#{self}.set_margins_LR")
-      self::margins_left_right = margin
+      self.margins_left_right = margin
     end
 
     #
@@ -679,7 +830,7 @@ module Writexlsx
     #
     def set_margins_TB(margin)
       put_deprecate_message("#{self}.set_margins_TB")
-      self::margins_top_bottom = margin
+      self.margins_top_bottom = margin
     end
 
     #
@@ -688,7 +839,7 @@ module Writexlsx
     #
     def set_margin_left(margin = 0.7)
       put_deprecate_message("#{self}.set_margin_left")
-      self::margin_left = margin
+      self.margin_left = margin
     end
 
     #
@@ -697,7 +848,7 @@ module Writexlsx
     #
     def set_margin_right(margin = 0.7)
       put_deprecate_message("#{self}.set_margin_right")
-      self::margin_right = margin
+      self.margin_right = margin
     end
 
     #
@@ -706,7 +857,7 @@ module Writexlsx
     #
     def set_margin_top(margin = 0.75)
       put_deprecate_message("#{self}.set_margin_top")
-      self::margin_top = margin
+      self.margin_top = margin
     end
 
     #
@@ -715,7 +866,7 @@ module Writexlsx
     #
     def set_margin_bottom(margin = 0.75)
       put_deprecate_message("#{self}.set_margin_bottom")
-      self::margin_bottom = margin
+      self.margin_bottom = margin
     end
 
     #
@@ -747,7 +898,7 @@ module Writexlsx
     #
     def repeat_columns(*args)
       if args[0] =~ /^\D/
-        dummy, first_col, dummy, last_col = substitute_cellref(*args)
+        _dummy, first_col, _dummy, last_col = substitute_cellref(*args)
       else
         first_col, last_col = args
       end
@@ -771,13 +922,17 @@ module Writexlsx
     #
     def print_area(*args)
       return @page_setup.print_area.dup if args.empty?
-      row1, col1, row2, col2 = row_col_notation(args)
+
+      if (row_col_array = row_col_notation(args.first))
+        row1, col1, row2, col2 = row_col_array
+      else
+        row1, col1, row2, col2 = args
+      end
+
       return if [row1, col1, row2, col2].include?(nil)
 
       # Ignore max print area since this is the same as no print area for Excel.
-      if row1 == 0 && col1 == 0 && row2 == ROW_MAX - 1 && col2 == COL_MAX - 1
-        return
-      end
+      return if row1 == 0 && col1 == 0 && row2 == ROW_MAX - 1 && col2 == COL_MAX - 1
 
       # Build up the print area range "=Sheet2!R1C1:R2C1"
       @page_setup.print_area = convert_name_area(row1, col1, row2, col2)
@@ -788,12 +943,12 @@ module Writexlsx
     #
     def zoom=(scale)
       # Confine the scale to Excel's range
-      if scale < 10 or scale > 400
-        # carp "Zoom factor scale outside range: 10 <= zoom <= 400"
-        @zoom = 100
-      else
-        @zoom = scale.to_i
-      end
+      @zoom = if scale < 10 or scale > 400
+                # carp "Zoom factor scale outside range: 10 <= zoom <= 400"
+                100
+              else
+                scale.to_i
+              end
     end
 
     # This method is deprecated. use zoom=().
@@ -823,23 +978,24 @@ module Writexlsx
     #
     def set_print_scale(scale = 100)
       put_deprecate_message("#{self}.set_print_scale")
-      self::print_scale = (scale)
+      self.print_scale = (scale)
     end
 
-     #
-     # Set the option to print the worksheet in black and white.
-     #
-     def print_black_and_white
-       @page_setup.black_white = true
+    #
+    # Set the option to print the worksheet in black and white.
+    #
+    def print_black_and_white
+      @page_setup.black_white        = true
+      @page_setup.page_setup_changed = true
     end
 
-     #
-     # Causes the write() method to treat integers with a leading zero as a string.
-     # This ensures that any leading zeros such, as in zip codes, are maintained.
-     #
-     def keep_leading_zeros(flag = true)
-       @leading_zeros = !!flag
-     end
+    #
+    # Causes the write() method to treat integers with a leading zero as a string.
+    # This ensures that any leading zeros such, as in zip codes, are maintained.
+    #
+    def keep_leading_zeros(flag = true)
+      @leading_zeros = !!flag
+    end
 
     #
     # Display the worksheet right to left for some eastern versions of Excel.
@@ -852,7 +1008,7 @@ module Writexlsx
     # Hide cell zero values.
     #
     def hide_zero(flag = true)
-        @show_zeros = !flag
+      @show_zeros = !flag
     end
 
     #
@@ -877,7 +1033,7 @@ module Writexlsx
 
     def set_start_page(page_start)
       put_deprecate_message("#{self}.set_start_page")
-      self::start_page = page_start
+      self.start_page = page_start
     end
 
     #
@@ -889,88 +1045,126 @@ module Writexlsx
     # data the {#write()}[#method-i-write] method acts as a general alias for several more
     # specific methods:
     #
-    def write(*args)
+    def write(row, col, token = nil, format = nil, value1 = nil, value2 = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row_col_args = row_col_notation(args)
-      token = row_col_args[2] || ''
-
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _token     = col
+        _format    = token
+        _value1    = format
+        _value2    = value1
+      else
+        _row = row
+        _col = col
+        _token = token
+        _format = format
+        _value1 = value1
+        _value2 = value2
+      end
+      _token ||= ''
+      _token = _token.to_s if token.instance_of?(Time) || token.instance_of?(Date)
+
+      if _format.respond_to?(:force_text_format?) && _format.force_text_format?
+        write_string(_row, _col, _token, _format) # Force text format
       # Match an array ref.
-      if token.respond_to?(:to_ary)
-        write_row(*args)
-      elsif token.respond_to?(:coerce)  # Numeric
-        write_number(*args)
-      # Match integer with leading zero(s)
-      elsif @leading_zeros && token =~ /^0\d*$/
-        write_string(*args)
-      elsif token =~ /\A([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?\Z/
-        write_number(*args)
-      # Match formula
-      elsif token =~ /^=/
-        write_formula(*args)
-      # Match array formula
-      elsif token =~ /^\{=.*\}$/
-        write_formula(*args)
-      # Match blank
-      elsif token == ''
-        row_col_args.delete_at(2)     # remove the empty string from the parameter list
-        write_blank(*row_col_args)
-      elsif @workbook.strings_to_urls
-        # Match http, https or ftp URL
-        if token =~ %r|\A[fh]tt?ps?://|
-          write_url(*args)
-        # Match mailto:
-        elsif token =~ %r|\Amailto:|
-          write_url(*args)
-        # Match internal or external sheet link
-        elsif token =~ %r!\A(?:in|ex)ternal:!
-          write_url(*args)
+      elsif _token.respond_to?(:to_ary)
+        write_row(_row, _col, _token, _format, _value1, _value2)
+      elsif _token.respond_to?(:coerce)  # Numeric
+        write_number(_row, _col, _token, _format)
+      elsif _token.respond_to?(:=~)  # String
+        # Match integer with leading zero(s)
+        if @leading_zeros && _token =~ /^0\d*$/
+          write_string(_row, _col, _token, _format)
+        elsif _token =~ /\A([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?\Z/
+          write_number(_row, _col, _token, _format)
+        # Match formula
+        elsif _token =~ /^=/
+          write_formula(_row, _col, _token, _format, _value1)
+        # Match array formula
+        elsif _token =~ /^\{=.*\}$/
+          write_formula(_row, _col, _token, _format, _value1)
+        # Match blank
+        elsif _token == ''
+          #        row_col_args.delete_at(2)     # remove the empty string from the parameter list
+          write_blank(_row, _col, _format)
+        elsif @workbook.strings_to_urls
+          # Match http, https or ftp URL
+          if _token =~ %r{\A[fh]tt?ps?://}
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          # Match mailto:
+          elsif _token =~ /\Amailto:/
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          # Match internal or external sheet link
+          elsif _token =~ /\A(?:in|ex)ternal:/
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          else
+            write_string(_row, _col, _token, _format)
+          end
         else
-          write_string(*args)
+          write_string(_row, _col, _token, _format)
         end
       else
-        write_string(*args)
+        write_string(_row, _col, _token, _format)
       end
     end
 
     #
     # :call-seq:
-    #   write_row(row, col, array [ , format ] )
+    #   write_row(row, col, array [ , format ])
     #
     # Write a row of data starting from (row, col). Call write_col() if any of
     # the elements of the array are in turn array. This allows the writing
     # of 1D or 2D arrays of data in one go.
     #
-    def write_row(*args)
+    def write_row(row, col, tokens = nil, *options)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, tokens, *options = row_col_notation(args)
-      raise "Not an array ref in call to write_row()$!" unless tokens.respond_to?(:to_ary)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _tokens    = col
+        _options   = [tokens] + options
+      else
+        _row = row
+        _col = col
+        _tokens = tokens
+        _options = options
+      end
+      raise "Not an array ref in call to write_row()$!" unless _tokens.respond_to?(:to_ary)
 
-      tokens.each do |token|
+      _tokens.each do |_token|
         # Check for nested arrays
-        if token.respond_to?(:to_ary)
-          write_col(row, col, token, *options)
+        if _token.respond_to?(:to_ary)
+          write_col(_row, _col, _token, *_options)
         else
-          write(row, col, token, *options)
+          write(_row, _col, _token, *_options)
         end
-        col += 1
+        _col += 1
       end
     end
 
     #
     # :call-seq:
-    #   write_col(row, col, array [ , format ] )
+    #   write_col(row, col, array [ , format ])
     #
     # Write a column of data starting from (row, col). Call write_row() if any of
     # the elements of the array are in turn array. This allows the writing
     # of 1D or 2D arrays of data in one go.
     #
-    def write_col(*args)
-      row, col, tokens, *options = row_col_notation(args)
+    def write_col(row, col, tokens = nil, *options)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _tokens    = col
+        _options   = [tokens] + options if options
+      else
+        _row = row
+        _col = col
+        _tokens = tokens
+        _options = options
+      end
 
-      tokens.each do |token|
+      _tokens.each do |_token|
         # write() will deal with any nested arrays
-        write(row, col, token, *options)
-        row += 1
+        write(_row, _col, _token, *_options)
+        _row += 1
       end
     end
 
@@ -980,87 +1174,124 @@ module Writexlsx
     #
     # Write a comment to the specified row and column (zero indexed).
     #
-    def write_comment(*args)
+    def write_comment(row, col, string = nil, options = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, string, options = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, string].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _string    = col
+        _options   = string
+      else
+        _row = row
+        _col = col
+        _string = string
+        _options = options
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _string].include?(nil)
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
       @has_vml = true
 
       # Process the properties of the cell comment.
-      @comments.add(@workbook, self, row, col, string, options)
+      @comments.add(@workbook, self, _row, _col, _string, _options)
     end
 
     #
     # :call-seq:
-    #   write_number(row, column, number [ , format ] )
+    #   write_number(row, column, number [ , format ])
     #
     # Write an integer or a float to the cell specified by row and column:
     #
-    def write_number(*args)
+    def write_number(row, col, number, format = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, num, xf = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil? || num.nil?
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _number = col
+        _format = number
+      else
+        _row = row
+        _col = col
+        _number = number
+        _format = format
+      end
+      raise WriteXLSXInsufficientArgumentError if _row.nil? || _col.nil? || _number.nil?
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      store_data_to_table(NumberCellData.new(self, row, col, num, xf))
+      store_data_to_table(NumberCellData.new(_number, _format), _row, _col)
     end
 
     #
     # :call-seq:
-    #   write_string(row, column, string [, format ] )
+    #   write_string(row, column, string [, format ])
     #
     # Write a string to the specified row and column (zero indexed).
     # +format+ is optional.
     #
-    def write_string(*args)
+    def write_string(row, col, string = nil, format = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, str, xf = row_col_notation(args)
-      str &&= str.to_s
-      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil? || str.nil?
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _string = col
+        _format = string
+      else
+        _row = row
+        _col = col
+        _string = string
+        _format = format
+      end
+      _string &&= _string.to_s
+      raise WriteXLSXInsufficientArgumentError if _row.nil? || _col.nil? || _string.nil?
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      index = shared_string_index(str.length > STR_MAX ? str[0, STR_MAX] : str)
+      index = shared_string_index(_string.length > STR_MAX ? _string[0, STR_MAX] : _string)
 
-      store_data_to_table(StringCellData.new(self, row, col, index, xf))
+      store_data_to_table(StringCellData.new(index, _format, _string), _row, _col)
     end
 
     #
     # :call-seq:
-    #    write_rich_string(row, column, (string | format, string)+,  [,cell_format] )
+    #    write_rich_string(row, column, (string | format, string)+,  [,cell_format])
     #
     # The write_rich_string() method is used to write strings with multiple formats.
     # The method receives string fragments prefixed by format objects. The final
     # format object is used as the cell format.
     #
-    def write_rich_string(*args)
+    def write_rich_string(row, col, *rich_strings)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, *rich_strings = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, rich_strings[0]].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col    = row_col_array
+        _rich_strings = [col] + rich_strings
+      else
+        _row = row
+        _col = col
+        _rich_strings = rich_strings
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _rich_strings[0]].include?(nil)
 
-      xf = cell_format_of_rich_string(rich_strings)
+      _xf = cell_format_of_rich_string(_rich_strings)
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      fragments, length = rich_strings_fragments(rich_strings)
+      _fragments, _raw_string = rich_strings_fragments(_rich_strings)
       # can't allow 2 formats in a row
-      return -4 unless fragments
+      return -4 unless _fragments
 
-      index = shared_string_index(xml_str_of_rich_string(fragments))
+      # Check that the string si < 32767 chars.
+      return 3 if _raw_string.size > @xls_strmax
 
-      store_data_to_table(StringCellData.new(self, row, col, index, xf))
+      index = shared_string_index(xml_str_of_rich_string(_fragments))
+
+      store_data_to_table(RichStringCellData.new(index, _xf, _raw_string), _row, _col)
     end
 
     #
@@ -1071,40 +1302,256 @@ module Writexlsx
     # A blank cell is used to specify formatting without adding a string
     # or a number.
     #
-    def write_blank(*args)
+    def write_blank(row, col, format = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, xf = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _format = col
+      else
+        _row = row
+        _col = col
+        _format = format
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col].include?(nil)
 
       # Don't write a blank cell unless it has a format
-      return unless xf
+      return unless _format
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
+
+      store_data_to_table(BlankCellData.new(_format), _row, _col)
+    end
 
-      store_data_to_table(BlankCellData.new(self, row, col, xf))
+    def expand_formula(formula, function, addition = '')
+      if formula =~ /\b(#{function})/
+        formula.gsub(
+          ::Regexp.last_match(1),
+          "_xlfn#{addition}.#{::Regexp.last_match(1)}"
+        )
+      else
+        formula
+      end
+    end
+    private :expand_formula
+
+    #
+    # Utility method to strip equal sign and array braces from a formula
+    # and also expand out future and dynamic array formulas.
+    #
+    def prepare_formula(given_formula, expand_future_functions = nil)
+      # Ignore empty/null formulas.
+      return given_formula unless ptrue?(given_formula)
+
+      # Remove array formula braces and the leading =.
+      formula = given_formula.sub(/^\{(.*)\}$/, '\1').sub(/^=/, '')
+
+      # # Don't expand formulas that the user has already expanded.
+      return formula if formula =~ /_xlfn\./
+
+      # Expand dynamic array formulas.
+      formula = expand_formula(formula, 'ANCHORARRAY\(')
+      formula = expand_formula(formula, 'BYCOL\(')
+      formula = expand_formula(formula, 'BYROW\(')
+      formula = expand_formula(formula, 'CHOOSECOLS\(')
+      formula = expand_formula(formula, 'CHOOSEROWS\(')
+      formula = expand_formula(formula, 'DROP\(')
+      formula = expand_formula(formula, 'EXPAND\(')
+      formula = expand_formula(formula, 'FILTER\(', '._xlws')
+      formula = expand_formula(formula, 'HSTACK\(')
+      formula = expand_formula(formula, 'LAMBDA\(')
+      formula = expand_formula(formula, 'MAKEARRAY\(')
+      formula = expand_formula(formula, 'MAP\(')
+      formula = expand_formula(formula, 'RANDARRAY\(')
+      formula = expand_formula(formula, 'REDUCE\(')
+      formula = expand_formula(formula, 'SCAN\(')
+      formula = expand_formula(formula, 'SEQUENCE\(')
+      formula = expand_formula(formula, 'SINGLE\(')
+      formula = expand_formula(formula, 'SORT\(', '._xlws')
+      formula = expand_formula(formula, 'SORTBY\(')
+      formula = expand_formula(formula, 'SWITCH\(')
+      formula = expand_formula(formula, 'TAKE\(')
+      formula = expand_formula(formula, 'TEXTSPLIT\(')
+      formula = expand_formula(formula, 'TOCOL\(')
+      formula = expand_formula(formula, 'TOROW\(')
+      formula = expand_formula(formula, 'UNIQUE\(')
+      formula = expand_formula(formula, 'VSTACK\(')
+      formula = expand_formula(formula, 'WRAPCOLS\(')
+      formula = expand_formula(formula, 'WRAPROWS\(')
+      formula = expand_formula(formula, 'XLOOKUP\(')
+
+      if !@use_future_functions && !ptrue?(expand_future_functions)
+        return formula
+      end
+
+      # Future functions.
+      formula = expand_formula(formula, 'ACOTH\(')
+      formula = expand_formula(formula, 'ACOT\(')
+      formula = expand_formula(formula, 'AGGREGATE\(')
+      formula = expand_formula(formula, 'ARABIC\(')
+      formula = expand_formula(formula, 'ARRAYTOTEXT\(')
+      formula = expand_formula(formula, 'BASE\(')
+      formula = expand_formula(formula, 'BETA.DIST\(')
+      formula = expand_formula(formula, 'BETA.INV\(')
+      formula = expand_formula(formula, 'BINOM.DIST.RANGE\(')
+      formula = expand_formula(formula, 'BINOM.DIST\(')
+      formula = expand_formula(formula, 'BINOM.INV\(')
+      formula = expand_formula(formula, 'BITAND\(')
+      formula = expand_formula(formula, 'BITLSHIFT\(')
+      formula = expand_formula(formula, 'BITOR\(')
+      formula = expand_formula(formula, 'BITRSHIFT\(')
+      formula = expand_formula(formula, 'BITXOR\(')
+      formula = expand_formula(formula, 'CEILING.MATH\(')
+      formula = expand_formula(formula, 'CEILING.PRECISE\(')
+      formula = expand_formula(formula, 'CHISQ.DIST.RT\(')
+      formula = expand_formula(formula, 'CHISQ.DIST\(')
+      formula = expand_formula(formula, 'CHISQ.INV.RT\(')
+      formula = expand_formula(formula, 'CHISQ.INV\(')
+      formula = expand_formula(formula, 'CHISQ.TEST\(')
+      formula = expand_formula(formula, 'COMBINA\(')
+      formula = expand_formula(formula, 'CONCAT\(')
+      formula = expand_formula(formula, 'CONFIDENCE.NORM\(')
+      formula = expand_formula(formula, 'CONFIDENCE.T\(')
+      formula = expand_formula(formula, 'COTH\(')
+      formula = expand_formula(formula, 'COT\(')
+      formula = expand_formula(formula, 'COVARIANCE.P\(')
+      formula = expand_formula(formula, 'COVARIANCE.S\(')
+      formula = expand_formula(formula, 'CSCH\(')
+      formula = expand_formula(formula, 'CSC\(')
+      formula = expand_formula(formula, 'DAYS\(')
+      formula = expand_formula(formula, 'DECIMAL\(')
+      formula = expand_formula(formula, 'ERF.PRECISE\(')
+      formula = expand_formula(formula, 'ERFC.PRECISE\(')
+      formula = expand_formula(formula, 'EXPON.DIST\(')
+      formula = expand_formula(formula, 'F.DIST.RT\(')
+      formula = expand_formula(formula, 'F.DIST\(')
+      formula = expand_formula(formula, 'F.INV.RT\(')
+      formula = expand_formula(formula, 'F.INV\(')
+      formula = expand_formula(formula, 'F.TEST\(')
+      formula = expand_formula(formula, 'FILTERXML\(')
+      formula = expand_formula(formula, 'FLOOR.MATH\(')
+      formula = expand_formula(formula, 'FLOOR.PRECISE\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.CONFINT\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.SEASONALITY\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.STAT\(')
+      formula = expand_formula(formula, 'FORECAST.ETS\(')
+      formula = expand_formula(formula, 'FORECAST.LINEAR\(')
+      formula = expand_formula(formula, 'FORMULATEXT\(')
+      formula = expand_formula(formula, 'GAMMA.DIST\(')
+      formula = expand_formula(formula, 'GAMMA.INV\(')
+      formula = expand_formula(formula, 'GAMMALN.PRECISE\(')
+      formula = expand_formula(formula, 'GAMMA\(')
+      formula = expand_formula(formula, 'GAUSS\(')
+      formula = expand_formula(formula, 'HYPGEOM.DIST\(')
+      formula = expand_formula(formula, 'IFNA\(')
+      formula = expand_formula(formula, 'IFS\(')
+      formula = expand_formula(formula, 'IMCOSH\(')
+      formula = expand_formula(formula, 'IMCOT\(')
+      formula = expand_formula(formula, 'IMCSCH\(')
+      formula = expand_formula(formula, 'IMCSC\(')
+      formula = expand_formula(formula, 'IMSECH\(')
+      formula = expand_formula(formula, 'IMSEC\(')
+      formula = expand_formula(formula, 'IMSINH\(')
+      formula = expand_formula(formula, 'IMTAN\(')
+      formula = expand_formula(formula, 'ISFORMULA\(')
+      formula = expand_formula(formula, 'ISOMITTED\(')
+      formula = expand_formula(formula, 'ISOWEEKNUM\(')
+      formula = expand_formula(formula, 'LET\(')
+      formula = expand_formula(formula, 'LOGNORM.DIST\(')
+      formula = expand_formula(formula, 'LOGNORM.INV\(')
+      formula = expand_formula(formula, 'MAXIFS\(')
+      formula = expand_formula(formula, 'MINIFS\(')
+      formula = expand_formula(formula, 'MODE.MULT\(')
+      formula = expand_formula(formula, 'MODE.SNGL\(')
+      formula = expand_formula(formula, 'MUNIT\(')
+      formula = expand_formula(formula, 'NEGBINOM.DIST\(')
+      formula = expand_formula(formula, 'NORM.DIST\(')
+      formula = expand_formula(formula, 'NORM.INV\(')
+      formula = expand_formula(formula, 'NORM.S.DIST\(')
+      formula = expand_formula(formula, 'NORM.S.INV\(')
+      formula = expand_formula(formula, 'NUMBERVALUE\(')
+      formula = expand_formula(formula, 'PDURATION\(')
+      formula = expand_formula(formula, 'PERCENTILE.EXC\(')
+      formula = expand_formula(formula, 'PERCENTILE.INC\(')
+      formula = expand_formula(formula, 'PERCENTRANK.EXC\(')
+      formula = expand_formula(formula, 'PERCENTRANK.INC\(')
+      formula = expand_formula(formula, 'PERMUTATIONA\(')
+      formula = expand_formula(formula, 'PHI\(')
+      formula = expand_formula(formula, 'POISSON.DIST\(')
+      formula = expand_formula(formula, 'QUARTILE.EXC\(')
+      formula = expand_formula(formula, 'QUARTILE.INC\(')
+      formula = expand_formula(formula, 'QUERYSTRING\(')
+      formula = expand_formula(formula, 'RANK.AVG\(')
+      formula = expand_formula(formula, 'RANK.EQ\(')
+      formula = expand_formula(formula, 'RRI\(')
+      formula = expand_formula(formula, 'SECH\(')
+      formula = expand_formula(formula, 'SEC\(')
+      formula = expand_formula(formula, 'SHEETS\(')
+      formula = expand_formula(formula, 'SHEET\(')
+      formula = expand_formula(formula, 'SKEW.P\(')
+      formula = expand_formula(formula, 'STDEV.P\(')
+      formula = expand_formula(formula, 'STDEV.S\(')
+      formula = expand_formula(formula, 'T.DIST.2T\(')
+      formula = expand_formula(formula, 'T.DIST.RT\(')
+      formula = expand_formula(formula, 'T.DIST\(')
+      formula = expand_formula(formula, 'T.INV.2T\(')
+      formula = expand_formula(formula, 'T.INV\(')
+      formula = expand_formula(formula, 'T.TEST\(')
+      formula = expand_formula(formula, 'TEXTAFTER\(')
+      formula = expand_formula(formula, 'TEXTBEFORE\(')
+      formula = expand_formula(formula, 'TEXTJOIN\(')
+      formula = expand_formula(formula, 'UNICHAR\(')
+      formula = expand_formula(formula, 'UNICODE\(')
+      formula = expand_formula(formula, 'VALUETOTEXT\(')
+      formula = expand_formula(formula, 'VAR.P\(')
+      formula = expand_formula(formula, 'VAR.S\(')
+      formula = expand_formula(formula, 'WEBSERVICE\(')
+      formula = expand_formula(formula, 'WEIBULL.DIST\(')
+      formula = expand_formula(formula, 'XMATCH\(')
+      formula = expand_formula(formula, 'XOR\(')
+      expand_formula(formula, 'Z.TEST\(')
     end
 
     #
     # :call-seq:
-    #   write_formula(row, column, formula [ , format [ , value ] ] )
+    #   write_formula(row, column, formula [ , format [ , value ] ])
     #
     # Write a formula or function to the cell specified by +row+ and +column+:
     #
-    def write_formula(*args)
+    def write_formula(row, col, formula = nil, format = nil, value = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, formula, format, value = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, formula].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _formula   = col
+        _format    = formula
+        _value     = format
+      else
+        _row = row
+        _col = col
+        _formula = formula
+        _format = format
+        _value = value
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _formula].include?(nil)
 
-      if formula =~ /^\{=.*\}$/
-        write_array_formula(row, col, row, col, formula, format, value)
+      # Check for dynamic array functions.
+      regex = /\bLET\(|\bSORT\(|\bLAMBDA\(|\bSINGLE\(|\bSORTBY\(|\bUNIQUE\(|\bXMATCH\(|\bFILTER\(|\bXLOOKUP\(|\bSEQUENCE\(|\bRANDARRAY\(|\bANCHORARRAY\(/
+      if _formula =~ regex
+        return write_dynamic_array_formula(
+          _row, _col, _row, _col, _formula, _format, _value
+        )
+      end
+
+      # Hand off array formulas.
+      if _formula =~ /^\{=.*\}$/
+        write_array_formula(_row, _col, _row, _col, _formula, _format, _value)
       else
-        check_dimensions(row, col)
-        store_row_col_max_min_values(row, col)
-        formula = formula.sub(/^=/, '')
+        check_dimensions(_row, _col)
+        store_row_col_max_min_values(_row, _col)
+        _formula = _formula.sub(/^=/, '')
 
-        store_data_to_table(FormulaCellData.new(self, row, col, formula, format, value))
+        store_data_to_table(FormulaCellData.new(_formula, _format, _value), _row, _col)
       end
     end
 
@@ -1114,7 +1561,20 @@ module Writexlsx
     #
     def write_array_formula_base(type, *args)
       # Check for a cell reference in A1 notation and substitute row and column
-      row1, col1, row2, col2, formula, xf, value = row_col_notation(args)
+      # Convert single cell to range
+      if args.first.to_s =~ /^([A-Za-z]+[0-9]+)$/
+        range = "#{::Regexp.last_match(1)}:#{::Regexp.last_match(1)}"
+        params = [range] + args[1..-1]
+      else
+        params = args
+      end
+
+      if (row_col_array = row_col_notation(params.first))
+        row1, col1, row2, col2 = row_col_array
+        formula, xf, value = params[1..-1]
+      else
+        row1, col1, row2, col2, formula, xf, value = params
+      end
       raise WriteXLSXInsufficientArgumentError if [row1, col1, row2, col2, formula].include?(nil)
 
       # Swap last row/col with first row/col as necessary
@@ -1128,29 +1588,31 @@ module Writexlsx
       store_row_col_max_min_values(row2, col2)
 
       # Define array range
-      if row1 == row2 && col1 == col2
-        range = xl_rowcol_to_cell(row1, col1)
-      else
-        range ="#{xl_rowcol_to_cell(row1, col1)}:#{xl_rowcol_to_cell(row2, col2)}"
-      end
+      range = if row1 == row2 && col1 == col2
+                xl_rowcol_to_cell(row1, col1)
+              else
+                "#{xl_rowcol_to_cell(row1, col1)}:#{xl_rowcol_to_cell(row2, col2)}"
+              end
 
-      # Remove array formula braces and the leading =.
-      formula = formula.sub(/^\{(.*)\}$/, '\1').sub(/^=/, '')
+      # Modify the formula string, as needed.
+      formula = prepare_formula(formula, 1)
 
       store_data_to_table(
         if type == 'a'
-          FormulaArrayCellData.new(self, row1, col1, formula, xf, range, value)
+          FormulaArrayCellData.new(formula, xf, range, value)
         elsif type == 'd'
-          DynamicFormulaArrayCellData.new(self, row1, col1, formula, xf, range, value)
+          DynamicFormulaArrayCellData.new(formula, xf, range, value)
         else
           raise "invalid type in write_array_formula_base()."
-        end
+        end,
+        row1, col1
       )
 
       # Pad out the rest of the area with formatted zeroes.
       (row1..row2).each do |row|
         (col1..col2).each do |col|
           next if row == row1 && col == col1
+
           write_number(row, col, 0, xf)
         end
       end
@@ -1161,8 +1623,8 @@ module Writexlsx
     #
     # Write an array formula to the specified row and column (zero indexed).
     #
-    def write_array_formula(*args)
-      write_array_formula_base('a', *args)
+    def write_array_formula(row1, col1, row2 = nil, col2 = nil, formula = nil, format = nil, value = nil)
+      write_array_formula_base('a', row1, col1, row2, col2, formula, format, value)
     end
 
     #
@@ -1170,8 +1632,8 @@ module Writexlsx
     #
     # Write a dynamic formula to the specified row and column (zero indexed).
     #
-    def write_dynamic_array_formula(*args)
-      write_array_formula_base('d', *args)
+    def write_dynamic_array_formula(row1, col1, row2 = nil, col2 = nil, formula = nil, format = nil, value = nil)
+      write_array_formula_base('d', row1, col1, row2, col2, formula, format, value)
       @has_dynamic_arrays = true
     end
 
@@ -1180,19 +1642,27 @@ module Writexlsx
     #
     # Write a boolean value to the specified row and column (zero indexed).
     #
-    def write_boolean(*args)
-      row, col, val, xf = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil?
+    def write_boolean(row, col, val = nil, format = nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _val       = col
+        _format    = val
+      else
+        _row = row
+        _col = col
+        _val = val
+        _format = format
+      end
+      raise WriteXLSXInsufficientArgumentError if _row.nil? || _col.nil?
 
-      val = val ? 1 : 0  # Boolean value.
+      _val = _val ? 1 : 0  # Boolean value.
       # xf : cell format.
-      type = 'l'                 # The data type
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      store_data_to_table(BooleanCellData.new(self, row, col, val, xf))
+      store_data_to_table(BooleanCellData.new(_val, _format), _row, _col)
     end
 
     #
@@ -1201,40 +1671,47 @@ module Writexlsx
     #
     # Update formatting of the cell to the specified row and column (zero indexed).
     #
-    def update_format_with_params(*args)
-      row, col, params = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil? || params.nil?
+    def update_format_with_params(row, col, params = nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _params = args[1]
+      else
+        _row = row
+        _col = col
+        _params = params
+      end
+      raise WriteXLSXInsufficientArgumentError if _row.nil? || _col.nil? || _params.nil?
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
       format = nil
       cell_data = nil
-      if @cell_data_table[row].nil? || @cell_data_table[row][col].nil?
-        format = @workbook.add_format(params)
-        write_blank(row, col, format)
+      if @cell_data_table[_row].nil? || @cell_data_table[_row][_col].nil?
+        format = @workbook.add_format(_params)
+        write_blank(_row, _col, format)
       else
-        if @cell_data_table[row][col].xf.nil?
-          format = @workbook.add_format(params)
-          cell_data = @cell_data_table[row][col]
+        if @cell_data_table[_row][_col].xf.nil?
+          format = @workbook.add_format(_params)
+          cell_data = @cell_data_table[_row][_col]
         else
           format = @workbook.add_format
-          cell_data = @cell_data_table[row][col]
+          cell_data = @cell_data_table[_row][_col]
           format.copy(cell_data.xf)
-          format.set_format_properties(params)
+          format.set_format_properties(_params)
         end
         # keep original value of cell
-        if cell_data.is_a? FormulaCellData
-          value = "=#{cell_data.token}"
-        elsif cell_data.is_a? FormulaArrayCellData
-          value = "{=#{cell_data.token}}"
-        elsif cell_data.is_a? StringCellData
-          value = @workbook.shared_strings.string(cell_data.data[:sst_id])
-        else
-          value = cell_data.data
-        end
-        write(row, col, value, format)
+        value = if cell_data.is_a? FormulaCellData
+                  "=#{cell_data.token}"
+                elsif cell_data.is_a? FormulaArrayCellData
+                  "{=#{cell_data.token}}"
+                elsif cell_data.is_a? StringCellData
+                  @workbook.shared_strings.string(cell_data.data[:sst_id])
+                else
+                  cell_data.data
+                end
+        write(_row, _col, value, format)
       end
     end
 
@@ -1244,22 +1721,31 @@ module Writexlsx
     #
     # Update formatting of cells in range to the specified row and column (zero indexed).
     #
-    def update_range_format_with_params(*args)
-      row_first, col_first, row_last, col_last, params = row_col_notation(args)
+    def update_range_format_with_params(row_first, col_first, row_last = nil, col_last = nil, params = nil)
+      if (row_col_array = row_col_notation(row_first))
+        _row_first, _col_first, _row_last, _col_last = row_col_array
+        params = args[1..-1]
+      else
+        _row_first = row_first
+        _col_first = col_first
+        _row_last  = row_last
+        _col_last  = col_last
+        _params    = params
+      end
 
-      raise WriteXLSXInsufficientArgumentError if [row_first, col_first, row_last, col_last, params].include?(nil)
+      raise WriteXLSXInsufficientArgumentError if [_row_first, _col_first, _row_last, _col_last, _params].include?(nil)
 
       # Swap last row/col with first row/col as necessary
-      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
+      _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_dimensions(_row_last, _col_last)
+      store_row_col_max_min_values(_row_last, _col_last)
 
-      (row_first..row_last).each do |row|
-        (col_first..col_last).each do |col|
-          update_format_with_params(row, col, params)
+      (_row_first.._row_last).each do |row|
+        (_col_first.._col_last).each do |col|
+          update_format_with_params(row, col, _params)
         end
       end
     end
@@ -1287,7 +1773,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_url(row, column, url [ , format, label, tip ] )
+    #   write_url(row, column, url [ , format, label, tip ])
     #
     # Write a hyperlink to a URL in the cell specified by +row+ and +column+.
     # The hyperlink is comprised of two elements: the visible label and
@@ -1296,79 +1782,109 @@ module Writexlsx
     # The label is written using the {#write()}[#method-i-write] method. Therefore it is
     # possible to write strings, numbers or formulas as labels.
     #
-    def write_url(*args)
+    def write_url(row, col, url = nil, format = nil, str = nil, tip = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, url, xf, str, tip = row_col_notation(args)
-      xf, str = str, xf if str.respond_to?(:xf_index) || !xf.respond_to?(:xf_index)
-      raise WriteXLSXInsufficientArgumentError if [row, col, url].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _url       = col
+        _format    = url
+        _str       = format
+        _tip       = str
+      else
+        _row = row
+        _col = col
+        _url = url
+        _format = format
+        _str = str
+        _tip = tip
+      end
+      _format, _str = _str, _format if _str.respond_to?(:xf_index) || !_format.respond_to?(:xf_index)
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _url].include?(nil)
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      hyperlink = Hyperlink.factory(url, str, tip)
-      store_hyperlink(row, col, hyperlink)
+      hyperlink = Hyperlink.factory(_url, _str, _tip)
+      store_hyperlink(_row, _col, hyperlink)
 
-      if hyperlinks_count > 65_530
-        raise "URL '#{url}' added but URL exceeds Excel's limit of 65,530 URLs per worksheet."
-      end
+      raise "URL '#{url}' added but URL exceeds Excel's limit of 65,530 URLs per worksheet." if hyperlinks_count > 65_530
 
       # Add the default URL format.
-      xf = @default_url_format unless xf
+      _format ||= @default_url_format
 
       # Write the hyperlink string.
-      write_string(row, col, hyperlink.str, xf)
+      write_string(_row, _col, hyperlink.str, _format)
     end
 
     #
     # :call-seq:
-    #   write_date_time (row, col, date_string [ , format ] )
+    #   write_date_time (row, col, date_string [ , format ])
     #
     # Write a datetime string in ISO8601 "yyyy-mm-ddThh:mm:ss.ss" format as a
     # number representing an Excel date. format is optional.
     #
-    def write_date_time(*args)
+    def write_date_time(row, col, str, format = nil)
       # Check for a cell reference in A1 notation and substitute row and column
-      row, col, str, xf = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, str].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _str       = col
+        _format    = str
+      else
+        _row = row
+        _col = col
+        _str = str
+        _format = format
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _str].include?(nil)
 
       # Check that row and col are valid and store max and min values
-      check_dimensions(row, col)
-      store_row_col_max_min_values(row, col)
+      check_dimensions(_row, _col)
+      store_row_col_max_min_values(_row, _col)
 
-      date_time = convert_date_time(str)
+      date_time = convert_date_time(_str)
 
       if date_time
-        store_data_to_table(NumberCellData.new(self, row, col, date_time, xf))
+        store_data_to_table(DateTimeCellData.new(date_time, _format), _row, _col)
       else
         # If the date isn't valid then write it as a string.
-        write_string(*args)
+        write_string(_row, _col, _str, _format)
       end
     end
 
     #
     # :call-seq:
-    #   insert_chart(row, column, chart [ , x, y, x_scale, y_scale ] )
+    #   insert_chart(row, column, chart [ , x, y, x_scale, y_scale ])
     #
     # This method can be used to insert a Chart object into a worksheet.
     # The Chart must be created by the add_chart() Workbook method and
     # it must have the embedded option set.
     #
-    def insert_chart(*args)
+    def insert_chart(row, col, chart = nil, *options)
       # Check for a cell reference in A1 notation and substitute row and column.
-      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]
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _chart     = col
+        _options   = [chart] + options
+      else
+        _row = row
+        _col = col
+        _chart = chart
+        _options = options
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _chart].include?(nil)
 
+      if _options.first.instance_of?(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]
+        description = params[:description]
+        decorative  = params[:decorative]
       else
-        x_offset, y_offset, x_scale, y_scale, anchor = options
+        x_offset, y_offset, x_scale, y_scale, anchor = _options
       end
       x_offset ||= 0
       y_offset ||= 0
@@ -1376,37 +1892,49 @@ module Writexlsx
       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
+      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
 
-      if chart.already_inserted? || (chart.combined && chart.combined.already_inserted?)
+      if _chart.already_inserted? || (_chart.combined && _chart.combined.already_inserted?)
         raise "Chart cannot be inserted in a worksheet more than once"
       else
-        chart.already_inserted          = true
-        chart.combined.already_inserted = true if chart.combined
+        _chart.already_inserted          = true
+        _chart.combined.already_inserted = true if _chart.combined
       end
 
       # Use the values set with chart.set_size, if any.
-      x_scale  = chart.x_scale  if chart.x_scale  != 1
-      y_scale  = chart.y_scale  if chart.y_scale  != 1
-      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, anchor]
+      x_scale  = _chart.x_scale  if _chart.x_scale  != 1
+      y_scale  = _chart.y_scale  if _chart.y_scale  != 1
+      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, anchor, description, decorative
+      ]
     end
 
     #
     # :call-seq:
     #   insert_image(row, column, filename, options)
     #
-    def insert_image(*args)
+    def insert_image(row, col, image = nil, *options)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, image, *options = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, image].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _image     = col
+        _options   = [image] + options
+      else
+        _row = row
+        _col = col
+        _image = image
+        _options = options
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col, _image].include?(nil)
 
-      if options.first.class == Hash
+      if _options.first.instance_of?(Hash)
         # Newer hash bashed options
-        params      = options.first
+        params      = _options.first
         x_offset    = params[:x_offset]
         y_offset    = params[:y_offset]
         x_scale     = params[:x_scale]
@@ -1417,7 +1945,7 @@ module Writexlsx
         description = params[:description]
         decorative  = params[:decorative]
       else
-        x_offset, y_offset, x_scale, y_scale, anchor = options
+        x_offset, y_offset, x_scale, y_scale, anchor = _options
       end
       x_offset ||= 0
       y_offset ||= 0
@@ -1426,55 +1954,67 @@ module Writexlsx
       anchor   ||= 2
 
       @images << [
-        row, col, image, x_offset, y_offset,
+        _row, _col, _image, x_offset, y_offset,
         x_scale, y_scale, url, tip, anchor, description, decorative
       ]
     end
 
     #
     # :call-seq:
-    #   repeat_formula(row, column, formula [ , format ] )
+    #   repeat_formula(row, column, formula [ , format ])
     #
     # Deprecated. This is a writeexcel gem's method that is no longer
     # required by WriteXLSX.
     #
-    def repeat_formula(*args)
+    def repeat_formula(row, col, formula, format, *pairs)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, formula, format, *pairs = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col].include?(nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _formula   = col
+        _format    = formula
+        _pairs     = [format] + pairs
+      else
+        _row = row
+        _col = col
+        _formula = formula
+        _format = format
+        _pairs = pairs
+      end
+      raise WriteXLSXInsufficientArgumentError if [_row, _col].include?(nil)
 
-      raise "Odd number of elements in pattern/replacement list" unless pairs.size % 2 == 0
-      raise "Not a valid formula" unless formula.respond_to?(:to_ary)
+      raise "Odd number of elements in pattern/replacement list" unless _pairs.size.even?
+      raise "Not a valid formula" unless _formula.respond_to?(:to_ary)
 
-      tokens  = formula.join("\t").split("\t")
+      tokens  = _formula.join("\t").split("\t")
       raise "No tokens in formula" if tokens.empty?
 
-      value = nil
-      if pairs[-2] == 'result'
-        value = pairs.pop
-        pairs.pop
+      _value = nil
+      if _pairs[-2] == 'result'
+        _value = _pairs.pop
+        _pairs.pop
       end
-      while !pairs.empty?
-        pattern = pairs.shift
-        replace = pairs.shift
+      until _pairs.empty?
+        pattern = _pairs.shift
+        replace = _pairs.shift
 
         tokens.each do |token|
           break if token.sub!(pattern, replace)
         end
       end
-      formula = tokens.join('')
-      write_formula(row, col, formula, format, value)
+      _formula = tokens.join('')
+      write_formula(_row, _col, _formula, _format, _value)
     end
 
     #
     # :call-seq:
-    #   set_row(row [ , height, format, hidden, level, collapsed ] )
+    #   set_row(row [ , height, format, hidden, level, collapsed ])
     #
     # This method can be used to change the default properties of a row.
     # All parameters apart from +row+ are optional.
     #
     def set_row(*args)
       return unless args[0]
+
       row = args[0]
       height = args[1] || @default_height
       xf     = args[2]
@@ -1541,9 +2081,7 @@ module Writexlsx
         @row_size_changed = 1
       end
 
-      if ptrue?(zero_height)
-        @default_row_zeroed = 1
-      end
+      @default_row_zeroed = 1 if ptrue?(zero_height)
     end
 
     #
@@ -1553,14 +2091,20 @@ module Writexlsx
     # others should be blank. All cells should contain the same format.
     #
     def merge_range(*args)
-      row_first, col_first, row_last, col_last, string, format, *extra_args = row_col_notation(args)
+      if (row_col_array = row_col_notation(args.first))
+        row_first, col_first, row_last, col_last = row_col_array
+        string, format, *extra_args = args[1..-1]
+      else
+        row_first, col_first, row_last, col_last,
+        string, format, *extra_args = args
+      end
 
       raise "Incorrect number of arguments" if [row_first, col_first, row_last, col_last, format].include?(nil)
       raise "Fifth parameter must be a format object" unless format.respond_to?(:xf_index)
       raise "Can't merge single cell" if row_first == row_last && col_first == col_last
 
       # Swap last row/col with first row/col as necessary
-      row_first,  row_last  = row_last,  row_first  if row_first > row_last
+      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 the data range is valid and store the max and min values.
@@ -1586,10 +2130,21 @@ module Writexlsx
     def merge_range_type(type, *args)
       case type
       when 'array_formula', 'blank', 'rich_string'
-        row_first, col_first, row_last, col_last, *others = row_col_notation(args)
+        if (row_col_array = row_col_notation(args.first))
+          row_first, col_first, row_last, col_last = row_col_array
+          *others = args[1..-1]
+        else
+          row_first, col_first, row_last, col_last, *others = args
+        end
         format = others.pop
       else
-        row_first, col_first, row_last, col_last, token, format, *others = row_col_notation(args)
+        if (row_col_array = row_col_notation(args.first))
+          row_first, col_first, row_last, col_last = row_col_array
+          token, format, *others = args[1..-1]
+        else
+          row_first, col_first, row_last, col_last,
+          token, format, *others = args
+        end
       end
 
       raise "Format object missing or in an incorrect position" unless format.respond_to?(:xf_index)
@@ -1682,8 +2237,16 @@ module Writexlsx
     # The insert_button() method can be used to insert an Excel form button
     # into a worksheet.
     #
-    def insert_button(*args)
-      @buttons_array << button_params(*(row_col_notation(args)))
+    def insert_button(row, col, properties = nil)
+      if (row_col_array = row_col_notation(row))
+        _row, _col = row_col_array
+        _properties = col
+      else
+        _row = row
+        _col = col
+        _properties = properties
+      end
+      @buttons_array << button_params(_row, _col, _properties)
       @has_vml = 1
     end
 
@@ -1705,11 +2268,7 @@ module Writexlsx
     # Set the option to hide gridlines on the screen and the printed page.
     #
     def hide_gridlines(option = 1)
-      if option == 2
-        @screen_gridlines = false
-      else
-        @screen_gridlines = true
-      end
+      @screen_gridlines = (option != 2)
 
       @page_setup.hide_gridlines(option)
     end
@@ -1743,7 +2302,7 @@ module Writexlsx
     def fit_to_pages(width = 1, height = 1)
       @page_setup.fit_page   = true
       @page_setup.fit_width  = width
-      @page_setup.fit_height  = height
+      @page_setup.fit_height = height
       @page_setup.page_setup_changed = true
     end
 
@@ -1753,17 +2312,29 @@ module Writexlsx
     #
     # Set the autofilter area in the worksheet.
     #
-    def autofilter(*args)
-      row1, col1, row2, col2 = row_col_notation(args)
-      return if [row1, col1, row2, col2].include?(nil)
+    def autofilter(row1, col1 = nil, row2 = nil, col2 = nil)
+      if (row_col_array = row_col_notation(row1))
+        _row1, _col1, _row2, _col2 = row_col_array
+      else
+        _row1 = row1
+        _col1 = col1
+        _row2 = row2
+        _col2 = col2
+      end
+      return if [_row1, _col1, _row2, _col2].include?(nil)
 
       # Reverse max and min values if necessary.
-      row1, row2 = row2, row1 if row2 < row1
-      col1, col2 = col2, col1 if col2 < col1
+      _row1, _row2 = _row2, _row1 if _row2 < _row1
+      _col1, _col2 = _col2, _col1 if _col2 < _col1
 
-      @autofilter_area = convert_name_area(row1, col1, row2, col2)
-      @autofilter_ref  = xl_range(row1, row2, col1, col2)
-      @filter_range    = [col1, col2]
+      @autofilter_area = convert_name_area(_row1, _col1, _row2, _col2)
+      @autofilter_ref  = xl_range(_row1, _row2, _col1, _col2)
+      @filter_range    = [_col1, _col2]
+
+      # Store the filter cell positions for use in the autofit calculation.
+      (_col1.._col2).each do |col|
+        @filter_cells["#{_row1}:#{col}"] = 1
+      end
     end
 
     #
@@ -1779,9 +2350,7 @@ module Writexlsx
 
       tokens = extract_filter_tokens(expression)
 
-      unless tokens.size == 3 || tokens.size == 7
-        raise "Incorrect number of tokens in expression '#{expression}'"
-      end
+      raise "Incorrect number of tokens in expression '#{expression}'" unless tokens.size == 3 || tokens.size == 7
 
       tokens = parse_filter_expression(expression, tokens)
 
@@ -1891,7 +2460,9 @@ module Writexlsx
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       drawing_type = 1
 
-      row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor  = @charts[index]
+      row,     col,     chart,  x_offset,    y_offset,
+      x_scale, y_scale, anchor, description, decorative = @charts[index]
+
       chart.id = chart_id - 1
       x_scale ||= 0
       y_scale ||= 0
@@ -1909,15 +2480,15 @@ module Writexlsx
       name = chart.name
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor, drawing_rel_index, 0, nil, 0)
-      if !drawings?
+      drawing = Drawing.new(drawing_type, dimensions, 0, 0, nil, anchor, drawing_rel_index, 0, nil, name, description, decorative)
+      if drawings?
+        @drawings.add_drawing_object(drawing)
+      else
         @drawings = Drawings.new
         @drawings.add_drawing_object(drawing)
         @drawings.embedded = 1
 
-        @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml" ]
-      else
-        @drawings.add_drawing_object(drawing)
+        @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
       end
       @drawing_links << ['/chart', "../charts/chart#{chart_id}.xml"]
     end
@@ -1933,31 +2504,31 @@ module Writexlsx
 
       # Iterate through the table data.
       data = []
-      (row_start .. row_end).each do |row_num|
+      (row_start..row_end).each do |row_num|
         # Store nil if row doesn't exist.
-        if !@cell_data_table[row_num]
+        unless @cell_data_table[row_num]
           data << nil
           next
         end
 
-        (col_start .. col_end).each do |col_num|
-          if cell = @cell_data_table[row_num][col_num]
+        (col_start..col_end).each do |col_num|
+          cell = @cell_data_table[row_num][col_num]
+          if cell
             data << cell.data
           else
-            # Store nil if col doesn't exist.
             data << nil
           end
         end
       end
 
-      return data
+      data
     end
 
     #
     # Calculate the vertices that define the position of a graphical object within
     # the worksheet in pixels.
     #
-    def position_object_pixels(col_start, row_start, x1, y1, width, height, anchor = nil) #: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)
@@ -1975,22 +2546,22 @@ module Writexlsx
       y1 = 0 if y1 < 0
 
       # 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, anchor)}
-      else
-        # Optimisation for when the column widths haven't changed.
-        x_abs = @default_col_pixels * col_start
-      end
+      x_abs = if @col_size_changed
+                (0..col_start - 1).inject(0) { |sum, col| sum += size_col(col, anchor) }
+              else
+                # Optimisation for when the column widths haven't changed.
+                @default_col_pixels * col_start
+              end
       x_abs += x1
 
       # 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, anchor)}
-      else
-        # Optimisation for when the row heights haven't changed.
-        y_abs = @default_row_pixels * row_start
-      end
+      y_abs = if @row_size_changed
+                (0..row_start - 1).inject(0) { |sum, row| sum += size_row(row, anchor) }
+              else
+                # Optimisation for when the row heights haven't changed.
+                @default_row_pixels * row_start
+              end
       y_abs += y1
 
       # Adjust start column for offsets that are greater than the col width.
@@ -2043,35 +2614,37 @@ module Writexlsx
     #
     # Write the cell value <v> element.
     #
-    def write_cell_value(value = '') #:nodoc:
-      return write_cell_formula('=NA()') if !value.nil? && value.is_a?(Float) && value.nan?
+    def write_cell_value(value = '') # :nodoc:
+      return write_cell_formula('=NA()') if value.is_a?(Float) && value.nan?
 
       value ||= ''
-      value = value.to_i if value == value.to_i
+
+      int_value = value.to_i
+      value = int_value if value == int_value
       @writer.data_element('v', value)
     end
 
     #
     # Write the cell formula <f> element.
     #
-    def write_cell_formula(formula = '') #:nodoc:
+    def write_cell_formula(formula = '') # :nodoc:
       @writer.data_element('f', formula)
     end
 
     #
     # Write the cell array formula <f> element.
     #
-    def write_cell_array_formula(formula, range) #:nodoc:
+    def write_cell_array_formula(formula, range) # :nodoc:
       @writer.data_element(
         'f', formula,
         [
-          ['t', 'array'],
+          %w[t array],
           ['ref', range]
         ]
       )
     end
 
-    def date_1904? #:nodoc:
+    def date_1904? # :nodoc:
       @workbook.date_1904?
     end
 
@@ -2083,9 +2656,9 @@ module Writexlsx
     # Convert from an Excel internal colour index to a XML style #RRGGBB index
     # based on the default or user defined values in the Workbook palette.
     #
-    def palette_color(index) #:nodoc:
+    def palette_color(index) # :nodoc:
       if index.to_s =~ /^#([0-9A-F]{6})$/i
-        "FF#{$1.upcase}"
+        "FF#{::Regexp.last_match(1).upcase}"
       else
         "FF#{super(index)}"
       end
@@ -2104,8 +2677,8 @@ module Writexlsx
         @external_hyper_links,
         @external_drawing_links,
         @external_vml_links,
-        @external_table_links,
         @external_background_links,
+        @external_table_links,
         @external_comment_links
       ].reject { |a| a.empty? }
     end
@@ -2125,7 +2698,7 @@ module Writexlsx
       # The VML o:idmap data id contains a comma separated range when there is
       # more than one 1024 block of comments, like this: data="1,2".
       data = "#{vml_data_id}"
-      (1 .. num_comments_block).each do |i|
+      (1..num_comments_block).each do |i|
         data += ",#{vml_data_id + i}"
       end
       @vml_data_id = data
@@ -2183,11 +2756,7 @@ module Writexlsx
     # set the vba name for the worksheet
     #
     def set_vba_name(vba_codename = nil)
-      if vba_codename
-        @vba_codename = vba_codename
-      else
-        @vba_codename = @name
-      end
+      @vba_codename = vba_codename || @name
     end
 
     #
@@ -2195,33 +2764,29 @@ module Writexlsx
     #
     def ignore_errors(ignores)
       # List of valid input parameters.
-      valid_parameter_keys = [
-        :number_stored_as_text,
-        :eval_error,
-        :formula_differs,
-        :formula_range,
-        :formula_unlocked,
-        :empty_cell_reference,
-        :list_data_validation,
-        :calculated_column,
-        :two_digit_text_year
+      valid_parameter_keys = %i[
+        number_stored_as_text
+        eval_error
+        formula_differs
+        formula_range
+        formula_unlocked
+        empty_cell_reference
+        list_data_validation
+        calculated_column
+        two_digit_text_year
       ]
 
-      unless (ignores.keys - valid_parameter_keys).empty?
-        raise "Unknown parameter '#{ignores.key - valid_parameter_keys}' in ignore_errors()."
-      end
+      raise "Unknown parameter '#{ignores.key - valid_parameter_keys}' in ignore_errors()." unless (ignores.keys - valid_parameter_keys).empty?
 
       @ignore_errors = ignores
     end
 
-    def write_ext(url)
+    def write_ext(url, &block)
       attributes = [
         ['xmlns:x14', "#{OFFICE_URL}spreadsheetml/2009/9/main"],
         ['uri',       url]
       ]
-      @writer.tag_elements('ext', attributes) do
-        yield
-      end
+      @writer.tag_elements('ext', attributes, &block)
     end
 
     def write_sparkline_groups
@@ -2240,6 +2805,33 @@ module Writexlsx
 
     private
 
+    #
+    # Compare adjacent column information structures.
+    #
+    def compare_col_info(col_options, previous_options)
+      if !col_options.width.nil? != !previous_options.width.nil?
+        return nil
+      end
+      if col_options.width && previous_options.width &&
+         col_options.width != previous_options.width
+        return nil
+      end
+
+      if !col_options.format.nil? != !previous_options.format.nil?
+        return nil
+      end
+      if col_options.format && previous_options.format &&
+         col_options.format != previous_options.format
+        return nil
+      end
+
+      return nil if col_options.hidden    != previous_options.hidden
+      return nil if col_options.level     != previous_options.level
+      return nil if col_options.collapsed != previous_options.collapsed
+
+      true
+    end
+
     #
     # Get the index used to address a drawing rel link.
     #
@@ -2279,11 +2871,7 @@ module Writexlsx
 
     def cell_format_of_rich_string(rich_strings)
       # If the last arg is a format we use it as the cell format.
-      if rich_strings[-1].respond_to?(:xf_index)
-        rich_strings.pop
-      else
-        nil
-      end
+      rich_strings.pop if rich_strings[-1].respond_to?(:xf_index)
     end
 
     #
@@ -2295,9 +2883,9 @@ module Writexlsx
       # Create a temp format with the default font for unformatted fragments.
       default = Format.new(0)
 
-      length = 0                     # String length.
       last = 'format'
       pos  = 0
+      raw_string = ''
 
       fragments = []
       rich_strings.each do |token|
@@ -2310,20 +2898,20 @@ module Writexlsx
           last = 'format'
         else
           # Token is a string.
-          if last != 'format'
-            # If previous token wasn't a format add one before the string.
-            fragments << default << token
-          else
+          if last == 'format'
             # If previous token was a format just add the string.
             fragments << token
+          else
+            # If previous token wasn't a format add one before the string.
+            fragments << default << token
           end
 
-          length += token.size    # Keep track of actual string length.
+          raw_string += token    # Keep track of actual string length.
           last = 'string'
         end
         pos += 1
       end
-      [fragments, length]
+      [fragments, raw_string]
     end
 
     def xml_str_of_rich_string(fragments)
@@ -2332,7 +2920,7 @@ module Writexlsx
       writer = Package::XMLWriterSimple.new
 
       # If the first token is a string start the <r> element.
-      writer.start_tag('r') if !fragments[0].respond_to?(:xf_index)
+      writer.start_tag('r') unless fragments[0].respond_to?(:xf_index)
 
       # Write the XML elements for the format string fragments.
       fragments.each do |token|
@@ -2354,9 +2942,10 @@ module Writexlsx
 
     # Pad out the rest of the area with formatted blank cells.
     def write_formatted_blank_to_area(row_first, row_last, col_first, col_last, format)
-      (row_first .. row_last).each do |row|
-        (col_first .. col_last).each do |col|
+      (row_first..row_last).each do |row|
+        (col_first..col_last).each do |col|
           next if row == row_first && col == col_first
+
           write_blank(row, col, format)
         end
       end
@@ -2367,13 +2956,13 @@ module Writexlsx
     # whitespace groups. The only tricky part is to extract string tokens that
     # contain whitespace and/or quoted double quotes (Excel's escaped quotes).
     #
-    def extract_filter_tokens(expression = nil) #:nodoc:
+    def extract_filter_tokens(expression = nil) # :nodoc:
       return [] unless expression
 
       tokens = []
       str = expression
       while str =~ /"(?:[^"]|"")*"|\S+/
-        tokens << $&
+        tokens << ::Regexp.last_match(0)
         str = $~.post_match
       end
 
@@ -2381,7 +2970,7 @@ module Writexlsx
       tokens.map! do |token|
         token.sub!(/^"/, '')
         token.sub!(/"$/, '')
-        token.gsub!(/""/, '"')
+        token.gsub!('""', '"')
 
         # if token is number, convert to numeric.
         if token =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/
@@ -2398,11 +2987,11 @@ module Writexlsx
     # Converts the tokens of a possibly conditional expression into 1 or 2
     # sub expressions for further parsing.
     #
-    def parse_filter_expression(expression, tokens) #:nodoc:
+    def parse_filter_expression(expression, tokens) # :nodoc:
       # The number of tokens will be either 3 (for 1 expression)
       # or 7 (for 2  expressions).
       #
-      if (tokens.size == 7)
+      if tokens.size == 7
         conditional = tokens[3]
         if conditional =~ /^(and|&&)$/
           conditional = 0
@@ -2410,7 +2999,7 @@ module Writexlsx
           conditional = 1
         else
           raise "Token '#{conditional}' is not a valid conditional " +
-          "in filter expression '#{expression}'"
+                "in filter expression '#{expression}'"
         end
         expression_1 = parse_filter_tokens(expression, tokens[0..2])
         expression_2 = parse_filter_tokens(expression, tokens[4..6])
@@ -2423,7 +3012,7 @@ module Writexlsx
     #
     # Parse the 3 tokens of a filter expression and return the operator and token.
     #
-    def parse_filter_tokens(expression, tokens)     #:nodoc:
+    def parse_filter_tokens(expression, tokens)     # :nodoc:
       operators = {
         '==' => 2,
         '='  => 2,
@@ -2438,7 +3027,7 @@ module Writexlsx
         '<'  => 1,
         '<=' => 3,
         '>'  => 4,
-        '>=' => 6,
+        '>=' => 6
       }
 
       operator = operators[tokens[1]]
@@ -2447,40 +3036,38 @@ module Writexlsx
       # Special handling of "Top" filter expressions.
       if tokens[0] =~ /^top|bottom$/i
         value = tokens[1]
-        if (value.to_s =~ /\D/ or value.to_i < 1 or value.to_i > 500)
+        if value.to_s =~ /\D/ or value.to_i < 1 or value.to_i > 500
           raise "The value '#{value}' in expression '#{expression}' " +
-          "must be in the range 1 to 500"
+                "must be in the range 1 to 500"
         end
         token.downcase!
-        if (token != 'items' and token != '%')
+        if token != 'items' and token != '%'
           raise "The type '#{token}' in expression '#{expression}' " +
-          "must be either 'items' or '%'"
+                "must be either 'items' or '%'"
         end
 
-        if (tokens[0] =~ /^top$/i)
-          operator = 30
-        else
-          operator = 32
-        end
+        operator = if tokens[0] =~ /^top$/i
+                     30
+                   else
+                     32
+                   end
 
-        if (tokens[2] == '%')
-          operator += 1
-        end
+        operator += 1 if tokens[2] == '%'
 
         token    = value
       end
 
-      if (not operator and tokens[0])
+      if !operator and tokens[0]
         raise "Token '#{tokens[1]}' is not a valid operator " +
-        "in filter expression '#{expression}'"
+              "in filter expression '#{expression}'"
       end
 
       # Special handling for Blanks/NonBlanks.
-      if (token.to_s =~ /^blanks|nonblanks$/i)
+      if token.to_s =~ /^blanks|nonblanks$/i
         # Only allow Equals or NotEqual in this context.
-        if (operator != 2 and operator != 5)
+        if operator != 2 and operator != 5
           raise "The operator '#{tokens[1]}' in expression '#{expression}' " +
-          "is not valid in relation to Blanks/NonBlanks'"
+                "is not valid in relation to Blanks/NonBlanks'"
         end
 
         token.downcase!
@@ -2488,25 +3075,19 @@ module Writexlsx
         # The operator should always be 2 (=) to flag a "simple" equality in
         # the binary record. Therefore we convert <> to =.
         if token == 'blanks'
-          if operator == 5
-            token = ' '
-          end
+          token = ' ' if operator == 5
+        elsif operator == 5
+          operator = 2
+          token    = 'blanks'
         else
-          if operator == 5
-            operator = 2
-            token    = 'blanks'
-          else
-            operator = 5
-            token    = ' '
-          end
+          operator = 5
+          token    = ' '
         end
       end
 
       # if the string token contains an Excel match character then change the
       # operator type to indicate a non "simple" equality.
-      if (operator == 2 and token.to_s =~ /[*?]/)
-        operator = 22
-      end
+      operator = 22 if operator == 2 and token.to_s =~ /[*?]/
 
       [operator, token]
     end
@@ -2518,7 +3099,7 @@ module Writexlsx
     #   2. Sorts the list.
     #   3. Removes 0 from the list if present.
     #
-    def sort_pagebreaks(*args) #:nodoc:
+    def sort_pagebreaks(*args) # :nodoc:
       return [] if args.empty?
 
       breaks = args.uniq.sort
@@ -2538,17 +3119,17 @@ module Writexlsx
     # Calculate the vertices that define the position of a graphical object within
     # the worksheet in EMUs.
     #
-    def position_object_emus(col_start, row_start, x1, y1, width, height, anchor = nil) #: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, anchor)
 
       # Convert the pixel values to EMUs. See above.
-      x1    = (0.5 + 9_525 * x1).to_i
-      y1    = (0.5 + 9_525 * y1).to_i
-      x2    = (0.5 + 9_525 * x2).to_i
-      y2    = (0.5 + 9_525 * y2).to_i
-      x_abs = (0.5 + 9_525 * x_abs).to_i
-      y_abs = (0.5 + 9_525 * y_abs).to_i
+      x1    = (0.5 + (9_525 * x1)).to_i
+      y1    = (0.5 + (9_525 * y1)).to_i
+      x2    = (0.5 + (9_525 * x2)).to_i
+      y2    = (0.5 + (9_525 * y2)).to_i
+      x_abs = (0.5 + (9_525 * x_abs)).to_i
+      y_abs = (0.5 + (9_525 * y_abs)).to_i
 
       [col_start, row_start, x1, y1, col_end, row_end, x2, y2, x_abs, y_abs]
     end
@@ -2559,19 +3140,20 @@ module Writexlsx
     # 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, anchor = 0) #: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, hidden = @col_sizes[col]
+      if @col_info[col]
+        width  = @col_info[col].width || @default_col_width
+        hidden = @col_info[col].hidden
 
         # Convert to pixels.
-        if hidden == 1 && anchor != 4
-          pixels = 0
-        elsif width < 1
-          pixels = (width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i
-        else
-          pixels = (width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING
-        end
+        pixels = if hidden == 1 && anchor != 4
+                   0
+                 elsif width < 1
+                   ((width * (MAX_DIGIT_WIDTH + PADDING)) + 0.5).to_i
+                 else
+                   ((width * MAX_DIGIT_WIDTH) + 0.5).to_i + PADDING
+                 end
       else
         pixels = @default_col_pixels
       end
@@ -2584,16 +3166,16 @@ module Writexlsx
     # treated as having a height of zero unless it has the special
     # "object_position" of 4 (size with cells).
     #
-    def size_row(row, anchor = 0) #: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, hidden = @row_sizes[row]
 
-        if hidden == 1 && anchor != 4
-          pixels = 0
-        else
-          pixels = (4 / 3.0 * height).to_i
-        end
+        pixels = if hidden == 1 && anchor != 4
+                   0
+                 else
+                   (4 / 3.0 * height).to_i
+                 end
       else
         pixels = (4 / 3.0 * @default_row_height).to_i
       end
@@ -2608,12 +3190,10 @@ module Writexlsx
       padding         = 5.0
 
       if pixels <= 12
-        width =  pixels / (max_digit_width + padding)
+        pixels / (max_digit_width + padding)
       else
-        width = (pixels - padding) / max_digit_width
+        (pixels - padding) / max_digit_width
       end
-
-      width
     end
 
     #
@@ -2621,19 +3201,19 @@ module Writexlsx
     #
     def pixels_to_height(pixels)
       height = 0.75 * pixels
-      height = height.to_i if ( height - height.to_i).abs < 0.1
+      height = height.to_i if (height - height.to_i).abs < 0.1
       height
     end
 
     #
     # Set up image/drawings.
     #
-    def prepare_image(index, image_id, drawing_id, width, height, name, image_type, x_dpi = 96, y_dpi = 96, md5 = nil) #: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
 
-      row, col, image, x_offset, y_offset,
+      row, col, _image, x_offset, y_offset,
       x_scale, y_scale, url, tip, anchor, description, decorative = @images[index]
 
       width  *= x_scale
@@ -2649,41 +3229,37 @@ module Writexlsx
       height = (0.5 + (height * 9_525)).to_i
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor, 0, 0, tip, decorative)
-      if !drawings?
+      drawing = Drawing.new(drawing_type, dimensions, width, height, nil, anchor, 0, 0, tip, name, description, decorative)
+      if drawings?
+        drawings = @drawings
+      else
         drawings = Drawings.new
         drawings.embedded = 1
 
         @drawings = drawings
 
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
-      else
-        drawings = @drawings
       end
       drawings.add_drawing_object(drawing)
 
-      if description
-        drawing.description = description
-      end
+      drawing.description = name unless description
 
       if url
         rel_type = '/hyperlink'
         target_mode = 'External'
-        if url =~ %r!^[fh]tt?ps?://! || url =~ /^mailto:/
-          target = escape_url(url)
-        end
+        target = escape_url(url) if url =~ %r{^[fh]tt?ps?://} || url =~ /^mailto:/
         if url =~ /^external:/
           target = escape_url(url.sub(/^external:/, ''))
 
           # Additional escape not required in worksheet hyperlinks
-          target = target.gsub(/#/, '%23')
+          target = target.gsub("#", '%23')
 
           # Prefix absolute paths (not relative) with file:///
-          if target =~ /^\w:/ || target =~ /^\\\\/
-            target = "file:///#{target}"
-          else
-            target = target.gsub(/\\/, '/')
-          end
+          target = if target =~ /^\w:/ || target =~ /^\\\\/
+                     "file:///#{target}"
+                   else
+                     target.gsub("\\", '/')
+                   end
         end
 
         if url =~ /^internal:/
@@ -2697,15 +3273,11 @@ Ignoring URL #{target} where link or anchor > 255 characters since it exceeds Ex
 EOS
         end
 
-        if target && !@drawing_rels[url]
-          @drawing_links << [rel_type, target, target_mode]
-        end
+        @drawing_links << [rel_type, target, target_mode] if target && !@drawing_rels[url]
         drawing.url_rel_index = drawing_rel_index(url)
       end
 
-      if !@drawing_rels[md5]
-        @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"]
-      end
+      @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"] unless @drawing_rels[md5]
       drawing.rel_index = drawing_rel_index(md5)
     end
     public :prepare_image
@@ -2713,11 +3285,9 @@ EOS
     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] = ''
+      body[/\.[^.]+$/, 0] = ''
 
-      if !@vml_drawing_rels[md5]
-        @vml_drawing_links   << ['/image', "../media/image#{image_id}.#{image_type}" ]
-      end
+      @vml_drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"] unless @vml_drawing_rels[md5]
 
       ref_id = get_vml_drawing_rel_index(md5)
       @header_images_array << [width, height, body, position, x_dpi, y_dpi, ref_id]
@@ -2745,25 +3315,42 @@ EOS
 
     #
     # :call-seq:
-    #   insert_shape(row, col, shape [ , x, y, x_scale, y_scale ] )
+    #   insert_shape(row, col, shape [ , x, y, x_scale, y_scale ])
     #
     # Insert a shape into the worksheet.
     #
-    def insert_shape(*args)
+    def insert_shape(
+          row_start, column_start, shape = nil, x_offset = nil, y_offset = nil,
+          x_scale = nil, y_scale = nil, anchor = nil
+        )
       # 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, 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, anchor
+      if (row_col_array = row_col_notation(row_start))
+        _row_start, _column_start = row_col_array
+        _shape    = column_start
+        _x_offset = shape
+        _y_offset = x_offset
+        _x_scale  = y_offset
+        _y_scale  = x_scale
+        _anchor   = y_scale
+      else
+        _row_start = row_start
+        _column_start = column_start
+        _shape = shape
+        _x_offset = x_offset
+        _y_offset = y_offset
+        _x_scale = x_scale
+        _y_scale = y_scale
+        _anchor = anchor
+      end
+      raise "Insufficient arguments in insert_shape()" if [_row_start, _column_start, _shape].include?(nil)
+
+      _shape.set_position(
+        _row_start, _column_start, _x_offset, _y_offset,
+        _x_scale, _y_scale, _anchor
       )
       # Assign a shape ID.
       while true
-        id = shape.id || 0
+        id = _shape.id || 0
         used = @shape_hash[id]
 
         # Test if shape ID is already used. Otherwise assign a new one.
@@ -2771,21 +3358,21 @@ EOS
           break
         else
           @last_shape_id += 1
-          shape.id = @last_shape_id
+          _shape.id = @last_shape_id
         end
       end
 
       # Allow lookup of entry into shape array by shape ID.
-      @shape_hash[shape.id] = shape.element = @shapes.size
+      @shape_hash[_shape.id] = _shape.element = @shapes.size
 
-      if ptrue?(shape.stencil)
-        # Insert a copy of the shape, not a reference so that the shape is
-        # used as a stencil. Previously stamped copies don't get modified
-        # if the stencil is modified.
-        insert = shape.dup
-      else
-        insert = shape
-      end
+      insert = if ptrue?(_shape.stencil)
+                 # Insert a copy of the shape, not a reference so that the shape is
+                 # used as a stencil. Previously stamped copies don't get modified
+                 # if the stencil is modified.
+                 _shape.dup
+               else
+                 _shape
+               end
 
       # For connectors change x/y coords based on location of connected shapes.
       insert.auto_locate_connectors(@shapes, @shape_hash)
@@ -2818,7 +3405,7 @@ EOS
       drawing_type = 3
       drawing = Drawing.new(
         drawing_type, shape.dimensions, shape.width_emu, shape.height_emu,
-        shape.name, shape, shape.anchor, drawing_rel_index, 0, nil, 0
+        shape, shape.anchor, drawing_rel_index, 0, shape.name, nil, 0
       )
       drawings.add_drawing_object(drawing)
     end
@@ -2836,32 +3423,31 @@ EOS
       # Set the button caption.
       caption = params[:caption] || "Button #{button_number}"
 
-      button.font = { :_caption => caption }
+      button.font = { _caption: caption }
 
       # Set the macro name.
-      if params[:macro]
-        button.macro = "[0]!#{params[:macro]}"
-      else
-        button.macro = "[0]!Button#{button_number}_Click"
-      end
+      button.macro = if params[:macro]
+                       "[0]!#{params[:macro]}"
+                     else
+                       "[0]!Button#{button_number}_Click"
+                     end
+
+      # Set the alt text for the button.
+      button.description = params[:description]
 
       # Ensure that a width and height have been set.
       default_width  = @default_col_pixels
       default_height = @default_row_pixels
-      params[:width]  = default_width  if !params[:width]
-      params[:height] = default_height if !params[:height]
+      params[:width]  = default_width  unless params[:width]
+      params[:height] = default_height unless params[:height]
 
       # Set the x/y offsets.
-      params[:x_offset] = 0 if !params[:x_offset]
-      params[:y_offset] = 0 if !params[:y_offset]
+      params[:x_offset] = 0 unless params[:x_offset]
+      params[:y_offset] = 0 unless params[:y_offset]
 
       # Scale the size of the button box if required.
-      if params[:x_scale]
-        params[:width] = params[:width] * params[:x_scale]
-      end
-      if params[:y_scale]
-        params[:height] = params[:height] * params[:y_scale]
-      end
+      params[:width] = params[:width] * params[:x_scale] if params[:x_scale]
+      params[:height] = params[:height] * params[:y_scale] if params[:y_scale]
 
       # Round the dimensions to the nearest pixel.
       params[:width]  = (0.5 + params[:width]).to_i
@@ -2889,34 +3475,28 @@ EOS
     end
 
     #
-    # Based on the algorithm provided by Daniel Rentz of OpenOffice.
-    #
-    def encode_password(password) #:nodoc:
-      i = 0
-      chars = password.split(//)
-      count = chars.size
+    # Hash a worksheet password. Based on the algorithm in ECMA-376-4:2016,
+    # Office Open XML File Foemats -- Transitional Migration Features,
+    # Additional attributes for workbookProtection element (Part 1, §18.2.29).   #
+    def encode_password(password) # :nodoc:
+      hash = 0
 
-      chars.collect! do |char|
-        i += 1
-        char     = char.ord << i
-        low_15   = char & 0x7fff
-        high_15  = char & 0x7fff << 15
-        high_15  = high_15 >> 15
-        char     = low_15 | high_15
+      password.reverse.split("").each do |char|
+        hash = ((hash >> 14) & 0x01) | ((hash << 1) & 0x7fff)
+        hash ^= char.ord
       end
 
-      encoded_password  = 0x0000
-      chars.each { |c| encoded_password ^= c }
-      encoded_password ^= count
-      encoded_password ^= 0xCE4B
+      hash = ((hash >> 14) & 0x01) | ((hash << 1) & 0x7fff)
+      hash ^= password.length
+      hash ^= 0xCE4B
 
-      sprintf("%X", encoded_password)
+      sprintf("%X", hash)
     end
 
     #
     # Write the <worksheet> element. This is the root element of Worksheet.
     #
-    def write_worksheet_attributes #:nodoc:
+    def write_worksheet_attributes # :nodoc:
       schema = 'http://schemas.openxmlformats.org/'
       attributes = [
         ['xmlns',    "#{schema}spreadsheetml/2006/main"],
@@ -2934,7 +3514,7 @@ EOS
     #
     # Write the <sheetPr> element for Sheet level properties.
     #
-    def write_sheet_pr #:nodoc:
+    def write_sheet_pr # :nodoc:
       return unless tab_outline_fit? || vba_codename? || filter_on?
 
       attributes = []
@@ -2959,14 +3539,14 @@ EOS
     #
     # Write the <pageSetUpPr> element.
     #
-    def write_page_set_up_pr #:nodoc:
-      @writer.empty_tag('pageSetUpPr', [ ['fitToPage', 1] ]) if fit_page?
+    def write_page_set_up_pr # :nodoc:
+      @writer.empty_tag('pageSetUpPr', [['fitToPage', 1]]) if fit_page?
     end
 
     # Write the <dimension> element. This specifies the range of cells in the
     # worksheet. As a special case, empty spreadsheets use 'A1' as a range.
     #
-    def write_dimension #:nodoc:
+    def write_dimension # :nodoc:
       if !@dim_rowmin && !@dim_colmin
         # If the min dims are undefined then no dimensions have been set
         # and we use the default 'A1'.
@@ -2992,16 +3572,17 @@ EOS
         cell_2 = xl_rowcol_to_cell(@dim_rowmax, @dim_colmax)
         ref = cell_1 + ':' + cell_2
       end
-      @writer.empty_tag('dimension', [ ['ref', ref] ])
+      @writer.empty_tag('dimension', [['ref', ref]])
     end
+
     #
     # Write the <sheetViews> element.
     #
-    def write_sheet_views #:nodoc:
+    def write_sheet_views # :nodoc:
       @writer.tag_elements('sheetViews', []) { write_sheet_view }
     end
 
-    def write_sheet_view #:nodoc:
+    def write_sheet_view # :nodoc:
       attributes = []
       # Hide screen gridlines if required.
       attributes << ['showGridLines', 0] unless @screen_gridlines
@@ -3022,13 +3603,27 @@ EOS
       attributes << ["showOutlineSymbols", 0] if @outline_on
 
       # Set the page view/layout mode if required.
-      # TODO. Add pageBreakPreview mode when requested.
-      attributes << ['view', 'pageLayout'] if page_view?
+      case @page_view
+      when 1
+        attributes << %w[view pageLayout]
+      when 2
+        attributes << %w[view pageBreakPreview]
+      end
+
+      # Set the first visible cell.
+      attributes << ['topLeftCell', @top_left_cell] if ptrue?(@top_left_cell)
 
       # Set the zoom level.
       if @zoom != 100
-        attributes << ['zoomScale', @zoom] unless page_view?
-        attributes << ['zoomScaleNormal', @zoom] if zoom_scale_normal?
+        attributes << ['zoomScale', @zoom]
+
+        if @page_view == 1
+          attributes << ['zoomScalePageLayoutView', @zoom]
+        elsif @page_view == 2
+          attributes << ['zoomScaleSheetLayoutView', @zoom]
+        elsif ptrue?(@zoom_scale_normal)
+          attributes << ['zoomScaleNormal', @zoom]
+        end
       end
 
       attributes << ['workbookViewId', 0]
@@ -3046,14 +3641,14 @@ EOS
     #
     # Write the <selection> elements.
     #
-    def write_selections #:nodoc:
+    def write_selections # :nodoc:
       @selections.each { |selection| write_selection(*selection) }
     end
 
     #
     # Write the <selection> element.
     #
-    def write_selection(pane, active_cell, sqref) #:nodoc:
+    def write_selection(pane, active_cell, sqref) # :nodoc:
       attributes  = []
       attributes << ['pane', pane]              if pane
       attributes << ['activeCell', active_cell] if active_cell
@@ -3065,71 +3660,94 @@ EOS
     #
     # Write the <sheetFormatPr> element.
     #
-    def write_sheet_format_pr #:nodoc:
-      base_col_width     = 10
-
+    def write_sheet_format_pr # :nodoc:
       attributes = [
         ['defaultRowHeight', @default_row_height]
       ]
-      if @default_row_height != @original_row_height
-        attributes << ['customHeight', 1]
-      end
+      attributes << ['customHeight', 1] if @default_row_height != @original_row_height
 
-      if ptrue?(@default_row_zeroed)
-        attributes << ['zeroHeight', 1]
-      end
+      attributes << ['zeroHeight', 1] if ptrue?(@default_row_zeroed)
 
       attributes << ['outlineLevelRow', @outline_row_level] if @outline_row_level > 0
       attributes << ['outlineLevelCol', @outline_col_level] if @outline_col_level > 0
-      if @excel_version == 2010
-        attributes << ['x14ac:dyDescent', '0.25']
-      end
+      attributes << ['x14ac:dyDescent', '0.25'] if @excel_version == 2010
       @writer.empty_tag('sheetFormatPr', attributes)
     end
 
     #
     # Write the <cols> element and <col> sub elements.
     #
-    def write_cols #:nodoc:
+    def write_cols # :nodoc:
       # Exit unless some column have been formatted.
-      return if @colinfo.empty?
+      return if @col_info.empty?
 
       @writer.tag_elements('cols') do
-        @colinfo.keys.sort.each {|col| write_col_info(@colinfo[col]) }
+        # Use the first element of the column informatin structure to set
+        # the initial/previous properties.
+        first_col           = @col_info.keys.min
+        last_col            = first_col
+        previous_options    = @col_info[first_col]
+        deleted_col         = first_col
+        deleted_col_options = previous_options
+
+        @col_info.delete(first_col)
+
+        @col_info.keys.sort.each do |col|
+          col_options = @col_info[col]
+
+          # Check if the column number is contiguous with the previous
+          # column and if the properties are the same.
+          if (col == last_col + 1) &&
+             compare_col_info(col_options, previous_options)
+            last_col = col
+          else
+            # If not contiguous/equal then we write out the current range
+            # of columns and start again.
+            write_col_info([first_col, last_col, previous_options])
+            first_col = col
+            last_col  = first_col
+            previous_options = col_options
+          end
+        end
+
+        # We will exit the previous loop with one unhandled column range.
+        write_col_info([first_col, last_col, previous_options])
+
+        # Put back the deleted first column information structure:
+        @col_info[deleted_col] = deleted_col_options
       end
     end
 
     #
     # Write the <col> element.
     #
-    def write_col_info(args) #:nodoc:
+    def write_col_info(args) # :nodoc:
       @writer.empty_tag('col', col_info_attributes(args))
     end
 
     def col_info_attributes(args)
-      min    = args[0] || 0     # First formatted column.
-      max    = args[1] || 0     # Last formatted column.
-      width  = args[2]          # Col width in user units.
-      format = args[3]          # Format index.
-      hidden = args[4] || 0     # Hidden flag.
-      level  = args[5] || 0     # Outline level.
-      collapsed = args[6] || 0  # Outline level.
+      min       = args[0]           || 0 # First formatted column.
+      max       = args[1]           || 0 # Last formatted column.
+      width     = args[2].width          # Col width in user units.
+      format    = args[2].format         # Format index.
+      hidden    = args[2].hidden    || 0 # Hidden flag.
+      level     = args[2].level     || 0 # Outline level.
+      collapsed = args[2].collapsed || 0 # Outline Collapsed
+      autofit   = args[2].autofit   || 0 # Best fit for autofit numbers.
       xf_index = format ? format.get_xf_index : 0
 
       custom_width = true
       custom_width = false if width.nil? && hidden == 0
       custom_width = false if width == 8.43
 
-      width = hidden == 0 ? @default_col_width : 0 unless width
+      width ||= hidden == 0 ? @default_col_width : 0
 
       # Convert column width from user units to character width.
-      if width && width < 1
-        width =
-         ((width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i / MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
-      else
-        width =
-          (((width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING).to_i/ MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
-      end
+      width = if width && width < 1
+                (((width * (MAX_DIGIT_WIDTH + PADDING)) + 0.5).to_i / MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
+              else
+                ((((width * MAX_DIGIT_WIDTH) + 0.5).to_i + PADDING).to_i / MAX_DIGIT_WIDTH.to_f * 256).to_i / 256.0
+              end
       width = width.to_i if width - width.to_i == 0
 
       attributes = [
@@ -3138,10 +3756,11 @@ EOS
         ['width', width]
       ]
 
-      attributes << ['style',        xf_index] if xf_index != 0
-      attributes << ['hidden',       1]        if hidden != 0
+      attributes << ['style',        xf_index] if xf_index  != 0
+      attributes << ['hidden',       1]        if hidden    != 0
+      attributes << ['bestFit',      1]        if autofit   != 0
       attributes << ['customWidth',  1]        if custom_width
-      attributes << ['outlineLevel', level]    if level != 0
+      attributes << ['outlineLevel', level]    if level     != 0
       attributes << ['collapsed',    1]        if collapsed != 0
       attributes
     end
@@ -3149,22 +3768,22 @@ EOS
     #
     # Write the <sheetData> element.
     #
-    def write_sheet_data #:nodoc:
-      if !@dim_rowmin
+    def write_sheet_data # :nodoc:
+      if @dim_rowmin
+        @writer.tag_elements('sheetData') { write_rows }
+      else
         # If the dimensions aren't defined then there is no data to write.
         @writer.empty_tag('sheetData')
-      else
-        @writer.tag_elements('sheetData') { write_rows }
       end
     end
 
     #
     # Write out the worksheet data as a series of rows and cells.
     #
-    def write_rows #:nodoc:
+    def write_rows # :nodoc:
       calculate_spans
 
-      (@dim_rowmin .. @dim_rowmax).each do |row_num|
+      (@dim_rowmin..@dim_rowmax).each do |row_num|
         # Skip row if it doesn't contain row formatting or cell data.
         next if not_contain_formatting_or_data?(row_num)
 
@@ -3177,8 +3796,6 @@ EOS
           write_row_element(row_num, span, *args) do
             write_cell_column_dimension(row_num)
           end
-        elsif @comments[row_num]
-          write_empty_row(row_num, span, *(@set_rows[row_num]))
         else
           # Row attributes only.
           write_empty_row(row_num, span, *(@set_rows[row_num]))
@@ -3191,29 +3808,31 @@ EOS
     end
 
     def write_cell_column_dimension(row_num)  # :nodoc:
-      (@dim_colmin .. @dim_colmax).each do |col_num|
-        @cell_data_table[row_num][col_num].write_cell if @cell_data_table[row_num][col_num]
+      row = @cell_data_table[row_num]
+      row_name = (row_num + 1).to_s
+      (@dim_colmin..@dim_colmax).each do |col_num|
+        if (cell = row[col_num])
+          cell.write_cell(self, row_num, row_name, col_num)
+        end
       end
     end
 
     #
     # Write the <row> element.
     #
-    def write_row_element(*args)  # :nodoc:
-      @writer.tag_elements('row', row_attributes(args)) do
-        yield
-      end
+    def write_row_element(*args, &block)  # :nodoc:
+      @writer.tag_elements('row', row_attributes(args), &block)
     end
 
     #
     # Write and empty <row> element, i.e., attributes only, no cell data.
     #
-    def write_empty_row(*args) #:nodoc:
+    def write_empty_row(*args) # :nodoc:
       @writer.empty_tag('row', row_attributes(args))
     end
 
     def row_attributes(args)
-      r, spans, height, format, hidden, level, collapsed, empty_row = args
+      r, spans, height, format, hidden, level, collapsed, _empty_row = args
       height    ||= @default_row_height
       hidden    ||= 0
       level     ||= 0
@@ -3230,36 +3849,34 @@ EOS
       attributes << ['outlineLevel', level]    if ptrue?(level)
       attributes << ['collapsed',    1]        if ptrue?(collapsed)
 
-      if @excel_version == 2010
-        attributes << ['x14ac:dyDescent', '0.25']
-      end
+      attributes << ['x14ac:dyDescent', '0.25'] if @excel_version == 2010
       attributes
     end
 
     #
     # Write the frozen or split <pane> elements.
     #
-    def write_panes #:nodoc:
+    def write_panes # :nodoc:
       return if @panes.empty?
 
       if @panes[4] == 2
         write_split_panes
       else
-        write_freeze_panes(*(@panes))
+        write_freeze_panes(*@panes)
       end
     end
 
     #
     # Write the <pane> element for freeze panes.
     #
-    def write_freeze_panes(row, col, top_row, left_col, type) #:nodoc:
+    def write_freeze_panes(row, col, top_row, left_col, type) # :nodoc:
       y_split       = row
       x_split       = col
       top_left_cell = xl_rowcol_to_cell(top_row, left_col)
 
       # Move user cell selection to the panes.
       unless @selections.empty?
-        dummy, active_cell, sqref = @selections[0]
+        _dummy, active_cell, sqref = @selections[0]
         @selections = []
       end
 
@@ -3268,13 +3885,13 @@ EOS
       active_pane = set_active_pane_and_cell_selections(row, col, row, col, active_cell, sqref)
 
       # Set the pane type.
-      if type == 0
-        state = 'frozen'
-      elsif type == 1
-        state = 'frozenSplit'
-      else
-        state = 'split'
-      end
+      state = if type == 0
+                'frozen'
+              elsif type == 1
+                'frozenSplit'
+              else
+                'split'
+              end
 
       attributes = []
       attributes << ['xSplit',      x_split] if x_split > 0
@@ -3291,35 +3908,35 @@ EOS
     #
     # See also, implementers note for split_panes().
     #
-    def write_split_panes #:nodoc:
+    def write_split_panes # :nodoc:
       row, col, top_row, left_col = @panes
       has_selection = false
       y_split = row
       x_split = col
 
       # Move user cell selection to the panes.
-      if !@selections.empty?
-        dummy, active_cell, sqref = @selections[0]
+      unless @selections.empty?
+        _dummy, active_cell, sqref = @selections[0]
         @selections = []
         has_selection = true
       end
 
       # Convert the row and col to 1/20 twip units with padding.
-      y_split = (20 * y_split + 300).to_i if y_split > 0
+      y_split = ((20 * y_split) + 300).to_i if y_split > 0
       x_split = calculate_x_split_width(x_split) if x_split > 0
 
       # For non-explicit topLeft definitions, estimate the cell offset based
       # on the pixels dimensions. This is only a workaround and doesn't take
       # adjusted cell dimensions into account.
       if top_row == row && left_col == col
-        top_row  = (0.5 + (y_split - 300) / 20 / 15).to_i
-        left_col = (0.5 + (x_split - 390) / 20 / 3 * 4 / 64).to_i
+        top_row  = (0.5 + ((y_split - 300) / 20 / 15)).to_i
+        left_col = (0.5 + ((x_split - 390) / 20 / 3 * 4 / 64)).to_i
       end
 
       top_left_cell = xl_rowcol_to_cell(top_row, left_col)
 
       # If there is no selection set the active cell to the top left cell.
-      if !has_selection
+      unless has_selection
         active_cell = top_left_cell
         sqref       = top_left_cell
       end
@@ -3339,13 +3956,13 @@ EOS
     #
     # Convert column width from user units to pane split width.
     #
-    def calculate_x_split_width(width) #:nodoc:
+    def calculate_x_split_width(width) # :nodoc:
       # Convert to pixels.
-      if width < 1
-        pixels = int(width * 12 + 0.5)
-      else
-        pixels = (width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING
-      end
+      pixels = if width < 1
+                 int((width * 12) + 0.5)
+               else
+                 ((width * MAX_DIGIT_WIDTH) + 0.5).to_i + PADDING
+               end
 
       # Convert to points.
       points = pixels * 3 / 4
@@ -3360,17 +3977,17 @@ EOS
     #
     # Write the <sheetCalcPr> element for the worksheet calculation properties.
     #
-    def write_sheet_calc_pr #:nodoc:
-      @writer.empty_tag('sheetCalcPr', [ ['fullCalcOnLoad', 1] ])
+    def write_sheet_calc_pr # :nodoc:
+      @writer.empty_tag('sheetCalcPr', [['fullCalcOnLoad', 1]])
     end
 
     #
     # Write the <phoneticPr> element.
     #
-    def write_phonetic_pr #:nodoc:
+    def write_phonetic_pr # :nodoc:
       attributes = [
         ['fontId', 0],
-        ['type',   'noConversion']
+        %w[type noConversion]
       ]
 
       @writer.empty_tag('phoneticPr', attributes)
@@ -3379,82 +3996,80 @@ EOS
     #
     # Write the <pageMargins> element.
     #
-    def write_page_margins #:nodoc:
+    def write_page_margins # :nodoc:
       @page_setup.write_page_margins(@writer)
     end
 
     #
     # Write the <pageSetup> element.
     #
-    def write_page_setup #:nodoc:
+    def write_page_setup # :nodoc:
       @page_setup.write_page_setup(@writer)
     end
 
     #
     # Write the <mergeCells> element.
     #
-    def write_merge_cells #:nodoc:
+    def write_merge_cells # :nodoc:
       write_some_elements('mergeCells', @merge) do
         @merge.each { |merged_range| write_merge_cell(merged_range) }
       end
     end
 
-    def write_some_elements(tag, container)
+    def write_some_elements(tag, container, &block)
       return if container.empty?
 
-      @writer.tag_elements(tag, [ ['count', container.size] ]) do
-        yield
-      end
+      @writer.tag_elements(tag, [['count', container.size]], &block)
     end
 
     #
     # Write the <mergeCell> element.
     #
-    def write_merge_cell(merged_range) #:nodoc:
+    def write_merge_cell(merged_range) # :nodoc:
       row_min, col_min, row_max, col_max = merged_range
 
       # Convert the merge dimensions to a cell range.
       cell_1 = xl_rowcol_to_cell(row_min, col_min)
       cell_2 = xl_rowcol_to_cell(row_max, col_max)
 
-      @writer.empty_tag('mergeCell', [ ['ref', "#{cell_1}:#{cell_2}"] ])
+      @writer.empty_tag('mergeCell', [['ref', "#{cell_1}:#{cell_2}"]])
     end
 
     #
     # Write the <printOptions> element.
     #
-    def write_print_options #:nodoc:
+    def write_print_options # :nodoc:
       @page_setup.write_print_options(@writer)
     end
 
     #
     # Write the <headerFooter> element.
     #
-    def write_header_footer #:nodoc:
+    def write_header_footer # :nodoc:
       @page_setup.write_header_footer(@writer, excel2003_style?)
     end
 
     #
     # Write the <rowBreaks> element.
     #
-    def write_row_breaks #:nodoc:
+    def write_row_breaks # :nodoc:
       write_breaks('rowBreaks')
     end
 
     #
     # Write the <colBreaks> element.
     #
-    def write_col_breaks #:nodoc:
+    def write_col_breaks # :nodoc:
       write_breaks('colBreaks')
     end
 
     def write_breaks(tag) # :nodoc:
       case tag
       when 'rowBreaks'
-        page_breaks = sort_pagebreaks(*(@page_setup.hbreaks))
+        page_breaks = sort_pagebreaks(*@page_setup.hbreaks)
         max = 16383
       when 'colBreaks'
-        page_breaks = sort_pagebreaks(*(@page_setup.vbreaks))
+        page_breaks = sort_pagebreaks(*@page_setup.vbreaks)
         max = 1048575
       else
         raise "Invalid parameter '#{tag}' in write_breaks."
@@ -3472,10 +4087,11 @@ EOS
         page_breaks.each { |num| write_brk(num, max) }
       end
     end
+
     #
     # Write the <brk> element.
     #
-    def write_brk(id, max) #:nodoc:
+    def write_brk(id, max) # :nodoc:
       attributes = [
         ['id',  id],
         ['max', max],
@@ -3488,7 +4104,7 @@ EOS
     #
     # Write the <autoFilter> element.
     #
-    def write_auto_filter #:nodoc:
+    def write_auto_filter # :nodoc:
       return unless autofilter_ref?
 
       attributes = [
@@ -3510,10 +4126,10 @@ EOS
     # Function to iterate through the columns that form part of an autofilter
     # range and write the appropriate filters.
     #
-    def write_autofilters #:nodoc:
+    def write_autofilters # :nodoc:
       col1, col2 = @filter_range
 
-      (col1 .. col2).each do |col|
+      (col1..col2).each do |col|
         # Skip if column doesn't have an active filter.
         next unless @filter_cols[col]
 
@@ -3529,8 +4145,8 @@ EOS
     #
     # Write the <filterColumn> element.
     #
-    def write_filter_column(col_id, type, *filters) #:nodoc:
-      @writer.tag_elements('filterColumn', [ ['colId', col_id] ]) do
+    def write_filter_column(col_id, type, *filters) # :nodoc:
+      @writer.tag_elements('filterColumn', [['colId', col_id]]) do
         if type == 1
           # Type == 1 is the new XLSX style filter.
           write_filters(*filters)
@@ -3544,13 +4160,11 @@ EOS
     #
     # Write the <filters> element.
     #
-    def write_filters(*filters) #:nodoc:
-      non_blanks = filters.reject { |filter| filter =~ /^blanks$/i }
+    def write_filters(*filters) # :nodoc:
+      non_blanks = filters.reject { |filter| filter.to_s =~ /^blanks$/i }
       attributes = []
 
-      if filters != non_blanks
-        attributes = [ ['blank', 1] ]
-      end
+      attributes = [['blank', 1]] if filters != non_blanks
 
       if filters.size == 1 && non_blanks.empty?
         # Special case for blank cells only.
@@ -3566,14 +4180,14 @@ EOS
     #
     # Write the <filter> element.
     #
-    def write_filter(val) #:nodoc:
-      @writer.empty_tag('filter', [ ['val', val] ])
+    def write_filter(val) # :nodoc:
+      @writer.empty_tag('filter', [['val', val]])
     end
 
     #
     # Write the <customFilters> element.
     #
-    def write_custom_filters(*tokens) #:nodoc:
+    def write_custom_filters(*tokens) # :nodoc:
       if tokens.size == 2
         # One filter expression only.
         @writer.tag_elements('customFilters') { write_custom_filter(*tokens) }
@@ -3581,11 +4195,11 @@ EOS
         # Two filter expressions.
 
         # Check if the "join" operand is "and" or "or".
-        if tokens[2] == 0
-          attributes = [ ['and', 1] ]
-        else
-          attributes = [ ['and', 0] ]
-        end
+        attributes = if tokens[2] == 0
+                       [['and', 1]]
+                     else
+                       [['and', 0]]
+                     end
 
         # Write the two custom filters.
         @writer.tag_elements('customFilters', attributes) do
@@ -3598,7 +4212,7 @@ EOS
     #
     # Write the <customFilter> element.
     #
-    def write_custom_filter(operator, val) #:nodoc:
+    def write_custom_filter(operator, val) # :nodoc:
       operators = {
         1  => 'lessThan',
         2  => 'equal',
@@ -3628,8 +4242,9 @@ EOS
     # Process any sored hyperlinks in row/col order and write the <hyperlinks>
     # element. The attributes are different for internal and external links.
     #
-    def write_hyperlinks #:nodoc:
+    def write_hyperlinks # :nodoc:
       return unless @hyperlinks
+
       hlink_attributes = []
       @hyperlinks.keys.sort.each do |row_num|
         # Sort the hyperlinks into column order.
@@ -3642,11 +4257,9 @@ EOS
           # If the cell isn't a string then we have to add the url as
           # the string to display
           if ptrue?(@cell_data_table)          &&
-              ptrue?(@cell_data_table[row_num]) &&
-              ptrue?(@cell_data_table[row_num][col_num])
-            if @cell_data_table[row_num][col_num].display_url_string?
-              link.display_on
-            end
+             ptrue?(@cell_data_table[row_num]) &&
+             ptrue?(@cell_data_table[row_num][col_num]) && @cell_data_table[row_num][col_num].display_url_string?
+            link.display_on
           end
 
           if link.respond_to?(:external_hyper_link)
@@ -3672,7 +4285,7 @@ EOS
     #
     # Write the <tabColor> element.
     #
-    def write_tab_color #:nodoc:
+    def write_tab_color # :nodoc:
       return unless tab_color?
 
       @writer.empty_tag(
@@ -3701,7 +4314,7 @@ EOS
     #
     # Write the <sheetProtection> element.
     #
-    def write_sheet_protection #:nodoc:
+    def write_sheet_protection # :nodoc:
       return unless protect?
 
       attributes = []
@@ -3759,14 +4372,14 @@ EOS
     #
     # Write the <drawing> elements.
     #
-    def write_drawings #:nodoc:
+    def write_drawings # :nodoc:
       increment_rel_id_and_write_r_id('drawing') if drawings?
     end
 
     #
     # Write the <legacyDrawing> element.
     #
-    def write_legacy_drawing #:nodoc:
+    def write_legacy_drawing # :nodoc:
       increment_rel_id_and_write_r_id('legacyDrawing') if has_vml?
     end
 
@@ -3779,7 +4392,7 @@ EOS
       # Increment the relationship id for any drawings or comments.
       @rel_count += 1
 
-      attributes = [ ['r:id', "rId#{@rel_count}"] ]
+      attributes = [['r:id', "rId#{@rel_count}"]]
       @writer.empty_tag('legacyDrawingHF', attributes)
     end
 
@@ -3801,7 +4414,7 @@ EOS
     #
     # Write the underline font element.
     #
-    def write_underline(writer, underline) #:nodoc:
+    def write_underline(writer, underline) # :nodoc:
       writer.empty_tag('u', underline_attributes(underline))
     end
 
@@ -3811,7 +4424,7 @@ EOS
     def write_table_parts
       return if @tables.empty?
 
-      @writer.tag_elements('tableParts', [ ['count', tables_count] ]) do
+      @writer.tag_elements('tableParts', [['count', tables_count]]) do
         tables_count.times { increment_rel_id_and_write_r_id('tablePart') }
       end
     end
@@ -3850,7 +4463,6 @@ EOS
     def write_ext_list_data_bars
       # Write the ext element.
       write_ext('{78C0D931-6437-407d-A8EE-F0AAD7539E65}') do
-
         @writer.tag_elements('x14:conditionalFormattings') do
           # Write each of the Excel 2010 conditional formatting data bar elements.
           @data_bars_2010.each do |data_bar|
@@ -3860,16 +4472,16 @@ EOS
         end
       end
     end
+
     #
     # Write the <x14:conditionalFormatting> element.
     #
     def write_conditional_formatting_2010(data_bar)
       xmlns_xm = 'http://schemas.microsoft.com/office/excel/2006/main'
 
-      attributes = [ ['xmlns:xm', xmlns_xm] ]
+      attributes = [['xmlns:xm', xmlns_xm]]
 
       @writer.tag_elements('x14:conditionalFormatting', attributes) do
-
         # Write the '<x14:cfRule element.
         write_x14_cf_rule(data_bar)
 
@@ -3881,26 +4493,21 @@ EOS
         write_x14_cfvo(data_bar[:x14_max_type], data_bar[:max_value])
 
         # Write the x14:borderColor element.
-        if !ptrue?(data_bar[:bar_no_border])
-          write_x14_border_color(data_bar[:bar_border_color])
-        end
+        write_x14_border_color(data_bar[:bar_border_color]) unless ptrue?(data_bar[:bar_no_border])
 
         # Write the x14:negativeFillColor element.
-        if !ptrue?(data_bar[:bar_negative_color_same])
-          write_x14_negative_fill_color(data_bar[:bar_negative_color])
-        end
+        write_x14_negative_fill_color(data_bar[:bar_negative_color]) unless ptrue?(data_bar[:bar_negative_color_same])
 
         # Write the x14:negativeBorderColor element.
         if !ptrue?(data_bar[:bar_no_border]) &&
            !ptrue?(data_bar[:bar_negative_border_color_same])
           write_x14_negative_border_color(
-            data_bar[:bar_negative_border_color])
+            data_bar[:bar_negative_border_color]
+          )
         end
 
         # Write the x14:axisColor element.
-        if data_bar[:bar_axis_position] != 'none'
-          write_x14_axis_color(data_bar[:bar_axis_color])
-        end
+        write_x14_axis_color(data_bar[:bar_axis_color]) if data_bar[:bar_axis_position] != 'none'
 
         # Write closing elements.
         @writer.end_tag('x14:dataBar')
@@ -3915,9 +4522,9 @@ EOS
     # Write the <cfvo> element.
     #
     def write_x14_cfvo(type, value)
-      attributes = [ ['type', type ] ]
+      attributes = [['type', type]]
 
-      if %w(min max autoMin autoMax).include?(type)
+      if %w[min max autoMin autoMax].include?(type)
         @writer.empty_tag('x14:cfvo', attributes)
       else
         @writer.tag_elements('x14:cfvo', attributes) do
@@ -3939,7 +4546,6 @@ EOS
       ]
 
       @writer.start_tag('x14:cfRule', attributes)
-
     end
 
     #
@@ -3954,32 +4560,22 @@ EOS
         ['maxLength', max_length]
       ]
 
-      attributes << ['border',   1] if !ptrue?(data_bar[:bar_no_border])
+      attributes << ['border',   1] unless ptrue?(data_bar[:bar_no_border])
       attributes << ['gradient', 0] if ptrue?(data_bar[:bar_solid])
 
-      if data_bar[:bar_direction] == 'left'
-        attributes << ['direction', 'leftToRight']
-      end
-      if data_bar[:bar_direction] == 'right'
-        attributes << ['direction', 'rightToLeft']
-      end
+      attributes << %w[direction leftToRight] if data_bar[:bar_direction] == 'left'
+      attributes << %w[direction rightToLeft] if data_bar[:bar_direction] == 'right'
 
-      if ptrue?(data_bar[:bar_negative_color_same])
-        attributes << ['negativeBarColorSameAsPositive', 1]
-      end
+      attributes << ['negativeBarColorSameAsPositive', 1] if ptrue?(data_bar[:bar_negative_color_same])
 
       if !ptrue?(data_bar[:bar_no_border]) &&
          !ptrue?(data_bar[:bar_negative_border_color_same])
         attributes << ['negativeBarBorderColorSameAsPositive', 0]
       end
 
-      if data_bar[:bar_axis_position] == 'middle'
-        attributes << ['axisPosition', 'middle']
-      end
+      attributes << %w[axisPosition middle] if data_bar[:bar_axis_position] == 'middle'
 
-      if data_bar[:bar_axis_position] == 'none'
-        attributes << ['axisPosition', 'none']
-      end
+      attributes << %w[axisPosition none] if data_bar[:bar_axis_position] == 'none'
 
       @writer.start_tag('x14:dataBar', attributes)
     end
@@ -3988,7 +4584,7 @@ EOS
     # Write the <x14:borderColor> element.
     #
     def write_x14_border_color(rgb)
-      attributes = [ ['rgb', rgb]  ]
+      attributes = [['rgb', rgb]]
 
       @writer.empty_tag('x14:borderColor', attributes)
     end
@@ -3997,7 +4593,7 @@ EOS
     # Write the <x14:negativeFillColor> element.
     #
     def write_x14_negative_fill_color(rgb)
-      attributes = [ ['rgb', rgb] ]
+      attributes = [['rgb', rgb]]
 
       @writer.empty_tag('x14:negativeFillColor', attributes)
     end
@@ -4006,7 +4602,7 @@ EOS
     # Write the <x14:negativeBorderColor> element.
     #
     def write_x14_negative_border_color(rgb)
-      attributes = [ ['rgb', rgb] ]
+      attributes = [['rgb', rgb]]
 
       @writer.empty_tag('x14:negativeBorderColor', attributes)
     end
@@ -4015,7 +4611,7 @@ EOS
     # Write the <x14:axisColor> element.
     #
     def write_x14_axis_color(rgb)
-      attributes = [ ['rgb', rgb] ]
+      attributes = [['rgb', rgb]]
 
       @writer.empty_tag('x14:axisColor', attributes)
     end
@@ -4026,7 +4622,6 @@ EOS
     def write_ext_list_sparklines
       # Write the ext element.
       write_ext('{05C60535-1F16-4fd2-B633-F4F36F0B64E0}') do
-
         # Write the x14:sparklineGroups element.
         write_sparkline_groups
       end
@@ -4038,7 +4633,7 @@ EOS
     def write_sparklines(sparkline)
       # Write the sparkline elements.
       @writer.tag_elements('x14:sparklines') do
-        (0..sparkline[:count]-1).each do |i|
+        (0..sparkline[:count] - 1).each do |i|
           range    = sparkline[:ranges][i]
           location = sparkline[:locations][i]
 
@@ -4052,14 +4647,14 @@ EOS
 
     def sparkline_groups_attributes  # :nodoc:
       [
-       ['xmlns:xm', "#{OFFICE_URL}excel/2006/main"]
+        ['xmlns:xm', "#{OFFICE_URL}excel/2006/main"]
       ]
     end
 
     #
     # Write the <dataValidations> element.
     #
-    def write_data_validations #:nodoc:
+    def write_data_validations # :nodoc:
       write_some_elements('dataValidations', @validations) do
         @validations.each { |validation| validation.write_data_validation(@writer) }
       end
@@ -4068,7 +4663,7 @@ EOS
     #
     # Write the Worksheet conditional formats.
     #
-    def write_conditional_formats  #:nodoc:
+    def write_conditional_formats  # :nodoc:
       @cond_formats.keys.sort.each do |range|
         write_conditional_formatting(range, @cond_formats[range])
       end
@@ -4077,18 +4672,17 @@ EOS
     #
     # Write the <conditionalFormatting> element.
     #
-    def write_conditional_formatting(range, cond_formats) #:nodoc:
-      @writer.tag_elements('conditionalFormatting', [ ['sqref', range] ]) do
+    def write_conditional_formatting(range, cond_formats) # :nodoc:
+      @writer.tag_elements('conditionalFormatting', [['sqref', range]]) do
         cond_formats.each { |cond_format| cond_format.write_cf_rule }
       end
     end
 
-    def store_data_to_table(cell_data) #:nodoc:
-      row, col = cell_data.row, cell_data.col
+    def store_data_to_table(cell_data, row, col) # :nodoc:
       if @cell_data_table[row]
         @cell_data_table[row][col] = cell_data
       else
-        @cell_data_table[row] = {}
+        @cell_data_table[row] = []
         @cell_data_table[row][col] = cell_data
       end
     end
@@ -4103,44 +4697,40 @@ EOS
     # optimisation and isn't strictly required. However, it makes comparing
     # files easier.
     #
-    def calculate_spans #:nodoc:
+    def calculate_spans # :nodoc:
       span_min = nil
       span_max = 0
       spans = []
 
-      (@dim_rowmin .. @dim_rowmax).each do |row_num|
-        if @cell_data_table[row_num]
-          span_min, span_max = calc_spans(@cell_data_table, row_num, span_min, span_max)
-        end
+      (@dim_rowmin..@dim_rowmax).each do |row_num|
+        span_min, span_max = calc_spans(@cell_data_table, row_num, span_min, span_max) if @cell_data_table[row_num]
 
         # Calculate spans for comments.
-        if @comments[row_num]
-          span_min, span_max = calc_spans(@comments, row_num, span_min, span_max)
-        end
+        span_min, span_max = calc_spans(@comments, row_num, span_min, span_max) if @comments[row_num]
 
-        if ((row_num + 1) % 16 == 0) || (row_num == @dim_rowmax)
-          span_index = row_num / 16
-          if span_min
-            span_min += 1
-            span_max += 1
-            spans[span_index] = "#{span_min}:#{span_max}"
-            span_min = nil
-          end
-        end
+        next unless ((row_num + 1) % 16 == 0) || (row_num == @dim_rowmax)
+
+        span_index = row_num / 16
+        next unless span_min
+
+        span_min += 1
+        span_max += 1
+        spans[span_index] = "#{span_min}:#{span_max}"
+        span_min = nil
       end
 
       @row_spans = spans
     end
 
     def calc_spans(data, row_num, span_min, span_max)
-      (@dim_colmin .. @dim_colmax).each do |col_num|
+      (@dim_colmin..@dim_colmax).each do |col_num|
         if data[row_num][col_num]
-          if !span_min
-            span_min = col_num
-            span_max = col_num
-          else
+          if span_min
             span_min = col_num if col_num < span_min
             span_max = col_num if col_num > span_max
+          else
+            span_min = col_num
+            span_max = col_num
           end
         end
       end
@@ -4151,7 +4741,7 @@ EOS
     # Add a string to the shared string table, if it isn't already there, and
     # return the string index.
     #
-    def shared_string_index(str) #:nodoc:
+    def shared_string_index(str) # :nodoc:
       @workbook.shared_string_index(str)
     end
 
@@ -4161,7 +4751,7 @@ EOS
     # Convert zero indexed rows and columns to the format required by worksheet
     # named ranges, eg, "Sheet1!$A$1:$C$13".
     #
-    def convert_name_area(row_num_1, col_num_1, row_num_2, col_num_2) #:nodoc:
+    def convert_name_area(row_num_1, col_num_1, row_num_2, col_num_2) # :nodoc:
       range1       = ''
       range2       = ''
       row_col_only = false
@@ -4187,25 +4777,25 @@ EOS
       end
 
       # A repeated range is only written once (if it isn't a special case).
-      if range1 == range2 && !row_col_only
-        area = range1
-      else
-        area = "#{range1}:#{range2}"
-      end
+      area = if range1 == range2 && !row_col_only
+               range1
+             else
+               "#{range1}:#{range2}"
+             end
 
       # Build up the print area range "Sheet1!$A$1:$C$13".
       "#{quote_sheetname(@name)}!#{area}"
     end
 
-    def fit_page? #:nodoc:
+    def fit_page? # :nodoc:
       @page_setup.fit_page
     end
 
-    def filter_on? #:nodoc:
+    def filter_on? # :nodoc:
       ptrue?(@filter_on)
     end
 
-    def tab_color? #:nodoc:
+    def tab_color? # :nodoc:
       ptrue?(@tab_color)
     end
 
@@ -4217,37 +4807,33 @@ EOS
       ptrue?(@vba_codename)
     end
 
-    def zoom_scale_normal? #:nodoc:
+    def zoom_scale_normal? # :nodoc:
       ptrue?(@zoom_scale_normal)
     end
 
-    def page_view? #:nodoc:
-      !!@page_view
-    end
-
-    def right_to_left? #:nodoc:
+    def right_to_left? # :nodoc:
       !!@right_to_left
     end
 
-    def show_zeros? #:nodoc:
+    def show_zeros? # :nodoc:
       !!@show_zeros
     end
 
-    def protect? #:nodoc:
+    def protect? # :nodoc:
       !!@protect
     end
 
-    def autofilter_ref? #:nodoc:
+    def autofilter_ref? # :nodoc:
       !!@autofilter_ref
     end
 
-    def drawings? #:nodoc:
+    def drawings? # :nodoc:
       !!@drawings
     end
 
-    def remove_white_space(margin) #:nodoc:
+    def remove_white_space(margin) # :nodoc:
       if margin.respond_to?(:gsub)
-        margin.gsub(/[^\d\.]/, '')
+        margin.gsub(/[^\d.]/, '')
       else
         margin
       end
@@ -4260,15 +4846,15 @@ EOS
         col_cell = xl_rowcol_to_cell(0, left_col)
 
         @selections <<
-          [ 'topRight',    col_cell,    col_cell ] <<
-          [ 'bottomLeft',  row_cell,    row_cell ] <<
-          [ 'bottomRight', active_cell, sqref ]
+          ['topRight',    col_cell,    col_cell] <<
+          ['bottomLeft',  row_cell,    row_cell] <<
+          ['bottomRight', active_cell, sqref]
       elsif col > 0
         active_pane = 'topRight'
-        @selections << [ 'topRight', active_cell, sqref ]
+        @selections << ['topRight', active_cell, sqref]
       else
         active_pane = 'bottomLeft'
-        @selections << [ 'bottomLeft', active_cell, sqref ]
+        @selections << ['bottomLeft', active_cell, sqref]
       end
       active_pane
     end
@@ -4279,16 +4865,15 @@ EOS
         col_letter = col
 
         # Convert col ref to a cell ref and then to a col number.
-        dummy, col = substitute_cellref("#{col}1")
+        _dummy, col = substitute_cellref("#{col}1")
         raise "Invalid column '#{col_letter}'" if col >= COL_MAX
       end
 
       col_first, col_last = @filter_range
 
       # Reject column if it is outside filter range.
-      if col < col_first or col > col_last
-        raise "Column '#{col}' outside autofilter column range (#{col_first} .. #{col_last})"
-      end
+      raise "Column '#{col}' outside autofilter column range (#{col_first} .. #{col_last})" if col < col_first or col > col_last
+
       col
     end
 
@@ -4300,21 +4885,19 @@ EOS
 
       ignore = @ignore_errors
 
-      @writer.tag_elements('ignoredErrors' ) do
+      @writer.tag_elements('ignoredErrors') do
         {
-          :number_stored_as_text => 'numberStoredAsText',
-          :eval_error            => 'evalError',
-          :formula_differs       => 'formula',
-          :formula_range         => 'formulaRange',
-          :formula_unlocked      => 'unlockedFormula',
-          :empty_cell_reference  => 'emptyCellReference',
-          :list_data_validation  => 'listDataValidation',
-          :calculated_column     => 'calculatedColumn',
-          :two_digit_text_year   => 'twoDigitTextYear'
+          number_stored_as_text: 'numberStoredAsText',
+          eval_error:            'evalError',
+          formula_differs:       'formula',
+          formula_range:         'formulaRange',
+          formula_unlocked:      'unlockedFormula',
+          empty_cell_reference:  'emptyCellReference',
+          list_data_validation:  'listDataValidation',
+          calculated_column:     'calculatedColumn',
+          two_digit_text_year:   'twoDigitTextYear'
         }.each do |key, value|
-          if ignore[key]
-            write_ignored_error(value, ignore[key])
-          end
+          write_ignored_error(value, ignore[key]) if ignore[key]
         end
       end
     end