write_xlsx 1.09.3 → 1.11.2

data/lib/write_xlsx/package/table.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
@@ -11,17 +12,18 @@ module Writexlsx
       class ColumnData
         attr_reader :id
         attr_accessor :name, :format, :formula, :name_format
-        attr_accessor :total_string, :total_function
+        attr_accessor :total_string, :total_function, :custom_total
 
         def initialize(id, param = {})
           @id             = id
           @name           = "Column#{id}"
           @total_string   = ''
           @total_function = ''
+          @custom_total   = ''
           @formula        = ''
           @format         = nil
           @name_format    = nil
-          @user_data      = param[id-1] if param
+          @user_data      = param[id - 1] if param
         end
       end
 
@@ -39,8 +41,8 @@ module Writexlsx
         # Set the data range rows (without the header and footer).
         @first_data_row = @row1
         @first_data_row += 1 if ptrue?(@param[:header_row])
-        @last_data_row  = @row2
-        @last_data_row  -= 1 if @param[:total_row]
+        @last_data_row = @row2
+        @last_data_row -= 1 if @param[:total_row]
 
         set_the_table_options
         set_the_table_style
@@ -50,6 +52,8 @@ module Writexlsx
 
         add_the_table_columns
         write_the_cell_data_if_supplied
+        write_any_columns_formulas_after_the_user_supplied_table_data
+        store_filter_cell_positions
       end
 
       def set_xml_writer(filename)
@@ -76,7 +80,7 @@ module Writexlsx
           # Set up the default column data.
           col_data = Package::Table::ColumnData.new(col_id + 1, @param[:columns])
 
-          overrite_the_defaults_with_any_use_defined_values(col_id, col_data, col_num)
+          overwrite_the_defaults_with_any_use_defined_values(col_id, col_data, col_num)
 
           # Store the column data.
           @columns << col_data
@@ -87,49 +91,44 @@ module Writexlsx
         end    # Table columns.
       end
 
-      def overrite_the_defaults_with_any_use_defined_values(col_id, col_data, col_num)
-        if @param[:columns]
-          # Check if there are user defined values for this column.
-          if user_data = @param[:columns][col_id]
-            # Map user defined values to internal values.
-            if user_data[:header] && !user_data[:header].empty?
-              col_data.name = user_data[:header]
-            end
+      def overwrite_the_defaults_with_any_use_defined_values(col_id, col_data, col_num)
+        # Check if there are user defined values for this column.
+        if @param[:columns] && (user_data = @param[:columns][col_id])
+          # Map user defined values to internal values.
+          col_data.name = user_data[:header] if user_data[:header] && !user_data[:header].empty?
+
+          # Excel requires unique case insensitive header names.
+          if @seen_name[col_data.name.downcase]
+            raise "add_table() contains duplicate name: '#{col_data.name}'"
+          else
+            @seen_name[col_data.name.downcase] = true
+          end
 
-            # Excel requires unique case insensitive header names.
-            if @seen_name[col_data.name.downcase]
-              raise "add_table() contains duplicate name: '#{col_data.name}'"
-            else
-              @seen_name[col_data.name.downcase] = true
-            end
-            # Get the header format if defined.
-            col_data.name_format = user_data[:header_format]
+          # Get the header format if defined.
+          col_data.name_format = user_data[:header_format]
 
-            # Handle the column formula.
-            handle_the_column_formula(
-              col_data, col_num, user_data[:formula], user_data[:format]
-            )
+          # Handle the column formula.
+          handle_the_column_formula(
+            col_data, col_num, user_data[:formula], user_data[:format]
+          )
 
-            # Handle the function for the total row.
-            if user_data[:total_function]
-              handle_the_function_for_the_table_row(
-                @row2, col_data, col_num, user_data
-              )
-            elsif user_data[:total_string]
-              total_label_only(
-                @row2, col_num, col_data, user_data[:total_string], user_data[:format]
-              )
-            end
+          # Handle the function for the total row.
+          if user_data[:total_function]
+            handle_the_function_for_the_table_row(
+              @row2, col_data, col_num, user_data
+            )
+          elsif user_data[:total_string]
+            total_label_only(
+              @row2, col_num, col_data, user_data[:total_string], user_data[:format]
+            )
+          end
 
-            # Get the dxf format index.
-            if user_data[:format]
-              col_data.format = user_data[:format].get_dxf_index
-            end
+          # Get the dxf format index.
+          col_data.format = user_data[:format].get_dxf_index if user_data[:format]
 
-            # Store the column format for writing the cell data.
-            # It doesn't matter if it is undefined.
-            @col_formats[col_id] = user_data[:format]
-          end
+          # Store the column format for writing the cell data.
+          # It doesn't matter if it is undefined.
+          @col_formats[col_id] = user_data[:format]
         end
       end
 
@@ -159,6 +158,31 @@ module Writexlsx
         end
       end
 
+      def write_any_columns_formulas_after_the_user_supplied_table_data
+        col_id = 0
+
+        (@col1..@col2).each do |col|
+          column_data = @columns[col_id]
+          if ptrue?(column_data) && ptrue?(column_data.formula)
+            formula_format = @col_formats[col_id]
+            formula        = column_data.formula
+
+            (@first_data_row..@last_data_row).each do |row|
+              @worksheet.write_formula(row, col, formula, formula_format)
+            end
+          end
+          col_id += 1
+        end
+      end
+
+      def store_filter_cell_positions
+        if ptrue?(@param[:autofilter])
+          (@col1..@col2).each do |col|
+            @worksheet.filter_cells["#{@row1}:#{col}"] = 1
+          end
+        end
+      end
+
       def prepare(id)
         @id = id
         @name ||= "Table#{id}"
@@ -166,81 +190,108 @@ module Writexlsx
 
       private
 
-      def handle_args(*args)
+      def handle_args(row1, col1 = nil, row2 = nil, col2 = nil, param = nil)
         # Check for a cell reference in A1 notation and substitute row and column
-        row1, col1, row2, col2, param = row_col_notation(args)
+        if (row_col_array = row_col_notation(row1))
+          _row1, _col1, _row2, _col2 = row_col_array
+          _param = col1
+        else
+          _row1 = row1
+          _col1 = col1
+          _row2 = row2
+          _col2 = col2
+          _param = param
+        end
 
         # Check for a valid number of args.
-        raise "Not enough parameters to add_table()" if [row1, col1, row2, col2].include?(nil)
+        raise "Not enough parameters to add_table()" if [_row1, _col1, _row2, _col2].include?(nil)
 
         # Check that row and col are valid without storing the values.
-        check_dimensions_and_update_max_min_values(row1, col1, 1, 1)
-        check_dimensions_and_update_max_min_values(row2, col2, 1, 1)
+        check_dimensions_and_update_max_min_values(_row1, _col1, 1, 1)
+        check_dimensions_and_update_max_min_values(_row2, _col2, 1, 1)
 
         # Swap last row/col for first row/col as necessary.
-        row1, row2 = row2, row1 if row1 > row2
-        col1, col2 = col2, col1 if col1 > col2
+        _row1, _row2 = _row2, _row1 if _row1 > _row2
+        _col1, _col2 = _col2, _col1 if _col1 > _col2
 
         # The final hash contains the validation parameters.
-        param ||= {}
+        _param ||= {}
 
         # Turn on Excel's defaults.
-        param[:banded_rows] ||= 1
-        param[:header_row]  ||= 1
-        param[:autofilter]  ||= 1
+        _param[:banded_rows] ||= 1
+        _param[:header_row]  ||= 1
+        _param[:autofilter]  ||= 1
 
         # Check that there are enough rows.
-        num_rows = row2 - row1
-        num_rows -= 1 if ptrue?(param[:header_row])
+        num_rows = _row2 - _row1
+        num_rows -= 1 if ptrue?(_param[:header_row])
 
-        if num_rows < 0
-          raise "Must have at least one data row in in add_table()"
-        end
+        raise "Must have at least one data row in in add_table()" if num_rows < 0
 
         # If the header row if off the default is to turn autofilter off.
-        param[:autofilter] = 0 if param[:header_row] == 0
+        _param[:autofilter] = 0 if _param[:header_row] == 0
 
-        check_parameter(param, valid_table_parameter, 'add_table')
+        check_parameter(_param, valid_table_parameter, 'add_table')
 
-        [row1, row2, col1, col2, param]
+        [_row1, _row2, _col1, _col2, _param]
       end
 
       # List of valid input parameters.
       def valid_table_parameter
-        [
-          :autofilter,
-          :banded_columns,
-          :banded_rows,
-          :columns,
-          :data,
-          :first_column,
-          :header_row,
-          :last_column,
-          :name,
-          :style,
-          :total_row
+        %i[
+          autofilter
+          banded_columns
+          banded_rows
+          columns
+          data
+          first_column
+          header_row
+          last_column
+          name
+          style
+          total_row
         ]
       end
 
-      def handle_the_column_formula(col_data, col_num, formula, format)
+      def handle_the_column_formula(col_data, _col_num, formula, _format)
         return unless formula
 
-        col_data.formula = formula.sub(/^=/, '').gsub(/@/,'[#This Row],')
+        formula = formula.sub(/^=/, '').gsub(/@/, '[#This Row],')
 
-        (@first_data_row..@last_data_row).each do |row|
-          @worksheet.write_formula(row, col_num, col_data.formula, format)
-        end
+        # Escape any future functions.
+        col_data.formula = @worksheet.prepare_formula(formula, 1)
+
+        # (@first_data_row..@last_data_row).each do |row|
+        #   @worksheet.write_formula(row, col_num, col_data.formula, format)
+        # end
       end
 
       def handle_the_function_for_the_table_row(row2, col_data, col_num, user_data)
-        function = user_data[:total_function].downcase.gsub(/[_\s]/, '')
+        formula = ''
+        function = user_data[:total_function]
+        function = 'countNums' if function == 'count_nums'
+        function = 'stdDev'    if function == 'std_dev'
 
-        function = 'countNums' if function == 'countnums'
-        function = 'stdDev'    if function == 'stddev'
+        subtotals = {
+          average:   101,
+          countNums: 102,
+          count:     103,
+          max:       104,
+          min:       105,
+          stdDev:    106,
+          sum:       109,
+          var:       110
+        }
 
-        col_data.total_function = function
+        if subtotals[function.to_sym]
+          formula = table_function_to_formula(function, col_data.name)
+        else
+          formula = @worksheet.prepare_formula(function, 1)
+          col_data.custom_total = formula
+          function = 'custom'
+        end
 
-        formula = table_function_to_formula(function, col_data.name)
+        col_data.total_function = function
         @worksheet.write_formula(row2, col_num, formula, user_data[:format], user_data[:total_value])
       end
 
@@ -248,25 +299,26 @@ module Writexlsx
       # Convert a table total function to a worksheet formula.
       #
       def table_function_to_formula(function, col_name)
-        col_name = col_name.gsub(/'/, "''").
-                     gsub(/#/, "'#").
-                     gsub(/\[/, "'[").
-                     gsub(/\]/, "']")
+        col_name = col_name.gsub("'", "''")
+                           .gsub("#", "'#")
+                           .gsub("[", "'[")
+                           .gsub("]", "']")
 
         subtotals = {
-          :average   => 101,
-          :countNums => 102,
-          :count     => 103,
-          :max       => 104,
-          :min       => 105,
-          :stdDev    => 107,
-          :sum       => 109,
-          :var       => 110
+          average:   101,
+          countNums: 102,
+          count:     103,
+          max:       104,
+          min:       105,
+          stdDev:    107,
+          sum:       109,
+          var:       110
         }
 
-        unless func_num = subtotals[function.to_sym]
+        unless (func_num = subtotals[function.to_sym])
           raise "Unsupported function '#{function}' in add_table()"
         end
+
         "SUBTOTAL(#{func_num},[#{col_name}])"
       end
 
@@ -287,11 +339,11 @@ module Writexlsx
       end
 
       def set_the_table_style
-        if @param[:style]
-          @style = @param[:style].gsub(/\s/, '')
-        else
-          @style = "TableStyleMedium9"
-        end
+        @style = if @param[:style]
+                   @param[:style].gsub(/\s/, '')
+                 else
+                   "TableStyleMedium9"
+                 end
       end
 
       def set_the_table_name
@@ -299,19 +351,13 @@ module Writexlsx
           name = @param[:name]
 
           # Raise if the name contains invalid chars as defined by Excel help.
-          if name !~ /^[\w\\][\w\\.]*$/ || name =~ /^\d/
-            raise "Invalid character in name '#{name} used in add_table()"
-          end
+          raise "Invalid character in name '#{name} used in add_table()" if name !~ /^[\w\\][\w\\.]*$/ || name =~ /^\d/
 
           # Raise if the name looks like a cell name.
-          if name =~ /^[a-zA-Z][a-zA-Z]?[a-dA-D]?[0-9]+$/
-            ralse "Invalid name '#{name}' looks like a cell name in add_table()"
-          end
+          ralse "Invalid name '#{name}' looks like a cell name in add_table()" if name =~ /^[a-zA-Z][a-zA-Z]?[a-dA-D]?[0-9]+$/
 
           # Raise if the name looks like a R1C1.
-          if name =~ /^[rcRC]$/ || name =~ /^[rcRC]\d+[rcRC]\d+$/
-            raise "Invalid name '#{name}' like a RC cell ref in add_table()"
-          end
+          raise "Invalid name '#{name}' like a RC cell ref in add_table()" if name =~ /^[rcRC]$/ || name =~ /^[rcRC]\d+[rcRC]\d+$/
 
           @name = @param[:name]
         end
@@ -338,15 +384,13 @@ module Writexlsx
           ['ref',         @range]
         ]
 
-        unless ptrue?(@header_row_count)
-          attributes << ['headerRowCount', 0]
-        end
+        attributes << ['headerRowCount', 0] unless ptrue?(@header_row_count)
 
-        if ptrue?(@totals_row_shown)
-          attributes << ['totalsRowCount', 1]
-        else
-          attributes << ['totalsRowShown', 0]
-        end
+        attributes << if ptrue?(@totals_row_shown)
+                        ['totalsRowCount', 1]
+                      else
+                        ['totalsRowShown', 0]
+                      end
       end
 
       #
@@ -355,7 +399,7 @@ module Writexlsx
       def write_auto_filter
         return unless ptrue?(@autofilter)
 
-        attributes = [ ['ref', @autofilter] ]
+        attributes = [['ref', @autofilter]]
 
         @writer.empty_tag('autoFilter', attributes)
       end
@@ -366,10 +410,10 @@ module Writexlsx
       def write_table_columns
         count = @columns.size
 
-        attributes = [ ['count', count] ]
+        attributes = [['count', count]]
 
         @writer.tag_elements('tableColumns', attributes) do
-          @columns.each {|col_data| write_table_column(col_data)}
+          @columns.each { |col_data| write_table_column(col_data) }
         end
       end
 
@@ -388,14 +432,18 @@ module Writexlsx
           attributes << [:totalsRowFunction, col_data.total_function]
         end
 
-        if col_data.format
-          attributes << [:dataDxfId, col_data.format]
-        end
+        attributes << [:dataDxfId, col_data.format] if col_data.format
 
-        if ptrue?(col_data.formula)
+        if ptrue?(col_data.formula) || ptrue?(col_data.custom_total)
           @writer.tag_elements('tableColumn', attributes) do
-            # Write the calculatedColumnFormula element.
-            write_calculated_column_formula(col_data.formula)
+            if ptrue?(col_data.formula)
+              # Write the calculatedColumnFormula element.
+              write_calculated_column_formula(col_data.formula)
+            end
+            if ptrue?(col_data.custom_total)
+              # Write the totalsRowFormula element.
+              write_totals_row_formula(col_data.custom_total)
+            end
           end
         else
           @writer.empty_tag('tableColumn', attributes)
@@ -407,9 +455,7 @@ module Writexlsx
       #
       def write_table_style_info
         attributes = []
-        if @style && @style != '' && @style != 'None'
-          attributes << ['name', @style]
-        end
+        attributes << ['name', @style] if @style && @style != '' && @style != 'None'
         attributes << ['showFirstColumn',   @show_first_col]
         attributes << ['showLastColumn',    @show_last_col]
         attributes << ['showRowStripes',    @show_row_stripes]
@@ -424,6 +470,15 @@ module Writexlsx
       def write_calculated_column_formula(formula)
         @writer.data_element('calculatedColumnFormula', formula)
       end
+
+      #
+      # _write_totals_row_formula()
+      #
+      # Write the <totalsRowFormula> element.
+      #
+      def write_totals_row_formula(formula)
+        @writer.data_element('totalsRowFormula', formula)
+      end
     end
   end
 end

data/lib/write_xlsx/package/theme.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
@@ -6,7 +7,6 @@ require 'write_xlsx/utility'
 module Writexlsx
   module Package
     class Theme
-
       include Writexlsx::Utility
 
       def initialize
@@ -15,6 +15,7 @@ module Writexlsx
 
       def assemble_xml_file
         return unless @writer
+
         write_theme_file
         @writer.write("\n")
         @writer.close
@@ -36,8 +37,8 @@ module Writexlsx
       #
       def write_theme_file
         theme  =
-          %Q{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>}
+          %(<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>)
         @writer.write(theme)
       end
     end