workbook 0.8.1 → 0.9.0

data/lib/workbook/readers/ods_reader.rb

@@ -1,34 +1,36 @@
 # frozen_string_literal: true
 
-# -*- encoding : utf-8 -*-
-# frozen_string_literal: true
 module Workbook
   module Readers
     module OdsReader
       # reads self with and ods-type content.xml
       # @param [String,File] file_obj a file or file reference
       # @return [Workbook::Book] self
-      def load_ods file_obj, options={}
+      def load_ods file_obj, options = {}
         file_obj = file_obj.path if file_obj.is_a? File
         content = ""
         styles = ""
+
         Zip::File.open(file_obj) do |zipfile|
           zipfile.entries.each do |file|
             styles = zipfile.read(file.name) if file.name == "styles.xml"
             content = zipfile.read(file.name) if file.name == "content.xml"
           end
         end
+
         content = Nokogiri.XML(content)
         styles = Nokogiri.XML(styles)
+
         template.add_raw content
         parse_ods_style styles
         parse_ods content, options
-        return self
+
+        self
       end
 
       def set_format_property format, property, value
         value.strip!
-        format[property] = value if value and value != ""
+        format[property] = value if value && (value != "")
       end
 
       def parse_ods_style parse_ods_style
@@ -37,14 +39,14 @@ module Workbook
           if style_family == "table-cell"
             format = Workbook::Format.new
             format.name = style.xpath("@style:name").to_s
-            format.parent = self.template.formats[style.xpath("@style:parent-style-name").to_s]
+            format.parent = template.formats[style.xpath("@style:parent-style-name").to_s]
             set_format_property format, :border, style.xpath("style:table-cell-properties/@fo:border").to_s
-            set_format_property format, :vertical_align, style.xpath("style:table-cell-properties/@style:vertical-align").to_s.gsub("automatic","auto")
-            set_format_property format, :padding, style.xpath("style:table-cell-properties/@fo:padding").to_s.gsub("automatic","auto")
+            set_format_property format, :vertical_align, style.xpath("style:table-cell-properties/@style:vertical-align").to_s.gsub("automatic", "auto")
+            set_format_property format, :padding, style.xpath("style:table-cell-properties/@fo:padding").to_s.gsub("automatic", "auto")
             set_format_property format, :font, style.xpath("style:text-properties/style:font-name").to_s + " " + style.xpath("style:text-properties/fo:font-size").to_s + " " + style.xpath("style:text-properties/fo:font-weight").to_s
             set_format_property format, :color, style.xpath("style:text-properties/@fo:color").to_s
             set_format_property format, :background_color, style.xpath("style:table-cell-properties/@fo:background-color").to_s
-            self.template.add_format(format)
+            template.add_format(format)
           end
         end
       end
@@ -52,105 +54,104 @@ module Workbook
       # updates self with and ods-type content.xml
       # @param [Nokogiri::XML::Document] ods_spreadsheet nokogirified content.xml
       # @return [Workbook::Book] self
-      def parse_ods ods_spreadsheet=template.raws[Nokogiri::XML::Document], options={}
-        require 'cgi'
+      def parse_ods ods_spreadsheet = template.raws[Nokogiri::XML::Document], options = {}
+        require "cgi"
 
-        options = {:additional_type_parsing=>false}.merge options
-        # styles
-        #puts ods_spreadsheet
         parse_ods_style ods_spreadsheet
 
-        # data
-        ods_spreadsheet.xpath("//office:body/office:spreadsheet").each_with_index do |sheet,sheetindex|
-          workbook_sheet = self.create_or_open_sheet_at(sheetindex)
-          sheet.xpath("table:table").each_with_index do |table,tableindex|
-            parse_local_table(workbook_sheet,table,tableindex)
+        ods_spreadsheet.xpath("//office:body/office:spreadsheet").each_with_index do |sheet, sheetindex|
+          workbook_sheet = create_or_open_sheet_at(sheetindex)
+          sheet.xpath("table:table").each_with_index do |table, tableindex|
+            parse_local_table(workbook_sheet, table, tableindex)
           end
         end
-        return self
+        self
       end
 
-      #parse the contents of an entire table by parsing every row in it and adding it to the table
-      def parse_local_table(sheet,table,tableindex)
-        local_table = sheet.create_or_open_table_at(tableindex)
+      # parse the contents of an entire table by parsing every row in it and adding it to the table
+      def parse_local_table(sheet, table, tableindex)
+        local_table = sheet[tableindex]
         local_table.name = table.xpath("@table:name").to_s
-        #column_count = get_column_count(table)
+
         table.xpath("table:table-row").each do |row|
           local_table << parse_local_row(row)
         end
+
         local_table.trim!
       end
 
-      #set column count
+      # set column count
       def get_column_count(table)
         first_row = table.xpath("table:table-row").first
         cells = first_row.xpath("table:table-cell|table:covered-table-cell")
         column_count = 0
         cells.each do |cell|
-          if cell.xpath('@table:number-columns-spanned').children.size>0
-            column_count +=cell.xpath('@table:number-columns-spanned').children[0].inner_text.to_i
+          column_count += if cell.xpath("@table:number-columns-spanned").children.size > 0
+            cell.xpath("@table:number-columns-spanned").children[0].inner_text.to_i
           else
-            column_count +=1
+            1
           end
         end
         column_count
       end
 
-      #parse the contents of an entire row by parsing every cell in it and adding it to the row
+      # parse the contents of an entire row by parsing every cell in it and adding it to the row
       def parse_local_row(row)
         cells = row.xpath("table:table-cell|table:covered-table-cell")
         workbook_row = Workbook::Row.new
         cells.each do |cell|
           @cell = cell
-          repeat = get_repeat
-          workbook_cell = Workbook::Cell.new()
+          repeat = cell_repeat
+          workbook_cell = Workbook::Cell.new
           workbook_cell.value = @cell.nil? ? nil : parse_local_cell(workbook_cell)
           repeat.times do
             workbook_row << workbook_cell
           end
         end
-        return workbook_row
+        workbook_row
       end
 
-      def get_repeat
-        pre_set = @cell.xpath('@table:number-columns-repeated').to_s
-        return 1 if (pre_set.nil? || pre_set=="") # if not present, don't repeat.
-        return 1 unless "#{pre_set.to_i}"=="#{pre_set}" # return 1 if it's not a valid integer
+      def cell_repeat
+        pre_set = @cell.xpath("@table:number-columns-repeated").to_s
+        return 1 if pre_set.nil? || pre_set == "" # if not present, don't repeat.
+        return 1 unless pre_set.to_i.to_s == pre_set.to_s # return 1 if it's not a valid integer
         return 1 if pre_set.to_i < 1 # return 1, negative repeats make no sense
-        return pre_set.to_i
+        pre_set.to_i
       end
 
-      #parse the contents of a single cell
+      # parse the contents of a single cell
       def parse_local_cell(workbook_cell)
         return Workbook::NilValue.new(:covered) if @cell.name == "covered-table-cell"
-        set_cell_attributes(workbook_cell)
-        valuetype = @cell.xpath('@office:value-type').to_s
+        configure_cell_attributes(workbook_cell)
+        valuetype = @cell.xpath("@office:value-type").to_s
         parse_local_value(valuetype)
       end
 
       # Sets cell attributes for rowspan, colspan and format
-      def set_cell_attributes(workbook_cell)
-        workbook_cell.format = self.template.formats[@cell.xpath('@table:style-name').to_s]
-        workbook_cell.colspan= @cell.xpath('@table:number-columns-spanned').to_s
-        workbook_cell.rowspan= @cell.xpath('@table:number-rows-spanned').to_s
+      def configure_cell_attributes(workbook_cell)
+        workbook_cell.format = template.formats[@cell.xpath("@table:style-name").to_s]
+        workbook_cell.colspan = @cell.xpath("@table:number-columns-spanned").to_s
+        workbook_cell.rowspan = @cell.xpath("@table:number-rows-spanned").to_s
       end
 
       # Sets value in right context type
       def parse_local_value(valuetype)
         value = CGI.unescapeHTML(@cell.xpath("text:p//text()").to_s)
-        value = (value=="") ? nil : value
+        value = value == "" ? nil : value
+
         case valuetype
-        when 'integer'
+        when "integer"
           value = @cell.xpath("@office:value").to_s.to_i
-        when 'float'
+        when "float"
           value = @cell.xpath("@office:value").to_s.to_f
-          value = value.to_i unless @cell.xpath("@office:value").to_s.match(/\./) #sadly most integers are typed as floats...
-        when 'date'
+          value = value.to_i unless /\./.match?(@cell.xpath("@office:value").to_s) # sadly most integers are typed as floats...
+        when "date"
           value = DateTime.parse(@cell.xpath("@office:date-value").to_s)
+        when "currency"
+          value = @cell.xpath("@office:value").to_s.to_f
         end
         value
       end
-
     end
   end
 end

data/lib/workbook/readers/txt_reader.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
+
 module Workbook
   module Readers
     module TxtReader
-      def load_txt text, options={}
+      def load_txt text, options = {}
         csv = text
-        parse_txt csv, options
+        parse_txt(csv, options)
       end
 
-      def parse_txt csv_raw, options={}
-        csv = []
-        csv_raw.split("\n").each {|l| csv << CSV.parse_line(l,{:col_sep=>"\t"});nil}
-        self[0]=Workbook::Sheet.new(csv,self,{:parse_cells_on_batch_creation=>true, :cell_parse_options=>{:detect_date=>true}}) unless sheet.has_contents?
+      def parse_txt(csv_raw, options = {})
+        csv = csv_raw.split("\n").collect { |l| CSV.parse_line(l, col_sep: "\t") }
+        self[0] = Workbook::Sheet.new(csv, self, parse_cells_on_batch_creation: true, cell_parse_options: {detect_date: true}) unless sheet.has_contents?
       end
     end
   end

data/lib/workbook/readers/xls_reader.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
-require 'spreadsheet'
-require 'workbook/readers/xls_shared'
+
+require "spreadsheet"
+require "workbook/readers/xls_shared"
 
 module Workbook
   module Readers
@@ -11,20 +10,11 @@ module Workbook
       include Workbook::Readers::XlsShared
 
       def load_xls file_obj, options
-        begin
-          sp = Spreadsheet.open(file_obj, 'rb')
-          template.add_raw sp
-          parse_xls sp, options
-        rescue Ole::Storage::FormatError
-          begin
-            # Assuming it is a tab separated txt inside .xls
-            import(file_obj.path, 'txt')
-          rescue Exception => ef
-
-            raise ef
-          end
-        end
-
+        sp = Spreadsheet.open(file_obj, "rb")
+        template.add_raw sp
+        parse_xls sp, options
+      rescue Ole::Storage::FormatError
+        import(file_obj.path, "txt")
       end
 
       def parse_xls_cell xls_cell, xls_row, ci
@@ -33,9 +23,9 @@ module Workbook
           rv = Workbook::Cell.new xls_cell
           rv.parse!
         rescue ArgumentError => e
-          if e.message.match('not a Spreadsheet::Formula')
+          if e.message.match?("not a Spreadsheet::Formula")
             v = xls_cell.value
-            if v.class == Float and xls_row.format(ci).date?
+            if v.instance_of?(Float) && xls_row.format(ci).date?
               xls_row[ci] = v
               v = xls_row.datetime(ci)
             end
@@ -43,14 +33,12 @@ module Workbook
               v = "----!"
             end
             rv = Workbook::Cell.new v
-          elsif e.message.match('not a Spreadsheet::Link')
+          elsif e.message.match?("not a Spreadsheet::Link")
             rv = Workbook::Cell.new xls_cell.to_s
-          elsif e.message.match('not a Spreadsheet::Link')
-            rv = Workbook::Cell.new xls_cell.to_s
-          elsif e.message.match('not a Spreadsheet::Excel::Error')
+          elsif e.message.match?("not a Spreadsheet::Excel::Error")
             rv = "._."
           else
-            rv = "._."  # raise e (we're going to be silent for now)
+            rv = "._." # raise e (we're going to be silent for now)
           end
         end
         rv
@@ -64,8 +52,8 @@ module Workbook
           col_width = col_widths[ci]
         end
 
-        f = template.create_or_find_format_by "object_id_#{xls_format.object_id}",col_width
-        f[:width]= col_width
+        f = template.create_or_find_format_by "object_id_#{xls_format.object_id}", col_width
+        f[:width] = col_width
         f[:rotation] = xls_format.rotation if xls_format.rotation
         f[:background_color] = xls_color_to_html_hex(xls_format.pattern_fg_color)
         f[:number_format] = ms_formatting_to_strftime(xls_format.number_format)
@@ -81,15 +69,14 @@ module Workbook
       def parse_xls_row ri, s, xls_sheet
         xls_row = xls_sheet.row(ri)
         r = s.table.create_or_open_row_at(ri)
-        col_widths = xls_sheet.columns.collect{|c| c.width if c}
-        xls_row.each_with_index do |xls_cell,ci|
+        col_widths = xls_sheet.columns.collect { |c| c&.width }
+        xls_row.each_with_index do |xls_cell, ci|
           r[ci] = parse_xls_cell xls_cell, xls_row, ci
           r[ci].format = parse_xls_format xls_row, ci, ri, col_widths
         end
       end
 
-      def parse_xls xls_spreadsheet=template.raws[Spreadsheet::Excel::Workbook], options={}
-        options = {:additional_type_parsing=>true}.merge options
+      def parse_xls xls_spreadsheet = template.raws[Spreadsheet::Excel::Workbook], options = {}
         number_of_worksheets = xls_spreadsheet.worksheets.count
         number_of_worksheets.times do |si|
           xls_sheet = xls_spreadsheet.worksheets[si]
@@ -103,15 +90,16 @@ module Workbook
               end
             rescue TypeError
               puts "WARNING: Failed at worksheet (#{si})... ignored"
-              #ignore SpreadsheetGem can be buggy...
+              # ignore SpreadsheetGem can be buggy...
             end
           end
         end
       end
 
       private
+
       def xls_color_to_html_hex color_sym
-        Workbook::Book::XLS_COLORS[color_sym] ? Workbook::Book::XLS_COLORS[color_sym] : "#000000"
+        Workbook::Book::XLS_COLORS[color_sym] || "#000000"
       end
     end
   end

data/lib/workbook/readers/xls_shared.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
-
-# -*- encoding : utf-8 -*-
 # frozen_string_literal: true
-require 'date'
+
+require "date"
 
 module Workbook
   module Readers
     module XlsShared
-
       # Converts standard (ruby/C++/unix/...) strftime formatting to MS's formatting
       #
       # @param [String, nil] ms_nr_format (nil returns nil)
@@ -16,26 +14,26 @@ module Workbook
         ms_nr_format = num_fmt_id_to_ms_formatting(ms_nr_format) if ms_nr_format.is_a? Integer
         if ms_nr_format
           ms_nr_format = ms_nr_format.to_s.downcase
-          return nil if ms_nr_format == 'general' or ms_nr_format == ""
+          return nil if (ms_nr_format == "general") || (ms_nr_format == "")
           translation_table = {
-            'yyyy'=>'%Y',
-            'dddd'=>'%A',
-            'mmmm'=>'%B',
-            'ddd'=>'%a',
-            'mmm'=>'%b',
-            'yy'=>'%y',
-            'dd'=>'%d',
-            'mm'=>'%m',
-            'y'=>'%y',
-            '%%y'=>'%y',
-            'd'=>'%e',
-            '%%e'=>'%d',
-            'm'=>'%m',
-            '%%m'=>'%m',
-            ';@'=>'',
-            '\\'=>''
+            "yyyy" => "%Y",
+            "dddd" => "%A",
+            "mmmm" => "%B",
+            "ddd" => "%a",
+            "mmm" => "%b",
+            "yy" => "%y",
+            "dd" => "%d",
+            "mm" => "%m",
+            "y" => "%y",
+            "%%y" => "%y",
+            "d" => "%e",
+            "%%e" => "%d",
+            "m" => "%m",
+            "%%m" => "%m",
+            ";@" => "",
+            "\\" => ""
           }
-          translation_table.each{|k,v| ms_nr_format.gsub!(k,v) }
+          translation_table.each { |k, v| ms_nr_format.gsub!(k, v) }
           ms_nr_format
         end
       end
@@ -45,37 +43,30 @@ module Workbook
       # @return [String] number format (excel markup)
       def num_fmt_id_to_ms_formatting num_fmt_id
         # from: https://stackoverflow.com/questions/4730152/what-indicates-an-office-open-xml-cell-contains-a-date-time-value
-        {'0'=>nil, '1'=>'0', '2'=>'0.00', '3'=>'#,##0', '4'=>'#,##0.00',
-          '9'=>'0%', '10'=>'0.00%', '11'=>'0.00E+00', '12'=>'# ?/?',
-          '13'=>'# ??/??', '14'=>'mm-dd-yy', '15'=>'d-mmm-yy', '16'=>'d-mmm',
-          '17'=>'mmm-yy', '18'=>'h:mm AM/PM', '19'=>'h:mm:ss AM/PM',
-          '20'=>'h:mm', '21'=>'h:mm:ss', '22'=>'m/d/yy h:mm',
-          '37'=>'#,##0 ;(#,##0)', '38'=>'#,##0 ;[Red](#,##0)',
-          '39'=>'#,##0.00;(#,##0.00)', '40'=>'#,##0.00;[Red](#,##0.00)',
-          '44'=>'_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)',
-          '45'=>'mm:ss', '46'=>'[h]:mm:ss', '47'=>'mmss.0', '48'=>'##0.0E+0',
-          '49'=>'@', '27'=>'[$-404]e/m/d', '30'=>'m/d/yy', '36'=>'[$-404]e/m/d',
-          '50'=>'[$-404]e/m/d', '57'=>'[$-404]e/m/d', '59'=>'t0', '60'=>'t0.00',
-          '61'=>'t#,##0', '62'=>'t#,##0.00', '67'=>'t0%', '68'=>'t0.00%',
-          '69'=>'t# ?/?', '70' => 't# ??/??'}[num_fmt_id.to_s]
+        {"0" => nil, "1" => "0", "2" => "0.00", "3" => "#,##0", "4" => "#,##0.00",
+         "9" => "0%", "10" => "0.00%", "11" => "0.00E+00", "12" => "# ?/?",
+         "13" => "# ??/??", "14" => "mm-dd-yy", "15" => "d-mmm-yy", "16" => "d-mmm",
+         "17" => "mmm-yy", "18" => "h:mm AM/PM", "19" => "h:mm:ss AM/PM",
+         "20" => "h:mm", "21" => "h:mm:ss", "22" => "m/d/yy h:mm",
+         "37" => "#,##0 ;(#,##0)", "38" => "#,##0 ;[Red](#,##0)",
+         "39" => "#,##0.00;(#,##0.00)", "40" => "#,##0.00;[Red](#,##0.00)",
+         "44" => '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)',
+         "45" => "mm:ss", "46" => "[h]:mm:ss", "47" => "mmss.0", "48" => "##0.0E+0",
+         "49" => "@", "27" => "[$-404]e/m/d", "30" => "m/d/yy", "36" => "[$-404]e/m/d",
+         "50" => "[$-404]e/m/d", "57" => "[$-404]e/m/d", "59" => "t0", "60" => "t0.00",
+         "61" => "t#,##0", "62" => "t#,##0.00", "67" => "t0%", "68" => "t0.00%",
+         "69" => "t# ?/?", "70" => "t# ??/??"}[num_fmt_id.to_s]
       end
 
-
-
-
-
-
-
-
       # Attempt to convert html-hex color value to xls color number
       #
       # @param [String] hex color
       # @return [String] xls color
       def html_color_to_xls_color hex
-        Workbook::Readers::XlsShared::XLS_COLORS.each do |k,v|
-          return k if (v == hex or (hex and hex != "" and k == hex.to_sym))
+        Workbook::Readers::XlsShared::XLS_COLORS.each do |k, v|
+          return k if (v == hex) || (hex && (hex != "") && (k == hex.to_sym))
         end
-        return nil
+        nil
       end
 
       # Converts standard (ruby/C++/unix/...) strftime formatting to MS's formatting
@@ -84,86 +75,84 @@ module Workbook
       # @return [String, nil]
       def strftime_to_ms_format numberformat
         return nil if numberformat.nil?
-        return numberformat.gsub('%Y','yyyy').gsub('%A','dddd').gsub('%B','mmmm').gsub('%a','ddd').gsub('%b','mmm').gsub('%y','yy').gsub('%d','dd').gsub('%m','mm').gsub('%y','y').gsub('%y','%%y').gsub('%e','d')
+        numberformat.gsub("%Y", "yyyy").gsub("%A", "dddd").gsub("%B", "mmmm").gsub("%a", "ddd").gsub("%b", "mmm").gsub("%y", "yy").gsub("%d", "dd").gsub("%m", "mm").gsub("%y", "y").gsub("%y", "%%y").gsub("%e", "d")
       end
 
-      def xls_number_to_time number, base_date = DateTime.new(1899,12,30)
+      def xls_number_to_time number, base_date = DateTime.new(1899, 12, 30)
         base_date + number.to_f
       end
 
-      def xls_number_to_date number, base_date = Date.new(1899,12,30)
+      def xls_number_to_date number, base_date = Date.new(1899, 12, 30)
         base_date + number.to_i
       end
 
-      XLS_COLORS = {:xls_color_1=>'#000000',
-        :xls_color_2=>'#FFFFFF',
-        :xls_color_3=>'#FF0000',
-        :xls_color_4=>'#00FF00',
-        :xls_color_5=>'#0000FF',
-        :xls_color_6=>'#FFFF00',
-        :xls_color_7=>'#FF00FF',
-        :xls_color_8=>'#00FFFF',
-        :xls_color_9=>'#800000',
-        :xls_color_10=>'#008000',
-        :xls_color_11=>'#000080',
-        :xls_color_12=>'#808000',
-        :xls_color_13=>'#800080',
-        :xls_color_14=>'#008080',
-        :xls_color_15=>'#C0C0C0',
-        :xls_color_16=>'#808080',
-        :xls_color_17=>'#9999FF',
-        :xls_color_18=>'#993366',
-        :xls_color_19=>'#FFFFCC',
-        :xls_color_20=>'#CCFFFF',
-        :xls_color_21=>'#660066',
-        :xls_color_22=>'#FF8080',
-        :xls_color_23=>'#0066CC',
-        :xls_color_24=>'#CCCCFF',
-        :xls_color_25=>'#000080',
-        :xls_color_26=>'#FF00FF',
-        :xls_color_27=>'#FFFF00',
-        :xls_color_28=>'#00FFFF',
-        :xls_color_29=>'#800080',
-        :xls_color_30=>'#800000',
-        :xls_color_31=>'#008080',
-        :xls_color_32=>'#0000FF',
-        :xls_color_33=>'#00CCFF',
-        :xls_color_34=>'#CCFFFF',
-        :xls_color_35=>'#CCFFCC',
-        :xls_color_36=>'#FFFF99',
-        :xls_color_37=>'#99CCFF',
-        :xls_color_38=>'#FF99CC',
-        :xls_color_39=>'#CC99FF',
-        :xls_color_40=>'#FFCC99',
-        :xls_color_41=>'#3366FF',
-        :xls_color_42=>'#33CCCC',
-        :xls_color_43=>'#99CC00',
-        :xls_color_44=>'#FFCC00',
-        :xls_color_45=>'#FF9900',
-        :xls_color_46=>'#FF6600',
-        :xls_color_47=>'#666699',
-        :xls_color_48=>'#969696',
-        :xls_color_49=>'#003366',
-        :xls_color_50=>'#339966',
-        :xls_color_51=>'#003300',
-        :xls_color_52=>'#333300',
-        :xls_color_53=>'#993300',
-        :xls_color_54=>'#993366',
-        :xls_color_55=>'#333399',
-        :xls_color_56=>'#333333',
-        :black=>'#000000',
-        :white=>'#FFFFFF',
-        :red=>'#FF0000',
-        :green=>'#00FF00',
-        :blue=>'#0000FF',
-        :yellow=>'#FFFF00',
-        :magenta=>'#FF00FF',
-        :cyan=>'#00FFFF',
-        :border=>'#FFFFFF',
-        :text=>'#000000',
-        :lime=>'#00f94c'
-      }
+      XLS_COLORS = {xls_color_1: "#000000",
+                    xls_color_2: "#FFFFFF",
+                    xls_color_3: "#FF0000",
+                    xls_color_4: "#00FF00",
+                    xls_color_5: "#0000FF",
+                    xls_color_6: "#FFFF00",
+                    xls_color_7: "#FF00FF",
+                    xls_color_8: "#00FFFF",
+                    xls_color_9: "#800000",
+                    xls_color_10: "#008000",
+                    xls_color_11: "#000080",
+                    xls_color_12: "#808000",
+                    xls_color_13: "#800080",
+                    xls_color_14: "#008080",
+                    xls_color_15: "#C0C0C0",
+                    xls_color_16: "#808080",
+                    xls_color_17: "#9999FF",
+                    xls_color_18: "#993366",
+                    xls_color_19: "#FFFFCC",
+                    xls_color_20: "#CCFFFF",
+                    xls_color_21: "#660066",
+                    xls_color_22: "#FF8080",
+                    xls_color_23: "#0066CC",
+                    xls_color_24: "#CCCCFF",
+                    xls_color_25: "#000080",
+                    xls_color_26: "#FF00FF",
+                    xls_color_27: "#FFFF00",
+                    xls_color_28: "#00FFFF",
+                    xls_color_29: "#800080",
+                    xls_color_30: "#800000",
+                    xls_color_31: "#008080",
+                    xls_color_32: "#0000FF",
+                    xls_color_33: "#00CCFF",
+                    xls_color_34: "#CCFFFF",
+                    xls_color_35: "#CCFFCC",
+                    xls_color_36: "#FFFF99",
+                    xls_color_37: "#99CCFF",
+                    xls_color_38: "#FF99CC",
+                    xls_color_39: "#CC99FF",
+                    xls_color_40: "#FFCC99",
+                    xls_color_41: "#3366FF",
+                    xls_color_42: "#33CCCC",
+                    xls_color_43: "#99CC00",
+                    xls_color_44: "#FFCC00",
+                    xls_color_45: "#FF9900",
+                    xls_color_46: "#FF6600",
+                    xls_color_47: "#666699",
+                    xls_color_48: "#969696",
+                    xls_color_49: "#003366",
+                    xls_color_50: "#339966",
+                    xls_color_51: "#003300",
+                    xls_color_52: "#333300",
+                    xls_color_53: "#993300",
+                    xls_color_54: "#993366",
+                    xls_color_55: "#333399",
+                    xls_color_56: "#333333",
+                    black: "#000000",
+                    white: "#FFFFFF",
+                    red: "#FF0000",
+                    green: "#00FF00",
+                    blue: "#0000FF",
+                    yellow: "#FFFF00",
+                    magenta: "#FF00FF",
+                    cyan: "#00FFFF",
+                    border: "#FFFFFF",
+                    text: "#000000",
+                    lime: "#00f94c"}
     end
   end
 end
-