write_xlsx 0.86.0 → 0.97.0

data/lib/write_xlsx/chart/axis.rb

@@ -9,12 +9,13 @@ class Axis < Caption
       include Writexlsx::Utility
 
       attr_accessor :defaults
-      attr_accessor :min, :max, :num_format, :position, :major_tick_mark
+      attr_accessor :min, :max, :num_format, :position
+      attr_accessor :major_tick_mark, :minor_tick_mark
       attr_reader :minor_unit, :major_unit, :minor_unit_type, :major_unit_type
       attr_reader :display_units_visible, :display_units
       attr_reader :log_base, :crossing, :position_axis, :label_position, :visible
       attr_reader :num_format_linked, :num_font, :layout, :interval_unit
-      attr_reader :major_gridlines, :minor_gridlines, :reverse
+      attr_reader :interval_tick, :major_gridlines, :minor_gridlines, :reverse
       attr_reader :line, :fill, :text_axis
       #
       # Convert user defined axis values into axis instance.
@@ -27,11 +28,11 @@ def merge_with_hash(params) # :nodoc:
           :reverse, :min, :max, :minor_unit, :major_unit, :minor_unit_type,
           :major_unit_type, :log_base, :crossing, :position_axis,
           :label_position, :num_format, :num_format_linked, :interval_unit,
-          :major_tick_mark, :line, :fill
+          :interval_tick, :line, :fill
         ].each { |val| instance_variable_set("@#{val}", args[val]) }
-        @visible           = args[:visible] || 1
-
         set_major_minor_gridlines(args)
+
+        @visible           = args[:visible] || 1
         set_display_units(args)
         set_display_units_visible(args)
         set_position(args)
@@ -44,6 +45,10 @@ def merge_with_hash(params) # :nodoc:
           @chart.date_category = false
           @text_axis = true
         end
+
+        # Set the tick marker types.
+        @major_tick_mark = get_tick_type(params[:major_tick_mark])
+        @minor_tick_mark = get_tick_type(params[:minor_tick_mark])
       end
 
       #
@@ -126,6 +131,26 @@ def get_display_units(display_units)
         end
       end
 
+      #
+      # Convert user tick types to internal units.
+      #
+      def get_tick_type(tick_type)
+        return if !ptrue?(tick_type)
+
+        types = {
+          'outside' => 'out',
+          'inside'  => 'in',
+          'none'    => 'none',
+          'cross'   => 'cross'
+        }
+
+        if(types[tick_type])
+          return types[tick_type]
+        else
+          raise "Unknown tick_type type '#{tick_type}'\n"
+        end
+      end
+
       def set_display_units(args)
         @display_units = get_display_units(args[:display_units])
       end
@@ -134,7 +159,7 @@ def set_display_units_visible(args)
         if args[:display_units_visible]
           @display_units_visible = args[:display_units_visible]
         else
-          @display_units_visible = 1;
+          @display_units_visible = 1
         end
       end
 
@@ -159,8 +184,8 @@ def set_position_axis
       end
 
       def set_font_properties(args)
-        @num_font  = @chart.convert_font_args(args[:num_font])
-        @name_font = @chart.convert_font_args(args[:name_font])
+        @num_font  = convert_font_args(args[:num_font])
+        @name_font = convert_font_args(args[:name_font])
       end
 
       def set_axis_name_layout(args)

data/lib/write_xlsx/chart/caption.rb

@@ -3,6 +3,8 @@
 module Writexlsx
   class Chart
     class Caption
+      include Writexlsx::Utility
+
       attr_accessor :name, :formula, :data_id, :name_font
       attr_reader :layout, :overlay, :none
 
@@ -13,7 +15,7 @@ def initialize(chart)
       def merge_with_hash(params) # :nodoc:
         @name, @formula = @chart.process_names(params[:name], params[:name_formula])
         @data_id        = @chart.data_id(@formula, params[:data])
-        @name_font      = @chart.convert_font_args(params[:name_font])
+        @name_font      = convert_font_args(params[:name_font])
         @layout   = @chart.layout_properties(params[:layout], 1)
 
         # Set the title overlay option.

data/lib/write_xlsx/chart/pie.rb

@@ -96,6 +96,8 @@ def write_plot_area
           write_layout(@plotarea.layout, 'plot')
           # Write the subclass chart type element.
           write_chart_type
+          # Write the c:spPr eleent for the plotarea formatting.
+          write_sp_pr(@plotarea)
         end
       end
 

data/lib/write_xlsx/chart/series.rb

@@ -8,22 +8,30 @@ class Chartline
       include Writexlsx::Utility
       include Writexlsx::Gradient
 
-      attr_reader :line, :fill, :type
+      attr_reader :line, :fill, :type, :gradient, :pattern
 
       def initialize(params)
         @line      = params[:line]
         @fill      = params[:fill]
+        @pattern   = params[:pattern]
+        @gradient  = params[:gradient]
         # Set the line properties for the marker..
         @line = line_properties(@line)
         # Allow 'border' as a synonym for 'line'.
         @line = line_properties(params[:border]) if params[:border]
-
-        # Set the gradient fill properties for the series.
-        @gradient = gradient_properties(params[:gradient])
-
         # Set the fill properties for the marker.
         @fill = fill_properties(@fill)
+        # Set the pattern properties for the series.
+        @pattern = pattern_properties(@pattern)
+        # Set the gradient fill properties for the series.
+        @gradient = gradient_properties(@gradient)
+        # Pattern fill overrides solid fill.
         @fill = nil if ptrue?(@gradient)
+        # Gradient fill overrides solid and pattern fills.
+        if ptrue?(@gradient)
+          @pattern = nil
+          @fill    = nil
+        end
       end
 
       def line_defined?
@@ -49,16 +57,20 @@ def initialize(params)
 
     class Trendline < Chartline
       attr_reader :name, :forward, :backward, :order, :period
+      attr_reader :intercept, :display_equation, :display_r_squared
 
       def initialize(params)
         super(params)
 
-        @name     = params[:name]
-        @forward  = params[:forward]
-        @backward = params[:backward]
-        @order    = params[:order]
-        @period   = params[:period]
-        @type     = value_or_raise(types, params[:type], 'trendline type')
+        @name              = params[:name]
+        @forward           = params[:forward]
+        @backward          = params[:backward]
+        @order             = params[:order]
+        @period            = params[:period]
+        @intercept         = params[:intercept]
+        @display_equation  = params[:display_equation]
+        @display_r_squared = params[:display_r_squared]
+        @type              = value_or_raise(types, params[:type], 'trendline type')
       end
 
       private
@@ -170,7 +182,7 @@ class Series
       include Writexlsx::Gradient
 
       attr_reader :values, :categories, :name, :name_formula, :name_id
-      attr_reader :cat_data_id, :val_data_id, :fill, :gradient
+      attr_reader :cat_data_id, :val_data_id, :fill, :pattern, :gradient
       attr_reader :trendline, :smooth, :labels, :invert_if_negative
       attr_reader :x2_axis, :y2_axis, :error_bars, :points
       attr_accessor :line, :marker
@@ -184,13 +196,21 @@ def initialize(chart, params = {})
 
         set_data_ids(params)
 
-        @line = line_properties(params[:border] || params[:line])
-        @fill = fill_properties(params[:fill])
-
+        @line       = line_properties(params[:border] || params[:line])
+        @fill       = fill_properties(params[:fill])
+        @pattern    = pattern_properties(params[:pattern])
         @gradient   = gradient_properties(params[:gradient])
-        @fill       = nil if ptrue?(@gradient)
+        # Pattern fill overrides solid fill.
+        @fill       = nil if ptrue?(@pattern)
+        # Gradient fill overrides solid and patter fills.
+        if ptrue?(@gradient)
+          @pattern = nil
+          @fill    = nil
+        end
 
+        # Set the marker properties for the series.
         @marker     = Marker.new(params[:marker]) if params[:marker]
+        # Set the trendline properties for the series.
         @trendline  = Trendline.new(params[:trendline]) if params[:trendline]
         @error_bars = errorbars(params[:x_error_bars], params[:y_error_bars])
         @points     = params[:points].collect { |p| p ? Point.new(p) : p } if params[:points]
@@ -277,7 +297,7 @@ def labels_properties(labels) # :nodoc:
         end
 
         if labels[:font]
-          labels[:font] = @chart.convert_font_args(labels[:font])
+          labels[:font] = convert_font_args(labels[:font])
         end
 
         labels

data/lib/write_xlsx/format.rb

@@ -163,7 +163,7 @@ class Format
     include Writexlsx::Utility
 
     attr_reader :xf_index, :dxf_index, :num_format   # :nodoc:
-    attr_reader :underline, :font_script, :size, :theme, :font, :font_family, :hyperlink   # :nodoc:
+    attr_reader :underline, :font_script, :size, :theme, :font, :font_family, :hyperlink, :xf_id   # :nodoc:
     attr_reader :diag_type, :diag_color, :font_only, :color, :color_indexed   # :nodoc:
     attr_reader :left, :left_color, :right, :right_color, :top, :top_color, :bottom, :bottom_color   # :nodoc:
     attr_reader :font_scheme   # :nodoc:
@@ -200,6 +200,7 @@ def initialize(formats, params = {})   # :nodoc:
       @font_extend    = 0
       @theme          = 0
       @hyperlink      = 0
+      @xf_id          = 0
 
       @hidden         = 0
       @locked         = 1
@@ -396,7 +397,8 @@ def get_font_key
         @font,
         @italic,
         @size,
-        @underline
+        @underline,
+        @theme
       ].join(':')
     end
 
@@ -593,15 +595,15 @@ def set_rotation(rotation)
     end
 
     #
-    # Set the properties for the hyperlink style. TODO. This doesn't currently
-    # work. Fix it when styles are supported.
+    # Set the properties for the hyperlink style. This isn't a public method. To
+    # be fixed when styles are supported.
     #
-    def set_hyperlink
-      @hyperlink = 1
+    def set_hyperlink(hyperlink)
+      @xf_id = 1
 
       set_underline(1)
       set_theme(10)
-      set_align('top')
+      @hyperlink = hyperlink
     end
 
     def set_font_info(fonts)
@@ -804,11 +806,11 @@ def xf_attributes
         ['fontId'  , font_index],
         ['fillId'  , fill_index],
         ['borderId', border_index],
-        ['xfId'    , 0]
+        ['xfId'    , xf_id]
       ]
       attributes << ['applyNumberFormat', 1] if num_format_index > 0
       # Add applyFont attribute if XF format uses a font element.
-      attributes << ['applyFont', 1] if font_index > 0
+      attributes << ['applyFont', 1] if font_index > 0 && !ptrue?(@hyperlink)
       # Add applyFill attribute if XF format uses a fill element.
       attributes << ['applyFill', 1] if fill_index > 0
       # Add applyBorder attribute if XF format uses a border element.
@@ -817,8 +819,10 @@ def xf_attributes
       # Check if XF format has alignment properties set.
       apply_align, align = get_align_properties
       # We can also have applyAlignment without a sub-element.
-      attributes << ['applyAlignment', 1] if apply_align
-      attributes << ['applyProtection', 1] if get_protection_properties
+      attributes << ['applyAlignment', 1] if apply_align || ptrue?(@hyperlink)
+      if get_protection_properties || ptrue?(hyperlink)
+        attributes << ['applyProtection', 1]
+      end
 
       attributes
     end
@@ -844,6 +848,10 @@ def write_font_family_scheme(writer)
           writer.empty_tag('family', [ ['val', @font_family] ])
       end
 
+      if ptrue?(@font_charset)
+        writer.empty_tag('charset', [ ['val', @font_charset] ])
+      end
+
       if @font == 'Calibri' && !ptrue?(@hyperlink)
         writer.empty_tag('scheme', [ ['val', @font_scheme] ])
       end

data/lib/write_xlsx/package/conditional_format.rb

@@ -7,8 +7,8 @@ class ConditionalFormat
 
       def self.factory(worksheet, *args)
         range, param  =
-          Package::ConditionalFormat.new(worksheet, nil, nil).
-          range_param_for_conditional_formatting(*args)
+               Package::ConditionalFormat.new(worksheet, nil, nil).
+                 range_param_for_conditional_formatting(*args)
 
         case param[:type]
         when 'cellIs'
@@ -29,6 +29,8 @@ def self.factory(worksheet, *args)
           DataBarFormat.new(worksheet, range, param)
         when 'expression'
           ExpressionFormat.new(worksheet, range, param)
+        when 'iconSet'
+          IconSetFormat.new(worksheet, range, param)
         else # when 'duplicateValues', 'uniqueValues'
           ConditionalFormat.new(worksheet, range, param)
         end
@@ -59,11 +61,13 @@ def write_formula_tag(data) #:nodoc:
       #
       # Write the <cfvo> element.
       #
-      def write_cfvo(type, val)
-        @writer.empty_tag('cfvo', [
-                                   ['type', type],
-                                   ['val', val]
-                                  ])
+      def write_cfvo(type, value, criteria = nil)
+        attributes = [ ['type', type] ]
+        attributes << [ 'val', value] if value
+
+        attributes << ['gte', 0] if ptrue?(criteria)
+
+        @writer.empty_tag('cfvo', attributes)
       end
 
       def attributes
@@ -154,6 +158,54 @@ def bar_color
         @param[:bar_color]
       end
 
+      def bar_border_color
+        @param[:bar_border_color]
+      end
+
+      def bar_negative_color
+        @param[:bar_negative_color]
+      end
+
+      def bar_negative_color_same
+        @param[:bar_negative_color_same]
+      end
+
+      def bar_no_border
+        @param[:bar_no_border]
+      end
+
+      def bar_axis_position
+        @param[:bar_axis_position]
+      end
+
+      def bar_axis_color
+        @param[:bar_axis_color]
+      end
+
+      def icon_style
+        @param[:icon_style]
+      end
+
+      def total_icons
+        @param[:total_icons]
+      end
+
+      def icons
+        @param[:icons]
+      end
+
+      def icons_only
+        @param[:icons_only]
+      end
+
+      def reverse_icons
+        @param[:reverse_icons]
+      end
+
+      def bar_only
+        @param[:bar_only]
+      end
+
       def range_param_for_conditional_formatting(*args)  # :nodoc:
         range_start_cell_for_conditional_formatting(*args)
         param_for_conditional_formatting(*args)
@@ -274,17 +326,68 @@ def handling_of_blanks_error_types
           @param[:mid_color] = palette_color(@param[:mid_color])
           @param[:min_color] = palette_color(@param[:min_color])
         when 'dataBar'
-          # Color scales don't use any additional formatting.
+          # Excel 2007 data bars don't use any additional formatting.
           @param[:format] = nil
 
-          @param[:min_type]  ||= 'min'
-          @param[:max_type]  ||= 'max'
-          @param[:min_value] ||= 0
-          @param[:max_value] ||= 0
-          @param[:bar_color] ||= '#638EC6'
+          if !@param[:min_type]
+            @param[:min_type]     = 'min'
+            @param[:x14_min_type] = 'autoMin'
+          else
+            @param[:x14_min_type] = @param[:min_type]
+          end
+          if !@param[:max_type]
+            @param[:max_type]     = 'max'
+            @param[:x14_max_type] = 'autoMax'
+          else
+            @param[:x14_max_type] = @param[:max_type]
+          end
+
+          @param[:min_value]                      ||= 0
+          @param[:max_value]                      ||= 0
+          @param[:bar_color]                      ||= '#638EC6'
+          @param[:bar_border_color]               ||= @param[:bar_color]
+          @param[:bar_only]                       ||= 0
+          @param[:bar_no_border]                  ||= 0
+          @param[:bar_solid]                      ||= 0
+          @param[:bar_direction]                  ||= ''
+          @param[:bar_negative_color]             ||= '#FF0000'
+          @param[:bar_negative_border_color]      ||= '#FF0000'
+          @param[:bar_negative_color_same]        ||= 0
+          @param[:bar_negative_border_color_same] ||= 0
+          @param[:bar_axis_position]              ||= ''
+          @param[:bar_axis_color]                 ||= '#000000'
+
+          @param[:bar_color] =
+            palette_color(@param[:bar_color])
+          @param[:bar_border_color] =
+            palette_color(@param[:bar_border_color])
+          @param[:bar_negative_color] =
+            palette_color(@param[:bar_negative_color])
+          @param[:bar_negative_border_color] =
+            palette_color(@param[:bar_negative_border_color])
+          @param[:bar_axis_color] =
+            palette_color(@param[:bar_axis_color])
+        end
+
+        # Adjust for 2010 style data_bar parameters.
+        if ptrue?(@param[:is_data_bar_2010])
+          @worksheet.excel_version = 2010
 
-          @param[:bar_color] = palette_color(@param[:bar_color])
+          if @param[:min_type] == 'min' && @param[:min_value] == 0
+            @param[:min_value] = nil
+          end
+          if @param[:max_type] == 'max' && @param[:max_value] == 0
+            @param[:max_value] = nil
+          end
+
+          # Store range for Excel 2010 data bars.
+          @param[:range] = range
         end
+
+        # Strip the leading = from formulas.
+        @param[:min_value] = @param[:min_value].to_s.sub(/^=/, '') if @param[:min_value]
+        @param[:mid_value] = @param[:mid_value].to_s.sub(/^=/, '') if @param[:mid_value]
+        @param[:max_value] = @param[:max_value].to_s.sub(/^=/, '') if @param[:max_value]
       end
 
       def palette_color(index)
@@ -293,7 +396,7 @@ def palette_color(index)
 
       def range_start_cell_for_conditional_formatting(*args)  # :nodoc:
         row1, row2, col1, col2, user_range, param =
-          row_col_param_for_conditional_formatting(*args)
+                                            row_col_param_for_conditional_formatting(*args)
         # If the first and last cell are the same write a single cell.
         if row1 == row2 && col1 == col2
           range = xl_rowcol_to_cell(row1, col1)
@@ -336,19 +439,32 @@ def row_col_param_for_conditional_formatting(*args)
 
       def param_for_conditional_formatting(*args)  # :nodoc:
         dummy, dummy, dummy, dummy, dummy, @param =
-          row_col_param_for_conditional_formatting(*args)
+                                           row_col_param_for_conditional_formatting(*args)
         check_conditional_formatting_parameters(@param)
 
         @param[:format] = @param[:format].get_dxf_index if @param[:format]
         @param[:priority] = @worksheet.dxf_priority
+
+        # Check for 2010 style data_bar parameters.
+        %i(data_bar_2010 bar_solid bar_border_color bar_negative_color
+           bar_negative_color_same bar_negative_border_color
+           bar_negative_border_color_same bar_no_border
+           bar_axis_position bar_axis_color bar_direction
+        ).each do |key|
+          if @param[key]
+            @param[:is_data_bar_2010] = 1
+            break
+          end
+        end
+
         @worksheet.dxf_priority += 1
       end
 
       def check_conditional_formatting_parameters(param)  # :nodoc:
         # Check for valid input parameters.
-        unless (param.keys.uniq - valid_parameter_for_conditional_formatting).empty? &&
-            param.has_key?(:type)                                   &&
-            valid_type_for_conditional_formatting.has_key?(param[:type].downcase)
+        if !(param.keys.uniq - valid_parameter_for_conditional_formatting).empty? ||
+           !param.has_key?(:type) ||
+           !valid_type_for_conditional_formatting.has_key?(param[:type].downcase)
           raise WriteXLSXOptionParameterError, "Invalid type : #{param[:type]}"
         end
 
@@ -369,6 +485,32 @@ def check_conditional_formatting_parameters(param)  # :nodoc:
           param[:maximum] = convert_date_time_if_required(param[:maximum])
         end
 
+        # Set properties for icon sets.
+        if param[:type] == 'iconSet'
+          if !param[:icon_style]
+            raise "The 'icon_style' parameter must be specified when " +
+                  "'type' == 'icon_set' in conditional_formatting()"
+          end
+
+          # Check for valid icon styles.
+          if !icon_set_styles[param[:icon_style]]
+            raise "Unknown icon style '$param->{icon_style}' for parameter " +
+                  "'icon_style' in conditional_formatting()"
+          else
+            param[:icon_style] = icon_set_styles[param[:icon_style]]
+          end
+
+          # Set the number of icons for the icon style.
+          param[:total_icons] = 3
+          if param[:icon_style] =~ /^4/
+            param[:total_icons] = 4
+          elsif param[:icon_style] =~ /^5/
+            param[:total_icons] = 5
+          end
+
+          param[:icons] = set_icon_properties(param[:total_icons], param[:icons])
+        end
+
         # 'Between' and 'Not between' criteria require 2 values.
         if param[:criteria] == 'between' || param[:criteria] == 'notBetween'
           unless param.has_key?(:minimum) || param.has_key?(:maximum)
@@ -400,23 +542,39 @@ def convert_date_time_if_required(val)
       # List of valid input parameters for conditional_formatting.
       def valid_parameter_for_conditional_formatting
         [
-         :type,
-         :format,
-         :criteria,
-         :value,
-         :minimum,
-         :maximum,
-         :stop_if_true,
-         :min_type,
-         :mid_type,
-         :max_type,
-         :min_value,
-         :mid_value,
-         :max_value,
-         :min_color,
-         :mid_color,
-         :max_color,
-         :bar_color
+          :type,
+          :format,
+          :criteria,
+          :value,
+          :minimum,
+          :maximum,
+          :stop_if_true,
+          :min_type,
+          :mid_type,
+          :max_type,
+          :min_value,
+          :mid_value,
+          :max_value,
+          :min_color,
+          :mid_color,
+          :max_color,
+          :bar_color,
+          :bar_negative_color,
+          :bar_negative_color_same,
+          :bar_solid,
+          :bar_border_color,
+          :bar_negative_border_color,
+          :bar_negative_border_color_same,
+          :bar_no_border,
+          :bar_direction,
+          :bar_axis_position,
+          :bar_axis_color,
+          :bar_only,
+          :icon_style,
+          :reverse_icons,
+          :icons_only,
+          :icons,
+          :data_bar_2010
         ]
       end
 
@@ -440,7 +598,8 @@ def valid_type_for_conditional_formatting
           '2_color_scale' => '2_color_scale',
           '3_color_scale' => '3_color_scale',
           'data_bar'      => 'dataBar',
-          'formula'       => 'expression'
+          'formula'       => 'expression',
+          'icon_set'      => 'iconSet'
         }
       end
 
@@ -479,6 +638,100 @@ def valid_criteria_type_for_conditional_formatting
         }
       end
 
+      # List of valid icon styles.
+      def icon_set_styles
+        {
+          "3_arrows"                => "3Arrows",            # 1
+          "3_flags"                 => "3Flags",             # 2
+          "3_traffic_lights_rimmed" => "3TrafficLights2",    # 3
+          "3_symbols_circled"       => "3Symbols",           # 4
+          "4_arrows"                => "4Arrows",            # 5
+          "4_red_to_black"          => "4RedToBlack",        # 6
+          "4_traffic_lights"        => "4TrafficLights",     # 7
+          "5_arrows_gray"           => "5ArrowsGray",        # 8
+          "5_quarters"              => "5Quarters",          # 9
+          "3_arrows_gray"           => "3ArrowsGray",        # 10
+          "3_traffic_lights"        => "3TrafficLights",     # 11
+          "3_signs"                 => "3Signs",             # 12
+          "3_symbols"               => "3Symbols2",          # 13
+          "4_arrows_gray"           => "4ArrowsGray",        # 14
+          "4_ratings"               => "4Rating",            # 15
+          "5_arrows"                => "5Arrows",            # 16
+          "5_ratings"               => "5Rating",            # 17
+        }
+      end
+
+      #
+      # Set the sub-properites for icons.
+      #
+      def set_icon_properties(total_icons, user_props)
+        props       = []
+
+        # Set the default icon properties.
+        total_icons.times do
+          props << {
+            :criteria => 0,
+            :value    => 0,
+            :type     => 'percent'
+          }
+        end
+
+        # Set the default icon values based on the number of icons.
+        if total_icons == 3
+          props[0][:value] = 67
+          props[1][:value] = 33
+        elsif total_icons == 4
+          props[0][:value] = 75
+          props[1][:value] = 50
+          props[2][:value] = 25
+        elsif total_icons == 5
+          props[0][:value] = 80
+          props[1][:value] = 60
+          props[2][:value] = 40
+          props[3][:value] = 20
+        end
+
+        # Overwrite default properties with user defined properties.
+        if user_props
+
+          # Ensure we don't set user properties for lowest icon.
+          max_data = user_props.size
+          max_data = total_icons -1 if max_data >= total_icons
+
+          (0..max_data - 1).each do |i|
+            # Set the user defined 'value' property.
+            if user_props[i][:value]
+              props[i][:value] = user_props[i][:value].to_s.sub(/^=/, '')
+            end
+
+            # Set the user defined 'type' property.
+            if user_props[i][:type]
+
+              type = user_props[i][:type]
+
+              if type != 'percent' && type != 'percentile' &&
+                 type != 'number'  && type != 'formula'
+                raise "Unknown icon property type '$props->{type}' for sub-" +
+                      "property 'type' in conditional_formatting()"
+              else
+                props[i][:type] = type
+
+                if props[i][:type] == 'number'
+                  props[i][:type] = 'num'
+                end
+              end
+            end
+
+            # Set the user defined 'criteria' property.
+            if user_props[i][:criteria] && user_props[i][:criteria] == '>'
+              props[i][:criteria] = 1
+            end
+
+          end
+        end
+        props
+      end
+
       def date_1904?
         @worksheet.date_1904?
       end
@@ -578,6 +831,9 @@ class DataBarFormat < ConditionalFormat
       def write_cf_rule
         @writer.tag_elements('cfRule', attributes) do
           write_data_bar
+          if ptrue?(@param[:is_data_bar_2010])
+            write_data_bar_ext(@param)
+          end
         end
       end
 
@@ -585,13 +841,42 @@ def write_cf_rule
       # Write the <dataBar> element.
       #
       def write_data_bar
-        @writer.tag_elements('dataBar') do
+        attributes = []
+
+        if ptrue?(bar_only)
+          attributes << ['showValue', 0]
+        end
+        @writer.tag_elements('dataBar',attributes) do
           write_cfvo(min_type, min_value)
           write_cfvo(max_type, max_value)
 
           write_color(@writer, 'rgb', bar_color)
         end
       end
+
+      #
+      # Write the <extLst> dataBar extension element.
+      #
+      def write_data_bar_ext(param)
+        # Create a pseudo GUID for each unique Excel 2010 data bar.
+        worksheet_count = @worksheet.index + 1
+        data_bar_count  = @worksheet.data_bars_2010.size + 1
+
+        guid = sprintf(
+          "{DA7ABA51-AAAA-BBBB-%04X-%012X}",
+          worksheet_count, data_bar_count
+        )
+
+        # Store the 2010 data bar parameters to write the extLst elements.
+        param[:guid] = guid
+        @worksheet.data_bars_2010 << param
+
+        @writer.tag_elements('extLst') do
+          @worksheet.write_ext('{B025F937-C7B1-47D3-B67F-A62EFF666E3E}') do
+            @writer.data_element('x14:id', guid)
+          end
+        end
+      end
     end
 
     class ExpressionFormat < ConditionalFormat
@@ -599,5 +884,33 @@ def write_cf_rule
         write_cf_rule_formula_tag(criteria)
       end
     end
+
+    class IconSetFormat < ConditionalFormat
+      def write_cf_rule
+        @writer.tag_elements('cfRule', attributes) do
+          write_icon_set
+        end
+      end
+
+      #
+      # Write the <iconSet> element.
+      #
+      def write_icon_set
+        attributes = []
+        # Don't set attribute for default style.
+        attributes = [ ['iconSet', icon_style] ] if icon_style != '3TrafficLights'
+        attributes << ['showValue', 0]           if icons_only
+        attributes << ['reverse', 1]             if reverse_icons
+
+        @writer.tag_elements('iconSet', attributes) do
+          # Write the properties for different icon styles.
+          if icons
+            icons.reverse.each do |icon|
+              write_cfvo(icon[:type], icon[:value], icon[:criteria])
+            end
+          end
+        end
+      end
+    end
   end
 end