write_xlsx 0.85.9 → 1.09.2

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 @@ module Writexlsx
       @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(font)                                 if ptrue?(font)
       end
     end
 
@@ -40,7 +49,7 @@ module Writexlsx
     include Writexlsx::Utility
     include Writexlsx::Gradient
 
-    attr_reader :line, :fill, :gradient, :layout
+    attr_reader :line, :fill, :pattern, :gradient, :layout
 
     def initialize(params = {})
       @layout = layout_properties(params[:layout])
@@ -51,6 +60,9 @@ module Writexlsx
       # Set the line properties for the chartarea.
       @line = border ? line_properties(border) : line_properties(params[:line])
 
+      # Set the pattern properties for the series.
+      @pattern = pattern_properties(params[:pattern])
+
       # Set the gradient fill properties for the series.
       @gradient = gradient_properties(params[:gradient])
 
@@ -58,9 +70,16 @@ module Writexlsx
       fill = params[:color] ? { :color => params[:color] } : params[:fill]
       @fill = fill_properties(fill)
 
-      if ptrue?(@gradient)
+      # Pattern fill overrides solid fill.
+      if ptrue?(@pattern)
         @fill = nil
       end
+
+      # Gradient fill overrides solid and pattern fills.
+      if ptrue?(@gradient)
+        @pattern = nil
+        @fill    = nil
+      end
     end
 
     private
@@ -144,17 +163,18 @@ module Writexlsx
 
   class Chart
     include Writexlsx::Utility
+    include Writexlsx::Gradient
 
-    attr_accessor :id, :name   # :nodoc:
-    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  # :nodoc:
+    attr_accessor :id, :name                                         # :nodoc:
+    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                                      # :nodoc:
     attr_reader :label_positions, :label_position_default, :combined # :nodoc:
-    attr_writer :date_category, :already_inserted
-    attr_writer :series_index
-    attr_writer :writer
-    attr_reader :x2_axis, :y2_axis, :axis2_ids
+    attr_writer :date_category, :already_inserted                    # :nodoc:
+    attr_writer :series_index                                        # :nodoc:
+    attr_writer :writer                                              # :nodoc:
+    attr_reader :x2_axis, :y2_axis, :axis2_ids                       # :nodoc:
 
     #
     # Factory method for returning chart objects based on their class type.
@@ -254,6 +274,10 @@ module Writexlsx
         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.
@@ -330,16 +354,8 @@ module Writexlsx
     # 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
 
     #
@@ -407,6 +423,7 @@ module Writexlsx
     #
     def set_table(params = {})
       @table = Table.new(params)
+      @table.palette = @palette
     end
 
     #
@@ -507,39 +524,6 @@ module Writexlsx
       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.
     #
@@ -621,7 +605,7 @@ module Writexlsx
       @y_scale           = 1
       @x_offset          = 0
       @y_offset          = 0
-      @legend_position   = 'right'
+      @legend            = Legend.new
       @smooth_allowed    = 0
       @cross_between     = 'between'
       @date_category     = false
@@ -662,20 +646,6 @@ module Writexlsx
       '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.
     #
@@ -713,38 +683,6 @@ module Writexlsx
       [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.
     #
@@ -845,7 +783,7 @@ module Writexlsx
         elsif @title.formula
           write_title_formula(@title, nil, nil, @title.layout, @title.overlay)
         elsif @title.name
-          write_title_rich(@title, nil, @title.layout, @title.overlay)
+          write_title_rich(@title, nil, @title.name_font, @title.layout, @title.overlay)
         end
 
         # Write the c:plotArea element.
@@ -1119,7 +1057,7 @@ module Writexlsx
     end
 
     def write_val_base(formula, data_id, tag) # :nodoc:
-      data    = @formula_data[data_id]
+      data = @formula_data[data_id]
 
       @writer.tag_elements(tag) do
         # Unlike Cat axes data should only be numeric.
@@ -1240,8 +1178,8 @@ module Writexlsx
       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
@@ -1264,9 +1202,9 @@ module Writexlsx
 
         # 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.name_font, x_axis.layout)
         end
 
         # Write the c:numFmt element.
@@ -1275,6 +1213,9 @@ module Writexlsx
         # Write the c:majorTickMark element.
         write_major_tick_mark(x_axis.major_tick_mark)
 
+        # Write the c:minorTickMark element.
+        write_minor_tick_mark(x_axis.minor_tick_mark)
+
         # Write the c:tickLblPos element.
         write_tick_label_pos(x_axis.label_position)
 
@@ -1293,11 +1234,13 @@ module Writexlsx
         # 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.
         write_tick_lbl_skip(x_axis.interval_unit)
+        # Write the c:tickMarkSkip element.
+        write_tick_mark_skip(x_axis.interval_tick)
       end
     end
 
@@ -1338,7 +1281,7 @@ module Writexlsx
         if y_axis.formula
           write_title_formula(y_axis, @horiz_val_axis, nil, y_axis.layout)
         elsif y_axis.name
-          write_title_rich(y_axis, @horiz_val_axis, y_axis.layout)
+          write_title_rich(y_axis, @horiz_val_axis, y_axis.name_font, y_axis.layout)
         end
 
         # Write the c:numberFormat element.
@@ -1347,6 +1290,9 @@ module Writexlsx
         # Write the c:majorTickMark element.
         write_major_tick_mark(y_axis.major_tick_mark)
 
+        # Write the c:minorTickMark element.
+        write_minor_tick_mark(y_axis.minor_tick_mark)
+
         # Write the c:tickLblPos element.
         write_tick_label_pos(y_axis.label_position)
 
@@ -1410,7 +1356,7 @@ module Writexlsx
         if x_axis.formula
           write_title_formula(x_axis, nil, nil, x_axis.layout)
         elsif x_axis.name
-          write_title_rich(x_axis, nil, x_axis.layout)
+          write_title_rich(x_axis, nil, x_axis.name_font, x_axis.layout)
         end
         # Write the c:numFmt element.
         write_number_format(x_axis)
@@ -1436,6 +1382,8 @@ module Writexlsx
         write_label_offset(100)
         # Write the c:tickLblSkip element.
         write_tick_lbl_skip(x_axis.interval_unit)
+        # Write the c:tickMarkSkip element.
+        write_tick_mark_skip(x_axis.interval_tick)
         # Write the c:majorUnit element.
         write_c_major_unit(x_axis.major_unit)
         # Write the c:majorTimeUnit element.
@@ -1449,7 +1397,7 @@ module Writexlsx
 
     def write_crossing(crossing)
       # Note, the category crossing comes from the value axis.
-      if nil_or_max?(crossing)
+      if [nil, 'max', 'min'].include?(crossing)
         # Write the c:crosses element.
         write_crosses(crossing)
       else
@@ -1460,11 +1408,11 @@ module Writexlsx
 
     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
     #
     # Write the <c:scaling> element.
@@ -1495,7 +1443,7 @@ module Writexlsx
     # Write the <c:orientation> element.
     #
     def write_orientation(reverse = nil) # :nodoc:
-      val     = ptrue?(reverse) ? 'maxMin' : 'minMax'
+      val = ptrue?(reverse) ? 'maxMin' : 'minMax'
 
       @writer.empty_tag('c:orientation', [ ['val', val] ])
     end
@@ -1551,9 +1499,9 @@ module Writexlsx
       source_linked = 0
 
       attributes = [
-                    ['formatCode',   format_code],
-                    ['sourceLinked', source_linked]
-                   ]
+        ['formatCode',   format_code],
+        ['sourceLinked', source_linked]
+      ]
 
       @writer.empty_tag('c:numFmt', attributes)
     end
@@ -1567,6 +1515,15 @@ module Writexlsx
       @writer.empty_tag('c:majorTickMark', [ ['val', val] ])
     end
 
+    #
+    # Write the <c:minorTickMark> element.
+    #
+    def write_minor_tick_mark(val)
+      return unless ptrue?(val)
+
+      @writer.empty_tag('c:minorTickMark', [ ['val', val] ])
+    end
+
     #
     # Write the <c:tickLblPos> element.
     #
@@ -1611,6 +1568,12 @@ module Writexlsx
     # 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
 
@@ -1630,6 +1593,15 @@ module Writexlsx
       @writer.empty_tag('c:tickLblSkip', [ ['val', val] ])
     end
 
+    #
+    # Write the <c:tickMarkSkip> element.
+    #
+    def write_tick_mark_skip(val)  # :nodoc:
+      return unless val
+
+      @writer.empty_tag( 'c:tickMarkSkip', [ ['val', val] ])
+    end
+
     #
     # Write the <c:majorGridlines> element.
     #
@@ -1704,10 +1676,10 @@ module Writexlsx
     # 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])
@@ -1715,20 +1687,23 @@ module Writexlsx
         # 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(@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
 
@@ -1803,13 +1778,13 @@ module Writexlsx
       footer = 0.3
 
       attributes = [
-                    ['b',      b],
-                    ['l',      l],
-                    ['r',      r],
-                    ['t',      t],
-                    ['header', header],
-                    ['footer', footer]
-                   ]
+        ['b',      b],
+        ['l',      l],
+        ['r',      r],
+        ['t',      t],
+        ['header', header],
+        ['footer', footer]
+      ]
 
       @writer.empty_tag('c:pageMargins', attributes)
     end
@@ -1833,10 +1808,10 @@ module Writexlsx
     #
     # 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, font, layout, 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, font)
         # Write the c:layout element.
         write_layout(layout, 'text')
         # Write the c:overlay element.
@@ -1847,7 +1822,7 @@ module Writexlsx
     #
     # 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)
@@ -1856,15 +1831,17 @@ module Writexlsx
         # 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(axis ? axis.name_font : title.name_font, is_y_axis)
       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, font) # :nodoc:
+      @writer.tag_elements('c:tx') do
+        write_rich(title, font, is_y_axis)
+      end
     end
 
     #
@@ -1886,61 +1863,30 @@ module Writexlsx
     #
     # Write the <c:rich> element.
     #
-    def write_rich(title, horiz) # :nodoc:
+    def write_rich(title, font, is_y_axis, ignore_rich_pr = false) # :nodoc:
       rotation = nil
-      if title.name_font && title.name_font[:_rotation]
-        rotation = title.name_font[:_rotation]
+
+      if font && font[:_rotation]
+        rotation = 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)
+        write_a_p_rich(title, font, ignore_rich_pr)
       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.
     #
-    def write_a_p_rich(title) # :nodoc:
+    def write_a_p_rich(title, font, ignore_rich_pr) # :nodoc:
       @writer.tag_elements('a:p') do
         # Write the a:pPr element.
-        write_a_p_pr_rich(title.name_font)
+        write_a_p_pr_rich(font) if !ignore_rich_pr
         # Write the a:r element.
-        write_a_r(title)
-      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
+        write_a_r(title, font)
       end
     end
 
@@ -1951,39 +1897,15 @@ module Writexlsx
       @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.
     #
-    def write_a_r(title) # :nodoc:
+    def write_a_r(title, font) # :nodoc:
       @writer.tag_elements('a:r') do
         # Write the a:rPr element.
-        write_a_r_pr(title.name_font)
+        write_a_r_pr(font)
         # Write the a:t element.
-        write_a_t(title.name)
+        write_a_t(title.respond_to?(:name) ? title.name : title)
       end
     end
 
@@ -1998,24 +1920,6 @@ module Writexlsx
       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.
     #
@@ -2023,24 +1927,6 @@ module Writexlsx
       @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.
     #
@@ -2084,16 +1970,27 @@ module Writexlsx
       @writer.empty_tag('c:symbol', [ ['val', val] ])
     end
 
+    def has_fill_formatting(element)
+      line     = series_property(element, :line)
+      fill     = series_property(element, :fill)
+      pattern  = series_property(element, :pattern)
+      gradient = series_property(element, :gradient)
+
+      (line && ptrue?(line[:_defined])) ||
+        (fill && ptrue?(fill[:_defined])) || pattern || gradient
+    end
+
+
     #
     # Write the <c:spPr> element.
     #
     def write_sp_pr(series) # :nodoc:
-      line     = series.line
-      fill     = series.fill
-      gradient = series.gradient if series.respond_to?(:gradient)
+      return if !has_fill_formatting(series)
 
-      return if (!line || !ptrue?(line[:_defined])) &&
-        (!fill || !ptrue?(fill[:_defined])) && !gradient
+      line     = series_property(series, :line)
+      fill     = series_property(series, :fill)
+      pattern  = series_property(series, :pattern)
+      gradient = series_property(series, :gradient)
 
       @writer.tag_elements('c:spPr') do
         # Write the fill elements for solid charts such as pie/doughnut and bar.
@@ -2106,6 +2003,9 @@ module Writexlsx
             write_a_solid_fill(fill)
           end
         end
+        if ptrue?(pattern)
+          write_a_patt_fill(pattern)
+        end
         if ptrue?(gradient)
           # Write the a:gradFill element.
           write_a_grad_fill(gradient)
@@ -2115,6 +2015,14 @@ module Writexlsx
       end
     end
 
+    def series_property(object, property)
+      if object.respond_to?(property)
+        object.send(property)
+      elsif object.respond_to?(:[])
+        object[property]
+      end
+    end
+
     #
     # Write the <a:ln> element.
     #
@@ -2158,20 +2066,12 @@ module Writexlsx
     end
 
     #
-    # Write the <a:solidFill> element.
+    # Write the <a:alpha> element.
     #
-    def write_a_solid_fill(line) # :nodoc:
-      @writer.tag_elements('a:solidFill') do
-        # Write the a:srgbClr element.
-        write_a_srgb_clr(color(line[:color])) if line[:color]
-      end
-    end
+    def write_a_alpha(val)
+      val = (100 - val.to_i) * 1000
 
-    #
-    # Write the <a:srgbClr> element.
-    #
-    def write_a_srgb_clr(val) # :nodoc:
-      @writer.empty_tag('a:srgbClr', [ ['val', val] ])
+      @writer.empty_tag('a:alpha', [ ['val', val] ])
     end
 
     #
@@ -2202,6 +2102,20 @@ module Writexlsx
         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
 
@@ -2253,6 +2167,54 @@ module Writexlsx
       @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.
     #
@@ -2300,12 +2262,17 @@ module Writexlsx
         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.
           if token &&
-              !(token.to_s =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/)
+             !(token.to_s =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/)
             token = 0
           end
 
@@ -2403,8 +2370,14 @@ module Writexlsx
       return unless labels
 
       @writer.tag_elements('c:dLbls') do
+        # Write the custom c:dLbl elements.
+        if labels[:custom]
+          write_custom_labels(labels, labels[:custom])
+        end
         # Write the c:numFmt element.
         write_data_label_number_format(labels[:num_format]) if labels[:num_format]
+        # Write the c:spPr element.
+        write_sp_pr(labels)
         # Write the data label font elements.
         write_axis_font(labels[:font]) if labels[:font]
         # Write the c:dLblPos element.
@@ -2426,6 +2399,105 @@ module Writexlsx
       end
     end
 
+    #
+    # Write the <c:dLbl> element.
+    #
+    def write_custom_labels(parent, labels)
+      index  = 0
+
+      labels.each do |label|
+        index += 1
+        next if !ptrue?(label)
+
+        @writer.tag_elements('c:dLbl') do
+          # Write the c:idx element.
+          write_idx(index - 1)
+
+          if label[:delete] && label[:delete]
+            write_delete(1)
+          elsif label[:formula]
+            write_custom_label_formula(label)
+
+            write_d_lbl_pos(parent[:position]) if parent[:position]
+            write_show_val      if parent[:value]
+            write_show_cat_name if parent[:category]
+            write_show_ser_name if parent[:series_name]
+          elsif label[:value]
+            write_custom_label_str(label)
+
+            write_d_lbl_pos(parent[:position]) if parent[:position]
+            write_show_val      if parent[:value]
+            write_show_cat_name if parent[:category]
+            write_show_ser_name if parent[:series_name]
+          else
+            write_custom_label_format_only(label)
+          end
+        end
+      end
+    end
+
+    #
+    # Write parts of the <c:dLbl> element for strings.
+    #
+    def write_custom_label_str(label)
+      value          = label[:value]
+      font           = label[:font]
+      is_y_axis      = 0
+      has_formatting = has_fill_formatting(label)
+
+      # Write the c:layout element.
+      write_layout()
+
+      @writer.tag_elements('c:tx') do
+        # Write the c:rich element.
+        write_rich(value, font, is_y_axis, !has_formatting)
+      end
+
+      # Write the c:cpPr element.
+      write_sp_pr(label)
+    end
+
+    #
+    # Write parts of the <c:dLbl> element for formulas.
+    #
+    def write_custom_label_formula(label)
+      formula = label[:formula]
+      data_id = label[:data_id]
+
+      if data_id
+        data = @formula_data[data_id]
+      end
+
+      # Write the c:layout element.
+      write_layout
+
+      @writer.tag_elements('c:tx') do
+        # Write the c:strRef element.
+        write_str_ref(formula, data, 'str')
+      end
+
+      # Write the data label formatting, if any.
+      write_custom_label_format_only(label)
+    end
+
+    #
+    # Write parts of the <c:dLbl> element for labels where only the formatting has
+    # changed.
+    #
+    def write_custom_label_format_only(label)
+      font           = label[:font]
+      has_formatting = has_fill_formatting(label)
+
+      if has_formatting
+        # Write the c:spPr element.
+        write_sp_pr(label)
+        write_tx_pr(font)
+      elsif font
+        @writer.empty_tag('c:spPr')
+        write_tx_pr(font)
+      end
+    end
+
     #
     # Write the <c:showLegendKey> element.
     #
@@ -2631,7 +2703,7 @@ module Writexlsx
     end
 
     def write_num_ref_or_lit(values, data)
-      if values.to_s =~ /^=/                     # '=Sheet1!$A$1:$A$5'
+      if values.to_s =~ /^=/                # '=Sheet1!$A$1:$A$5'
         write_num_ref(values, data, 'num')
       else                                  # [1, 2, 3]
         write_num_lit(values)
@@ -2754,7 +2826,7 @@ module Writexlsx
 
             # Write the a:srgbClr element.
             # TODO: Wait for a feature request to support transparency.
-            write_a_srgb_clr( color );
+            write_a_srgb_clr( color )
           end
         end
       end
@@ -2829,6 +2901,26 @@ module Writexlsx
       @writer.empty_tag('a:tileRect', attributes)
     end
 
+    #
+    # Write the <a:pattFill> element.
+    #
+    def write_a_patt_fill(pattern)
+      attributes = [ ['prst', pattern[:pattern]] ]
+
+      @writer.tag_elements('a:pattFill', attributes) do
+        write_a_fg_clr(pattern[:fg_color])
+        write_a_bg_clr(pattern[:bg_color])
+      end
+    end
+
+    def write_a_fg_clr(color)
+      @writer.tag_elements('a:fgClr') { write_a_srgb_clr(color(color)) }
+    end
+
+    def write_a_bg_clr(color)
+      @writer.tag_elements('a:bgClr') { write_a_srgb_clr(color(color)) }
+    end
+
     def write_bars_base(tag, format)
       if format.line_defined? || format.fill_defined?
         @writer.tag_elements(tag) { write_sp_pr(format) }
@@ -2836,9 +2928,5 @@ module Writexlsx
         @writer.empty_tag(tag)
       end
     end
-
-    def nil_or_max?(val)  # :nodoc:
-      val.nil? || val == 'max'
-    end
   end
 end