write_xlsx 0.89.0 → 1.01.0

data/examples/indent.rb

@@ -8,7 +8,7 @@
 # This program demonstrates the indentation cell format.
 #
 # reverse(c), May 2004, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/macros.rb

@@ -12,7 +12,7 @@
 # An embedded macro is connected to a form button on the worksheet.
 #
 # reverse(c), November 2012, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/merge1.rb

@@ -11,7 +11,7 @@
 # See the merge3.pl - merge6.pl programs.
 #
 # reverse(c), August 2002, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 require 'write_xlsx'
 

data/examples/merge2.rb

@@ -11,7 +11,7 @@
 # See the merge3.pl - merge6.pl programs.
 #
 # reverse(c), August 2002, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/merge3.rb

@@ -7,7 +7,7 @@
 # merged cell.
 #
 # reverse(c), September 2002, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/merge4.rb

@@ -7,7 +7,7 @@
 # method with complex formatting.
 #
 # reverse(c), September 2002, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/merge5.rb

@@ -8,7 +8,7 @@
 #
 #
 # reverse(c), September 2002, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/merge6.rb

@@ -7,7 +7,7 @@
 # method with Unicode strings.
 #
 # reverse(c), December 2005, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/outline.rb

@@ -61,7 +61,7 @@
 # See the main Excel::Writer::XLSX documentation for more information.
 #
 # reverse(c), April 2003, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/outline_collapsed.rb

@@ -9,7 +9,7 @@
 # outlines.pl example program for more general examples.
 #
 # reverse ('(c)'), March 2008, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/panes.rb

@@ -6,7 +6,7 @@
 # Example of using the Excel::Writer::XLSX module to create worksheet panes.
 #
 # reverse(c), May 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/properties.rb

@@ -6,7 +6,7 @@
 # An example of adding document properties to a Excel::Writer::XLSX file.
 #
 # reverse('©'), August 2008, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/regions.rb

@@ -7,7 +7,7 @@
 # Excel workbook with multiple worksheets.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/rich_strings.rb

@@ -7,7 +7,7 @@
 # strings with multiple formatting.
 #
 # reverse(c), February 2011, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/right_to_left.rb

@@ -7,7 +7,7 @@
 # of Excel.
 #
 # reverse(c), January 2006, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape1.rb

@@ -7,7 +7,7 @@
 # add shapes to an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape2.rb

@@ -7,7 +7,7 @@
 # modify shapes properties in an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape3.rb

@@ -7,7 +7,7 @@
 # scale shapes in an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape4.rb

@@ -7,7 +7,7 @@
 # demonstrate stenciling in an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape5.rb

@@ -7,7 +7,7 @@
 # add shapes (objects and top/bottom connectors) to an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape6.rb

@@ -7,7 +7,7 @@
 # add shapes (objects and right/left connectors) to an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape7.rb

@@ -7,7 +7,7 @@
 # add shapes and one-to-many connectors to an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape8.rb

@@ -7,7 +7,7 @@
 # add shapes and one-to-many connectors to an Excel xlsx file.
 #
 # reverse('c'), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to Ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/shape_all.rb

@@ -10,7 +10,7 @@
 # part of the ECMA-376 standard.
 #
 # reverse(c), May 2012, John McNamara, jmcnamara@cpan.org
-# converted to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# converted to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 require 'write_xlsx'
 

data/examples/sparklines1.rb

@@ -10,7 +10,7 @@
 # of more complex sparkline formatting.
 #
 # reverse ('(c)'), November 2011, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/sparklines2.rb

@@ -10,7 +10,7 @@
 # options that can be applied to sparklines.
 #
 # reverse ('(c)'), November 2011, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stats.rb

@@ -6,7 +6,7 @@
 # A Simple example of how to use functions with the WriteXLSX gem.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stats_ext.rb

@@ -9,7 +9,7 @@
 # other worksheets within the same workbook.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/stocks.rb

@@ -9,7 +9,7 @@
 # with colours to indicate if a share price has gone up or down.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/tab_colors.rb

@@ -5,7 +5,7 @@
 # Example of how to set Excel worksheet tab colours.
 #
 # reverse(c), May 2006, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/examples/tables.rb

@@ -9,7 +9,7 @@
 # structure that can be references in a formula or formatted collectively.
 #
 # reverse(c), March 2001, John McNamara, jmcnamara@cpan.org
-# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+# convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
 
 require 'write_xlsx'

data/lib/write_xlsx/chart.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/gradient'
+require 'write_xlsx/chart/legend'
 require 'write_xlsx/utility'
 require 'write_xlsx/chart/axis'
 require 'write_xlsx/chart/caption'
@@ -10,7 +11,7 @@ module Writexlsx
   class Table
     include Writexlsx::Utility
 
-    attr_reader :horizontal, :vertical, :outline, :show_keys
+    attr_reader :horizontal, :vertical, :outline, :show_keys, :font
 
     def initialize(params = {})
       @horizontal, @vertical, @outline, @show_keys = true, true, true, false
@@ -18,14 +19,22 @@ def initialize(params = {})
       @vertical   = params[:vertical]   if params.has_key?(:vertical)
       @outline    = params[:outline]    if params.has_key?(:outline)
       @show_keys  = params[:show_keys]  if params.has_key?(:show_keys)
+      @font       = convert_font_args(params[:font])
+    end
+
+    def palette=(palette)
+      @palette = palette
     end
 
     def write_d_table(writer)
-      writer.tag_elements('c:dTable') do
-        writer.empty_tag('c:showHorzBorder', attributes) if ptrue?(horizontal)
-        writer.empty_tag('c:showVertBorder', attributes) if ptrue?(vertical)
-        writer.empty_tag('c:showOutline',    attributes) if ptrue?(outline)
-        writer.empty_tag('c:showKeys',       attributes) if ptrue?(show_keys)
+      @writer = writer
+      @writer.tag_elements('c:dTable') do
+        @writer.empty_tag('c:showHorzBorder', attributes) if ptrue?(horizontal)
+        @writer.empty_tag('c:showVertBorder', attributes) if ptrue?(vertical)
+        @writer.empty_tag('c:showOutline',    attributes) if ptrue?(outline)
+        @writer.empty_tag('c:showKeys',       attributes) if ptrue?(show_keys)
+        # Write the table font.
+        write_tx_pr(nil, font)                            if ptrue?(font)
       end
     end
 
@@ -154,6 +163,7 @@ def numeric_or_downcase(val)
 
   class Chart
     include Writexlsx::Utility
+    include Writexlsx::Gradient
 
     attr_accessor :id, :name   # :nodoc:
     attr_writer :index, :palette, :protection   # :nodoc:
@@ -264,6 +274,10 @@ def add_series(params)
         raise  "Must specify ':categories' in add_series for this chart type"
       end
 
+      if @series.size == 255
+        raise "The maximum number of series that can be added to an Excel Chart is 255."
+      end
+
       @series << Series.new(self, params)
 
       # Set the secondary axis properties.
@@ -340,16 +354,8 @@ def set_title(params)
     # Set the properties of the chart legend.
     #
     def set_legend(params)
-      if params[:none]
-        @legend_position = 'none'
-      else
-        @legend_position = params[:position] || 'right'
-      end
-      @legend_delete_series = params[:delete_series]
-      @legend_font          = convert_font_args(params[:font])
-
-      # Set the legend layout.
-      @legend_layout = layout_properties(params[:layout])
+      # Convert the user default properties to internal properties.
+      legend_properties(params)
     end
 
     #
@@ -417,6 +423,7 @@ def set_size(params = {})
     #
     def set_table(params = {})
       @table = Table.new(params)
+      @table.palette = @palette
     end
 
     #
@@ -517,39 +524,6 @@ def write_bar_chart(params)   # :nodoc:
       end
     end
 
-    #
-    # Convert user defined font values into private hash values.
-    #
-    def convert_font_args(params)
-      return unless params
-      font = params_to_font(params)
-
-      # Convert font size units.
-      font[:_size] *= 100 if font[:_size] && font[:_size] != 0
-
-      # Convert rotation into 60,000ths of a degree.
-      if ptrue?(font[:_rotation])
-        font[:_rotation] = 60_000 * font[:_rotation].to_i
-      end
-
-      font
-    end
-
-    def params_to_font(params)
-      {
-        :_name         => params[:name],
-        :_color        => params[:color],
-        :_size         => params[:size],
-        :_bold         => params[:bold],
-        :_italic       => params[:italic],
-        :_underline    => params[:underline],
-        :_pitch_family => params[:pitch_family],
-        :_charset      => params[:charset],
-        :_baseline     => params[:baseline] || 0,
-        :_rotation     => params[:rotation]
-      }
-    end
-
     #
     # Switch name and name_formula parameters if required.
     #
@@ -631,7 +605,7 @@ def display_setup
       @y_scale           = 1
       @x_offset          = 0
       @y_offset          = 0
-      @legend_position   = 'right'
+      @legend            = Legend.new
       @smooth_allowed    = 0
       @cross_between     = 'between'
       @date_category     = false
@@ -672,20 +646,6 @@ def get_data_type(data) # :nodoc:
       'num'
     end
 
-    #
-    # Convert the user specified colour index or string to a rgb colour.
-    #
-    def color(color_code) # :nodoc:
-      if color_code and color_code =~ /^#[0-9a-fA-F]{6}$/
-        # Convert a HTML style #RRGGBB color.
-        color_code.sub(/^#/, '').upcase
-      else
-        index = Format.color(color_code)
-        raise "Unknown color '#{color_code}' used in chart formatting." unless index
-        palette_color(index)
-      end
-    end
-
     #
     # Returns series which use the primary axes.
     #
@@ -723,38 +683,6 @@ def ids
       [id1, id2]
     end
 
-    #
-    # Get the font style attributes from a font hash.
-    #
-    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]
-
-      # Turn off baseline when testing fonts that don't have it.
-      if font[:_baseline] != -1
-        attributes << ['baseline', font[:_baseline]]
-      end
-      attributes
-    end
-
-    #
-    # Get the font latin attributes from a font hash.
-    #
-    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
-    end
     #
     # Setup the default properties for a chart.
     #
@@ -1250,8 +1178,8 @@ def write_cat_axis(params) # :nodoc:
       return unless axis_ids
       return if axis_ids.empty?
 
-      position = @cat_axis_position
-      horiz    = @horiz_cat_axis
+      position  = @cat_axis_position
+      is_y_axis = @horiz_cat_axis
 
       # Overwrite the default axis position with a user supplied value.
       position = x_axis.position || position
@@ -1274,9 +1202,9 @@ def write_cat_axis(params) # :nodoc:
 
         # Write the axis title elements.
         if x_axis.formula
-          write_title_formula(x_axis, horiz, @x_axis, x_axis.layout)
+          write_title_formula(x_axis, is_y_axis, @x_axis, x_axis.layout)
         elsif x_axis.name
-          write_title_rich(x_axis, horiz, x_axis.layout)
+          write_title_rich(x_axis, is_y_axis, x_axis.layout)
         end
 
         # Write the c:numFmt element.
@@ -1306,7 +1234,7 @@ def write_cat_axis(params) # :nodoc:
         # Write the c:auto element.
         write_auto(1) unless x_axis.text_axis
         # Write the c:labelAlign element.
-        write_label_align('ctr')
+        write_label_align(x_axis.label_align)
         # Write the c:labelOffset element.
         write_label_offset(100)
         # Write the c:tickLblSkip element.
@@ -1640,6 +1568,12 @@ def write_auto(val) # :nodoc:
     # Write the <c:labelAlign> element.
     #
     def write_label_align(val) # :nodoc:
+      val ||= 'ctr'
+      if val == 'right'
+        val = 'r'
+      elsif val == 'left'
+        val = 'l'
+      end
       @writer.empty_tag('c:lblAlgn', [ ['val', val] ])
     end
 
@@ -1742,10 +1676,10 @@ def write_c_minor_time_unit(val) # :nodoc:
     # Write the <c:legend> element.
     #
     def write_legend # :nodoc:
-      position = @legend_position.sub(/^overlay_/, '')
+      position = @legend.position.sub(/^overlay_/, '')
       return if position == 'none' || (not position_allowed.has_key?(position))
 
-      @delete_series = @legend_delete_series if @legend_delete_series.kind_of?(Array)
+      @delete_series = @legend.delete_series if @legend.delete_series.kind_of?(Array)
       @writer.tag_elements('c:legend') do
         # Write the c:legendPos element.
         write_legend_pos(position_allowed[position])
@@ -1753,20 +1687,23 @@ def write_legend # :nodoc:
         # Write the c:legendEntry element.
         @delete_series.each { |i| write_legend_entry(i) } if @delete_series
         # Write the c:layout element.
-        write_layout(@legend_layout, 'legend')
-        # Write the c:txPr element.
-        write_tx_pr(nil, @legend_font) if ptrue?(@legend_font)
+        write_layout(@legend.layout, 'legend')
         # Write the c:overlay element.
-        write_overlay if @legend_position =~ /^overlay_/
+        write_overlay if @legend.position =~ /^overlay_/
+        # Write the c:spPr element.
+        write_sp_pr(@legend)
+        # Write the c:txPr element.
+        write_tx_pr(nil, @legend.font) if ptrue?(@legend.font)
       end
     end
 
     def position_allowed
       {
-        'right'  => 'r',
-        'left'   => 'l',
-        'top'    => 't',
-        'bottom' => 'b'
+        'right'     => 'r',
+        'left'      => 'l',
+        'top'       => 't',
+        'bottom'    => 'b',
+        'top_right' => 'tr'
       }
     end
 
@@ -1871,10 +1808,10 @@ def write_auto_title_deleted
     #
     # Write the <c:title> element for a rich string.
     #
-    def write_title_rich(title, horiz = nil, layout = nil, overlay = nil) # :nodoc:
+    def write_title_rich(title, is_y_axis = nil, layout = nil, overlay = nil) # :nodoc:
       @writer.tag_elements('c:title') do
         # Write the c:tx element.
-        write_tx_rich(title, horiz)
+        write_tx_rich(title, is_y_axis)
         # Write the c:layout element.
         write_layout(layout, 'text')
         # Write the c:overlay element.
@@ -1885,7 +1822,7 @@ def write_title_rich(title, horiz = nil, layout = nil, overlay = nil) # :nodoc:
     #
     # Write the <c:title> element for a rich string.
     #
-    def write_title_formula(title, horiz = nil, axis = nil, layout = nil, overlay = nil) # :nodoc:
+    def write_title_formula(title, is_y_axis = nil, axis = nil, layout = nil, overlay = nil) # :nodoc:
       @writer.tag_elements('c:title') do
         # Write the c:tx element.
         write_tx_formula(title.formula, axis ? axis.data_id : title.data_id)
@@ -1894,15 +1831,15 @@ def write_title_formula(title, horiz = nil, axis = nil, layout = nil, overlay =
         # Write the c:overlay element.
         write_overlay if overlay
         # Write the c:txPr element.
-        write_tx_pr(horiz, axis ? axis.name_font : title.name_font)
+        write_tx_pr(is_y_axis, axis ? axis.name_font : title.name_font)
       end
     end
 
     #
     # Write the <c:tx> element.
     #
-    def write_tx_rich(title, horiz) # :nodoc:
-      @writer.tag_elements('c:tx') { write_rich(title, horiz) }
+    def write_tx_rich(title, is_y_axis) # :nodoc:
+      @writer.tag_elements('c:tx') { write_rich(title, is_y_axis) }
     end
 
     #
@@ -1924,40 +1861,20 @@ def write_tx_formula(title, data_id) # :nodoc:
     #
     # Write the <c:rich> element.
     #
-    def write_rich(title, horiz) # :nodoc:
+    def write_rich(title, is_y_axis) # :nodoc:
       rotation = nil
       if title.name_font && title.name_font[:_rotation]
         rotation = title.name_font[:_rotation]
       end
       @writer.tag_elements('c:rich') do
         # Write the a:bodyPr element.
-        write_a_body_pr(rotation, horiz)
+        write_a_body_pr(rotation, is_y_axis)
         # Write the a:lstStyle element.
         write_a_lst_style
         # Write the a:p element.
         write_a_p_rich(title)
       end
     end
-
-    #
-    # Write the <a:bodyPr> element.
-    #
-    def write_a_body_pr(rot, horiz = nil) # :nodoc:
-      rot = -5400000 if !rot && ptrue?(horiz)
-      attributes = []
-      attributes << ['rot',  rot]   if rot
-      attributes << ['vert', 'horz'] if ptrue?(horiz)
-
-      @writer.empty_tag('a:bodyPr', attributes)
-    end
-
-    #
-    # Write the <a:lstStyle> element.
-    #
-    def write_a_lst_style # :nodoc:
-      @writer.empty_tag('a:lstStyle')
-    end
-
     #
     # Write the <a:p> element for rich string titles.
     #
@@ -1970,18 +1887,6 @@ def write_a_p_rich(title) # :nodoc:
       end
     end
 
-    #
-    # Write the <a:p> element for formula titles.
-    #
-    def write_a_p_formula(font = nil) # :nodoc:
-      @writer.tag_elements('a:p') do
-        # Write the a:pPr element.
-        write_a_p_pr_formula(font)
-        # Write the a:endParaRPr element.
-        write_a_end_para_rpr
-      end
-    end
-
     #
     # Write the <a:pPr> element for rich string titles.
     #
@@ -1989,30 +1894,6 @@ def write_a_p_pr_rich(font) # :nodoc:
       @writer.tag_elements('a:pPr') { write_a_def_rpr(font) }
     end
 
-    #
-    # Write the <a:pPr> element for formula titles.
-    #
-    def write_a_p_pr_formula(font) # :nodoc:
-      @writer.tag_elements('a:pPr') { write_a_def_rpr(font) }
-    end
-
-    #
-    # Write the <a:defRPr> element.
-    #
-    def write_a_def_rpr(font = nil) # :nodoc:
-      write_def_rpr_r_pr_common(
-                                font,
-                                get_font_style_attributes(font),
-                                'a:defRPr')
-    end
-
-    #
-    # Write the <a:endParaRPr> element.
-    #
-    def write_a_end_para_rpr # :nodoc:
-      @writer.empty_tag('a:endParaRPr', [ ['lang', 'en-US'] ])
-    end
-
     #
     # Write the <a:r> element.
     #
@@ -2036,24 +1917,6 @@ def write_a_r_pr(font) # :nodoc:
       write_def_rpr_r_pr_common(font, attributes, 'a:rPr')
     end
 
-    def write_def_rpr_r_pr_common(font, style_attributes, tag)  # :nodoc:
-      latin_attributes = get_font_latin_attributes(font)
-      has_color = ptrue?(font) && ptrue?(font[:_color])
-
-      if !latin_attributes.empty? || has_color
-        @writer.tag_elements(tag, style_attributes) do
-          if has_color
-            write_a_solid_fill(:color => font[:_color])
-          end
-          if !latin_attributes.empty?
-            write_a_latin(latin_attributes)
-          end
-        end
-      else
-        @writer.empty_tag(tag, style_attributes)
-      end
-    end
-
     #
     # Write the <a:t> element.
     #
@@ -2061,24 +1924,6 @@ def write_a_t(title) # :nodoc:
       @writer.data_element('a:t', title)
     end
 
-    #
-    # Write the <c:txPr> element.
-    #
-    def write_tx_pr(horiz, font) # :nodoc:
-      rotation = nil
-      if font && font[:_rotation]
-        rotation = font[:_rotation]
-      end
-      @writer.tag_elements('c:txPr') do
-        # Write the a:bodyPr element.
-        write_a_body_pr(rotation, horiz)
-        # Write the a:lstStyle element.
-        write_a_lst_style
-        # Write the a:p element.
-        write_a_p_formula(font)
-      end
-    end
-
     #
     # Write the <c:marker> element.
     #
@@ -2199,34 +2044,6 @@ def write_a_no_fill # :nodoc:
       @writer.empty_tag('a:noFill')
     end
 
-    #
-    # Write the <a:solidFill> element.
-    #
-    def write_a_solid_fill(fill) # :nodoc:
-      @writer.tag_elements('a:solidFill') do
-        if fill[:color]
-          # Write the a:srgbClr element.
-          write_a_srgb_clr(color(fill[:color]), fill[:transparency])
-        end
-      end
-    end
-
-    #
-    # Write the <a:srgbClr> element.
-    #
-    def write_a_srgb_clr(color, transparency = nil) # :nodoc:
-      tag        = 'a:srgbClr'
-      attributes = [ ['val', color] ]
-
-      if ptrue?(transparency)
-        @writer.tag_elements(tag, attributes) do
-          write_a_alpha(transparency)
-        end
-      else
-        @writer.empty_tag(tag, attributes)
-      end
-     end
-
     #
     # Write the <a:alpha> element.
     #
@@ -2264,6 +2081,20 @@ def write_trendline(trendline) # :nodoc:
         write_forward(trendline.forward)
         # Write the c:backward element.
         write_backward(trendline.backward)
+        if trendline.intercept
+          # Write the c:intercept element.
+          write_intercept(trendline.intercept)
+        end
+        if trendline.display_r_squared
+          # Write the c:dispRSqr element.
+          write_disp_rsqr
+        end
+        if trendline.display_equation
+          # Write the c:dispEq element.
+          write_disp_eq
+          # Write the c:trendlineLbl element.
+          write_trendline_lbl
+        end
       end
     end
 
@@ -2315,6 +2146,54 @@ def write_backward(val) # :nodoc:
       @writer.empty_tag('c:backward', [ ['val', val] ])
     end
 
+    #
+    # Write the <c:intercept> element.
+    #
+    def write_intercept(val)
+      @writer.empty_tag('c:intercept', [ ['val', val] ])
+    end
+
+    #
+    # Write the <c:dispEq> element.
+    #
+    def write_disp_eq
+      @writer.empty_tag('c:dispEq', [ ['val', 1] ])
+    end
+
+    #
+    # Write the <c:dispRSqr> element.
+    #
+    def write_disp_rsqr
+      @writer.empty_tag('c:dispRSqr', [ ['val', 1] ])
+    end
+
+    #
+    # Write the <c:trendlineLbl> element.
+    #
+    def write_trendline_lbl
+      @writer.tag_elements('c:trendlineLbl') do
+        # Write the c:layout element.
+        write_layout
+        # Write the c:numFmt element.
+        write_trendline_num_fmt
+      end
+    end
+
+    #
+    # Write the <c:numFmt> element.
+    #
+    def write_trendline_num_fmt
+      format_code   = 'General'
+      source_linked = 0
+
+      attributes = [
+        ['formatCode',   format_code],
+        ['sourceLinked', source_linked]
+      ]
+
+      @writer.empty_tag('c:numFmt', attributes)
+    end
+
     #
     # Write the <c:hiLowLines> element.
     #
@@ -2362,7 +2241,12 @@ def write_num_base(tag, data)
         write_format_code('General')
 
         # Write the c:ptCount element.
-        write_pt_count(data.size)
+        if data
+          count = data.size
+        else
+          count = 0
+        end
+        write_pt_count(count)
 
         data.each_with_index do |token, i|
           # Write non-numeric data as 0.