write_xlsx 0.87.0 → 0.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7cdfffc65c56b8de477d41c1126ebd46a7d6e63aee6d6660bab0e9283be2c6
-  data.tar.gz: c62748b94058a7021e796b88031b7d126b8508ce9ece50bdaa7455a620d8403b
+  metadata.gz: a8880984e96fe4a8788fe6642220163ff36932dea018a335d00165a7b2d2ae04
+  data.tar.gz: 99153b43aba51974cca58ed8c38d6308814820846b4617444fcd302752843bc5
 SHA512:
-  metadata.gz: 0042aea94458add0013ceefed1e734593692c00f9dc32d8b02fef80093b2e62d3510ef62e84481c74acbf0436e8fe8223485a562a76ec8fd011724e2869c5b1e
-  data.tar.gz: 0bb9fed1ec24707d52b7557c256579606c39eadb716bfdc4acb5e5e6b13f0792fb3627e75f16aef375675160d57556fff7f02af6fea8e4819bbdb244f96657e9
+  metadata.gz: 1b5c868f6e42846e925282b0eed02064b4541e852e72012e083009dbaa44e6bc419f1ad5b630cfe3ca149b12832732b972f340e6038502e1c8acbce9358702d2
+  data.tar.gz: 8bc6c84b0bb6c5901516441c7a5b1e45044ba5c26d30c92ac773f0de521e8e78785cd8aa4759a0d0db96d629aedd4aaf2a7453cb1f075b36dd1e61fc34cb217d

data/.travis.yml

@@ -1,7 +1,50 @@
 language: ruby
 rvm:
+- 3.0.0
+- 2.7.2
+- 2.7.1
+- 2.7.0
+- 2.6.6
+- 2.6.5
+- 2.6.4
+- 2.6.3
+- 2.6.2
+- 2.6.1
+- 2.6.0
+- 2.5.8
+- 2.5.7
+- 2.5.6
+- 2.5.5
+- 2.5.4
+- 2.5.3
+- 2.5.2
+- 2.5.1
+- 2.5.0
+- 2.4.10
+- 2.4.9
+- 2.4.8
+- 2.4.7
+- 2.4.6
+- 2.4.5
+- 2.4.4
+- 2.4.3
+- 2.4.2
+- 2.4.1
+- 2.4.0
+- 2.3.8
+- 2.3.7
+- 2.3.6
+- 2.3.5
+- 2.3.4
+- 2.3.3
+- 2.3.2
 - 2.3.1
 - 2.3.0
+- 2.2.10
+- 2.2.9
+- 2.2.8
+- 2.2.7
+- 2.2.6
 - 2.2.5
 - 2.2.4
 - 2.2.3

data/Changes

@@ -1,5 +1,93 @@
 Change history of write_xlsx rubygem.
 
+2021-01-08 v0.99.0
+
+   Added font and font_size parameters to write_comment().
+
+   Allow formulas in date field of data_validation().
+
+   Added top_left chart legend position.
+
+   Added legend formatting options.
+
+   Added set_tab_ratio() method to set the ratio between the worksheet tabs
+   and the horizontal slider.
+
+   Added worksheet hide_row_col_headers() method to turn off worksheet row
+   and column headings.
+
+   Add functionality to align chart category axis labels.
+
+   Fix for issue with special characters in worksheet table functions.
+
+   Fix handling of 'num_format': '0' in duplicate formats.
+
+
+2021-01-03 v0.98.0
+
+   fixed for autofilter rule with blanks plus another filter.
+
+2021-01-02 v0.97.0
+
+   Added Excel 2010 data bar features such as solid fills and control over
+   the display of negative values.
+
+   Added default formatting for hyperlinks if none is specified. The format
+   is the Excel hyperlink style so links change colour after they are
+   clicked.
+
+   Fixed missing plotarea formatting in pie/doughnut charts.
+
+2020-12-31 v0.96.0
+
+   Added icon sets to conditional formatting.
+
+2020-12-30 v0.95.0
+
+   Added workbook set_size() method.
+
+2020-12-30 v0.94.0
+
+   Added font support to chart tables.
+
+2020-12-30 v0.93.0
+
+   Added trendline properties: intercept, display_equation and
+   display_r_squared.
+
+2020-12-30 v0.92.0
+
+   Fix for insert_image issue when handling images with zero dpi.
+
+2020-12-30 v0.91.0
+
+   Add set_custom_property() workbook method to set custom document
+   properties.
+
+2020-12-28 v0.90.0
+
+   Added worksheet_by_name() workbook method to retrieve a worksheet
+   in a workbook by name.
+
+   Fixed issue where internal file creation and modification dates where
+   in the local timezone instead of UTC.
+
+   Fixed issue with "external:" urls with space in sheetname.
+
+   Fixed issue where Unicode full-width number strings were treated as
+   numbers in write().
+
+2020-12-27 v0.89.0
+
+   Added write_boolean() worksheet method to write Excel boolean values.
+
+
+2020-12-26 v0.88.0
+
+   Added transparency option to solid fills in chart areas.
+
+   Added options to configure chart axis tick placement.
+
 2020-12-26 v0.87.0
 
    Added chart pattern and gradient fills.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Hideo NAKAMURA
+Copyright (c) 2012-2021 Hideo NAKAMURA
 
 MIT License
 

data/README.md

@@ -5,7 +5,7 @@
 
 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.86](https://github.com/jmcnamara/excel-writer-xlsx) .
+[Excel::Writer::XLSX-0.99](https://github.com/jmcnamara/excel-writer-xlsx) .
 
 ## Description
 
@@ -85,7 +85,7 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
 Original Perl module was written by John McNamara(jmcnamara@cpan.org).
 
 Converted to ruby by Hideo NAKAMURA(nakamrua.hideo@gmail.com)
-Copyright (c) 2012-2020 Hideo NAKAMURA.
+Copyright (c) 2012-2021 Hideo NAKAMURA.
 
 See LICENSE.txt for further details.
 

data/examples/a_simple.rb

@@ -34,11 +34,6 @@
 worksheet.write(8, 0, '=IF(A5>3,"Yes", "No")')
 
 # Write a hyperlink
-hyperlink_format = workbook.add_format(
-                     :color     => 'blue',
-                     :underline => 1
-                                      )
-
-worksheet.write(10, 0, 'http://www.ruby-lang.org/', hyperlink_format)
+worksheet.write(10, 0, 'http://www.ruby-lang.org/')
 
 workbook.close

data/examples/conditional_format.rb

@@ -26,12 +26,6 @@
     :color    => '#006100'
 )
 
-# Blue fill with dark blue text.
-format3 = workbook.add_format(
-    :bg_color => '#C6CEFF',
-    :color    => '#0000FF'
-)
-
 # Some sample data to run the conditional formatting against.
 data = [
     [ 34, 72,  38, 30, 75, 48, 75, 66, 84, 86 ],
@@ -226,19 +220,18 @@
 #
 caption = 'Examples of color scales and data bars. Default colors.'
 
-# Use different sample data for examples 7 and 8
-data7 = 1 .. 12
+data = 1 .. 12
 
 worksheet7.write('A1', caption)
 
 worksheet7.write('B2', "2 Color Scale")
-worksheet7.write_col('B3', data7)
+worksheet7.write_col('B3', data)
 
 worksheet7.write('D2', "3 Color Scale")
-worksheet7.write_col('D3', data7)
+worksheet7.write_col('D3', data)
 
 worksheet7.write('F2', "Data Bars")
-worksheet7.write_col('F3', data7)
+worksheet7.write_col('F3', data)
 
 
 worksheet7.conditional_formatting('B3:B14',
@@ -266,16 +259,18 @@
 #
 caption = 'Examples of color scales and data bars. Modified colors.'
 
+data = 1..12
+
 worksheet8.write('A1', caption)
 
 worksheet8.write('B2', "2 Color Scale")
-worksheet8.write_col('B3', data7)
+worksheet8.write_col('B3', data)
 
 worksheet8.write('D2', "3 Color Scale")
-worksheet8.write_col('D3', data7)
+worksheet8.write_col('D3', data)
 
 worksheet8.write('F2', "Data Bars")
-worksheet8.write_col('F3', data7)
+worksheet8.write_col('F3', data)
 
 
 worksheet8.conditional_formatting('B3:B14',
@@ -304,47 +299,79 @@
 
 ###############################################################################
 #
-# Example 9
+# Example 9.
 #
-caption = 'Cells with values >= 100 are always in blue. ' +
-  'Otherwise, cells with values >= 50 are in light red ' +
-  'and values < 50 are in light green.'
+caption = 'Examples of conditional formats with icon sets.'
+
+data = [
+  [1, 2, 3],
+  [1, 2, 3],
+  [1, 2, 3],
+  [1, 2, 3],
+  [1, 2, 3, 4],
+  [1, 2, 3, 4, 5],
+  [1, 2, 3, 4, 5]
+]
 
-# Write the data.
 worksheet9.write('A1', caption)
 worksheet9.write_col('B3', data)
 
-# Write a conditional format over a range.
-# Use stopIfTrue to prevent previous formats from being used
-# if the conditions of this format are met.
-worksheet9.conditional_formatting('B3:K12',
-    {
-        :type         => 'cell',
-        :criteria     => '>=',
-        :value        => 100,
-        :format       => format3,
-        :stop_if_true => 1
-    }
+worksheet9.conditional_formatting(
+  'B3:D3',
+  {
+    :type       => 'icon_set',
+    :icon_style => '3_traffic_lights'
+  }
 )
 
-# Write another conditional format over the same range.
-worksheet9.conditional_formatting('B3:K12',
-    {
-        :type     => 'cell',
-        :criteria => '>=',
-        :value    => 50,
-        :format   => format1
-    }
+worksheet9.conditional_formatting(
+  'B4:D4',
+  {
+    :type          => 'icon_set',
+    :icon_style    => '3_traffic_lights',
+    :reverse_icons => 1
+  }
 )
 
-# Write another conditional format over the same range.
-worksheet9.conditional_formatting('B3:K12',
-    {
-        :type     => 'cell',
-        :criteria => '<',
-        :value    => 50,
-        :format   => format2
-    }
+worksheet9.conditional_formatting(
+  'B5:D5',
+  {
+    :type        => 'icon_set',
+    :icon_style  => '3_traffic_lights',
+    :icons_only  => 1
+  }
+)
+
+worksheet9.conditional_formatting(
+  'B6:D6',
+  {
+    :type        => 'icon_set',
+    :icon_style  => '3_arrows'
+  }
+)
+
+worksheet9.conditional_formatting(
+  'B7:E8',
+  {
+    :type        => 'icon_set',
+    :icon_style  => '4_arrows'
+  }
+)
+
+worksheet9.conditional_formatting(
+  'B8:F8',
+  {
+    :type        => 'icon_set',
+    :icon_style  => '5_arrows'
+  }
+)
+
+worksheet9.conditional_formatting(
+  'B9:F9',
+  {
+    :type        => 'icon_set',
+    :icon_style  => '5_ratings'
+  }
 )
 
 workbook.close

data/examples/demo.rb

@@ -27,11 +27,6 @@
     :align => 'vcenter'
 )
 
-hyperlink_format = workbook.add_format(
-    :color => 'blue',
-    :underline => 1
-)
-
 headings = ['Features of WriteXLSX', '']
 worksheet.write_row('A1', headings, heading)
 
@@ -81,7 +76,7 @@
 # Hyperlinks
 #
 worksheet.write('A9', "Hyperlinks")
-worksheet.write('B9', 'http://www.ruby-lang.org/', hyperlink_format)
+worksheet.write('B9', 'http://www.ruby-lang.org/')
 
 #######################################################################
 #
@@ -99,4 +94,3 @@
 worksheet.write('A19', "Multiple worksheets")
 
 workbook.close
-

data/examples/hyperlink1.rb

@@ -22,13 +22,6 @@
 worksheet.set_column('A:A', 30)
 worksheet.set_selection('B1')
 
-
-# Add the standard url link format.
-url_format = workbook.add_format(
-    :color     => 'blue',
-    :underline => 1
-)
-
 # Add a sample format.
 red_format = workbook.add_format(
     :color     => 'red',
@@ -45,11 +38,11 @@
 
 
 # Write some hyperlinks
-worksheet.write('A1', 'http://www.perl.com/', url_format)
-worksheet.write('A3', 'http://www.perl.com/', url_format, str)
-worksheet.write('A5', 'http://www.perl.com/', url_format, str, tip)
+worksheet.write('A1', 'http://www.perl.com/')
+worksheet.write('A3', 'http://www.perl.com/', nil, str)
+worksheet.write('A5', 'http://www.perl.com/', nil, str, tip)
 worksheet.write('A7', 'http://www.perl.com/', red_format)
-worksheet.write('A9', 'mailto:jmcnamara@cpan.org', url_format, 'Mail me')
+worksheet.write('A9', 'mailto:jmcnamara@cpan.org', nil, 'Mail me')
 
 # Write a URL that isn't a hyperlink
 worksheet.write_string('A11', 'http://www.perl.com/')

data/lib/write_xlsx/chart.rb

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