write_xlsx 0.77.2 → 0.78.0

data/lib/write_xlsx/worksheet.rb

@@ -352,7 +352,10 @@ def initialize(workbook, index, name) #:nodoc:
       @outline_row_level = 0
       @outline_col_level = 0
 
+      @original_row_height    = 15
       @default_row_height     = 15
+      @default_row_pixels     = 20
+      @default_col_pixels     = 64
       @default_row_rezoed     = 0
 
       @merge = []
@@ -365,6 +368,17 @@ def initialize(workbook, index, name) #:nodoc:
 
       @cond_formats = {}
       @dxf_priority = 1
+
+      if excel2003_style?
+        @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
+        @page_setup.margin_header = 0.5
+        @page_setup.margin_footer = 0.5
+        @page_setup.header_footer_aligns = 1
+      end
     end
 
     def set_xml_writer(filename) #:nodoc:
@@ -381,6 +395,8 @@ def assemble_xml_file #:nodoc:
           write_cols
           write_sheet_data
           write_sheet_protection
+          # write_sheet_calc_pr
+          write_phonetic_pr if excel2003_style?
           write_auto_filter
           write_merge_cells
           write_conditional_formats
@@ -3087,10 +3103,10 @@ def set_row(*args)
     # Set the default row properties
     #
     def set_default_row(height = nil, zero_height = nil)
-      height      ||= 15
+      height      ||= @original_row_height
       zero_height ||= 0
 
-      if height != 15
+      if height != @original_row_height
         @default_row_height = height
 
         # Store the row change to allow optimisations.
@@ -5601,7 +5617,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
         x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col)}
       else
         # Optimisation for when the column widths haven't changed.
-        x_abs = 64 * col_start
+        x_abs = @default_col_pixels * col_start
       end
       x_abs += x1
 
@@ -5611,7 +5627,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
         y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row)}
       else
         # Optimisation for when the row heights haven't changed.
-        y_abs = 20 * row_start
+        y_abs = @default_row_pixels * row_start
       end
       y_abs += y1
 
@@ -5681,6 +5697,10 @@ def date_1904? #:nodoc:
       @workbook.date_1904?
     end
 
+    def excel2003_style? # :nodoc:
+      @workbook.excel2003_style
+    end
+
     #
     # 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.
@@ -6087,7 +6107,7 @@ def size_col(col) #:nodoc:
           pixels = (width * MAX_DIGIT_WIDTH + 0.5).to_i + PADDING
         end
       else
-        pixels = 64
+        pixels = @default_col_pixels
       end
       pixels
     end
@@ -6279,8 +6299,8 @@ def button_params(row, col, params)
       end
 
       # Ensure that a width and height have been set.
-      default_width  = 64
-      default_height = 20
+      default_width  = @default_col_pixels
+      default_height = @default_row_pixels
       params[:width]  = default_width  if !params[:width]
       params[:height] = default_height if !params[:height]
 
@@ -6498,7 +6518,7 @@ def write_sheet_format_pr #:nodoc:
       attributes = [
                     ['defaultRowHeight', @default_row_height]
                    ]
-      if @default_row_height != 15
+      if @default_row_height != @original_row_height
         attributes << ['customHeight', 1]
       end
 
@@ -6651,9 +6671,9 @@ def row_attributes(args)
       attributes << ['spans',        spans]    if spans
       attributes << ['s',            xf_index] if ptrue?(xf_index)
       attributes << ['customFormat', 1]        if ptrue?(format)
-      attributes << ['ht',           height]   if height != 15
+      attributes << ['ht',           height]   if height != @original_row_height
       attributes << ['hidden',       1]        if ptrue?(hidden)
-      attributes << ['customHeight', 1]        if height != 15
+      attributes << ['customHeight', 1]        if height != @original_row_height
       attributes << ['outlineLevel', level]    if ptrue?(level)
       attributes << ['collapsed',    1]        if ptrue?(collapsed)
 
@@ -6794,7 +6814,7 @@ def write_sheet_calc_pr #:nodoc:
     #
     def write_phonetic_pr #:nodoc:
       attributes = [
-                    ['fontId', 1],
+                    ['fontId', 0],
                     ['type',   'noConversion']
                    ]
 
@@ -6856,7 +6876,7 @@ def write_print_options #:nodoc:
     # Write the <headerFooter> element.
     #
     def write_header_footer #:nodoc:
-      @page_setup.write_header_footer(@writer)
+      @page_setup.write_header_footer(@writer, excel2003_style?)
     end
 
     #

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -12,7 +12,7 @@ class PageSetup # :nodoc:
       attr_accessor :fit_page, :fit_width, :fit_height, :page_setup_changed   # :nodoc:
       attr_writer :across                                                   # :nodoc:
       attr_accessor :orientation, :print_options_changed  # :nodoc:
-      attr_accessor :header, :footer, :header_footer_changed
+      attr_accessor :header, :footer, :header_footer_changed, :header_footer_aligns
       attr_writer :page_start
 
       def initialize # :nodoc:
@@ -136,13 +136,20 @@ def write_print_options(writer) #:nodoc:
       #
       # Write the <headerFooter> element.
       #
-      def write_header_footer(writer) #:nodoc:
-        return unless @header_footer_changed
-
-        writer.tag_elements('headerFooter') do
-          write_odd_header(writer) if @header && @header != ''
-          write_odd_footer(writer) if @footer && @footer != ''
+      def write_header_footer(writer, excel2003_style) #:nodoc:
+        tag = 'headerFooter'
+        attributes = []
+        attributes << ['alignWithMargins', 0] if @header_footer_aligns
+
+        if @header_footer_changed
+          writer.tag_elements(tag, attributes) do
+            write_odd_header(writer) if @header && @header != ''
+            write_odd_footer(writer) if @footer && @footer != ''
+          end
+        elsif excel2003_style
+          writer.empty_tag(tag, attributes)
         end
+
       end
 
       private

data/test/regression/test_chart_column09.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartColumn09 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_column09
+    @xlsx = 'chart_column09.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 xlsx file.
+    chart.instance_variable_set(:@axis_ids, [47400832, 61387136 ])
+
+    data = [
+            [ 1, 2, 3, 4, 5 ],
+            [ 1, 2, 3, 2, 1 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$5',
+                     :values          => 'Sheet1!$B$1:$B$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_column10.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartColumn10 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_column10
+    @xlsx = 'chart_column10.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 xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45686144, 45722240 ])
+
+    data = [
+            [ 'A', 'B', 'C', 'D', 'E' ],
+            [  1,   2,   3,   2,   1  ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$5',
+                     :values          => 'Sheet1!$B$1:$B$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_doughnut01.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_doughnut01
+    @xlsx = 'chart_doughnut01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45686144, 45722240 ])
+
+    data = [
+            [  2,  4,  6 ],
+            [ 60, 30, 10 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$3',
+                     :values          => 'Sheet1!$B$1:$B$3'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_doughnut02.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_doughnut02
+    @xlsx = 'chart_doughnut02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    data = [
+            [  2,  4,  6 ],
+            [ 60, 30, 10 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$3',
+                     :values          => 'Sheet1!$B$1:$B$3'
+                     )
+
+    chart.set_hole_size(10)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_doughnut03.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_doughnut03
+    @xlsx = 'chart_doughnut03.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    data = [
+            [  2,  4,  6 ],
+            [ 60, 30, 10 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$3',
+                     :values          => 'Sheet1!$B$1:$B$3'
+                     )
+
+    chart.set_hole_size(90)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_doughnut04.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_doughnut04
+    @xlsx = 'chart_doughnut04.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    data = [
+            [  2,  4,  6 ],
+            [ 60, 30, 10 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$3',
+                     :values          => 'Sheet1!$B$1:$B$3'
+                     )
+
+    chart.set_rotation(30)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end

data/test/regression/test_chart_doughnut05.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_doughnut05
+    @xlsx = 'chart_doughnut05.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    data = [
+            [  2,  4,  6 ],
+            [ 60, 30, 10 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories      => 'Sheet1!$A$1:$A$3',
+                     :values          => 'Sheet1!$B$1:$B$3'
+                     )
+
+    chart.set_rotation(360)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                nil
+                                )
+  end
+end