write_xlsx 0.0.3 → 0.0.4

data/lib/write_xlsx/package/vml.rb

@@ -85,12 +85,10 @@ def write_shapelayout(data_id)
 
         attributes = ['v:ext', ext]
 
-        @writer.start_tag('o:shapelayout', attributes)
-
-        # Write the o:idmap element.
-        write_idmap(data_id)
-
-        @writer.end_tag('o:shapelayout')
+        @writer.tag_elements('o:shapelayout', attributes) do
+          # Write the o:idmap element.
+          write_idmap(data_id)
+        end
       end
 
       #
@@ -123,15 +121,12 @@ def write_shapetype
             'path',      path
         ]
 
-        @writer.start_tag('v:shapetype', attributes)
-
-        # Write the v:stroke element.
-        write_stroke
-
-        # Write the v:path element.
-        write_path('t', 'rect')
-
-        @writer.end_tag('v:shapetype')
+        @writer.tag_elements('v:shapetype', attributes) do
+          # Write the v:stroke element.
+          write_stroke
+          # Write the v:path element.
+          write_path('t', 'rect')
+        end
       end
 
       #
@@ -203,24 +198,18 @@ def write_shape(id, z_index, comment)
             'o:insetmode', insetmode
         ]
 
-        @writer.start_tag('v:shape', attributes)
-
-        # Write the v:fill element.
-        write_fill
-
-        # Write the v:shadow element.
-        write_shadow
-
-        # Write the v:path element.
-        write_path(nil, 'none')
-
-        # Write the v:textbox element.
-        write_textbox
-
-        # Write the x:ClientData element.
-        write_client_data(comment)
-
-        @writer.end_tag('v:shape')
+        @writer.tag_elements('v:shape', attributes) do
+          # Write the v:fill element.
+          write_fill
+          # Write the v:shadow element.
+          write_shadow
+          # Write the v:path element.
+          write_path(nil, 'none')
+          # Write the v:textbox element.
+          write_textbox
+          # Write the x:ClientData element.
+          write_client_data(comment)
+        end
       end
 
       def float_to_str(float)
@@ -267,12 +256,10 @@ def write_textbox
 
         attributes = ['style', style]
 
-        @writer.start_tag('v:textbox', attributes)
-
-        # Write the div element.
-        write_div
-
-        @writer.end_tag('v:textbox')
+        @writer.tag_elements('v:textbox', attributes) do
+          # Write the div element.
+          write_div
+        end
       end
 
       #
@@ -282,8 +269,7 @@ def write_div
         style = 'text-align:left'
         attributes = ['style', style]
 
-        @writer.start_tag('div', attributes)
-        @writer.end_tag('div')
+        @writer.tag_elements('div', attributes) { }
       end
 
       #
@@ -294,30 +280,22 @@ def write_client_data(comment)
 
         attributes = ['ObjectType', object_type]
 
-        @writer.start_tag('x:ClientData', attributes)
-
-        # Write the x:MoveWithCells element.
-        write_move_with_cells
-
-        # Write the x:SizeWithCells element.
-        write_size_with_cells
-
-        # Write the x:Anchor element.
-        write_anchor(comment.vertices)
-
-        # Write the x:AutoFill element.
-        write_auto_fill
-
-        # Write the x:Row element.
-        write_row(comment.row)
-
-        # Write the x:Column element.
-        write_column(comment.col)
-
-        # Write the x:Visible element.
-        write_visible if comment.visible != 0 && !comment.visible.nil?
-
-        @writer.end_tag('x:ClientData')
+        @writer.tag_elements('x:ClientData', attributes) do
+          # Write the x:MoveWithCells element.
+          write_move_with_cells
+          # Write the x:SizeWithCells element.
+          write_size_with_cells
+          # Write the x:Anchor element.
+          write_anchor(comment.vertices)
+          # Write the x:AutoFill element.
+          write_auto_fill
+          # Write the x:Row element.
+          write_row(comment.row)
+          # Write the x:Column element.
+          write_column(comment.col)
+          # Write the x:Visible element.
+          write_visible if comment.visible != 0 && !comment.visible.nil?
+        end
       end
 
       #

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -22,6 +22,12 @@ def xml_decl(encoding = 'UTF-8', standalone = true)
         io_write(str)
       end
 
+      def tag_elements(tag, attributes = [])
+        start_tag(tag, attributes)
+        yield
+        end_tag(tag)
+      end
+
       def start_tag(tag, attr = [])
         str = "<#{tag}#{key_vals(attr)}>"
         io_write(str)
@@ -38,9 +44,7 @@ def empty_tag(tag, attr = [])
       end
 
       def data_element(tag, data, attr = [])
-        str = start_tag(tag, attr)
-        str << io_write("#{characters(data)}")
-        str << end_tag(tag)
+        tag_elements(tag, attr) { io_write("#{characters(data)}") }
       end
 
       def characters(data)

data/lib/write_xlsx/workbook.rb

@@ -844,7 +844,7 @@ def write_workbook_pr #:nodoc:
     end
 
     def write_book_views #:nodoc:
-      @writer.start_tag('bookViews') << write_workbook_view << @writer.end_tag('bookViews')
+      @writer.tag_elements('bookViews') { write_workbook_view }
     end
 
     def write_workbook_view #:nodoc:
@@ -864,13 +864,13 @@ def write_workbook_view #:nodoc:
     end
 
     def write_sheets #:nodoc:
-      str = @writer.start_tag('sheets')
-      id_num = 1
-      @worksheets.each do |sheet|
-        str << write_sheet(sheet.name, id_num, sheet.hidden?)
-        id_num += 1
+      @writer.tag_elements('sheets') do
+        id_num = 1
+        @worksheets.each do |sheet|
+          write_sheet(sheet.name, id_num, sheet.hidden?)
+          id_num += 1
+        end
       end
-      str << @writer.end_tag('sheets')
     end
 
     def write_sheet(name, sheet_id, hidden = false) #:nodoc:
@@ -893,7 +893,7 @@ def write_calc_pr #:nodoc:
 
     def write_ext_lst #:nodoc:
       tag = 'extLst'
-      @writer.start_tag(tag) << write_ext << @writer.end_tag(tag)
+      @writer.tag_elements(tag) { write_ext }
     end
 
     def write_ext #:nodoc:
@@ -902,7 +902,7 @@ def write_ext #:nodoc:
         'xmlns:mx', 'http://schemas.microsoft.com/office/mac/excel/2008/main',
         'uri', 'http://schemas.microsoft.com/office/mac/excel/2008/main'
       ]
-      @writer.start_tag(tag, attributes) << write_mx_arch_id << @writer.end_tag(tag)
+      @writer.tag_elements(tag, attributes) { write_mx_arch_id }
     end
 
     def write_mx_arch_id #:nodoc:
@@ -912,9 +912,9 @@ def write_mx_arch_id #:nodoc:
     def write_defined_names #:nodoc:
       return if @defined_names.nil? || @defined_names.empty?
       tag = 'definedNames'
-      str = @writer.start_tag(tag)
-      @defined_names.each { |defined_name| str << write_defined_name(defined_name) }
-      str << @writer.end_tag(tag)
+      @writer.tag_elements(tag) do
+        @defined_names.each { |defined_name| write_defined_name(defined_name) }
+      end
     end
 
     def write_defined_name(data) #:nodoc:
@@ -949,8 +949,6 @@ def defined_names #:nodoc:
     # Assemble worksheets into a workbook.
     #
     def store_workbook #:nodoc:
-      packager = Package::Packager.new
-
       # Add a default worksheet if non have been added.
       add_worksheet if @worksheets.empty?
 
@@ -960,19 +958,13 @@ def store_workbook #:nodoc:
       # Set the active sheet.
       @worksheets.each { |sheet| sheet.activate if sheet.index == @activesheet }
 
-      # Prepare the worksheet cell comments.
-      prepare_comments
-
-      # Set the defined names for the worksheets such as Print Titles.
-      prepare_defined_names
-
-      # Prepare the drawings, charts and images.
-      prepare_drawings
-
-      # Add cached data to charts.
-      add_chart_data
+      prepare_comments      # Prepare the worksheet cell comments.
+      prepare_defined_names # Set the defined names for the worksheets such as Print Titles.
+      prepare_drawings      # Prepare the drawings, charts and images.
+      add_chart_data        # Add cached data to charts.
 
       # Package the workbook.
+      packager = Package::Packager.new
       packager.add_workbook(self)
       packager.set_package_dir(@tempdir)
       packager.create_package
@@ -1020,45 +1012,27 @@ def prepare_formats #:nodoc:
       end
     end
 
-    #
-    # Set the default index for each format. This is mainly used for testing.
-    #
-    def set_default_xf_indices #:nodoc:
-      @formats.each { |format| format.get_xf_index }
-    end
-
     #
     # Iterate through the XF Format objects and give them an index to non-default
     # font elements.
     #
     def prepare_fonts #:nodoc:
       fonts = {}
-      index = 0
-
       @xf_formats.each do |format|
         key = format.get_font_key
-
-        if fonts[key]
-          # Font has already been used.
-          format.font_index = fonts[key]
-          format.has_font   = 0
-        else
-          # This is a new font.
-          fonts[key]        = index
-          format.font_index = index
-          format.has_font   = 1
-          index += 1
-        end
+        format.has_font(!fonts[key])
+        format.font_index = fonts[key] || fonts.size
+        fonts[key] ||= fonts.size
       end
 
-      @font_count = index
+      @font_count = fonts.size
 
       # For the DXF formats we only need to check if the properties have changed.
       @dxf_formats.each do |format|
         # The only font properties that can change for a DXF format are: color,
         # bold, italic, underline and strikethrough.
         if format.color || format.bold? || format.italic? || format.underline? || format.strikeout?
-          format.has_dxf_font = 1
+          format.has_dxf_font(true)
         end
       end
     end
@@ -1110,30 +1084,19 @@ def prepare_num_formats #:nodoc:
     #
     def prepare_borders #:nodoc:
       borders = {}
-      index = 0
-
       @xf_formats.each do |format|
         key = format.get_border_key
-
-        if borders[key]
-          # Border has already been used.
-          format.border_index = borders[key]
-          format.has_border   = 0
-        else
-          # This is a new border.
-          borders[key]        = index
-          format.border_index = index
-          format.has_border   = 1
-          index += 1
-        end
+        format.has_border(!borders[key])
+        format.border_index = borders[key] || borders.size
+        borders[key] ||= borders.size
       end
 
-      @border_count = index
+      @border_count = borders.size
 
       # For the DXF formats we only need to check if the properties have changed.
       @dxf_formats.each do |format|
         key = format.get_border_key
-        format.has_dxf_border = 1 if key =~ /[^0:]/
+        format.has_dxf_border(true) if key =~ /[^0:]/
       end
     end
 
@@ -1177,12 +1140,12 @@ def prepare_fills #:nodoc:
         if fills[key]
           # Fill has already been used.
           format.fill_index = fills[key]
-          format.has_fill   = 0
+          format.has_fill(false)
         else
           # This is a new fill.
           fills[key]        = index
           format.fill_index = index
-          format.has_fill   = 1
+          format.has_fill(true)
           index += 1
         end
       end
@@ -1191,7 +1154,7 @@ def prepare_fills #:nodoc:
 
       # For the DXF formats we only need to check if the properties have changed.
       @dxf_formats.each do |format|
-        format.has_dxf_fill = 1 if format.pattern || format.bg_color || format.fg_color
+        format.has_dxf_fill(true) if format.pattern || format.bg_color || format.fg_color
       end
     end
 

data/lib/write_xlsx/worksheet.rb

@@ -109,23 +109,21 @@ class CellData   # :nodoc:
       attr_reader :result, :range, :link_type, :url, :tip
 
       #
-      # Write the <cell> element. This is the innermost loop so efficiency is
+      # attributes for the <cell> element. This is the innermost loop so efficiency is
       # important where possible.
       #
-      def write_cell(worksheet) #:nodoc:
-        xf_index = 0
-        xf_index = xf.get_xf_index if xf.respond_to?(:get_xf_index)
-
+      def cell_attributes #:nodoc:
+        xf_index = xf ? xf.get_xf_index : 0
         attributes = ['r', xl_rowcol_to_cell(row, col)]
 
         # Add the cell format index.
         if xf_index != 0
           attributes << 's' << xf_index
-        elsif worksheet.set_rows[row] && worksheet.set_rows[row][1]
-          row_xf = worksheet.set_rows[row][1]
+        elsif @worksheet.set_rows[row] && @worksheet.set_rows[row][1]
+          row_xf = @worksheet.set_rows[row][1]
           attributes << 's' << row_xf.get_xf_index
-        elsif worksheet.col_formats[col]
-          col_xf = worksheet.col_formats[col]
+        elsif @worksheet.col_formats[col]
+          col_xf = @worksheet.col_formats[col]
           attributes << 's' << col_xf.get_xf_index
         end
         attributes
@@ -133,7 +131,8 @@ def write_cell(worksheet) #:nodoc:
     end
 
     class NumberCellData < CellData # :nodoc:
-      def initialize(row, col, num, xf)
+      def initialize(worksheet, row, col, num, xf)
+        @worksheet = worksheet
         @row, @col, @token, @xf = row, col, num, xf
       end
 
@@ -141,16 +140,16 @@ def data
         @token
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
-        worksheet.writer.start_tag('c', attributes)
-        worksheet.write_cell_value(token)
-        worksheet.writer.end_tag('c')
+      def write_cell
+        @worksheet.writer.tag_elements('c', cell_attributes) do
+          @worksheet.write_cell_value(token)
+        end
       end
     end
 
     class StringCellData < CellData # :nodoc:
-      def initialize(row, col, index, xf)
+      def initialize(worksheet, row, col, index, xf)
+        @worksheet = worksheet
         @row, @col, @token, @xf = row, col, index, xf
       end
 
@@ -158,17 +157,18 @@ def data
         { :sst_id => token }
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
+      def write_cell
+        attributes = cell_attributes
         attributes << 't' << 's'
-        worksheet.writer.start_tag('c', attributes)
-        worksheet.write_cell_value(token)
-        worksheet.writer.end_tag('c')
+        @worksheet.writer.tag_elements('c', attributes) do
+          @worksheet.write_cell_value(token)
+        end
       end
     end
 
     class FormulaCellData < CellData # :nodoc:
-      def initialize(row, col, formula, xf, result)
+      def initialize(worksheet, row, col, formula, xf, result)
+        @worksheet = worksheet
         @row, @col, @token, @xf, @result = row, col, formula, xf, result
       end
 
@@ -176,17 +176,17 @@ def data
         @result || 0
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
-        worksheet.writer.start_tag('c', attributes)
-        worksheet.write_cell_formula(token)
-        worksheet.write_cell_value(result || 0)
-        worksheet.writer.end_tag('c')
+      def write_cell
+        @worksheet.writer.tag_elements('c', cell_attributes) do
+          @worksheet.write_cell_formula(token)
+          @worksheet.write_cell_value(result || 0)
+        end
       end
     end
 
     class FormulaArrayCellData < CellData # :nodoc:
-      def initialize(row, col, formula, xf, range, result)
+      def initialize(worksheet, row, col, formula, xf, range, result)
+        @worksheet = worksheet
         @row, @col, @token, @xf, @range, @result = row, col, formula, xf, range, result
       end
 
@@ -194,17 +194,17 @@ def data
         @result || 0
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
-        worksheet.writer.start_tag('c', attributes)
-        worksheet.write_cell_array_formula(token, range)
-        worksheet.write_cell_value(result)
-        worksheet.writer.end_tag('c')
+      def write_cell
+        @worksheet.writer.tag_elements('c', cell_attributes) do
+          @worksheet.write_cell_array_formula(token, range)
+          @worksheet.write_cell_value(result)
+        end
       end
     end
 
     class HyperlinkCellData < CellData # :nodoc:
-      def initialize(row, col, index, xf, link_type, url, str, tip)
+      def initialize(worksheet, row, col, index, xf, link_type, url, str, tip)
+        @worksheet = worksheet
         @row, @col, @token, @xf, @link_type, @url, @str, @tip =
           row, col, index, xf, link_type, url, str, tip
       end
@@ -213,32 +213,33 @@ def data
         { :sst_id => token }
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
+      def write_cell
+        attributes = cell_attributes
         attributes << 't' << 's'
-        worksheet.writer.start_tag('c', attributes)
-        worksheet.write_cell_value(token)
-        worksheet.writer.end_tag('c')
+        @worksheet.writer.tag_elements('c', attributes) do
+          @worksheet.write_cell_value(token)
+        end
 
         if link_type == 1
           # External link with rel file relationship.
-          worksheet.hlink_count += 1
-          worksheet.hlink_refs <<
+          @worksheet.hlink_count += 1
+          @worksheet.hlink_refs <<
             [
              link_type,    row,     col,
-             worksheet.hlink_count, @str, @tip
+             @worksheet.hlink_count, @str, @tip
             ]
 
-          worksheet.external_hyper_links << [ '/hyperlink', @url, 'External' ]
+          @worksheet.external_hyper_links << [ '/hyperlink', @url, 'External' ]
         elsif link_type
           # External link with rel file relationship.
-          worksheet.hlink_refs << [link_type, row, col, @url, @str, @tip ]
+          @worksheet.hlink_refs << [link_type, row, col, @url, @str, @tip ]
         end
       end
     end
 
     class BlankCellData < CellData # :nodoc:
-      def initialize(row, col, index, xf)
+      def initialize(worksheet, row, col, index, xf)
+        @worksheet = worksheet
         @row, @col, @xf = row, col, xf
       end
 
@@ -246,9 +247,8 @@ def data
         ''
       end
 
-      def write_cell(worksheet)
-        attributes = super(worksheet)
-        worksheet.writer.empty_tag('c', attributes)
+      def write_cell
+        @worksheet.writer.empty_tag('c', cell_attributes)
       end
     end
 
@@ -724,14 +724,14 @@ def set_column(*args)
       #       the column dimensions in certain cases.
       ignore_row = 1
       ignore_col = 1
-      ignore_col = 0 if format.respond_to?(:get_xf_index) # Column has a format.
+      ignore_col = 0 if format.respond_to?(:xf_index)     # Column has a format.
       ignore_col = 0 if width && hidden && hidden != 0    # Column has a width but is hidden
 
       check_dimensions_and_update_max_min_values(0, firstcol, ignore_row, ignore_col)
       check_dimensions_and_update_max_min_values(0, lastcol,  ignore_row, ignore_col)
 
       # Set the limits for the outline levels (0 <= x <= 7).
-      level = 0 unless level
+      level ||= 0
       level = 0 if level < 0
       level = 7 if level > 7
 
@@ -2072,13 +2072,11 @@ def write_number(*args)
       row, col, num, xf = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, num].include?(nil)
 
-      type    = 'n'
-
       # 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)
 
-      store_data_to_table(NumberCellData.new(row, col, num, xf))
+      store_data_to_table(NumberCellData.new(self, row, col, num, xf))
     end
 
     #
@@ -2121,7 +2119,7 @@ def write_string(*args)
 
       index = shared_string_index(str[0, STR_MAX])
 
-      store_data_to_table(StringCellData.new(row, col, index, xf))
+      store_data_to_table(StringCellData.new(self, row, col, index, xf))
     end
 
     #
@@ -2222,12 +2220,11 @@ def write_rich_string(*args)
       raise WriteXLSXInsufficientArgumentError if [row, col, rich_strings[0]].include?(nil)
 
       # If the last arg is a format we use it as the cell format.
-      if rich_strings[-1].respond_to?(:get_xf_index)
+      if rich_strings[-1].respond_to?(:xf_index)
         xf = rich_strings.pop
       else
-        xf     = nil
+        xf = nil
       end
-      type   = 's'                   # The data type.
 
       # Check that row and col are valid and store max and min values
       check_dimensions(row, col)
@@ -2240,11 +2237,11 @@ def write_rich_string(*args)
       fragments, length = rich_strings_fragments(rich_strings)
 
       # If the first token is a string start the <r> element.
-      writer.start_tag('r') if !fragments[0].respond_to?(:get_xf_index)
+      writer.start_tag('r') if !fragments[0].respond_to?(:xf_index)
 
       # Write the XML elements for the format string fragments.
       fragments.each do |token|
-        if token.respond_to?(:get_xf_index)
+        if token.respond_to?(:xf_index)
           # Write the font run.
           writer.start_tag('r')
           write_font(writer, token)
@@ -2261,7 +2258,7 @@ def write_rich_string(*args)
       # Add the XML string to the shared string table.
       index = shared_string_index(writer.string)
 
-      store_data_to_table(StringCellData.new(row, col, index, xf))
+      store_data_to_table(StringCellData.new(self, row, col, index, xf))
     end
 
     #
@@ -2303,7 +2300,7 @@ def write_blank(*args)
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      store_data_to_table(BlankCellData.new(row, col,  nil, xf))
+      store_data_to_table(BlankCellData.new(self, row, col,  nil, xf))
     end
 
     #
@@ -2343,16 +2340,14 @@ def write_formula(*args)
       raise WriteXLSXInsufficientArgumentError if [row, col, formula].include?(nil)
 
       if formula =~ /^\{=.*\}$/
-        return write_array_formula(row, col, row, col, formula, format, value)
-      end
-
-      # 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)
-
-      formula.sub!(/^=/, '')
+        write_array_formula(row, col, row, col, formula, format, value)
+      else
+        check_dimensions(row, col)
+        store_row_col_max_min_values(row, col)
+        formula.sub!(/^=/, '')
 
-      store_data_to_table(FormulaCellData.new(row, col, formula, format, value))
+        store_data_to_table(FormulaCellData.new(self, row, col, formula, format, value))
+      end
     end
 
     #
@@ -2425,7 +2420,7 @@ def write_array_formula(*args)
       formula.sub!(/^\{(.*)\}$/, '\1')
       formula.sub!(/^=/, '')
 
-      store_data_to_table(FormulaArrayCellData.new(row1, col1, formula, xf, range, value))
+      store_data_to_table(FormulaArrayCellData.new(self, row1, col1, formula, xf, range, value))
     end
 
     # The outline_settings() method is used to control the appearance of
@@ -2547,7 +2542,6 @@ def write_url(*args)
       xf, str = str, xf if str.respond_to?(:xf_index)
       raise WriteXLSXInsufficientArgumentError if [row, col, url].include?(nil)
 
-      type      = 'l'                       # XML data type
       link_type = 1
 
       # Remove the URI scheme from internal links.
@@ -2561,7 +2555,7 @@ def write_url(*args)
       end
 
       # The displayed string defaults to the url string.
-      str = url unless str
+      str ||= url
 
       # For external links change the directory separator from Unix to Dos.
       if link_type == 3
@@ -2599,7 +2593,7 @@ def write_url(*args)
         link_type = 1
       end
 
-      store_data_to_table(HyperlinkCellData.new(row, col, index, xf, link_type, url, str, tip))
+      store_data_to_table(HyperlinkCellData.new(self, row, col, index, xf, link_type, url, str, tip))
     end
 
     #
@@ -2656,9 +2650,12 @@ def write_date_time(*args)
 
       date_time = convert_date_time(str)
 
-      # If the date isn't valid then write it as a string.
-      return write_string(args) unless date_time
-      store_data_to_table(NumberCellData.new(row, col, date_time, xf))
+      if date_time
+        store_data_to_table(NumberCellData.new(self, row, col, date_time, xf))
+      else
+        # If the date isn't valid then write it as a string.
+        write_string(args) unless date_time
+      end
     end
 
     #
@@ -3048,7 +3045,7 @@ def merge_range(*args)
       row_first, col_first, row_last, col_last, string, format, *extra_args = row_col_notation(args)
 
       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?(:get_xf_index)
+      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
@@ -3081,7 +3078,7 @@ def merge_range_type(type, *args)
         row_first, col_first, row_last, col_last, token, format, *others = row_col_notation(args)
       end
 
-      raise "Format object missing or in an incorrect position" unless format.respond_to?(:get_xf_index)
+      raise "Format object missing or in an incorrect position" 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
@@ -4344,16 +4341,6 @@ def set_some_defaults(param)
       param[:show_error]    ||= 1
     end
 
-    # Minor modification to allow comparison testing. Change RGB colors
-    # from long format, ffcc00 to short format fc0 used by VML.
-    def rgb_color(rgb)
-      result = sprintf("%02x%02x%02x", *rgb)
-      if result =~ /^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/
-        result = "#{$1}#{$2}#{$3}"
-      end
-      result
-    end
-
     # List of valid input parameters.
     def valid_validation_parameter
       [
@@ -4406,7 +4393,7 @@ def rich_strings_fragments(rich_strings) # :nodoc:
 
       fragments = []
       rich_strings.each do |token|
-        if token.respond_to?(:get_xf_index)
+        if token.respond_to?(:xf_index)
           raise AugumentError, "Can't allow 2 formats in a row" if last == 'format' && pos > 0
 
           # Token is a format object. Add it to the fragment list.
@@ -4837,10 +4824,10 @@ def write_sheet_pr #:nodoc:
       (attributes << 'filterMode' << 1) if filter_on?
 
       if fit_page? || tab_color?
-        @writer.start_tag('sheetPr', attributes)
-        write_tab_color
-        write_page_set_up_pr
-        @writer.end_tag('sheetPr')
+        @writer.tag_elements('sheetPr', attributes) do
+          write_tab_color
+          write_page_set_up_pr
+        end
       else
         @writer.empty_tag('sheetPr', attributes)
       end
@@ -4892,9 +4879,7 @@ def write_dimension #:nodoc:
     # Write the <sheetViews> element.
     #
     def write_sheet_views #:nodoc:
-      @writer.start_tag('sheetViews', [])
-      write_sheet_view
-      @writer.end_tag('sheetViews')
+      @writer.tag_elements('sheetViews', []) { write_sheet_view }
     end
 
     def write_sheet_view #:nodoc:
@@ -4926,10 +4911,10 @@ def write_sheet_view #:nodoc:
       if @panes.empty? && @selections.empty?
         @writer.empty_tag('sheetView', attributes)
       else
-        @writer.start_tag('sheetView', attributes)
-        write_panes
-        write_selections
-        @writer.end_tag('sheetView')
+        @writer.tag_elements('sheetView', attributes) do
+          write_panes
+          write_selections
+        end
       end
     end
 
@@ -4972,10 +4957,9 @@ def write_cols #:nodoc:
       # Exit unless some column have been formatted.
       return if @colinfo.empty?
 
-      @writer.start_tag('cols')
-      @colinfo.each {|col_info| write_col_info(*col_info) }
-
-      @writer.end_tag('cols')
+      @writer.tag_elements('cols') do
+        @colinfo.each {|col_info| write_col_info(*col_info) }
+      end
     end
 
     #
@@ -4989,23 +4973,15 @@ def write_col_info(*args) #:nodoc:
       hidden = args[4] || 0     # Hidden flag.
       level  = args[5] || 0     # Outline level.
       collapsed = args[6] || 0  # Outline level.
+      xf_index = format ? format.get_xf_index : 0
 
       custom_width = true
-      xf_index = 0
-      xf_index = format.get_xf_index if format.respond_to?(:get_xf_index)
+      custom_width = false if width.nil? && hidden == 0
+      custom_width = false if width == 8.43
 
-      # Set the Excel default col width.
       if width.nil?
-        if hidden == 0
-          width        = 8.43
-          custom_width = false
-        else
-          width = 0
-        end
-      else
-        # Width is defined but same as default.
-        custom_width = false if width == 8.43
-      end
+        width = hidden == 0 ? 8.43 : 0
+       end
 
       # Convert column width from user units to character width.
       max_digit_width = 7.0    # For Calabri 11.
@@ -5036,9 +5012,7 @@ def write_sheet_data #:nodoc:
         # If the dimensions aren't defined then there is no data to write.
         @writer.empty_tag('sheetData')
       else
-        @writer.start_tag('sheetData')
-        write_rows
-        @writer.end_tag('sheetData')
+        @writer.tag_elements('sheetData') { write_rows }
       end
     end
 
@@ -5112,7 +5086,7 @@ def not_contain_formatting_or_data?(row_num) # :nodoc:
 
     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(self) if @cell_data_table[row_num][col_num]
+        @cell_data_table[row_num][col_num].write_cell if @cell_data_table[row_num][col_num]
       end
     end
 
@@ -5125,12 +5099,10 @@ def write_row_element(r, spans = nil, height = 15, format = nil, hidden = false,
       level     ||= 0
       collapsed ||= 0
       empty_row ||= 0
-      xf_index = 0
+      xf_index = format ? format.get_xf_index : 0
 
       attributes = ['r',  r + 1]
 
-      xf_index = format.get_xf_index if format
-
       (attributes << 'spans'        << spans) if spans
       (attributes << 's'            << xf_index) if xf_index != 0
       (attributes << 'customFormat' << 1    ) if format
@@ -5362,9 +5334,7 @@ def write_page_setup #:nodoc:
     # Write the <extLst> element.
     #
     def write_ext_lst #:nodoc:
-      @writer.start_tag('extLst')
-      write_ext
-      @writer.end_tag('extLst')
+      @writer.tag_elements('extLst') { write_ext }
     end
 
     #
@@ -5379,9 +5349,7 @@ def write_ext #:nodoc:
         'uri',      uri
       ]
 
-      @writer.start_tag('ext', attributes)
-      write_mx_plv
-      @writer.end_tag('ext')
+      @writer.tag_elements('ext', attributes) { write_mx_plv }
     end
 
     #
@@ -5409,12 +5377,10 @@ def write_merge_cells #:nodoc:
 
       attributes = ['count', @merge.size]
 
-      @writer.start_tag('mergeCells', attributes)
-
-      # Write the mergeCell element.
-      @merge.each { |merged_range| write_merge_cell(merged_range) }
-
-      @writer.end_tag('mergeCells')
+      @writer.tag_elements('mergeCells', attributes) do
+        # Write the mergeCell element.
+        @merge.each { |merged_range| write_merge_cell(merged_range) }
+      end
     end
 
 
@@ -5463,10 +5429,10 @@ def write_print_options #:nodoc:
     def write_header_footer #:nodoc:
       return unless header_footer_changed?
 
-      @writer.start_tag('headerFooter')
-      write_odd_header if @header && @header != ''
-      write_odd_footer if @footer && @footer != ''
-      @writer.end_tag('headerFooter')
+      @writer.tag_elements('headerFooter') do
+        write_odd_header if @header && @header != ''
+        write_odd_footer if @footer && @footer != ''
+      end
     end
 
     #
@@ -5476,7 +5442,6 @@ def write_odd_header #:nodoc:
       @writer.data_element('oddHeader', @header)
     end
 
-    # _write_odd_footer()
     #
     # Write the <oddFooter> element.
     #
@@ -5515,9 +5480,9 @@ def write_breaks(tag) # :nodoc:
 
       attributes = ['count', count, 'manualBreakCount', count]
 
-      @writer.start_tag(tag, attributes)
-      page_breaks.each { |num| write_brk(num, max) }
-      @writer.end_tag(tag)
+      @writer.tag_elements(tag, attributes) do
+        page_breaks.each { |num| write_brk(num, max) }
+      end
     end
     #
     # Write the <brk> element.
@@ -5542,9 +5507,9 @@ def write_auto_filter #:nodoc:
 
       if filter_on?
         # Autofilter defined active filters.
-        @writer.start_tag('autoFilter', attributes)
-        write_autofilters
-        @writer.end_tag('autoFilter')
+        @writer.tag_elements('autoFilter', attributes) do
+          write_autofilters
+        end
       else
         # Autofilter defined without active filters.
         @writer.empty_tag('autoFilter', attributes)
@@ -5576,16 +5541,15 @@ def write_autofilters #:nodoc:
     def write_filter_column(col_id, type, *filters) #:nodoc:
       attributes = ['colId', col_id]
 
-      @writer.start_tag('filterColumn', attributes)
-      if type == 1
-        # Type == 1 is the new XLSX style filter.
-        write_filters(*filters)
-      else
-        # Type == 0 is the classic "custom" filter.
-        write_custom_filters(*filters)
+      @writer.tag_elements('filterColumn', attributes) do
+        if type == 1
+          # Type == 1 is the new XLSX style filter.
+          write_filters(*filters)
+        else
+          # Type == 0 is the classic "custom" filter.
+          write_custom_filters(*filters)
+        end
       end
-
-      @writer.end_tag('filterColumn')
     end
 
     #
@@ -5597,9 +5561,9 @@ def write_filters(*filters) #:nodoc:
         @writer.empty_tag('filters', ['blank', 1])
       else
         # General case.
-        @writer.start_tag('filters')
-        filters.each { |filter| write_filter(filter) }
-        @writer.end_tag('filters')
+        @writer.tag_elements('filters') do
+          filters.each { |filter| write_filter(filter) }
+        end
       end
     end
 
@@ -5617,9 +5581,7 @@ def write_filter(val) #:nodoc:
     def write_custom_filters(*tokens) #:nodoc:
       if tokens.size == 2
         # One filter expression only.
-        @writer.start_tag('customFilters')
-        write_custom_filter(*tokens)
-        @writer.end_tag('customFilters')
+        @writer.tag_elements('customFilters') { write_custom_filter(*tokens) }
       else
         # Two filter expressions.
 
@@ -5631,10 +5593,10 @@ def write_custom_filters(*tokens) #:nodoc:
         end
 
         # Write the two custom filters.
-        @writer.start_tag('customFilters', attributes)
-        write_custom_filter(tokens[0], tokens[1])
-        write_custom_filter(tokens[3], tokens[4])
-        @writer.end_tag('customFilters')
+        @writer.tag_elements('customFilters', attributes) do
+          write_custom_filter(tokens[0], tokens[1])
+          write_custom_filter(tokens[3], tokens[4])
+        end
       end
     end
 
@@ -5675,19 +5637,17 @@ def write_custom_filter(operator, val) #:nodoc:
     def write_hyperlinks #:nodoc:
       return if @hlink_refs.empty?
 
-      @writer.start_tag('hyperlinks')
+      @writer.tag_elements('hyperlinks') do
+        @hlink_refs.each do |aref|
+          type, *args = aref
 
-      @hlink_refs.each do |aref|
-        type, *args = aref
-
-        if type == 1
-          write_hyperlink_external(*args)
-        elsif type == 2
-          write_hyperlink_internal(*args)
+          if type == 1
+            write_hyperlink_external(*args)
+          elsif type == 2
+            write_hyperlink_internal(*args)
+          end
         end
       end
-
-      @writer.end_tag('hyperlinks')
     end
 
     #
@@ -5798,42 +5758,39 @@ def write_legacy_drawing #:nodoc:
     # Write the <font> element.
     #
     def write_font(writer, format) #:nodoc:
-      writer.start_tag('rPr')
-
-      writer.empty_tag('b')       if format.bold?
-      writer.empty_tag('i')       if format.italic?
-      writer.empty_tag('strike')  if format.strikeout?
-      writer.empty_tag('outline') if format.outline?
-      writer.empty_tag('shadow')  if format.shadow?
-
-      # Handle the underline variants.
-      write_underline(writer, format.underline) if format.underline?
-
-      write_vert_align(writer, 'superscript') if format.font_script == 1
-      write_vert_align(writer, 'subscript')   if format.font_script == 2
-
-      writer.empty_tag('sz', ['val', format.size])
-
-      theme = format.theme
-      color = format.color
-      if !theme.nil? && theme != 0
-        write_color(writer, 'theme', theme)
-      elsif !color.nil? && color != 0
-        color = get_palette_color(color)
-
-        write_color(writer, 'rgb', color)
-      else
-        write_color(writer, 'theme', 1)
-      end
+      writer.tag_elements('rPr') do
+        writer.empty_tag('b')       if format.bold?
+        writer.empty_tag('i')       if format.italic?
+        writer.empty_tag('strike')  if format.strikeout?
+        writer.empty_tag('outline') if format.outline?
+        writer.empty_tag('shadow')  if format.shadow?
+
+        # Handle the underline variants.
+        write_underline(writer, format.underline) if format.underline?
+
+        write_vert_align(writer, 'superscript') if format.font_script == 1
+        write_vert_align(writer, 'subscript')   if format.font_script == 2
+
+        writer.empty_tag('sz', ['val', format.size])
+
+        theme = format.theme
+        color = format.color
+        if !theme.nil? && theme != 0
+          write_color(writer, 'theme', theme)
+        elsif !color.nil? && color != 0
+          color = get_palette_color(color)
+          write_color(writer, 'rgb', color)
+        else
+          write_color(writer, 'theme', 1)
+        end
 
-      writer.empty_tag('rFont',  ['val', format.font])
-      writer.empty_tag('family', ['val', format.font_family])
+        writer.empty_tag('rFont',  ['val', format.font])
+        writer.empty_tag('family', ['val', format.font_family])
 
-      if format.font == 'Calibri' && format.hyperlink == 0
-        writer.empty_tag('scheme', ['val', format.font_scheme])
+        if format.font == 'Calibri' && format.hyperlink == 0
+          writer.empty_tag('scheme', ['val', format.font_scheme])
+        end
       end
-
-      writer.end_tag('rPr')
     end
 
     #
@@ -5870,9 +5827,9 @@ def write_data_validations #:nodoc:
 
       attributes = ['count', @validations.size]
 
-      @writer.start_tag('dataValidations', attributes)
-      @validations.each { |validation| write_data_validation(validation) }
-      @writer.end_tag('dataValidations')
+      @writer.tag_elements('dataValidations', attributes) do
+        @validations.each { |validation| write_data_validation(validation) }
+      end
     end
 
     #
@@ -5922,15 +5879,12 @@ def write_data_validation(param) #:nodoc:
       attributes << 'prompt' << param[:input_message]    if param[:input_message]
       attributes << 'sqref' << sqref
 
-      @writer.start_tag('dataValidation', attributes)
-
-      # Write the formula1 element.
-      write_formula_1(param[:value])
-
-      # Write the formula2 element.
-      write_formula_2(param[:maximum]) if param[:maximum]
-
-      @writer.end_tag('dataValidation')
+      @writer.tag_elements('dataValidation', attributes) do
+        # Write the formula1 element.
+        write_formula_1(param[:value])
+        # Write the formula2 element.
+        write_formula_2(param[:maximum]) if param[:maximum]
+      end
     end
 
     #
@@ -5977,11 +5931,9 @@ def write_conditional_formats #:nodoc:
     def write_conditional_formatting(range, params) #:nodoc:
       attributes = ['sqref', range]
 
-      @writer.start_tag('conditionalFormatting', attributes)
-
-      params.each { |param| write_cf_rule(param) }
-
-      @writer.end_tag('conditionalFormatting')
+      @writer.tag_elements('conditionalFormatting', attributes) do
+        params.each { |param| write_cf_rule(param) }
+      end
     end
 
     #
@@ -5996,18 +5948,16 @@ def write_cf_rule(param) #:nodoc:
       attributes << 'priority' << param[:priority]
       attributes << 'operator' << param[:criteria]
 
-      @writer.start_tag('cfRule', attributes)
-
-      if param[:type] == 'cellIs'
-        if param[:minimum] && param[:maximum]
-          write_formula_tag(param[:minimum])
-          write_formula_tag(param[:maximum])
-        else
-          write_formula_tag(param[:value])
+      @writer.tag_elements('cfRule', attributes) do
+        if param[:type] == 'cellIs'
+          if param[:minimum] && param[:maximum]
+            write_formula_tag(param[:minimum])
+            write_formula_tag(param[:maximum])
+          else
+            write_formula_tag(param[:value])
+          end
         end
       end
-
-      @writer.end_tag('cfRule')
     end
 
     def store_data_to_table(cell_data) #:nodoc: