write_xlsx 0.72.2 → 0.72.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ec26ddd5f837ef4d832d0efea345aaf5fdc524
-  data.tar.gz: e3e5c86594dd02a88a0dd3c18a018ff28b261ba2
+  metadata.gz: 7d6e30ec99cbb2730ee191dc212d2c30806486f1
+  data.tar.gz: d67dbc2cc225f0cb7dde96feebaf39600a718039
 SHA512:
-  metadata.gz: 5115cdfdcbfc75c4fdd51d14898b288ee0e17dde96156ce73319bd947683243e5ffb44ef7aaad674f3798f9f0b3dd9a2b3b4e74aa6e59248942464dd8ef8c28a
-  data.tar.gz: 3360712655ad5a43349666c8c7e7b9e76aafb0e5ea3cfec89785b5b3f7df087c485f6d463688a991855dfe486be3d1b810a77a86fec86f2e62b1dc985cf9230b
+  metadata.gz: d78099249c92fdc5f11f4d977a97d9b1e70b1ee9469ec3a6a0f96e298046703996c9841320c9e2c4276df8907700b33d7055588b1e72fa902737c256999f25a4
+  data.tar.gz: f78e06828d1e804f0a17730b5b80305082ead39dfd650c535f4289fe7ef35f51d43abf2e1f6550766c0be24ea30fa1fc5be6d2e5c08d405bd2f468cddd2c2ee5

data/{README.rdoc → Changes}

@@ -1,82 +1,8 @@
-= write_xlsx
+Change history of write_xlsx rubygem.
 
-gem to create a new file in the Excel 2007+ XLSX format, and you can use the same interface as writeexcel gem. write_xlsx is converted from Perl's module Excel::Writer::XLSX-0.70, https://github.com/jmcnamara/excel-writer-xlsx .
+2013-09-21 v0.72.3.beta1
+   speed up when script handles large number of cells.
 
-== Description
-
-Reference doc : http://cxn03651.github.io/write_xlsx/
-
-The WriteXLSX supports the following features:
-* Multiple worksheets
-* Strings and numbers
-* Unicode text
-* Cell formatting
-* Formulas (including array formats)
-* Images
-* Charts
-* Autofilters
-* Data validation
-* Conditional formatting
-* Macros
-* Tables
-* Shapes
-* Sparklines
-* Hyperlinks
-* Rich string formats
-* Defined names
-* Grouping/Outlines
-* Cell comments
-* Panes
-* Page set-up and printing options
-
-write_xlsx uses the same interface as writeexcel gem.
-
-== Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'write_xlsx'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install write_xlsx
-
-== Synopsis
-
-To write a string, a formatted string, a number and a formula to
-the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
-
-  require 'rubygems'
-  require 'write_xlsx'
-
-  # Create a new Excel workbook
-  workbook = WriteXLSX.new('ruby.xlsx')
-
-  # Add a worksheet
-  worksheet = workbook.add_worksheet
-
-  # Add and define a format
-  format = workbook.add_format # Add a format
-  format.set_bold
-  format.set_color('red')
-  format.set_align('center')
-
-  # Write a formatted and unformatted string, row and column notation.
-  col = row = 0
-  worksheet.write(row, col, "Hi Excel!", format)
-  worksheet.write(1,   col, "Hi Excel!")
-
-  # Write a number and a formula using A1 notation
-  worksheet.write('A3', 1.2345)
-  worksheet.write('A4', '=SIN(PI()/4)')
-
-  workbook.close
-
-== Recent change
 2013-09-07 v0.72.2
    work well with rubyzip 1.0.0
 
@@ -193,20 +119,3 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
 
 2012-01-20 v0.0.1
  initial release
-
-== Copyright
-Original Perl module was written by John McNamara(jmcnamara@cpan.org).
-
-Converted to ruby by Hideo NAKAMURA(cxn03651@msj.biglobe.ne.jp)
-Copyright (c) 2012 HIDEO NAKAMURA. See LICENSE.txt for further details.
-
-== Contributing to write_xlsx
-
-* repsitory: http://github.com/cxn03651/write_xlsx
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.

data/README.md

@@ -0,0 +1,96 @@
+# write_xlsx
+
+gem to create a new file in the Excel 2007+ XLSX format, and you can use the same interface as writeexcel gem. write_xlsx is converted from Perl's module [Excel::Writer::XLSX-0.72](https://github.com/jmcnamara/excel-writer-xlsx) .
+
+## Description
+
+Reference doc : http://cxn03651.github.io/write_xlsx/
+
+The WriteXLSX supports the following features:
+* Multiple worksheets
+* Strings and numbers
+* Unicode text
+* Cell formatting
+* Formulas (including array formats)
+* Images
+* Charts
+* Autofilters
+* Data validation
+* Conditional formatting
+* Macros
+* Tables
+* Shapes
+* Sparklines
+* Hyperlinks
+* Rich string formats
+* Defined names
+* Grouping/Outlines
+* Cell comments
+* Panes
+* Page set-up and printing options
+
+write_xlsx uses the same interface as writeexcel gem.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'write_xlsx'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install write_xlsx
+
+## Synopsis
+
+To write a string, a formatted string, a number and a formula to
+the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
+
+    require 'rubygems'
+    require 'write_xlsx'
+
+    # Create a new Excel workbook
+    workbook = WriteXLSX.new('ruby.xlsx')
+
+    # Add a worksheet
+    worksheet = workbook.add_worksheet
+
+    # Add and define a format
+    format = workbook.add_format # Add a format
+    format.set_bold
+    format.set_color('red')
+    format.set_align('center')
+
+    # Write a formatted and unformatted string, row and column notation.
+    col = row = 0
+    worksheet.write(row, col, "Hi Excel!", format)
+    worksheet.write(1,   col, "Hi Excel!")
+
+    # Write a number and a formula using A1 notation
+    worksheet.write('A3', 1.2345)
+    worksheet.write('A4', '=SIN(PI()/4)')
+
+    workbook.close
+
+## Copyright
+Original Perl module was written by John McNamara(jmcnamara@cpan.org).
+
+Converted to ruby by Hideo NAKAMURA(cxn03651@msj.biglobe.ne.jp)
+Copyright (c) 2012-2013 Hideo NAKAMURA.
+
+See LICENSE.txt for further details.
+
+## Contributing to write_xlsx
+
+* repsitory: http://github.com/cxn03651/write_xlsx
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.

data/lib/write_xlsx/chart.rb

@@ -31,7 +31,7 @@ def write_d_table(writer)
     private
 
     def attributes
-      ['val', 1]
+      [ ['val', 1] ]
     end
   end
 
@@ -130,33 +130,23 @@ def set_xml_writer(filename)   # :nodoc:
     # Assemble and write the XML file.
     #
     def assemble_xml_file   # :nodoc:
-      @writer.xml_decl
-
-      # Write the c:chartSpace element.
-      write_chart_space do
-
-        # Write the c:lang element.
-        write_lang
-
-        # Write the c:style element.
-        write_style
-
-        # Write the c:protection element.
-        write_protection
-
-        # Write the c:chart element.
-        write_chart
-
-        # Write the c:spPr element for the chartarea formatting.
-        write_sp_pr(@chartarea)
-
-        # Write the c:printSettings element.
-        write_print_settings if @embedded && @embedded != 0
+      write_xml_declaration do
+        # Write the c:chartSpace element.
+        write_chart_space do
+          # Write the c:lang element.
+          write_lang
+          # Write the c:style element.
+          write_style
+          # Write the c:protection element.
+          write_protection
+          # Write the c:chart element.
+          write_chart
+          # Write the c:spPr element for the chartarea formatting.
+          write_sp_pr(@chartarea)
+          # Write the c:printSettings element.
+          write_print_settings if @embedded && @embedded != 0
+        end
       end
-
-      # Close the XML writer object and filehandle.
-      @writer.crlf
-      @writer.close
     end
 
     #
@@ -415,38 +405,6 @@ def convert_font_args(params)
       font
     end
 
-    #
-    # Convert user defined line properties to the structure required internally.
-    #
-    def line_properties(line) # :nodoc:
-      return { :_defined => 0 } unless line
-
-      dash_types = {
-        :solid               => 'solid',
-        :round_dot           => 'sysDot',
-        :square_dot          => 'sysDash',
-        :dash                => 'dash',
-        :dash_dot            => 'dashDot',
-        :long_dash           => 'lgDash',
-        :long_dash_dot       => 'lgDashDot',
-        :long_dash_dot_dot   => 'lgDashDotDot',
-        :dot                 => 'dot',
-        :system_dash_dot     => 'sysDashDot',
-        :system_dash_dot_dot => 'sysDashDotDot'
-      }
-
-      # Check the dash type.
-      dash_type = line[:dash_type]
-
-      if dash_type
-        line[:dash_type] = value_or_raise(dash_types, dash_type, 'dash type')
-      end
-
-      line[:_defined] = 1
-
-      line
-    end
-
     #
     # Switch name and name_formula parameters if required.
     #
@@ -673,11 +631,6 @@ def area_properties(arg)  # :nodoc:
       return area
     end
 
-    def value_or_raise(hash, key, msg)
-      raise "Unknown #{msg} '#{key}'" unless hash[key.to_sym]
-      hash[key.to_sym]
-    end
-
     #
     # Returns series which use the primary axes.
     #
@@ -722,12 +675,12 @@ def get_font_style_attributes(font)
       return [] unless font
 
       attributes = []
-      attributes << 'sz' << font[:_size]      if ptrue?(font[:_size])
-      attributes << 'b'  << font[:_bold]      if font[:_bold]
-      attributes << 'i'  << font[:_italic]    if font[:_italic]
-      attributes << 'u'  << 'sng'             if font[:_underline]
+      attributes << ['sz', font[:_size]]      if ptrue?(font[:_size])
+      attributes << ['b',  font[:_bold]]      if font[:_bold]
+      attributes << ['i',  font[:_italic]]    if font[:_italic]
+      attributes << ['u',  'sng']             if font[:_underline]
 
-      attributes << 'baseline' << font[:_baseline]
+      attributes << ['baseline', font[:_baseline]]
       attributes
     end
 
@@ -738,9 +691,9 @@ def get_font_latin_attributes(font)
       return [] unless font
 
       attributes = []
-      attributes << 'typeface' << font[:_name] if ptrue?(font[:_name])
-      attributes << 'pitchFamily' << font[:_pitch_family] if font[:_pitch_family]
-      attributes << 'charset' << font[:_charset] if font[:_charset]
+      attributes << ['typeface', font[:_name]]            if ptrue?(font[:_name])
+      attributes << ['pitchFamily', font[:_pitch_family]] if font[:_pitch_family]
+      attributes << ['charset', font[:_charset]]          if font[:_charset]
 
       attributes
     end
@@ -780,52 +733,6 @@ def set_default_properties # :nodoc:
       set_y2_axis
     end
 
-    def default_chartarea_property
-      {
-        :_visible          => 0,
-        :_fg_color_index   => 0x4E,
-        :_fg_color_rgb     => 0xFFFFFF,
-        :_bg_color_index   => 0x4D,
-        :_bg_color_rgb     => 0x000000,
-        :_area_pattern     => 0x0000,
-        :_area_options     => 0x0000,
-        :_line_pattern     => 0x0005,
-        :_line_weight      => 0xFFFF,
-        :_line_color_index => 0x4D,
-        :_line_color_rgb   => 0x000000,
-        :_line_options     => 0x0008
-      }
-    end
-
-    def default_chartarea_property_for_embedded
-      default_chartarea_property.
-        merge(
-              :_visible => 1,
-              :_area_pattern => 0x0001,
-              :_area_options => 0x0001,
-              :_line_pattern => 0x0000,
-              :_line_weight  => 0x0000,
-              :_line_options => 0x0009
-              )
-    end
-
-    def default_plotarea_property
-      {
-        :_visible          => 1,
-        :_fg_color_index   => 0x16,
-        :_fg_color_rgb     => 0xC0C0C0,
-        :_bg_color_index   => 0x4F,
-        :_bg_color_rgb     => 0x000000,
-        :_area_pattern     => 0x0001,
-        :_area_options     => 0x0000,
-        :_line_pattern     => 0x0000,
-        :_line_weight      => 0x0000,
-        :_line_color_index => 0x17,
-        :_line_color_rgb   => 0x808080,
-        :_line_options     => 0x0000
-      }
-    end
-
     #
     # Write the <c:chartSpace> element.
     #
@@ -839,9 +746,9 @@ def write_chart_space # :nodoc:
     def chart_space_attributes # :nodoc:
       schema  = 'http://schemas.openxmlformats.org/'
       [
-       'xmlns:c', "#{schema}drawingml/2006/chart",
-       'xmlns:a', "#{schema}drawingml/2006/main",
-       'xmlns:r', "#{schema}officeDocument/2006/relationships"
+       ['xmlns:c', "#{schema}drawingml/2006/chart"],
+       ['xmlns:a', "#{schema}drawingml/2006/main"],
+       ['xmlns:r', "#{schema}officeDocument/2006/relationships"]
       ]
     end
 
@@ -849,7 +756,7 @@ def chart_space_attributes # :nodoc:
     # Write the <c:lang> element.
     #
     def write_lang # :nodoc:
-      @writer.empty_tag('c:lang', ['val', 'en-US'])
+      @writer.empty_tag('c:lang', [ ['val', 'en-US'] ])
     end
 
     #
@@ -858,7 +765,7 @@ def write_lang # :nodoc:
     def write_style # :nodoc:
       return if @style_id == 2
 
-      @writer.empty_tag('c:style', ['val', @style_id])
+      @writer.empty_tag('c:style', [ ['val', @style_id] ])
     end
 
     #
@@ -891,7 +798,7 @@ def write_chart # :nodoc:
     def write_disp_blanks_as
       return if @show_blanks == 'gap'
 
-      @writer.empty_tag('c:dispBlanksAs', ['val', @show_blanks])
+      @writer.empty_tag('c:dispBlanksAs', [ ['val', @show_blanks] ])
     end
 
     #
@@ -962,7 +869,7 @@ def write_chart_type # :nodoc:
     # Write the <c:grouping> element.
     #
     def write_grouping(val) # :nodoc:
-      @writer.empty_tag('c:grouping', ['val', val])
+      @writer.empty_tag('c:grouping', [ ['val', val] ])
     end
 
     #
@@ -1013,14 +920,14 @@ def write_ser(series) # :nodoc:
     # Write the <c:idx> element.
     #
     def write_idx(val) # :nodoc:
-      @writer.empty_tag('c:idx', ['val', val])
+      @writer.empty_tag('c:idx', [ ['val', val] ])
     end
 
     #
     # Write the <c:order> element.
     #
     def write_order(val) # :nodoc:
-      @writer.empty_tag('c:order', ['val', val])
+      @writer.empty_tag('c:order', [ ['val', val] ])
     end
 
     #
@@ -1143,7 +1050,7 @@ def write_axis_ids(params)
     # Write the <c:axId> element.
     #
     def write_axis_id(val) # :nodoc:
-      @writer.empty_tag('c:axId', ['val', val])
+      @writer.empty_tag('c:axId', [ ['val', val] ])
     end
 
     #
@@ -1219,12 +1126,21 @@ def write_cat_axis(params) # :nodoc:
     #
     # TODO. Maybe should have a _write_cat_val_axis method as well for scatter.
     #
-    def write_val_axis(params) # :nodoc:
-      x_axis   = params[:x_axis]
-      y_axis   = params[:y_axis]
+    def write_val_axis(params, cat = false) # :nodoc:
       axis_ids = params[:axis_ids]
       position = params[:position] || @val_axis_position
       horiz    = @horiz_val_axis
+      if cat
+        x_axis   = params[:y_axis]
+        y_axis   = params[:x_axis]
+        axis_ids_0 = axis_ids[1]
+        axis_ids_1 = axis_ids[0]
+      else
+        x_axis   = params[:x_axis]
+        y_axis   = params[:y_axis]
+        axis_ids_0 = axis_ids[0]
+        axis_ids_1 = axis_ids[1]
+      end
 
       return unless axis_ids && !axis_ids.empty?
 
@@ -1232,7 +1148,7 @@ def write_val_axis(params) # :nodoc:
       position = y_axis.position || position
 
       @writer.tag_elements('c:valAx') do
-        write_axis_id(axis_ids[1])
+        write_axis_id(axis_ids_1)
 
         # Write the c:scaling element.
         write_scaling_with_param(y_axis)
@@ -1268,7 +1184,7 @@ def write_val_axis(params) # :nodoc:
         write_axis_font(y_axis.num_font)
 
         # Write the c:crossAx element.
-        write_cross_axis(axis_ids[0])
+        write_cross_axis(axis_ids_0)
 
         write_crossing(x_axis.crossing)
 
@@ -1290,67 +1206,7 @@ def write_val_axis(params) # :nodoc:
     # Usually the X axis.
     #
     def write_cat_val_axis(params) # :nodoc:
-      x_axis   = params[:x_axis]
-      y_axis   = params[:y_axis]
-      axis_ids = params[:axis_ids]
-      position = params[:position] || @val_axis_position
-      horiz    = @horiz_val_axis
-
-      return unless axis_ids && !axis_ids.empty?
-
-      # Overwrite the default axis position with a user supplied value.
-      position = x_axis.position || position
-
-      @writer.tag_elements('c:valAx') do
-        write_axis_id(axis_ids[0])
-
-        # Write the c:scaling element.
-        write_scaling_with_param(x_axis)
-
-        write_delete(1) unless ptrue?(x_axis.visible)
-
-        # 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 c:minorGridlines element.
-        write_minor_gridlines(x_axis.minor_gridlines)
-
-        # Write the axis title elements.
-        if x_axis.formula
-          write_title_formula(x_axis, horiz)
-        elsif x_axis.name
-          write_title_rich(x_axis, horiz)
-        end
-
-        # Write the c:numberFormat element.
-        write_number_format(x_axis)
-
-        # Write the c:majorTickMark element.
-        write_major_tick_mark(x_axis.major_tick_mark)
-
-        # Write the c:tickLblPos element.
-        write_tick_label_pos(x_axis.label_position)
-
-        # Write the axis font elements.
-        write_axis_font(x_axis.num_font)
-
-        # Write the c:crossAx element.
-        write_cross_axis(axis_ids[1])
-
-        write_crossing(y_axis.crossing)
-
-        # Write the c:crossBetween element.
-        write_cross_between
-
-        # Write the c:majorUnit element.
-        write_c_major_unit(x_axis.major_unit)
-
-        # Write the c:minorunit element.
-        write_c_minor_unit(x_axis.minor_unit)
-      end
+      write_val_axis(params, true)
     end
 
     #
@@ -1466,7 +1322,7 @@ def write_scaling(reverse, min = nil, max = nil, log_base = nil) # :nodoc:
     def write_c_log_base(val) # :nodoc:
       return unless ptrue?(val)
 
-      @writer.empty_tag('c:logBase', ['val', val])
+      @writer.empty_tag('c:logBase', [ ['val', val] ])
     end
 
     #
@@ -1475,7 +1331,7 @@ def write_c_log_base(val) # :nodoc:
     def write_orientation(reverse = nil) # :nodoc:
       val     = ptrue?(reverse) ? 'maxMin' : 'minMax'
 
-      @writer.empty_tag('c:orientation', ['val', val])
+      @writer.empty_tag('c:orientation', [ ['val', val] ])
     end
 
     #
@@ -1484,7 +1340,7 @@ def write_orientation(reverse = nil) # :nodoc:
     def write_c_max(max = nil) # :nodoc:
       return if max.nil?
 
-      @writer.empty_tag('c:max', ['val', max])
+      @writer.empty_tag('c:max', [ ['val', max] ])
     end
 
     #
@@ -1493,7 +1349,7 @@ def write_c_max(max = nil) # :nodoc:
     def write_c_min(min = nil) # :nodoc:
       return if min.nil?
 
-      @writer.empty_tag('c:min', ['val', min])
+      @writer.empty_tag('c:min', [ ['val', min] ])
     end
 
     #
@@ -1505,7 +1361,7 @@ def write_axis_pos(val, reverse = false) # :nodoc:
         val = 't' if val == 'b'
       end
 
-      @writer.empty_tag('c:axPos', ['val', val])
+      @writer.empty_tag('c:axPos', [ ['val', val] ])
     end
 
     #
@@ -1532,7 +1388,7 @@ def write_cat_number_format(axis)
     def write_major_tick_mark(val)
       return unless ptrue?(val)
 
-      @writer.empty_tag('c:majorTickMark', ['val', val])
+      @writer.empty_tag('c:majorTickMark', [ ['val', val] ])
     end
 
     #
@@ -1542,14 +1398,14 @@ def write_tick_label_pos(val) # :nodoc:
       val ||= 'nextTo'
       val = 'nextTo' if val == 'next_to'
 
-      @writer.empty_tag('c:tickLblPos', ['val', val])
+      @writer.empty_tag('c:tickLblPos', [ ['val', val] ])
     end
 
     #
     # Write the <c:crossAx> element.
     #
     def write_cross_axis(val = 'autoZero') # :nodoc:
-      @writer.empty_tag('c:crossAx', ['val', val])
+      @writer.empty_tag('c:crossAx', [ ['val', val] ])
     end
 
     #
@@ -1558,35 +1414,35 @@ def write_cross_axis(val = 'autoZero') # :nodoc:
     def write_crosses(val) # :nodoc:
       val ||= 'autoZero'
 
-      @writer.empty_tag('c:crosses', ['val', val])
+      @writer.empty_tag('c:crosses', [ ['val', val] ])
     end
 
     #
     # Write the <c:crossesAt> element.
     #
     def write_c_crosses_at(val) # :nodoc:
-      @writer.empty_tag('c:crossesAt', ['val', val])
+      @writer.empty_tag('c:crossesAt', [ ['val', val] ])
     end
 
     #
     # Write the <c:auto> element.
     #
     def write_auto(val) # :nodoc:
-      @writer.empty_tag('c:auto', ['val', val])
+      @writer.empty_tag('c:auto', [ ['val', val] ])
     end
 
     #
     # Write the <c:labelAlign> element.
     #
     def write_label_align(val) # :nodoc:
-      @writer.empty_tag('c:lblAlgn', ['val', val])
+      @writer.empty_tag('c:lblAlgn', [ ['val', val] ])
     end
 
     #
     # Write the <c:labelOffset> element.
     #
     def write_label_offset(val) # :nodoc:
-      @writer.empty_tag('c:lblOffset', ['val', val])
+      @writer.empty_tag('c:lblOffset', [ ['val', val] ])
     end
 
     #
@@ -1614,7 +1470,7 @@ def write_gridlines_base(tag, gridlines)  # :nodoc:
     def write_cross_between # :nodoc:
       val  = @cross_between || 'between'
 
-      @writer.empty_tag('c:crossBetween', ['val', val])
+      @writer.empty_tag('c:crossBetween', [ ['val', val] ])
     end
 
     #
@@ -1623,7 +1479,7 @@ def write_cross_between # :nodoc:
     def write_c_major_unit(val = nil) # :nodoc:
       return unless val
 
-      @writer.empty_tag('c:majorUnit', ['val', val])
+      @writer.empty_tag('c:majorUnit', [ ['val', val] ])
     end
 
     #
@@ -1632,7 +1488,7 @@ def write_c_major_unit(val = nil) # :nodoc:
     def write_c_minor_unit(val = nil) # :nodoc:
       return unless val
 
-      @writer.empty_tag('c:minorUnit', ['val', val])
+      @writer.empty_tag('c:minorUnit', [ ['val', val] ])
     end
 
     #
@@ -1641,7 +1497,7 @@ def write_c_minor_unit(val = nil) # :nodoc:
     def write_c_major_time_unit(val) # :nodoc:
       val ||= 'days'
 
-      @writer.empty_tag('c:majorTimeUnit', ['val', val])
+      @writer.empty_tag('c:majorTimeUnit', [ ['val', val] ])
     end
 
     #
@@ -1650,7 +1506,7 @@ def write_c_major_time_unit(val) # :nodoc:
     def write_c_minor_time_unit(val) # :nodoc:
       val ||= 'days'
 
-      @writer.empty_tag('c:minorTimeUnit', ['val', val])
+      @writer.empty_tag('c:minorTimeUnit', [ ['val', val] ])
     end
 
     #
@@ -1700,7 +1556,7 @@ def write_legend # :nodoc:
     # Write the <c:legendPos> element.
     #
     def write_legend_pos(val) # :nodoc:
-      @writer.empty_tag('c:legendPos', ['val', val])
+      @writer.empty_tag('c:legendPos', [ ['val', val] ])
     end
 
     #
@@ -1731,7 +1587,7 @@ def write_plot_vis_only # :nodoc:
       # Ignore this element if we are plotting hidden data.
       return if @show_hidden_data
 
-      @writer.empty_tag('c:plotVisOnly', ['val', val])
+      @writer.empty_tag('c:plotVisOnly', [ ['val', val] ])
     end
 
     #
@@ -1767,12 +1623,12 @@ def write_page_margins # :nodoc:
       footer = 0.3
 
       attributes = [
-                    'b',      b,
-                    'l',      l,
-                    'r',      r,
-                    't',      t,
-                    'header', header,
-                    'footer', footer
+                    ['b',      b],
+                    ['l',      l],
+                    ['r',      r],
+                    ['t',      t],
+                    ['header', header],
+                    ['footer', footer]
                    ]
 
       @writer.empty_tag('c:pageMargins', attributes)
@@ -1856,8 +1712,8 @@ def write_a_body_pr(horiz) # :nodoc:
       vert  = 'horz'
 
       attributes = [
-                    'rot',  rot,
-                    'vert', vert
+                    ['rot',  rot],
+                    ['vert', vert]
                    ]
 
       attributes = [] unless ptrue?(horiz)
@@ -1871,8 +1727,8 @@ def write_a_body_pr(horiz) # :nodoc:
     def write_axis_body_pr(rot = nil, vert = nil)
       attributes = []
 
-      attributes << 'rot'  << rot  if rot
-      attributes << 'vert' << vert if vert
+      attributes << ['rot', rot]   if rot
+      attributes << ['vert', vert] if vert
 
       @writer.empty_tag('a:bodyPr', attributes)
     end
@@ -1936,7 +1792,7 @@ def write_a_def_rpr(font = nil) # :nodoc:
     # Write the <a:endParaRPr> element.
     #
     def write_a_end_para_rpr # :nodoc:
-      @writer.empty_tag('a:endParaRPr', ['lang', 'en-US'])
+      @writer.empty_tag('a:endParaRPr', [ ['lang', 'en-US'] ])
     end
 
     #
@@ -1955,11 +1811,11 @@ def write_a_r(title) # :nodoc:
     # Write the <a:rPr> element.
     #
     def write_a_r_pr(font) # :nodoc:
-      write_def_rpr_r_pr_common(
-                                font,
-                                get_font_style_attributes(font).unshift('en-US').unshift('lang'),
-                                'a:rPr'
-                                )
+      attributes = [ ['lang', 'en-US'] ]
+      attr_font = get_font_style_attributes(font)
+      attributes += attr_font unless attr_font.empty?
+
+      write_def_rpr_r_pr_common(font, attributes, 'a:rPr')
     end
 
     def write_def_rpr_r_pr_common(font, style_attributes, tag)  # :nodoc:
@@ -2027,21 +1883,21 @@ def write_marker(marker = nil) # :nodoc:
     def write_marker_value # :nodoc:
       return unless @default_marker
 
-      @writer.empty_tag('c:marker', ['val', 1])
+      @writer.empty_tag('c:marker', [ ['val', 1] ])
     end
 
     #
     # Write the <c:size> element.
     #
     def write_marker_size(val) # :nodoc:
-      @writer.empty_tag('c:size', ['val', val])
+      @writer.empty_tag('c:size', [ ['val', val] ])
     end
 
     #
     # Write the <c:symbol> element.
     #
     def write_symbol(val) # :nodoc:
-      @writer.empty_tag('c:symbol', ['val', val])
+      @writer.empty_tag('c:symbol', [ ['val', val] ])
     end
 
     #
@@ -2084,7 +1940,7 @@ def write_a_ln(line) # :nodoc:
         # Convert to internal units.
         width = (0.5 + (12700 * width)).to_i
 
-        attributes = ['w', width]
+        attributes << ['w', width]
       end
 
       @writer.tag_elements('a:ln', attributes) do
@@ -2129,14 +1985,14 @@ def write_a_solid_fill(line) # :nodoc:
     # Write the <a:srgbClr> element.
     #
     def write_a_srgb_clr(val) # :nodoc:
-      @writer.empty_tag('a:srgbClr', ['val', val])
+      @writer.empty_tag('a:srgbClr', [ ['val', val] ])
     end
 
     #
     # Write the <a:prstDash> element.
     #
     def write_a_prst_dash(val) # :nodoc:
-      @writer.empty_tag('a:prstDash', ['val', val])
+      @writer.empty_tag('a:prstDash', [ ['val', val] ])
     end
 
     #
@@ -2167,7 +2023,7 @@ def write_trendline(trendline) # :nodoc:
     # Write the <c:trendlineType> element.
     #
     def write_trendline_type(val) # :nodoc:
-      @writer.empty_tag('c:trendlineType', ['val', val])
+      @writer.empty_tag('c:trendlineType', [ ['val', val] ])
     end
 
     #
@@ -2183,14 +2039,14 @@ def write_name(data) # :nodoc:
     # Write the <c:order> element.
     #
     def write_trendline_order(val = 2) # :nodoc:
-      @writer.empty_tag('c:order', ['val', val])
+      @writer.empty_tag('c:order', [ ['val', val] ])
     end
 
     #
     # Write the <c:period> element.
     #
     def write_period(val = 2) # :nodoc:
-      @writer.empty_tag('c:period', ['val', val])
+      @writer.empty_tag('c:period', [ ['val', val] ])
     end
 
     #
@@ -2199,7 +2055,7 @@ def write_period(val = 2) # :nodoc:
     def write_forward(val) # :nodoc:
       return unless val
 
-      @writer.empty_tag('c:forward', ['val', val])
+      @writer.empty_tag('c:forward', [ ['val', val] ])
     end
 
     #
@@ -2208,7 +2064,7 @@ def write_forward(val) # :nodoc:
     def write_backward(val) # :nodoc:
       return unless val
 
-      @writer.empty_tag('c:backward', ['val', val])
+      @writer.empty_tag('c:backward', [ ['val', val] ])
     end
 
     #
@@ -2244,7 +2100,7 @@ def write_lines_base(tag, lines)
     def write_overlap(val = nil) # :nodoc:
       return unless val
 
-      @writer.empty_tag('c:overlap', ['val', val])
+      @writer.empty_tag('c:overlap', [ ['val', val] ])
     end
 
     #
@@ -2299,7 +2155,7 @@ def write_format_code(data) # :nodoc:
     # Write the <c:ptCount> element.
     #
     def write_pt_count(val) # :nodoc:
-      @writer.empty_tag('c:ptCount', ['val', val])
+      @writer.empty_tag('c:ptCount', [ ['val', val] ])
     end
 
     #
@@ -2308,7 +2164,7 @@ def write_pt_count(val) # :nodoc:
     def write_pt(idx, value) # :nodoc:
       return unless value
 
-      attributes = ['idx', idx]
+      attributes = [ ['idx', idx] ]
 
       @writer.tag_elements('c:pt', attributes) { write_v(value) }
     end
@@ -2381,49 +2237,49 @@ def write_d_lbls(labels) # :nodoc:
     # Write the <c:showVal> element.
     #
     def write_show_val # :nodoc:
-      @writer.empty_tag('c:showVal', ['val', 1])
+      @writer.empty_tag('c:showVal', [ ['val', 1] ])
     end
 
     #
     # Write the <c:showCatName> element.
     #
     def write_show_cat_name # :nodoc:
-      @writer.empty_tag('c:showCatName', ['val', 1])
+      @writer.empty_tag('c:showCatName', [ ['val', 1] ])
     end
 
     #
     # Write the <c:showSerName> element.
     #
     def write_show_ser_name # :nodoc:
-      @writer.empty_tag('c:showSerName', ['val', 1])
+      @writer.empty_tag('c:showSerName', [ ['val', 1] ])
     end
 
     #
     # Write the <c:showPercent> element.
     #
     def write_show_percent
-      @writer.empty_tag('c:showPercent', ['val', 1])
+      @writer.empty_tag('c:showPercent', [ ['val', 1] ])
     end
 
     #
     # Write the <c:showLeaderLines> element.
     #
     def write_show_leader_lines
-      @writer.empty_tag('c:showLeaderLines', ['val', 1])
+      @writer.empty_tag('c:showLeaderLines', [ ['val', 1] ])
     end
 
     #
     # Write the <c:dLblPos> element.
     #
     def write_d_lbl_pos(val)
-      @writer.empty_tag('c:dLblPos', ['val', val])
+      @writer.empty_tag('c:dLblPos', [ ['val', val] ])
     end
 
     #
     # Write the <c:delete> element.
     #
     def write_delete(val) # :nodoc:
-      @writer.empty_tag('c:delete', ['val', val])
+      @writer.empty_tag('c:delete', [ ['val', val] ])
     end
 
     #
@@ -2432,7 +2288,7 @@ def write_delete(val) # :nodoc:
     def write_c_invert_if_negative(invert = nil) # :nodoc:
       return unless ptrue?(invert)
 
-      @writer.empty_tag('c:invertIfNegative', ['val', 1])
+      @writer.empty_tag('c:invertIfNegative', [ ['val', 1] ])
     end
 
     #
@@ -2514,35 +2370,35 @@ def write_err_bars(direction, error_bars)
     # Write the <c:errDir> element.
     #
     def write_err_dir(val)
-      @writer.empty_tag('c:errDir', ['val', val])
+      @writer.empty_tag('c:errDir', [ ['val', val] ])
     end
 
     #
     # Write the <c:errBarType> element.
     #
     def write_err_bar_type(val)
-      @writer.empty_tag('c:errBarType', ['val', val])
+      @writer.empty_tag('c:errBarType', [ ['val', val] ])
     end
 
     #
     # Write the <c:errValType> element.
     #
     def write_err_val_type(val)
-      @writer.empty_tag('c:errValType', ['val', val])
+      @writer.empty_tag('c:errValType', [ ['val', val] ])
     end
 
     #
     # Write the <c:noEndCap> element.
     #
     def write_no_end_cap
-      @writer.empty_tag('c:noEndCap', ['val', 1])
+      @writer.empty_tag('c:noEndCap', [ ['val', 1] ])
     end
 
     #
     # Write the <c:val> element.
     #
     def write_error_val(val)
-      @writer.empty_tag('c:val', ['val', val])
+      @writer.empty_tag('c:val', [ ['val', val] ])
     end
 
     #
@@ -2569,7 +2425,7 @@ def write_up_down_bars
     def write_gap_width(val = nil)
       return unless val
 
-      @writer.empty_tag('c:gapWidth', ['val', val])
+      @writer.empty_tag('c:gapWidth', [ ['val', val] ])
     end
 
     #
@@ -2592,7 +2448,7 @@ def write_down_bars(format)
     def write_c_smooth(smooth)
       return unless ptrue?(smooth)
 
-      attributes = ['val', 1]
+      attributes = [ ['val', 1] ]
 
       @writer.empty_tag('c:smooth', attributes)
     end