write_xlsx 0.62.0 → 0.64.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = 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.62, https://github.com/jmcnamara/excel-writer-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.63, https://github.com/jmcnamara/excel-writer-xlsx .
 
 == Description
 
@@ -75,6 +75,19 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-03-05 v0.64.0
+   Added the option to format individual points in a chart series.
+   This allows Pie chart segments to be formatted.
+
+
+2013-03-05 v0.63.0
+  Added Chart data tools such as:
+    Error Bars
+    Up-Down Bars
+    High-Low Lines
+    Drop Lines.
+  See the chart_data_tools.rb example.
+
 2013-02-24 v0.62.0
   Added option for adding a data table to a Chart X-axis.
   See output from chart_data_table.rb example.

data/examples/chart_data_tools.rb

@@ -0,0 +1,215 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+#######################################################################
+#
+# A demo of an various Excel chart data tools that are available via
+# an WriteXLSX chart.
+#
+# These include, Trendlines, Data Labels, Error Bars, Drop Lines,
+# High-Low Lines and Up-Down Bars.
+#
+# reverse ('(c)'), December 2012, John McNamara, jmcnamara@cpan.org
+# convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+#
+
+require 'rubygems'
+require 'write_xlsx'
+
+# Create a new workbook called simple.xls and add a worksheet
+workbook  = WriteXLSX.new('chart_data_tools.xlsx')
+worksheet = workbook.add_worksheet
+bold      = workbook.add_format(:bold => 1)
+
+# Add the worksheet data that the charts will refer to.
+headings = [ 'Number', 'Data 1', 'Data 2' ]
+data = [
+    [ 2,  3,  4,  5,  6,  7 ],
+    [ 10, 40, 50, 20, 10, 50 ],
+    [ 30, 60, 70, 50, 40, 30 ]
+
+]
+
+worksheet.write('A1', headings, bold)
+worksheet.write('A2', data)
+
+
+#######################################################################
+#
+# Trendline example.
+#
+
+# Create a Line chart.
+chart1 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Configure the first series with a polynomial trendline.
+chart1.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$B$2:$B$7',
+    :trendline  => {
+        :type  => 'polynomial',
+        :order => 3,
+    },
+)
+
+# Configure the second series with a moving average trendline.
+chart1.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+    :trendline  => { :type => 'linear' },
+)
+
+# Add a chart title. and some axis labels.
+chart1.set_title(:name => 'Chart with Trendlines')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D2', chart1, 25, 10)
+
+
+#######################################################################
+#
+# Data Labels and Markers example.
+#
+
+# Create a Line chart.
+chart2 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Configure the first series.
+chart2.add_series(
+    :categories  => '=Sheet1!$A$2:$A$7',
+    :values      => '=Sheet1!$B$2:$B$7',
+    :data_labels => { :value => 1 },
+    :marker      => { :type => 'automatic' },
+)
+
+# Configure the second series.
+chart2.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+)
+
+# Add a chart title. and some axis labels.
+chart2.set_title(:name => 'Chart with Data Labels and Markers')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D18', chart2, 25, 10)
+
+
+#######################################################################
+#
+# Error Bars example.
+#
+
+# Create a Line chart.
+chart3 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Configure the first series.
+chart3.add_series(
+    :categories   => '=Sheet1!$A$2:$A$7',
+    :values       => '=Sheet1!$B$2:$B$7',
+    :y_error_bars => { :type => 'standard_error' },
+)
+
+# Configure the second series.
+chart3.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+)
+
+# Add a chart title. and some axis labels.
+chart3.set_title(:name => 'Chart with Error Bars')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D34', chart3, 25, 10)
+
+
+#######################################################################
+#
+# Up-Down Bars example.
+#
+
+# Create a Line chart.
+chart4 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Add the Up-Down Bars.
+chart4.set_up_down_bars
+
+# Configure the first series.
+chart4.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$B$2:$B$7',
+)
+
+# Configure the second series.
+chart4.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+)
+
+# Add a chart title. and some axis labels.
+chart4.set_title(:name => 'Chart with Up-Down Bars')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D50', chart4, 25, 10)
+
+
+#######################################################################
+#
+# High-Low Lines example.
+#
+
+# Create a Line chart.
+chart5 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Add the High-Low lines.
+chart5.set_high_low_lines
+
+# Configure the first series.
+chart5.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$B$2:$B$7',
+)
+
+# Configure the second series.
+chart5.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+)
+
+# Add a chart title. and some axis labels.
+chart5.set_title(:name => 'Chart with High-Low Lines')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D66', chart5, 25, 10)
+
+
+#######################################################################
+#
+# Drop Lines example.
+#
+
+# Create a Line chart.
+chart6 = workbook.add_chart(:type => 'line', :embedded => 1)
+
+# Add Drop Lines.
+chart6.set_drop_lines
+
+# Configure the first series.
+chart6.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$B$2:$B$7',
+)
+
+# Configure the second series.
+chart6.add_series(
+    :categories => '=Sheet1!$A$2:$A$7',
+    :values     => '=Sheet1!$C$2:$C$7',
+)
+
+# Add a chart title. and some axis labels.
+chart6.set_title(:name => 'Chart with Drop Lines')
+
+# Insert the chart into the worksheet (with an offset).
+worksheet.insert_chart('D82', chart6, 25, 10)
+
+workbook.close

data/examples/chart_pie.rb

@@ -5,6 +5,12 @@
 #
 # A demo of a Pie chart in Excel::Writer::XLSX.
 #
+# The demo also shows how to set segment colours. It is possible to
+# define chart colors for most types of WrtieXLSX charts
+# via the add_series() method. However, Pie charts are a special case
+# since each segment is represented as a point so it is necessary to
+# assign formatting to each point in the series.
+#
 # reverse(c), March 2011, John McNamara, jmcnamara@cpan.org
 # convert to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
 #
@@ -27,23 +33,48 @@
 worksheet.write('A2', data)
 
 # Create a new chart object. In this case an embedded chart.
-chart = workbook.add_chart(:type => 'pie', :embedded => 1)
+chart1 = workbook.add_chart(:type => 'pie', :embedded => 1)
 
 # Configure the series. Note the use of the array ref to define ranges:
 # [ $sheetname, $row_start, $row_end, $col_start, $col_end ].
-chart.add_series(
+# See below for an alternative syntax.
+chart1.add_series(
     :name       => 'Pie sales data',
     :categories => [ 'Sheet1', 1, 3, 0, 0 ],
     :values     => [ 'Sheet1', 1, 3, 1, 1 ]
 )
 
 # Add a title.
-chart.set_title(:name => 'Popular Pie Types')
+chart1.set_title(:name => 'Popular Pie Types')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
-chart.set_style(10)
+chart1.set_style(10)
 
 # Insert the chart into the worksheet (with an offset).
-worksheet.insert_chart('C2', chart, 25, 10)
+worksheet.insert_chart('C2', chart1, 25, 10)
+
+#
+# Create a Pie chart with user defined segment colors.
+#
+
+# Create an example Pie chart like above.
+chart2 = workbook.add_chart(:type => 'pie', :embedded => 1)
+
+# Configure the series and add user defined segment colours.
+chart2.add_series(
+                  :name       => 'Pie sales data',
+                  :categories => '=Sheet1!$A$2:$A$4',
+                  :values     => '=Sheet1!$B$2:$B$4',
+                  :points     => [
+                                  { :fill => { :color => '#5ABA10' } },
+                                  { :fill => { :color => '#FE110E' } },
+                                  { :fill => { :color => '#CA5C05' } }
+                                 ]
+                  )
+
+# Add a title.
+chart2.set_title(:name => 'Pie Chart with user defined colors')
+
+worksheet.insert_chart('C18', chart2, 25, 10)
 
 workbook.close

data/examples/sparklines2.rb

@@ -25,7 +25,7 @@
 # Set the columns widths to make the output clearer.
 worksheet1.set_column('A:A', 14)
 worksheet1.set_column('B:B', 50)
-worksheet1.set_zoom(150)
+worksheet1.zoom = 150
 
 # Headings.
 worksheet1.write('A1', 'Sparkline',   bold)

data/examples/tab_colors.rb

@@ -19,8 +19,8 @@
 worksheet4 = workbook.add_worksheet
 
 # Worksheet1 will have the default tab colour.
-worksheet2.set_tab_color('red')
-worksheet3.set_tab_color('green')
-worksheet4.set_tab_color(0x35)    # Orange
+worksheet2.tab_color = 'red'
+worksheet3.tab_color = 'green'
+worksheet4.tab_color = 0x35    # Orange
 
 workbook.close

data/lib/write_xlsx/chart.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
+require 'write_xlsx/chart/axis'
 
 module Writexlsx
   class Table
@@ -468,7 +469,7 @@ class Chart
     attr_writer :index, :palette, :protection   # :nodoc:
     attr_reader :embedded, :formula_ids, :formula_data   # :nodoc:
     attr_reader :x_scale, :y_scale, :x_offset, :y_offset # :nodoc:
-    attr_reader :width, :height
+    attr_reader :width, :height  # :nodoc:
 
     #
     # Factory method for returning chart objects based on their class type.
@@ -527,10 +528,10 @@ def initialize(subtype)   # :nodoc:
       @protection        = 0
       @chartarea         = {}
       @plotarea          = {}
-      @x_axis            = {}
-      @y_axis            = {}
-      @x2_axis           = {}
-      @y2_axis           = {}
+      @x_axis            = Axis.new
+      @y_axis            = Axis.new
+      @x2_axis           = Axis.new
+      @y2_axis           = Axis.new
       @name              = ''
       @show_blanks       = 'gap'
       @show_hidden_data  = false
@@ -699,22 +700,29 @@ def add_series(params)
       name_id = get_data_id(name_formula, params[:name_data])
 
       # Set the line properties for the series.
-      line = get_line_properties(params[:line])
+      line = line_properties(params[:line])
 
       # Allow 'border' as a synonym for 'line' in bar/column style charts.
-      line = get_line_properties(params[:border]) if params[:border]
+      line = line_properties(params[:border]) if params[:border]
 
       # Set the fill properties for the series.
-      fill = get_fill_properties(params[:fill])
+      fill = fill_properties(params[:fill])
 
       # Set the marker properties for the series.
-      marker = get_marker_properties(params[:marker])
+      marker = marker_properties(params[:marker])
 
       # Set the trendline properties for the series.
-      trendline = get_trendline_properties(params[:trendline])
+      trendline = trendline_properties(params[:trendline])
+
+      # Set the error bars properties for the series.
+      y_error_bars = error_bars_properties(params[:y_error_bars])
+      x_error_bars = error_bars_properties(params[:x_error_bars])
+
+      # Set the point properties for the series.
+      points = points_properties(params[:points])
 
       # Set the labels properties for the series.
-      labels = get_labels_properties(params[:data_labels])
+      labels = labels_properties(params[:data_labels])
 
       # Set the "invert if negative" fill property.
       invert_if_neg = params[:invert_if_negative]
@@ -739,7 +747,12 @@ def add_series(params)
         :_labels        => labels,
         :_invert_if_neg => invert_if_neg,
         :_x2_axis       => x2_axis,
-        :_y2_axis       => y2_axis
+        :_y2_axis       => y2_axis,
+        :_points        => points,
+        :_error_bars    => {
+          :_x_error_bars => x_error_bars,
+          :_y_error_bars => y_error_bars
+        }
       }
     end
 
@@ -842,7 +855,7 @@ def add_series(params)
     #     )
     #
     def set_x_axis(params = {})
-      @x_axis = convert_axis_args(@x_axis, params)
+      @x_axis.merge_with_hash(self, params)
     end
 
     #
@@ -852,21 +865,21 @@ def set_x_axis(params = {})
     # The properties that can be set are the same as for set_x_axis,
     #
     def set_y_axis(params = {})
-      @y_axis = convert_axis_args(@y_axis, params)
+      @y_axis.merge_with_hash(self, params)
     end
 
     #
     # Set the properties of the secondary X-axis.
     #
     def set_x2_axis(params = {})
-      @x2_axis = convert_axis_args(@x2_axis, params)
+      @x2_axis.merge_with_hash(self, params)
     end
 
     #
     # Set the properties of the secondary Y-axis.
     #
     def set_y2_axis(params = {})
-      @y2_axis = convert_axis_args(@y2_axis, params)
+      @y2_axis.merge_with_hash(self, params)
     end
 
     #
@@ -884,7 +897,6 @@ def set_y2_axis(params = {})
     #
     def set_title(params)
       name, name_formula = process_names(params[:name], params[:name_formula])
-
       data_id = get_data_id(name_formula, params[:data])
 
       @title_name    = name
@@ -941,7 +953,7 @@ def set_legend(params)
     #
     def set_plotarea(params)
       # Convert the user defined properties to internal properties.
-      @plotarea = get_area_properties(params)
+      @plotarea = area_properties(params)
     end
 
     #
@@ -956,7 +968,7 @@ def set_plotarea(params)
     #
     def set_chartarea(params)
       # Convert the user defined properties to internal properties.
-      @chartarea = get_area_properties(params)
+      @chartarea = area_properties(params)
     end
 
     #
@@ -1036,6 +1048,52 @@ def set_table(params = {})
       @table = Table.new(params)
     end
 
+    #
+    # Set properties for the chart up-down bars.
+    #
+    def set_up_down_bars(params = {})
+      # Map border to line.
+      [:up, :down].each do |up_down|
+        if params[up_down]
+          params[up_down][:line] = params[up_down][:border] if params[up_down][:border]
+        else
+          params[up_down] = {}
+        end
+      end
+
+      # Set the up and down bar properties.
+      @up_down_bars = {
+        :_up => {
+          :_line => line_properties(params[:up][:line]),
+          :_fill => line_properties(params[:up][:fill])
+        },
+        :_down => {
+          :_line => line_properties(params[:down][:line]),
+          :_fill => line_properties(params[:down][:fill])
+        }
+      }
+    end
+
+    #
+    # Set properties for the chart drop lines.
+    #
+    def set_drop_lines(params = {})
+      # Set the drop line properties.
+      line = line_properties(params[:line])
+
+      @drop_lines = { :_line => line }
+    end
+
+    #
+    # Set properties for the chart high-low lines.
+    #
+    def set_high_low_lines(params = {})
+      # Set the drop line properties.
+      line = line_properties(params[:line])
+
+      @hi_low_lines = { :_line => line }
+    end
+
     #
     # Setup the default configuration data for an embedded chart.
     #
@@ -1076,67 +1134,51 @@ def write_bar_chart(params)   # :nodoc:
       end
     end
 
-    private
-
     #
-    # retun primary/secondary series by :primary_axes flag
+    # Switch name and name_formula parameters if required.
     #
-    def axes_series(params)
-      if params[:primary_axes] != 0
-        primary_axes_series
-      else
-        secondary_axes_series
+    def process_names(name = nil, name_formula = nil) # :nodoc:
+      # Name looks like a formula, use it to set name_formula.
+      if name && name =~ /^=[^!]+!\$/
+        name_formula = name
+        name         = ''
       end
+
+      [name, name_formula]
     end
 
     #
-    # Convert user defined axis values into private hash values.
+    # Assign an id to a each unique series formula or title/axis formula. Repeated
+    # formulas such as for categories get the same id. If the series or title
+    # has user specified data associated with it then that is also stored. This
+    # data is used to populate cached Excel data when creating a chart.
+    # If there is no user defined data then it will be populated by the parent
+    # workbook in Workbook::_add_chart_data
     #
-    def convert_axis_args(axis, params) # :nodoc:
-      arg = (axis[:_defaults] || {}).merge(params)
-      name, name_formula = process_names(arg[:name], arg[:name_formula])
+    def get_data_id(formula, data) # :nodoc:
+      # Ignore series without a range formula.
+      return unless formula
 
-      data_id = get_data_id(name_formula, arg[:data])
+      # Strip the leading '=' from the formula.
+      formula = formula.sub(/^=/, '')
 
-      axis = {
-        :_defaults          => axis[:_defaults],
-        :_name              => name,
-        :_formula           => name_formula,
-        :_data_id           => data_id,
-        :_reverse           => arg[:reverse],
-        :_min               => arg[:min],
-        :_max               => arg[:max],
-        :_minor_unit        => arg[:minor_unit],
-        :_major_unit        => arg[:major_unit],
-        :_minor_unit_type   => arg[:minor_unit_type],
-        :_major_unit_type   => arg[:major_unit_type],
-        :_log_base          => arg[:log_base],
-        :_crossing          => arg[:crossing],
-        :_position          => arg[:position],
-        :_label_position    => arg[:label_position],
-        :_num_format        => arg[:num_format],
-        :_num_format_linked => arg[:num_format_linked],
-        :_visible           => arg[:visible] || 1
-      }
+      # Store the data id in a hash keyed by the formula and store the data
+      # in a separate array with the same id.
+      if !@formula_ids.has_key?(formula)
+        # Haven't seen this formula before.
+        id = @formula_data.size
 
-      # Map major_gridlines properties.
-      if arg[:major_gridlines] && ptrue?(arg[:major_gridlines][:visible])
-        axis[:_major_gridlines] = get_gridline_properties(arg[:major_gridlines])
-      end
+        @formula_data << data
+        @formula_ids[formula] = id
+      else
+        # Formula already seen. Return existing id.
+        id = @formula_ids[formula]
 
-      # Map minor_gridlines properties.
-      if arg[:minor_gridlines] && ptrue?(arg[:minor_gridlines][:visible])
-        axis[:_minor_gridlines] = get_gridline_properties(arg[:minor_gridlines])
+        # Store user defined data if it isn't already there.
+        @formula_data[id] = data unless @formula_data[id]
       end
 
-      # Only use the first letter of bottom, top, left or right.
-      axis[:_position] = axis[:_position].downcase[0, 1] if axis[:_position]
-
-      # Set the font properties if present.
-      axis[:_num_font] = convert_font_args(arg[:num_font])
-      axis[:_name_font]  = convert_font_args(arg[:name_font])
-
-      axis
+      id
     end
 
     #
@@ -1163,25 +1205,57 @@ def convert_font_args(params)
     end
 
     #
-    # Convert and aref of row col values to a range formula.
+    # Convert user defined line properties to the structure required internally.
     #
-    def aref_to_formula(data) # :nodoc:
-      # If it isn't an array ref it is probably a formula already.
-      return data unless data.kind_of?(Array)
-      xl_range_formula(*data)
+    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
 
+    private
+
     #
-    # Switch name and name_formula parameters if required.
+    # retun primary/secondary series by :primary_axes flag
     #
-    def process_names(name = nil, name_formula = nil) # :nodoc:
-      # Name looks like a formula, use it to set name_formula.
-      if name && name =~ /^=[^!]+!\$/
-        name_formula = name
-        name         = ''
+    def axes_series(params)
+      if params[:primary_axes] != 0
+        primary_axes_series
+      else
+        secondary_axes_series
       end
+    end
 
-      [name, name_formula]
+    #
+    # Convert and aref of row col values to a range formula.
+    #
+    def aref_to_formula(data) # :nodoc:
+      # If it isn't an array ref it is probably a formula already.
+      return data unless data.kind_of?(Array)
+      xl_range_formula(*data)
     end
 
     #
@@ -1204,41 +1278,6 @@ def get_data_type(data) # :nodoc:
       'num'
     end
 
-    #
-    # Assign an id to a each unique series formula or title/axis formula. Repeated
-    # formulas such as for categories get the same id. If the series or title
-    # has user specified data associated with it then that is also stored. This
-    # data is used to populate cached Excel data when creating a chart.
-    # If there is no user defined data then it will be populated by the parent
-    # workbook in Workbook::_add_chart_data
-    #
-    def get_data_id(formula, data) # :nodoc:
-      # Ignore series without a range formula.
-      return unless formula
-
-      # Strip the leading '=' from the formula.
-      formula = formula.sub(/^=/, '')
-
-      # Store the data id in a hash keyed by the formula and store the data
-      # in a separate array with the same id.
-      if !@formula_ids.has_key?(formula)
-        # Haven't seen this formula before.
-        id = @formula_data.size
-
-        @formula_data << data
-        @formula_ids[formula] = id
-      else
-        # Formula already seen. Return existing id.
-        id = @formula_ids[formula]
-
-        # Store user defined data if it isn't already there.
-        @formula_data[id] = data unless @formula_data[id]
-      end
-
-      id
-    end
-
-
     #
     # Convert the user specified colour index or string to a rgb colour.
     #
@@ -1329,42 +1368,10 @@ def get_swe_line_weight(val)
       weights[value] || default
     end
 
-    #
-    # Convert user defined line properties to the structure required internally.
-    #
-    def get_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
-
     #
     # Convert user defined fill properties to the structure required internally.
     #
-    def get_fill_properties(fill) # :nodoc:
+    def fill_properties(fill) # :nodoc:
       return { :_defined => 0 } unless fill
 
       fill[:_defined] = 1
@@ -1375,7 +1382,7 @@ def get_fill_properties(fill) # :nodoc:
     #
     # Convert user defined marker properties to the structure required internally.
     #
-    def get_marker_properties(marker) # :nodoc:
+    def marker_properties(marker) # :nodoc:
       return unless marker
 
       types = {
@@ -1404,13 +1411,13 @@ def get_marker_properties(marker) # :nodoc:
       end
 
       # Set the line properties for the marker..
-      line = get_line_properties(marker[:line])
+      line = line_properties(marker[:line])
 
       # Allow 'border' as a synonym for 'line'.
-      line = get_line_properties(marker[:border]) if marker[:border]
+      line = line_properties(marker[:border]) if marker[:border]
 
       # Set the fill properties for the marker.
-      fill = get_fill_properties(marker[:fill])
+      fill = fill_properties(marker[:fill])
 
       marker[:_line] = line
       marker[:_fill] = fill
@@ -1421,7 +1428,7 @@ def get_marker_properties(marker) # :nodoc:
     #
     # Convert user defined trendline properties to the structure required internally.
     #
-    def get_trendline_properties(trendline) # :nodoc:
+    def trendline_properties(trendline) # :nodoc:
       return unless trendline
 
       types = {
@@ -1439,13 +1446,13 @@ def get_trendline_properties(trendline) # :nodoc:
       trendline[:type] = value_or_raise(types, trend_type, 'trendline type')
 
       # Set the line properties for the trendline..
-      line = get_line_properties(trendline[:line])
+      line = line_properties(trendline[:line])
 
       # Allow 'border' as a synonym for 'line'.
-      line = get_line_properties(trendline[:border]) if trendline[:border]
+      line = line_properties(trendline[:border]) if trendline[:border]
 
       # Set the fill properties for the trendline.
-      fill = get_fill_properties(trendline[:fill])
+      fill = fill_properties(trendline[:fill])
 
       trendline[:_line] = line
       trendline[:_fill] = fill
@@ -1454,22 +1461,67 @@ def get_trendline_properties(trendline) # :nodoc:
     end
 
     #
-    # Convert user defined gridline properties to the structure required internally.
+    # Convert user defined error bars properties to structure required
+    # internally.
     #
-    def get_gridline_properties(args)
-      # Set the visible property for the gridline.
-      gridline = { :_visible => args[:visible] }
+    def error_bars_properties(params = {})
+      return if !ptrue?(params) || params.empty?
+
+      # Default values.
+      error_bars = {
+        :_type      => 'fixedVal',
+        :_value     => 1,
+        :_endcap    => 1,
+        :_direction => 'both'
+      }
+
+      types = {
+        :fixed              => 'fixedVal',
+        :percentage         => 'percentage',
+        :standard_deviation => 'stdDev',
+        :standard_error     => 'stdErr'
+      }
+
+      # Check the error bars type.
+      error_type = params[:type].to_sym
+
+      if types.key?(error_type)
+        error_bars[:_type] = types[error_type]
+      else
+        raise "Unknown error bars type '#{error_type}'\n"
+      end
+
+      # Set the value for error types that require it.
+      if params.key?(:value)
+        error_bars[:_value] = params[:value]
+      end
 
-      # Set the line properties for the gridline.
-      gridline[:_line] = get_line_properties(args[:line])
+      # Set the end-cap style.
+      if params.key?(:end_style)
+        error_bars[:_endcap] = params[:end_style]
+      end
 
-      gridline
+      # Set the error bar direction.
+      if params.key?(:direction)
+        if params[:direction] == 'minus'
+          error_bars[:_direction] = 'minus'
+        elsif params[:direction] == 'plus'
+          error_bars[:_direction] = 'plus'
+        else
+          # Default to 'both'
+        end
+      end
+
+      # Set the line properties for the error bars.
+      error_bars[:_line] = line_properties(params[:line])
+
+      error_bars
     end
 
     #
     # Convert user defined labels properties to the structure required internally.
     #
-    def get_labels_properties(labels) # :nodoc:
+    def labels_properties(labels) # :nodoc:
       return nil unless labels
 
       position = labels[:position]
@@ -1499,7 +1551,7 @@ def get_labels_properties(labels) # :nodoc:
     #
     # Convert user defined area properties to the structure required internally.
     #
-    def get_area_properties(arg)  # :nodoc:
+    def area_properties(arg)  # :nodoc:
       area = {}
 
       # Map deprecated Spreadsheet::WriteExcel fill colour.
@@ -1527,13 +1579,13 @@ def get_area_properties(arg)  # :nodoc:
       # Handle Excel::Writer::XLSX style properties.
 
       # Set the line properties for the chartarea.
-      line = get_line_properties(arg[:line])
+      line = line_properties(arg[:line])
 
       # Allow 'border' as a synonym for 'line'.
-      line = get_line_properties(arg[:border]) if (arg[:border])
+      line = line_properties(arg[:border]) if (arg[:border])
 
       # Set the fill properties for the chartarea.
-      fill = get_fill_properties(arg[:fill])
+      fill = fill_properties(arg[:fill])
 
       area[:_line] = line
       area[:_fill] = fill
@@ -1541,6 +1593,35 @@ def get_area_properties(arg)  # :nodoc:
       return area
     end
 
+    #
+    # Convert user defined points properties to structure required internally.
+    #
+    def points_properties(user_points = nil)
+      return unless user_points
+
+      points = []
+      user_points.each do |user_point|
+        if user_point
+          # Set the lline properties for the point.
+          line = line_properties(user_point[:line])
+
+          # Allow 'border' as a synonym for 'line'.
+          if user_point[:border]
+            line = line_properties(user_point[:border])
+          end
+
+          # Set the fill properties for the chartarea.
+          fill = fill_properties(user_point[:fill])
+
+          point = {}
+          point[:_line] = line
+          point[:_fill] = fill
+        end
+        points << point
+      end
+      points
+    end
+
     def value_or_raise(hash, key, msg)
       raise "Unknown #{msg} '#{key}'" unless hash[key.to_sym]
       hash[key.to_sym]
@@ -1613,24 +1694,24 @@ def get_font_latin_attributes(font)
     #
     def set_default_properties # :nodoc:
       # Set the default axis properties.
-      @x_axis[:_defaults] = {
+      @x_axis.defaults = {
         :num_format      => 'General',
         :major_gridlines => { :visible => 0 }
       }
 
-      @y_axis[:_defaults] = {
+      @y_axis.defaults = {
         :num_format      => 'General',
         :major_gridlines => { :visible => 1 }
       }
 
-      @x2_axis[:_defaults] = {
+      @x2_axis.defaults = {
         :num_format     => 'General',
         :label_position => 'none',
         :crossing       => 'max',
         :visible        => 0
       }
 
-      @y2_axis[:_defaults] = {
+      @y2_axis.defaults = {
         :num_format      => 'General',
         :major_gridlines => { :visible => 0 },
         :position        => 'right',
@@ -1713,25 +1794,16 @@ def chart_space_attributes # :nodoc:
     # Write the <c:lang> element.
     #
     def write_lang # :nodoc:
-      val  = 'en-US'
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:lang', attributes)
+      @writer.empty_tag('c:lang', ['val', 'en-US'])
     end
 
     #
     # Write the <c:style> element.
     #
     def write_style # :nodoc:
-      style_id = @style_id
-
-      # Don't write an element for the default style, 2.
-      return if style_id == 2
-
-      attributes = ['val', style_id]
+      return if @style_id == 2
 
-      @writer.empty_tag('c:style', attributes)
+      @writer.empty_tag('c:style', ['val', @style_id])
     end
 
     #
@@ -1762,14 +1834,9 @@ def write_chart # :nodoc:
     # Write the <c:dispBlanksAs> element.
     #
     def write_disp_blanks_as
-      val = @show_blanks
+      return if @show_blanks == 'gap'
 
-      # Ignore the default value.
-      return if val == 'gap'
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:dispBlanksAs', attributes)
+      @writer.empty_tag('c:dispBlanksAs', ['val', @show_blanks])
     end
 
     #
@@ -1839,8 +1906,7 @@ def write_chart_type # :nodoc:
     # Write the <c:grouping> element.
     #
     def write_grouping(val) # :nodoc:
-      attributes = ['val', val]
-      @writer.empty_tag('c:grouping', attributes)
+      @writer.empty_tag('c:grouping', ['val', val])
     end
 
     #
@@ -1894,10 +1960,14 @@ def write_ser(series) # :nodoc:
         write_marker(series[:_marker])
         # Write the c:invertIfNegative element.
         write_c_invert_if_negative(series[:_invert_if_neg])
+        # Write the c:dPt element.
+        write_d_pt(series[:_points])
         # Write the c:dLbls element.
         write_d_lbls(series[:_labels])
         # Write the c:trendline element.
         write_trendline(series[:_trendline])
+        # Write the c:errBars element.
+        write_error_bars(series[:_error_bars])
         # Write the c:cat element.
         write_cat(series)
         # Write the c:val element.
@@ -1909,18 +1979,14 @@ def write_ser(series) # :nodoc:
     # Write the <c:idx> element.
     #
     def write_idx(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:idx', attributes)
+      @writer.empty_tag('c:idx', ['val', val])
     end
 
     #
     # Write the <c:order> element.
     #
     def write_order(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:order', attributes)
+      @writer.empty_tag('c:order', ['val', val])
     end
 
     #
@@ -2043,9 +2109,7 @@ def write_axis_ids(params)
     # Write the <c:axId> element.
     #
     def write_axis_id(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:axId', attributes)
+      @writer.empty_tag('c:axId', ['val', val])
     end
 
     #
@@ -2064,48 +2128,48 @@ def write_cat_axis(params) # :nodoc:
       horiz    = @horiz_cat_axis
 
       # Overwrite the default axis position with a user supplied value.
-      position = x_axis[:_position] || position
+      position = x_axis.position || position
 
       @writer.tag_elements('c:catAx') do
         write_axis_id(axis_ids[0])
         # Write the c:scaling element.
-        write_scaling(x_axis[:_reverse])
+        write_scaling(x_axis.reverse)
 
-        write_delete(1) unless ptrue?(x_axis[:_visible])
+        write_delete(1) unless ptrue?(x_axis.visible)
 
         # Write the c:axPos element.
-        write_axis_pos(position, y_axis[:_reverse])
+        write_axis_pos(position, y_axis.reverse)
 
         # Write the c:majorGridlines element.
-        write_major_gridlines(x_axis[:_major_gridlines])
+        write_major_gridlines(x_axis.major_gridlines)
 
         # Write the c:minorGridlines element.
-        write_minor_gridlines(x_axis[:_minor_gridlines])
+        write_minor_gridlines(x_axis.minor_gridlines)
 
         # Write the axis title elements.
-        if title = x_axis[:_formula]
-          write_title_formula(title, @x_axis[:_data_id], horiz, @x_axis[:_name_font])
-        elsif title = x_axis[:_name]
-          write_title_rich(title, horiz, x_axis[:_name_font])
+        if title = x_axis.formula
+          write_title_formula(title, @x_axis.data_id, horiz, @x_axis.name_font)
+        elsif title = x_axis.name
+          write_title_rich(title, horiz, x_axis.name_font)
         end
 
         # Write the c:numFmt element.
         write_cat_number_format(x_axis)
 
         # Write the c:majorTickMark element.
-        write_major_tick_mark(x_axis[:_major_tick_mark])
+        write_major_tick_mark(x_axis.major_tick_mark)
 
         # Write the c:tickLblPos element.
-        write_tick_label_pos(x_axis[:_label_position])
+        write_tick_label_pos(x_axis.label_position)
 
         # Write the axis font elements.
-        write_axis_font(x_axis[:_num_font])
+        write_axis_font(x_axis.num_font)
 
         # Write the c:crossAx element.
         write_cross_axis(axis_ids[1])
 
-        if @show_crosses || ptrue?(x_axis[:_visible])
-          write_crossing(y_axis[:_crossing])
+        if @show_crosses || ptrue?(x_axis.visible)
+          write_crossing(y_axis.crossing)
         end
         # Write the c:auto element.
         write_auto(1)
@@ -2131,7 +2195,7 @@ def write_val_axis(params) # :nodoc:
       return unless axis_ids && !axis_ids.empty?
 
       # OVerwrite the default axis position with a user supplied value.
-      position = y_axis[:_position] || position
+      position = y_axis.position || position
 
       @writer.tag_elements('c:valAx') do
         write_axis_id(axis_ids[1])
@@ -2139,49 +2203,49 @@ def write_val_axis(params) # :nodoc:
         # Write the c:scaling element.
         write_scaling_with_param(y_axis)
 
-        write_delete(1) unless ptrue?(y_axis[:_visible])
+        write_delete(1) unless ptrue?(y_axis.visible)
 
         # Write the c:axPos element.
-        write_axis_pos(position, x_axis[:_reverse])
+        write_axis_pos(position, x_axis.reverse)
 
         # Write the c:majorGridlines element.
-        write_major_gridlines(y_axis[:_major_gridlines])
+        write_major_gridlines(y_axis.major_gridlines)
 
         # Write the c:minorGridlines element.
-        write_minor_gridlines(y_axis[:_minor_gridlines])
+        write_minor_gridlines(y_axis.minor_gridlines)
 
         # Write the axis title elements.
-        if title = y_axis[:_formula]
-          write_title_formula(title, y_axis[:_data_id], horiz, y_axis[:_name_font])
-        elsif title = y_axis[:_name]
-          write_title_rich(title, horiz, y_axis[:_name_font])
+        if title = y_axis.formula
+          write_title_formula(title, y_axis.data_id, horiz, y_axis.name_font)
+        elsif title = y_axis.name
+          write_title_rich(title, horiz, y_axis.name_font)
         end
 
         # Write the c:numberFormat element.
         write_number_format(y_axis)
 
         # Write the c:majorTickMark element.
-        write_major_tick_mark(y_axis[:_major_tick_mark])
+        write_major_tick_mark(y_axis.major_tick_mark)
 
         # Write the tickLblPos element.
-        write_tick_label_pos(y_axis[:_label_position])
+        write_tick_label_pos(y_axis.label_position)
 
         # Write the axis font elements.
-        write_axis_font(y_axis[:_num_font])
+        write_axis_font(y_axis.num_font)
 
         # Write the c:crossAx element.
         write_cross_axis(axis_ids[0])
 
-        write_crossing(x_axis[:_crossing])
+        write_crossing(x_axis.crossing)
 
         # Write the c:crossBetween element.
         write_cross_between
 
         # Write the c:majorUnit element.
-        write_c_major_unit(y_axis[:_major_unit])
+        write_c_major_unit(y_axis.major_unit)
 
         # Write the c:minorUnit element.
-        write_c_minor_unit(y_axis[:_minor_unit])
+        write_c_minor_unit(y_axis.minor_unit)
       end
     end
 
@@ -2201,7 +2265,7 @@ def write_cat_val_axis(params) # :nodoc:
       return unless axis_ids && !axis_ids.empty?
 
       # Overwrite the default axis position with a user supplied value.
-      position = x_axis[:_position] || position
+      position = x_axis.position || position
 
       @writer.tag_elements('c:valAx') do
         write_axis_id(axis_ids[0])
@@ -2209,89 +2273,49 @@ def write_cat_val_axis(params) # :nodoc:
         # Write the c:scaling element.
         write_scaling_with_param(x_axis)
 
-        write_delete(1) unless ptrue?(x_axis[:_visible])
+        write_delete(1) unless ptrue?(x_axis.visible)
 
         # Write the c:axPos element.
-        write_axis_pos(position, y_axis[:_reverse])
+        write_axis_pos(position, y_axis.reverse)
 
         # Write the c:majorGridlines element.
-        write_major_gridlines(x_axis[:_major_gridlines])
+        write_major_gridlines(x_axis.major_gridlines)
 
         # Write the c:minorGridlines element.
-        write_minor_gridlines(x_axis[:_minor_gridlines])
+        write_minor_gridlines(x_axis.minor_gridlines)
 
         # Write the axis title elements.
-        if title = x_axis[:_formula]
-          write_title_formula(title, y_axis[:_data_id], horiz, x_axis[:_name_font])
-        elsif title = x_axis[:_name]
-          write_title_rich(title, horiz, x_axis[:_name_font])
+        if title = x_axis.formula
+          write_title_formula(title, y_axis.data_id, horiz, x_axis.name_font)
+        elsif title = x_axis.name
+          write_title_rich(title, horiz, x_axis.name_font)
         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_major_tick_mark(x_axis.major_tick_mark)
 
         # Write the c:tickLblPos element.
-        write_tick_label_pos(x_axis[:_label_position])
+        write_tick_label_pos(x_axis.label_position)
 
         # Write the axis font elements.
-        write_axis_font(x_axis[:_num_font])
+        write_axis_font(x_axis.num_font)
 
         # Write the c:crossAx element.
         write_cross_axis(axis_ids[1])
 
-        write_crossing(y_axis[:_crossing])
+        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_c_major_unit(x_axis.major_unit)
 
         # Write the c:minorunit element.
-        write_c_minor_unit(x_axis[:_minor_unit])
-      end
-    end
-
-    def write_val_axis_common(position, hide_major_gridlines, params) # :nodoc:
-      position ||= @val_axis_position
-      horiz      = @horiz_val_axis
-
-      # Overwrite the default axis position with a user supplied value.
-      position = params[:axis_position] || position
-
-      @writer.tag_elements('c:valAx') do
-        write_axis_id(params[:axis_id])
-        # Write the c:scaling element.
-        write_scaling_with_param(params[:scaling_axis])
-
-        # Write the c:axPos element.
-        write_axis_pos(position, params[:axis_position_element])
-        # Write the c:majorGridlines element.
-        write_major_gridlines unless hide_major_gridlines
-        # Write the axis title elements.
-        if title = params[:title_axis][:_formula]
-          write_title_formula(title, @y_axis[:_data_id], horiz)
-        elsif title = params[:title_axis][:_name]
-          write_title_rich(title, horiz)
-        end
-        # Write the c:numberFormat element.
-        write_number_format
-        # Write the c:tickLblPos element.
-        write_tick_label_pos(params[:tick_label_pos])
-        # Write the c:crossAx element.
-        write_cross_axis(params[:cross_axis])
-
-        write_crossing(params[:category_crossing])
-
-        # Write the c:crossBetween element.
-        write_cross_between
-        # Write the c:majorUnit element.
-        write_c_major_unit(params[:major_unit])
-        # Write the c:minorUnit element.
-        write_c_minor_unit(params[:minor_unit])
+        write_c_minor_unit(x_axis.minor_unit)
       end
     end
 
@@ -2308,44 +2332,44 @@ def write_date_axis(params)  # :nodoc:
       position  = @cat_axis_position
 
       # Overwrite the default axis position with a user supplied value.
-      position = x_axis[:_position] || position
+      position = x_axis.position || position
 
       @writer.tag_elements('c:dateAx') 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_delete(1) unless ptrue?(x_axis.visible)
 
         # Write the c:axPos element.
-        write_axis_pos(position, y_axis[:reverse])
+        write_axis_pos(position, y_axis.reverse)
 
         # Write the c:majorGridlines element.
-        write_major_gridlines(x_axis[:_major_gridlines])
+        write_major_gridlines(x_axis.major_gridlines)
 
         # Write the c:minorGridlines element.
-        write_minor_gridlines(x_axis[:_minor_gridlines])
+        write_minor_gridlines(x_axis.minor_gridlines)
 
         # Write the axis title elements.
-        if title = x_axis[:_formula]
-          write_title_formula(title, x_axis[:_data_id], nil, x_axis[:_name_font])
-        elsif title = x_axis[:_name]
-          write_title_rich(title, nil, x_axis[:_name_font])
+        if title = x_axis.formula
+          write_title_formula(title, x_axis.data_id, nil, x_axis.name_font)
+        elsif title = x_axis.name
+          write_title_rich(title, nil, x_axis.name_font)
         end
         # Write the c:numFmt element.
         write_number_format(x_axis)
         # Write the c:majorTickMark element.
-        write_major_tick_mark(x_axis[:_major_tick_mark])
+        write_major_tick_mark(x_axis.major_tick_mark)
 
         # Write the c:tickLblPos element.
-        write_tick_label_pos(x_axis[:_label_position])
+        write_tick_label_pos(x_axis.label_position)
         # Write the font elements.
-        write_axis_font(x_axis[:_num_font])
+        write_axis_font(x_axis.num_font)
         # Write the c:crossAx element.
         write_cross_axis(axis_ids[1])
 
-        if @show_crosses || ptrue?(x_axis[:_visible])
-          write_crossing(y_axis[:_crossing])
+        if @show_crosses || ptrue?(x_axis.visible)
+          write_crossing(y_axis.crossing)
         end
 
         # Write the c:auto element.
@@ -2353,16 +2377,16 @@ def write_date_axis(params)  # :nodoc:
         # Write the c:labelOffset element.
         write_label_offset(100)
         # Write the c:majorUnit element.
-        write_c_major_unit(x_axis[:_major_unit])
+        write_c_major_unit(x_axis.major_unit)
         # Write the c:majorTimeUnit element.
-        if !x_axis[:_major_unit].nil?
-          write_c_major_time_unit(x_axis[:_major_unit_type])
+        if !x_axis.major_unit.nil?
+          write_c_major_time_unit(x_axis.major_unit_type)
         end
         # Write the c:minorUnit element.
-        write_c_minor_unit(x_axis[:_minor_unit])
+        write_c_minor_unit(x_axis.minor_unit)
         # Write the c:minorTimeUnit element.
-        if !x_axis[:_minor_unit].nil?
-          write_c_minor_time_unit(x_axis[:_minor_unit_type])
+        if !x_axis.minor_unit.nil?
+          write_c_minor_time_unit(x_axis.minor_unit_type)
         end
       end
     end
@@ -2380,10 +2404,10 @@ def write_crossing(crossing)
 
     def write_scaling_with_param(param)
       write_scaling(
-                    param[:_reverse],
-                    param[:_min],
-                    param[:_max],
-                    param[:_log_base]
+                    param.reverse,
+                    param.min,
+                    param.max,
+                    param.log_base
                     )
     end
     #
@@ -2408,9 +2432,7 @@ def write_scaling(reverse, min = nil, max = nil, log_base = nil) # :nodoc:
     def write_c_log_base(val) # :nodoc:
       return unless ptrue?(val)
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:logBase', attributes)
+      @writer.empty_tag('c:logBase', ['val', val])
     end
 
     #
@@ -2419,9 +2441,7 @@ def write_c_log_base(val) # :nodoc:
     def write_orientation(reverse = nil) # :nodoc:
       val     = ptrue?(reverse) ? 'maxMin' : 'minMax'
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:orientation', attributes)
+      @writer.empty_tag('c:orientation', ['val', val])
     end
 
     #
@@ -2430,9 +2450,7 @@ def write_orientation(reverse = nil) # :nodoc:
     def write_c_max(max = nil) # :nodoc:
       return if max.nil?
 
-      attributes = ['val', max]
-
-      @writer.empty_tag('c:max', attributes)
+      @writer.empty_tag('c:max', ['val', max])
     end
 
     #
@@ -2441,9 +2459,7 @@ def write_c_max(max = nil) # :nodoc:
     def write_c_min(min = nil) # :nodoc:
       return if min.nil?
 
-      attributes = ['val', min]
-
-      @writer.empty_tag('c:min', attributes)
+      @writer.empty_tag('c:min', ['val', min])
     end
 
     #
@@ -2455,9 +2471,7 @@ def write_axis_pos(val, reverse = false) # :nodoc:
         val = 't' if val == 'b'
       end
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:axPos', attributes)
+      @writer.empty_tag('c:axPos', ['val', val])
     end
 
     #
@@ -2467,25 +2481,7 @@ def write_axis_pos(val, reverse = false) # :nodoc:
     #
 
     def write_number_format(axis) # :nodoc:
-      format_code = axis[:_num_format]
-      source_linked = 1
-
-      # Check if a user defined number format has been set.
-      if axis[:_defaults] && format_code != axis[:_defaults][:num_format]
-        source_linked = 0
-      end
-
-      # User override of sourceLinked.
-      if ptrue?(axis[:_num_format_linked])
-        source_linked = 1
-      end
-
-      attributes = [
-                    'formatCode',   format_code,
-                    'sourceLinked', source_linked
-                   ]
-
-      @writer.empty_tag('c:numFmt', attributes)
+      axis.write_number_format(@writer)
     end
 
     #
@@ -2493,32 +2489,7 @@ def write_number_format(axis) # :nodoc:
     # don't always have a number format.
     #
     def write_cat_number_format(axis)
-      format_code    = axis[:_num_format]
-      source_linked  = 1
-      default_format = true
-
-      # Check if a user defined number format has been set.
-      if axis[:_defaults] && format_code != axis[:_defaults][:num_format]
-        source_linked  = 0
-        default_format = false
-      end
-
-      # User override of linkedSource.
-      if axis[:_num_format_linked]
-        source_linked = 1
-      end
-
-      # Skip if cat doesn't have a num format (unless it is non-default).
-      if !@cat_has_num_fmt && default_format
-        return ''
-      end
-
-      attributes = [
-                    'formatCode',   format_code,
-                    'sourceLinked', source_linked,
-                   ]
-
-      @writer.empty_tag('c:numFmt', attributes)
+      axis.write_cat_number_format(@writer, @cat_has_num_fmt)
     end
 
     #
@@ -2527,9 +2498,7 @@ def write_cat_number_format(axis)
     def write_major_tick_mark(val)
       return unless ptrue?(val)
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:majorTickMark', attributes)
+      @writer.empty_tag('c:majorTickMark', ['val', val])
     end
 
     #
@@ -2539,18 +2508,14 @@ def write_tick_label_pos(val) # :nodoc:
       val ||= 'nextTo'
       val = 'nextTo' if val == 'next_to'
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:tickLblPos', attributes)
+      @writer.empty_tag('c:tickLblPos', ['val', val])
     end
 
     #
     # Write the <c:crossAx> element.
     #
     def write_cross_axis(val = 'autoZero') # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:crossAx', attributes)
+      @writer.empty_tag('c:crossAx', ['val', val])
     end
 
     #
@@ -2559,73 +2524,54 @@ def write_cross_axis(val = 'autoZero') # :nodoc:
     def write_crosses(val) # :nodoc:
       val ||= 'autoZero'
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:crosses', attributes)
+      @writer.empty_tag('c:crosses', ['val', val])
     end
 
     #
     # Write the <c:crossesAt> element.
     #
     def write_c_crosses_at(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:crossesAt', attributes)
+      @writer.empty_tag('c:crossesAt', ['val', val])
     end
 
     #
     # Write the <c:auto> element.
     #
     def write_auto(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:auto', attributes)
+      @writer.empty_tag('c:auto', ['val', val])
     end
 
     #
     # Write the <c:labelAlign> element.
     #
     def write_label_align(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:lblAlgn', attributes)
+      @writer.empty_tag('c:lblAlgn', ['val', val])
     end
 
     #
     # Write the <c:labelOffset> element.
     #
     def write_label_offset(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:lblOffset', attributes)
+      @writer.empty_tag('c:lblOffset', ['val', val])
     end
 
     #
     # Write the <c:majorGridlines> element.
     #
     def write_major_gridlines(gridlines) # :nodoc:
-      write_gridlines_common(gridlines, 'c:majorGridlines')
+      write_gridlines_base('c:majorGridlines', gridlines)
     end
 
     #
     # Write the <c:minorGridlines> element.
     #
     def write_minor_gridlines(gridlines)  # :nodoc:
-      write_gridlines_common(gridlines, 'c:minorGridlines')
+      write_gridlines_base('c:minorGridlines', gridlines)
     end
 
-    def write_gridlines_common(gridlines, tag)  # :nodoc:
-      return unless gridlines
-      return unless ptrue?(gridlines[:_visible])
-
-      if gridlines[:_line] && ptrue?(gridlines[:_line][:_defined])
-        @writer.tag_elements(tag) do
-          # Write the c:spPr element.
-          write_sp_pr(gridlines)
-        end
-      else
-        @writer.empty_tag(tag)
-      end
+    def write_gridlines_base(tag, gridlines)  # :nodoc:
+      return if gridlines.respond_to?(:[]) and !ptrue?(gridlines[:_visible])
+      write_lines_base(tag, gridlines)
     end
 
     #
@@ -2634,9 +2580,7 @@ def write_gridlines_common(gridlines, tag)  # :nodoc:
     def write_cross_between # :nodoc:
       val  = @cross_between || 'between'
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:crossBetween', attributes)
+      @writer.empty_tag('c:crossBetween', ['val', val])
     end
 
     #
@@ -2645,9 +2589,7 @@ def write_cross_between # :nodoc:
     def write_c_major_unit(val = nil) # :nodoc:
       return unless val
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:majorUnit', attributes)
+      @writer.empty_tag('c:majorUnit', ['val', val])
     end
 
     #
@@ -2656,9 +2598,7 @@ def write_c_major_unit(val = nil) # :nodoc:
     def write_c_minor_unit(val = nil) # :nodoc:
       return unless val
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:minorUnit', attributes)
+      @writer.empty_tag('c:minorUnit', ['val', val])
     end
 
     #
@@ -2666,9 +2606,8 @@ def write_c_minor_unit(val = nil) # :nodoc:
     #
     def write_c_major_time_unit(val) # :nodoc:
       val ||= 'days'
-      attributes = ['val', val]
 
-      @writer.empty_tag('c:majorTimeUnit', attributes)
+      @writer.empty_tag('c:majorTimeUnit', ['val', val])
     end
 
     #
@@ -2676,9 +2615,8 @@ def write_c_major_time_unit(val) # :nodoc:
     #
     def write_c_minor_time_unit(val) # :nodoc:
       val ||= 'days'
-      attributes = ['val', val]
 
-      @writer.empty_tag('c:minorTimeUnit', attributes)
+      @writer.empty_tag('c:minorTimeUnit', ['val', val])
     end
 
     #
@@ -2728,9 +2666,7 @@ def write_legend # :nodoc:
     # Write the <c:legendPos> element.
     #
     def write_legend_pos(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:legendPos', attributes)
+      @writer.empty_tag('c:legendPos', ['val', val])
     end
 
     #
@@ -2749,11 +2685,7 @@ def write_legend_entry(index) # :nodoc:
     # Write the <c:overlay> element.
     #
     def write_overlay # :nodoc:
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:overlay', attributes)
+      @writer.empty_tag('c:overlay', ['val', 1])
     end
 
     #
@@ -2765,9 +2697,7 @@ def write_plot_vis_only # :nodoc:
       # Ignore this element if we are plotting hidden data.
       return if @show_hidden_data
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:plotVisOnly', attributes)
+      @writer.empty_tag('c:plotVisOnly', ['val', val])
     end
 
     #
@@ -2960,11 +2890,7 @@ def write_a_def_rpr(font = nil) # :nodoc:
     # Write the <a:endParaRPr> element.
     #
     def write_a_end_para_rpr # :nodoc:
-      lang = 'en-US'
-
-      attributes = ['lang', lang]
-
-      @writer.empty_tag('a:endParaRPr', attributes)
+      @writer.empty_tag('a:endParaRPr', ['lang', 'en-US'])
     end
 
     #
@@ -3053,31 +2979,23 @@ def write_marker(marker = nil) # :nodoc:
     # Write the <c:marker> element without a sub-element.
     #
     def write_marker_value # :nodoc:
-      style = @default_marker
+      return unless @default_marker
 
-      return unless style
-
-      attributes = ['val', 1]
-
-      @writer.empty_tag('c:marker', attributes)
+      @writer.empty_tag('c:marker', ['val', 1])
     end
 
     #
     # Write the <c:size> element.
     #
     def write_marker_size(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:size', attributes)
+      @writer.empty_tag('c:size', ['val', val])
     end
 
     #
     # Write the <c:symbol> element.
     #
     def write_symbol(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:symbol', attributes)
+      @writer.empty_tag('c:symbol', ['val', val])
     end
 
     #
@@ -3162,18 +3080,14 @@ def write_a_solid_fill(line) # :nodoc:
     # Write the <a:srgbClr> element.
     #
     def write_a_srgb_clr(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('a:srgbClr', attributes)
+      @writer.empty_tag('a:srgbClr', ['val', val])
     end
 
     #
     # Write the <a:prstDash> element.
     #
     def write_a_prst_dash(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('a:prstDash', attributes)
+      @writer.empty_tag('a:prstDash', ['val', val])
     end
 
     #
@@ -3204,9 +3118,7 @@ def write_trendline(trendline) # :nodoc:
     # Write the <c:trendlineType> element.
     #
     def write_trendline_type(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:trendlineType', attributes)
+      @writer.empty_tag('c:trendlineType', ['val', val])
     end
 
     #
@@ -3222,18 +3134,14 @@ def write_name(data) # :nodoc:
     # Write the <c:order> element.
     #
     def write_trendline_order(val = 2) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:order', attributes)
+      @writer.empty_tag('c:order', ['val', val])
     end
 
     #
     # Write the <c:period> element.
     #
     def write_period(val = 2) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:period', attributes)
+      @writer.empty_tag('c:period', ['val', val])
     end
 
     #
@@ -3242,9 +3150,7 @@ def write_period(val = 2) # :nodoc:
     def write_forward(val) # :nodoc:
       return unless val
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:forward', attributes)
+      @writer.empty_tag('c:forward', ['val', val])
     end
 
     #
@@ -3253,27 +3159,41 @@ def write_forward(val) # :nodoc:
     def write_backward(val) # :nodoc:
       return unless val
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:backward', attributes)
+      @writer.empty_tag('c:backward', ['val', val])
     end
 
     #
     # Write the <c:hiLowLines> element.
     #
     def write_hi_low_lines # :nodoc:
-      @writer.empty_tag('c:hiLowLines')
+      write_lines_base('c:hiLowLines', @hi_low_lines)
     end
 
     #
-    # Write the <c:overlap> element.
+    # Write the <c:dropLines> elent.
     #
-    def write_overlap # :nodoc:
-      val  = 100
+    def write_drop_lines
+      write_lines_base('c:dropLines', @drop_lines)
+    end
 
-      attributes = ['val', val]
+    #
+    # used from write_drop_lines and write_hi_low_lines
+    #
+    def write_lines_base(tag, lines)
+      return unless lines
 
-      @writer.empty_tag('c:overlap', attributes)
+      if lines[:_line] && ptrue?(lines[:_line][:_defined])
+        @writer.tag_elements(tag) { write_sp_pr(lines) }
+      else
+        @writer.empty_tag(tag)
+      end
+    end
+
+    #
+    # Write the <c:overlap> element.
+    #
+    def write_overlap # :nodoc:
+      @writer.empty_tag('c:overlap', ['val', 100])
     end
 
     #
@@ -3328,9 +3248,7 @@ def write_format_code(data) # :nodoc:
     # Write the <c:ptCount> element.
     #
     def write_pt_count(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:ptCount', attributes)
+      @writer.empty_tag('c:ptCount', ['val', val])
     end
 
     #
@@ -3360,6 +3278,32 @@ def write_protection # :nodoc:
       @writer.empty_tag('c:protection')
     end
 
+    #
+    # Write the <c:dPt> elements.
+    #
+    def write_d_pt(points = nil)
+      return unless ptrue?(points)
+
+      index = -1
+      points.each do |point|
+        index += 1
+        next unless ptrue?(point)
+
+        write_d_pt_point(index, point)
+      end
+    end
+
+    #
+    # Write an individual <c:dPt> element.
+    #
+    def write_d_pt_point(index, point)
+      @writer.tag_elements('c:dPt') do
+        # Write the c:idx element.
+        write_idx(index)
+        # Write the c:spPr element.
+        write_sp_pr(point)
+      end
+    end
     #
     # Write the <c:dLbls> element.
     #
@@ -3386,86 +3330,58 @@ def write_d_lbls(labels) # :nodoc:
     # Write the <c:showVal> element.
     #
     def write_show_val # :nodoc:
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:showVal', attributes)
+      @writer.empty_tag('c:showVal', ['val', 1])
     end
 
     #
     # Write the <c:showCatName> element.
     #
     def write_show_cat_name # :nodoc:
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:showCatName', attributes)
+      @writer.empty_tag('c:showCatName', ['val', 1])
     end
 
     #
     # Write the <c:showSerName> element.
     #
     def write_show_ser_name # :nodoc:
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:showSerName', attributes)
+      @writer.empty_tag('c:showSerName', ['val', 1])
     end
 
     #
     # Write the <c:showPercent> element.
     #
     def write_show_percent
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:showPercent', attributes)
+      @writer.empty_tag('c:showPercent', ['val', 1])
     end
 
     #
     # Write the <c:showLeaderLines> element.
     #
     def write_show_leader_lines
-      val  = 1
-
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:showLeaderLines', attributes)
+      @writer.empty_tag('c:showLeaderLines', ['val', 1])
     end
 
     #
     # Write the <c:dLblPos> element.
     #
     def write_d_lbl_pos(val)
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:dLblPos', attributes)
+      @writer.empty_tag('c:dLblPos', ['val', val])
     end
 
     #
     # Write the <c:delete> element.
     #
     def write_delete(val) # :nodoc:
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:delete', attributes)
+      @writer.empty_tag('c:delete', ['val', val])
     end
 
     #
     # Write the <c:invertIfNegative> element.
     #
     def write_c_invert_if_negative(invert = nil) # :nodoc:
-      val    = 1
-
-      return unless invert && invert != 0
+      return unless ptrue?(invert)
 
-      attributes = ['val', val]
-
-      @writer.empty_tag('c:invertIfNegative', attributes)
+      @writer.empty_tag('c:invertIfNegative', ['val', 1])
     end
 
     #
@@ -3498,6 +3414,133 @@ def write_d_table
       @table.write_d_table(@writer) if @table
     end
 
+    #
+    # Write the X and Y error bars.
+    #
+    def write_error_bars(error_bars)
+      return unless ptrue?(error_bars)
+
+      if error_bars[:_x_error_bars]
+        write_err_bars('x', error_bars[:_x_error_bars])
+      end
+      if error_bars[:_y_error_bars]
+        write_err_bars('y', error_bars[:_y_error_bars])
+      end
+    end
+
+    #
+    # Write the <c:errBars> element.
+    #
+    def write_err_bars(direction, error_bars)
+      return unless ptrue?(error_bars)
+
+      @writer.tag_elements('c:errBars') do
+        # Write the c:errDir element.
+        write_err_dir(direction)
+
+        # Write the c:errBarType element.
+        write_err_bar_type(error_bars[:_direction])
+
+        # Write the c:errValType element.
+        write_err_val_type(error_bars[:_type])
+
+        unless ptrue?(error_bars[:_endcap])
+          # Write the c:noEndCap element.
+          write_no_end_cap
+        end
+
+        if error_bars[:_type] != 'stdErr'
+          # Write the c:val element.
+          write_error_val(error_bars[:_value])
+        end
+
+        # Write the c:spPr element.
+        write_sp_pr(error_bars)
+      end
+    end
+
+    #
+    # Write the <c:errDir> element.
+    #
+    def write_err_dir(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])
+    end
+
+    #
+    # Write the <c:errValType> element.
+    #
+    def write_err_val_type(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])
+    end
+
+    #
+    # Write the <c:val> element.
+    #
+    def write_error_val(val)
+      @writer.empty_tag('c:val', ['val', val])
+    end
+
+    #
+    # Write the <c:upDownBars> element.
+    #
+    def write_up_down_bars
+      return unless ptrue?(@up_down_bars)
+
+      @writer.tag_elements('c:upDownBars') do
+        # Write the c:gapWidth element.
+        write_gap_width
+
+        # Write the c:upBars element.
+        write_up_bars(@up_down_bars[:_up])
+
+        # Write the c:downBars element.
+        write_down_bars(@up_down_bars[:_down])
+      end
+    end
+
+    #
+    # Write the <c:gapWidth> element.
+    #
+    def write_gap_width
+      @writer.empty_tag('c:gapWidth', ['val', 150])
+    end
+
+    #
+    # Write the <c:upBars> element.
+    #
+    def write_up_bars(format)
+      write_bars_base('c:upBars', format)
+    end
+
+    #
+    # Write the <c:upBars> element.
+    #
+    def write_down_bars(format)
+      write_bars_base('c:downBars', format)
+    end
+
+    def write_bars_base(tag, format)
+      if ptrue?(format[:_line][:_defined]) || ptrue?(format[:_fill][:_defined])
+        @writer.tag_elements(tag) { write_sp_pr(format) }
+      else
+        @writer.empty_tag(tag)
+      end
+    end
+
     def nil_or_max?(val)  # :nodoc:
       val.nil? || val == 'max'
     end