write_xlsx 0.55.0 → 0.56.0

data/README.rdoc

@@ -8,17 +8,18 @@ The WriteXLSX supports the following features:
 * Multiple worksheets
 * Strings and numbers
 * Unicode text
-* Rich string formats
+* Cell formatting
 * Formulas (including array formats)
-* cell formatting
-* Embedded images
+* Images
 * Charts
 * Autofilters
 * Data validation
 * Conditional formatting
 * Tables
 * Shapes
+* Sparklines
 * Hyperlinks
+* Rich string formats
 * Defined names
 * Grouping/Outlines
 * Cell comments
@@ -27,6 +28,20 @@ The WriteXLSX supports the following features:
 
 write_xlsx uses the same interface as writeexcel gem.
 
+== Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'writeexcel'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install writeexcel
+
 == Synopsis
 
 To write a string, a formatted string, a number and a formula to
@@ -59,6 +74,9 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-02-09 v0.56.0
+ Fix for issue where chart creation order had to be the same as the insertion order or charts would be out of sync.
+ Fixed issue where gridlines didn't work in Scatter and Stock charts.
 
 2013-02-09 v0.55.0
  Added Sparklines.

data/lib/write_xlsx/chart.rb

@@ -2178,6 +2178,9 @@ def write_cat_val_axis(params) # :nodoc:
         # Write the c:axPos element.
         write_axis_pos(position, y_axis[:_reverse])
 
+        # Write the c:majorGridlines element.
+        write_major_gridlines(x_axis[:_major_gridlines])
+
         # Write the axis title elements.
         if title = x_axis[:_formula]
           write_title_formula(title, y_axis[:_data_id], horiz, x_axis[:_name_font])
@@ -2277,6 +2280,10 @@ def write_date_axis(params)  # :nodoc:
 
         # Write the c:axPos element.
         write_axis_pos(position, y_axis[:reverse])
+
+        # Write the c:majorGridlines element.
+        write_major_gridlines(x_axis[:_major_gridlines])
+
         # Write the axis title elements.
         if title = x_axis[:_formula]
           write_title_formula(title, x_axis[:_data_id], nil, x_axis[:_name_font])

data/lib/write_xlsx/chartsheet.rb

@@ -138,6 +138,8 @@ def show_hidden_data(*args)
     # Set up chart/drawings.
     #
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
+      @chart.id = chart_id - 1
+
       drawing = Drawing.new
       @drawing = drawing
       @drawing.orientation = @print_style.orientation

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -49,7 +49,7 @@ def empty_tag_encoded(tag, attr = [])
       end
 
       def data_element(tag, data, attr = [])
-        tag_elements(tag, attr) { io_write("#{escape_xml_chars(data)}") }
+        tag_elements(tag, attr) { io_write("#{escape_data(data)}") }
       end
 
       #
@@ -67,7 +67,7 @@ def si_rich_element(data)
       end
 
       def characters(data)
-        io_write(escape_xml_chars(data))
+        io_write(escape_data(data))
       end
 
       def crlf
@@ -96,17 +96,27 @@ def key_val(key, val)
       def key_vals(attr)
         array = []
         (0 .. attr.size-1).step(2) do |i|
-          array << key_val(attr[i], escape_xml_chars(attr[i+1]))
+          array << key_val(attr[i], escape_attributes(attr[i+1]))
         end
         array.join('')
       end
 
-      def escape_xml_chars(str = '')
+      def escape_attributes(str = '')
+        return str if !(str =~ /["&<>]/)
+
+        str.
+          gsub(/&/, "&amp;").
+          gsub(/"/, "&quot;").
+          gsub(/</, "&lt;").
+          gsub(/>/, "&gt;")
+      end
+
+      def escape_data(str = '')
         if str =~ /[&<>"]/
           str.gsub(/&/, '&amp;').
             gsub(/</, '&lt;').
             gsub(/>/, '&gt;')
-         else
+        else
           str
         end
       end

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.55.0"
+  VERSION = "0.56.0"
 end

data/lib/write_xlsx/workbook.rb

@@ -358,9 +358,6 @@ def add_chart(params = {})
       chart = Chart.factory(type, params[:subtype])
       chart.palette = @palette
 
-      # Get an incremental id to use for axes ids.
-      chart.id = @charts.size
-
       # If the chart isn't embedded let the workbook control it.
       if ptrue?(embedded)
         chart.name = name if name
@@ -1638,8 +1635,6 @@ def prepare_drawings #:nodoc:
         shape_count = sheet.shapes.size
         next if chart_count + image_count + shape_count == 0
 
-        sheet.sort_charts
-
         drawing_id += 1
 
         (0 .. chart_count - 1).each do |index|
@@ -1665,6 +1660,10 @@ def prepare_drawings #:nodoc:
         @drawings << drawing
       end
 
+      # Sort the workbook charts references into the order that the were
+      # written from the worksheets above.
+      @charts = @charts.sort_by { |chart| chart.id }
+
       @drawing_count = drawing_id
     end
 

data/lib/write_xlsx/worksheet.rb

@@ -2797,17 +2797,6 @@ def insert_chart(*args)
       @charts << [row, col, chart, x_offset, y_offset, scale_x, scale_y]
     end
 
-    #
-    # Sort the worksheet charts into the order that they were created in rather
-    # than the insertion order. This is ensure that the chart and drawing objects
-    # written in the same order. The chart id is used to sort back into creation
-    # order.
-    #
-    def sort_charts
-      return if @charts.size < 2
-      @charts = @charts.sort {|a, b| a[2].id <=> b[2].id}
-    end
-
     #
     # :call-seq:
     #   insert_image(row, column, filename [ , x, y, scale_x, scale_y ] )
@@ -3641,7 +3630,7 @@ def valid_table_parameter
     private :valid_table_parameter
 
     #
-    # add_sparkline
+    # Add sparklines to the worksheet.
     #
     def add_sparkline(param)
       sparkline = {}
@@ -4652,6 +4641,7 @@ def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       drawing_type = 1
 
       row, col, chart, x_offset, y_offset, scale_x, scale_y  = @charts[index]
+      chart.id = chart_id - 1
       scale_x ||= 0
       scale_y ||= 0
 

data/test/regression/test_chart_gridlines01.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartGridlines01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gridlines01
+    @xlsx = 'chart_gridlines01.xlsx'
+    workbook   = WriteXLSX.new(@xlsx)
+    worksheet  = workbook.add_worksheet
+    chart      = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart.instance_variable_set(:@axis_ids, [67390848, 68472192])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:major_gridlines => { :visible => 1 })
+    chart.set_y_axis(:major_gridlines => { :visible => 0 })
+
+    worksheet.insert_chart('E9',  chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

data/test/regression/test_chart_gridlines02.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartGridlines02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gridlines02
+    @xlsx = 'chart_gridlines02.xlsx'
+    workbook   = WriteXLSX.new(@xlsx)
+    worksheet  = workbook.add_worksheet
+    chart      = workbook.add_chart(:type => 'scatter', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart.instance_variable_set(:@axis_ids, [57940608, 57938688])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    chart.set_x_axis(:major_gridlines => { :visible => 1 })
+    chart.set_y_axis(:major_gridlines => { :visible => 0 })
+
+    worksheet.insert_chart('E9',  chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

data/test/regression/test_chart_gridlines03.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartGridlines03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gridlines03
+    @xlsx = 'chart_gridlines03.xlsx'
+    workbook    =  WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'stock', :embedded => 1)
+    data_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart.instance_variable_set(:@axis_ids, [54553600, 54977280])
+
+    data = [
+            [ '2007-01-01T', '2007-01-02T', '2007-01-03T', '2007-01-04T', '2007-01-05T' ],
+            [ 27.2,  25.03, 19.05, 20.34, 18.5 ],
+            [ 23.49, 19.55, 15.12, 17.84, 16.34 ],
+            [ 25.45, 23.05, 17.32, 20.45, 17.34 ]
+           ]
+
+    (0..4).each do |row|
+      worksheet.write_date_time(row, 0, data[0][row], data_format)
+      worksheet.write(row, 1, data[1][row])
+      worksheet.write(row, 2, data[2][row])
+      worksheet.write(row, 3, data[3][row])
+    end
+
+    worksheet.set_column('A:D', 11)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$D$1:$D$5'
+                     )
+
+    chart.set_x_axis(:major_gridlines => { :visible => 1 })
+    chart.set_y_axis(:major_gridlines => { :visible => 0 })
+
+    worksheet.insert_chart('E9',  chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                [],
+                                {'xl/charts/chart1.xml' => ['<c:formatCode', '<c:pageMargins']}
+                                )
+  end
+end

data/test/regression/test_chart_gridlines04.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartGridlines04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gridlines04
+    @xlsx = 'chart_gridlines04.xlsx'
+    workbook    =  WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'radar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart.instance_variable_set(:@axis_ids, [54977280, 54978816])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_y_axis(:major_gridlines => { :visible => 0 })
+    chart.instance_variable_get(:@y_axis)[:_major_tick_mark] = 'cross'
+
+    worksheet.insert_chart('E9',  chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

data/test/regression/test_chart_name03.rb

@@ -46,8 +46,8 @@ def test_chart_name03
     chart2.add_series(:values => '=Sheet1!$B$1:$B$5')
     chart2.add_series(:values => '=Sheet1!$C$1:$C$5')
 
-    worksheet.insert_chart('E24', chart2)
     worksheet.insert_chart('E9',  chart1)
+    worksheet.insert_chart('E24', chart2)
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_chart_order01.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartOrder01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_order01
+    @xlsx = 'chart_order01.xlsx'
+    workbook    =  WriteXLSX.new(@xlsx)
+    worksheet1  = workbook.add_worksheet
+    worksheet2  = workbook.add_worksheet
+    worksheet3  = workbook.add_worksheet
+
+    chart1      = workbook.add_chart(:type => 'column', :embedded => 1)
+    chart2      = workbook.add_chart(:type => 'bar',    :embedded => 1)
+    chart3      = workbook.add_chart(:type => 'line',   :embedded => 1)
+    chart4      = workbook.add_chart(:type => 'pie',    :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart1.instance_variable_set(:@axis_ids, [54976896, 54978432])
+    chart2.instance_variable_set(:@axis_ids, [54310784, 54312320])
+    chart3.instance_variable_set(:@axis_ids, [69816704, 69818240])
+    chart4.instance_variable_set(:@axis_ids, [69816704, 69818240])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet1.write('A1', data)
+    worksheet2.write('A1', data)
+    worksheet3.write('A1', data)
+
+    chart1.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart2.add_series(:values => '=Sheet2!$A$1:$A$5')
+    chart3.add_series(:values => '=Sheet3!$A$1:$A$5')
+    chart4.add_series(:values => '=Sheet1!$B$1:$B$5')
+
+    worksheet1.insert_chart('E9',  chart1)
+    worksheet2.insert_chart('E9',  chart2)
+    worksheet3.insert_chart('E9',  chart3)
+    worksheet1.insert_chart('E24', chart4)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

data/test/regression/test_chart_order02.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartOrder02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_order02
+    @xlsx = 'chart_order01.xlsx'
+    workbook    =  WriteXLSX.new(@xlsx)
+    worksheet1  = workbook.add_worksheet
+    worksheet2  = workbook.add_worksheet
+    worksheet3  = workbook.add_worksheet
+
+    chart4      = workbook.add_chart(:type => 'pie',    :embedded => 1)
+    chart3      = workbook.add_chart(:type => 'line',   :embedded => 1)
+    chart2      = workbook.add_chart(:type => 'bar',    :embedded => 1)
+    chart1      = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart1.instance_variable_set(:@axis_ids, [54976896, 54978432])
+    chart2.instance_variable_set(:@axis_ids, [54310784, 54312320])
+    chart3.instance_variable_set(:@axis_ids, [69816704, 69818240])
+    chart4.instance_variable_set(:@axis_ids, [69816704, 69818240])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet1.write('A1', data)
+    worksheet2.write('A1', data)
+    worksheet3.write('A1', data)
+
+    chart1.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart2.add_series(:values => '=Sheet2!$A$1:$A$5')
+    chart3.add_series(:values => '=Sheet3!$A$1:$A$5')
+    chart4.add_series(:values => '=Sheet1!$B$1:$B$5')
+
+    worksheet1.insert_chart('E9',  chart1)
+    worksheet2.insert_chart('E9',  chart2)
+    worksheet3.insert_chart('E9',  chart3)
+    worksheet1.insert_chart('E24', chart4)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

data/test/regression/test_chart_order03.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestChartOrder03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_order03
+    @xlsx = 'chart_order03.xlsx'
+    workbook    =  WriteXLSX.new(@xlsx)
+    worksheet1  = workbook.add_worksheet
+    worksheet2  = workbook.add_worksheet
+    chart2      = workbook.add_chart(:type => 'bar')
+    worksheet3  = workbook.add_worksheet
+
+    chart4      = workbook.add_chart(:type => 'pie',    :embedded => 1)
+    chart3      = workbook.add_chart(:type => 'line',   :embedded => 1)
+    chart1      = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xls file.
+    chart1.instance_variable_set(:@axis_ids, [67913600, 68169088])
+    chart2.instance_variable_get(:@chart).
+      instance_variable_set(:@axis_ids, [58117120, 67654400])
+    chart3.instance_variable_set(:@axis_ids, [58109952, 68215936])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet1.write('A1', data)
+    worksheet2.write('A1', data)
+    worksheet3.write('A1', data)
+
+    chart1.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart2.add_series(:values => '=Sheet2!$A$1:$A$5')
+    chart3.add_series(:values => '=Sheet3!$A$1:$A$5')
+    chart4.add_series(:values => '=Sheet1!$B$1:$B$5')
+
+    worksheet1.insert_chart('E9',  chart1)
+    worksheet3.insert_chart('E9',  chart3)
+    worksheet1.insert_chart('E24', chart4)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                [],
+                                {
+                                  'xl/charts/chart1.xml' => [ '<c:formatCode', '<c:pageMargins' ],
+                                  'xl/charts/chart2.xml' => [ '<c:formatCode', '<c:pageMargins' ],
+                                  'xl/charts/chart4.xml' => [ '<c:formatCode', '<c:pageMargins' ]
+                                }
+                                )
+  end
+end

data/test/regression/test_escapes06.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionEscapes06 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_escapes06
+    @xlsx = 'escapes06.xlsx'
+    workbook   = WriteXLSX.new(@xlsx)
+    worksheet  = workbook.add_worksheet
+    num_format = workbook.add_format(:num_format => '[Red]0.0%\\ "a"')
+
+    worksheet.set_column('A:A', 14)
+
+    worksheet.write('A1', 123, num_format)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx
+                                )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
   prerelease: 
 platform: ruby
 authors:
@@ -421,11 +421,18 @@ files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_gridlines01.rb
+- test/regression/test_chart_gridlines02.rb
+- test/regression/test_chart_gridlines03.rb
+- test/regression/test_chart_gridlines04.rb
 - test/regression/test_chart_line01.rb
 - test/regression/test_chart_line02.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
+- test/regression/test_chart_order01.rb
+- test/regression/test_chart_order02.rb
+- test/regression/test_chart_order03.rb
 - test/regression/test_chart_pie01.rb
 - test/regression/test_chart_radar01.rb
 - test/regression/test_chart_radar02.rb
@@ -480,6 +487,7 @@ files:
 - test/regression/test_escapes03.rb
 - test/regression/test_escapes04.rb
 - test/regression/test_escapes05.rb
+- test/regression/test_escapes06.rb
 - test/regression/test_fit_to_pages01.rb
 - test/regression/test_fit_to_pages02.rb
 - test/regression/test_fit_to_pages03.rb
@@ -703,11 +711,17 @@ files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_gridlines01.xlsx
+- test/regression/xlsx_files/chart_gridlines02.xlsx
+- test/regression/xlsx_files/chart_gridlines03.xlsx
+- test/regression/xlsx_files/chart_gridlines04.xlsx
 - test/regression/xlsx_files/chart_line01.xlsx
 - test/regression/xlsx_files/chart_line02.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
+- test/regression/xlsx_files/chart_order01.xlsx
+- test/regression/xlsx_files/chart_order03.xlsx
 - test/regression/xlsx_files/chart_pie01.xlsx
 - test/regression/xlsx_files/chart_radar01.xlsx
 - test/regression/xlsx_files/chart_radar02.xlsx
@@ -763,6 +777,7 @@ files:
 - test/regression/xlsx_files/escapes03.xlsx
 - test/regression/xlsx_files/escapes04.xlsx
 - test/regression/xlsx_files/escapes05.xlsx
+- test/regression/xlsx_files/escapes06.xlsx
 - test/regression/xlsx_files/filehandle01.xlsx
 - test/regression/xlsx_files/fit_to_pages01.xlsx
 - test/regression/xlsx_files/fit_to_pages02.xlsx
@@ -1295,11 +1310,18 @@ test_files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_gridlines01.rb
+- test/regression/test_chart_gridlines02.rb
+- test/regression/test_chart_gridlines03.rb
+- test/regression/test_chart_gridlines04.rb
 - test/regression/test_chart_line01.rb
 - test/regression/test_chart_line02.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
+- test/regression/test_chart_order01.rb
+- test/regression/test_chart_order02.rb
+- test/regression/test_chart_order03.rb
 - test/regression/test_chart_pie01.rb
 - test/regression/test_chart_radar01.rb
 - test/regression/test_chart_radar02.rb
@@ -1354,6 +1376,7 @@ test_files:
 - test/regression/test_escapes03.rb
 - test/regression/test_escapes04.rb
 - test/regression/test_escapes05.rb
+- test/regression/test_escapes06.rb
 - test/regression/test_fit_to_pages01.rb
 - test/regression/test_fit_to_pages02.rb
 - test/regression/test_fit_to_pages03.rb
@@ -1577,11 +1600,17 @@ test_files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_gridlines01.xlsx
+- test/regression/xlsx_files/chart_gridlines02.xlsx
+- test/regression/xlsx_files/chart_gridlines03.xlsx
+- test/regression/xlsx_files/chart_gridlines04.xlsx
 - test/regression/xlsx_files/chart_line01.xlsx
 - test/regression/xlsx_files/chart_line02.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
+- test/regression/xlsx_files/chart_order01.xlsx
+- test/regression/xlsx_files/chart_order03.xlsx
 - test/regression/xlsx_files/chart_pie01.xlsx
 - test/regression/xlsx_files/chart_radar01.xlsx
 - test/regression/xlsx_files/chart_radar02.xlsx
@@ -1637,6 +1666,7 @@ test_files:
 - test/regression/xlsx_files/escapes03.xlsx
 - test/regression/xlsx_files/escapes04.xlsx
 - test/regression/xlsx_files/escapes05.xlsx
+- test/regression/xlsx_files/escapes06.xlsx
 - test/regression/xlsx_files/filehandle01.xlsx
 - test/regression/xlsx_files/fit_to_pages01.xlsx
 - test/regression/xlsx_files/fit_to_pages02.xlsx