write_xlsx 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e9354b51872770af7121d5581615b53c0cb3b7e86c221b0ecee60fe54dae4b
-  data.tar.gz: 97d6ae9ed6dee9e57e98981e105da155ef405fd5ea40ea17e8057871f02d90d9
+  metadata.gz: 14a7593970ecc4db14f2accbdc1634033ac9042cdd7680a20d4400ea1eda741f
+  data.tar.gz: 2ec671ba25dc571f612dc5b9d4a9c4ede2e147203d2e085313ea8b4a5f774377
 SHA512:
-  metadata.gz: a86f539563acd7da100be9fb11e1e3da99c1985200e21eaa91ca9db3f69ea130038f0ecead40ea0ba6efcc5b4f433dcd4acf039006faa65adb60ed88d0d5f005
-  data.tar.gz: f98a3ac1110600e8e2c578127f85a804c1237d44069481f6c0baacc27ff6f21eddbb96f063c544239730ba059a16f7637f39ebfd902f3cc87be4995401bf303b
+  metadata.gz: 255b8f5d60623d6c9966ba1209773129d3312238df315a16564d8c950fa39ac738296a9c788d4cb707abad7e659e9eaef528749fa7f1de7f93a2152e0534fbb4
+  data.tar.gz: c161bd9e8cfe47754f763a874ab83b183f76d7d290ecc53db1fa7a1ea1ec4433ee1d80efda0c139417321f02069db690fc113ab54104b5922b9c942210949e60

data/.rubocop.yml

@@ -8,6 +8,9 @@ AllCops:
   TargetRubyVersion: 2.6
   NewCops: enable
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
@@ -33,11 +36,17 @@ Layout/HeredocIndentation:
 Layout/LineLength:
   Max: 7000
 
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+
 Lint/DuplicateBranch:
   IgnoreLiteralBranches: true
   Exclude:
     - 'lib/write_xlsx/worksheet.rb'
 
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
 Lint/UselessSetterCall:
   Exclude:
     - 'lib/write_xlsx/worksheet.rb'
@@ -57,6 +66,9 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 400
 
+Metrics/ModuleLength:
+  Max: 1000
+
 Metrics/ParameterLists:
   Max: 12
   MaxOptionalParameters: 6
@@ -93,6 +105,9 @@ Style/HashSyntax:
   EnforceStyle: ruby19_no_mixed_keys
   EnforcedShorthandSyntax: either
 
+Style/IfUnlessModifier:
+  Enabled: false
+
 Style/NumericLiterals:
   MinDigits: 10
 

data/Changes

@@ -1,5 +1,26 @@
 Change history of write_xlsx rubygem.
 
+2023-05-06 v1.11.0
+    Added support for simulated worksheet `autofit()`.
+
+    Refactored internal column property handling to allow column ranges
+    to be overridden (a common UX expectation).
+
+    Add `quote_prefix` format property.
+
+    Fix for duplicate number formats. Issue #283(excel-write-xlsx)
+
+    Add fix for worksheets with tables and background images.
+
+    Replace/fix the worksheet protection password algorithm
+    so that is works correctly for strings over 24 chars.
+
+2023-02-16 v1.10.2
+    Fixed issue #104. Worksheet#write Ruby 3.2 removed Object#=~
+    making it impossible to write Date objects
+
+    Memory usage optimization.
+
 2023-01-31 v1.10.1
     Fixed PR #99. Remove range [1..] style to work on Ruby 2.5.
 

data/README.md

@@ -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-2022 Hideo NAKAMURA.
+Copyright (c) 2012-2023 Hideo NAKAMURA.
 
 See LICENSE.txt for further details.
 

data/examples/autofit.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+#
+# An example of using simulated autofit to automatically adjust the width of
+# worksheet columns based on the data in the cells.
+#
+# Copyright 2000-2023, John McNamara, jmcnamara@cpan.org
+#
+# SPDX-License-Identifier: Artistic-1.0-Perl OR GPL-1.0-or-later
+#
+# convert to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
+#
+require 'write_xlsx'
+
+workbook   = WriteXLSX.new('autofit.xlsx')
+worksheet  = workbook.add_worksheet
+
+# Write some worksheet data to demonstrate autofitting.
+worksheet.write(0, 0, "Foo")
+worksheet.write(1, 0, "Food")
+worksheet.write(2, 0, "Foody")
+worksheet.write(3, 0, "Froody")
+
+worksheet.write(0, 1, 12345)
+worksheet.write(1, 1, 12345678)
+worksheet.write(2, 1, 12345)
+
+worksheet.write(0, 2, "Some longer text")
+
+worksheet.write(0, 3, 'http://www.google.com')
+worksheet.write(1, 3, 'https://github.com')
+
+# Autofit the worksheet
+worksheet.autofit
+
+workbook.close

data/examples/chart_radar.rb

@@ -44,10 +44,8 @@ chart1.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart1.set_title(name: 'Results of sample analysis')
-chart1.set_x_axis(name: 'Test number')
-chart1.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart1.set_style(11)
@@ -81,10 +79,8 @@ chart2.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart2.set_title(name: 'Stacked Chart')
-chart2.set_x_axis(name: 'Test number')
-chart2.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart2.set_style(12)
@@ -118,10 +114,8 @@ chart3.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart3.set_title(name: 'Percent Stacked Chart')
-chart3.set_x_axis(name: 'Test number')
-chart3.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart3.set_style(13)

data/lib/write_xlsx/chart.rb

@@ -371,7 +371,7 @@ module Writexlsx
     # Set on of the 42 built-in Excel chart styles. The default style is 2.
     #
     def set_style(style_id = 2)
-      style_id = 2 if style_id < 0 || style_id > 48
+      style_id = 2 if style_id < 1 || style_id > 48
       @style_id = style_id
     end
 

data/lib/write_xlsx/format.rb

@@ -12,7 +12,7 @@ module Writexlsx
     attr_reader :diag_type, :diag_color, :font_only, :color_indexed                        # :nodoc:
     attr_reader :left, :left_color, :right, :right_color, :top, :top_color, :bottom, :bottom_color # :nodoc:
     attr_reader :font_scheme                                                                       # :nodoc:
-    attr_accessor :num_format_index, :border_index, :font_index                                    # :nodoc:
+    attr_accessor :quote_prefix, :num_format_index, :border_index, :font_index                                    # :nodoc:
     attr_accessor :fill_index, :font_condense, :font_extend, :diag_border                          # :nodoc:
     attr_accessor :bg_color, :fg_color, :pattern                                                   # :nodoc:
 
@@ -84,6 +84,7 @@ module Writexlsx
       @just_distrib   = 0
       @color_indexed  = 0
       @font_only      = 0
+      @quote_prefix   = 0
 
       set_format_properties(params) unless params.empty?
     end
@@ -213,7 +214,7 @@ module Writexlsx
     # Returns a unique hash key for the Format object.
     #
     def get_format_key
-      [get_font_key, get_border_key, get_fill_key, get_alignment_key, @num_format, @locked, @hidden].join(':')
+      [get_font_key, get_border_key, get_fill_key, get_alignment_key, @num_format, @locked, @hidden, @quote_prefix].join(':')
     end
 
     #
@@ -642,6 +643,7 @@ module Writexlsx
         ['borderId', border_index],
         ['xfId', xf_id]
       ]
+      attributes << ['quotePrefix', 1] if ptrue?(quote_prefix)
       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 && !ptrue?(@hyperlink)

data/lib/write_xlsx/package/conditional_format.rb

@@ -409,12 +409,23 @@ module Writexlsx
 
       def row_col_param_for_conditional_formatting(*args)
         # Check for a cell reference in A1 notation and substitute row and column
-        if args[0].to_s =~ (/^\D/) && (args[0] =~ /,/)
-          # Check for a user defined multiple range like B3:K6,B8:K11.
-          user_range = args[0].sub(/^=/, '').gsub(/\s*,\s*/, ' ').gsub(/\$/, '')
+        user_range = if args[0].to_s =~ (/^\D/) && (args[0] =~ /,/)
+                       # Check for a user defined multiple range like B3:K6,B8:K11.
+                       args[0].sub(/^=/, '').gsub(/\s*,\s*/, ' ').gsub(/\$/, '')
+                     end
+
+        if (row_col_array = row_col_notation(args.first))
+          if row_col_array.size == 2
+            row1, col1 = row_col_array
+            row2 = args[1]
+          elsif row_col_array.size == 4
+            row1, col1, row2, col2 = row_col_array
+            param = args[1]
+          end
+        else
+          row1, col1, row2, col2, param = args
         end
 
-        row1, col1, row2, col2, param = row_col_notation(args)
         if row2.respond_to?(:keys)
           param = row2
           row2 = row1

data/lib/write_xlsx/package/shared_strings.rb

@@ -11,11 +11,14 @@ module Writexlsx
 
       PRESERVE_SPACE_ATTRIBUTES = ['xml:space', 'preserve'].freeze
 
+      attr_reader :strings
+
       def initialize
         @writer        = Package::XMLWriterSimple.new
         @strings       = [] # string table
         @strings_index = {} # string table index
         @count         = 0 # count
+        @str_unique    = 0
       end
 
       def index(string, params = {})
@@ -25,10 +28,9 @@ module Writexlsx
 
       def add(string)
         unless @strings_index[string]
-          # Only first time the string will be append to list
-          # next time we only check and not #dup it
           str = string.frozen? ? string : string.freeze
           @strings << str
+          @str_unique += 1
           @strings_index[str] = @strings.size - 1
         end
         @count += 1
@@ -128,7 +130,7 @@ module Writexlsx
       end
 
       def unique_count
-        @strings.size
+        @str_unique
       end
     end
   end

data/lib/write_xlsx/package/styles.rb

@@ -14,7 +14,7 @@ module Writexlsx
         @xf_formats        = nil
         @palette           = []
         @font_count        = 0
-        @num_format_count  = 0
+        @num_formats       = []
         @border_count      = 0
         @fill_count        = 0
         @custom_colors     = []
@@ -38,18 +38,18 @@ module Writexlsx
       # Pass in the Format objects and other properties used to set the styles.
       #
       def set_style_properties(
-            xf_formats, palette, font_count, num_format_count, border_count,
+            xf_formats, palette, font_count, num_formats, border_count,
             fill_count, custom_colors, dxf_formats, has_comments
           )
-        @xf_formats       = xf_formats
-        @palette          = palette
-        @font_count       = font_count
-        @num_format_count = num_format_count
-        @border_count     = border_count
-        @fill_count       = fill_count
-        @custom_colors    = custom_colors
-        @dxf_formats      = dxf_formats
-        @has_comments     = has_comments
+        @xf_formats    = xf_formats
+        @palette       = palette
+        @font_count    = font_count
+        @num_formats   = num_formats
+        @border_count  = border_count
+        @fill_count    = fill_count
+        @custom_colors = custom_colors
+        @dxf_formats   = dxf_formats
+        @has_comments  = has_comments
       end
 
       #
@@ -77,7 +77,7 @@ module Writexlsx
       # Write the <numFmts> element.
       #
       def write_num_fmts
-        count = @num_format_count
+        count = @num_formats.size
 
         return if count == 0
 
@@ -85,11 +85,10 @@ module Writexlsx
 
         @writer.tag_elements('numFmts', attributes) do
           # Write the numFmts elements.
-          @xf_formats.each do |format|
-            # Ignore built-in number formats, i.e., < 164.
-            next unless format.num_format_index >= 164
-
-            write_num_fmt(format.num_format_index, format.num_format)
+          index = 164
+          @num_formats.each do |num_format|
+            write_num_fmt(index, num_format)
+            index += 1
           end
         end
       end

data/lib/write_xlsx/package/table.rb

@@ -51,6 +51,7 @@ module Writexlsx
 
         add_the_table_columns
         write_the_cell_data_if_supplied
+        store_filter_cell_positions
       end
 
       def set_xml_writer(filename)
@@ -155,6 +156,14 @@ module Writexlsx
         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}"
@@ -162,41 +171,50 @@ 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])
 
         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.

data/lib/write_xlsx/utility.rb

@@ -5,10 +5,28 @@ require 'write_xlsx/col_name'
 
 module Writexlsx
   module Utility
-    ROW_MAX  = 1048576  # :nodoc:
-    COL_MAX  = 16384    # :nodoc:
-    STR_MAX  = 32767    # :nodoc:
+    ROW_MAX       = 1048576  # :nodoc:
+    COL_MAX       = 16384    # :nodoc:
+    STR_MAX       = 32767    # :nodoc:
     SHEETNAME_MAX = 31  # :nodoc:
+    CHAR_WIDTHS   = {
+      ' '  =>  3, '!' =>  5, '"' =>  6, '#' =>  7, '$' =>  7, '%' => 11,
+      '&'  => 10, "'" =>  3, '(' =>  5, ')' =>  5, '*' =>  7, '+' =>  7,
+      ','  =>  4, '-' =>  5, '.' =>  4, '/' =>  6, '0' =>  7, '1' =>  7,
+      '2'  =>  7, '3' =>  7, '4' =>  7, '5' =>  7, '6' =>  7, '7' =>  7,
+      '8'  =>  7, '9' =>  7, ':' =>  4, ';' =>  4, '<' =>  7, '=' =>  7,
+      '>'  =>  7, '?' =>  7, '@' => 13, 'A' =>  9, 'B' =>  8, 'C' =>  8,
+      'D'  =>  9, 'E' =>  7, 'F' =>  7, 'G' =>  9, 'H' =>  9, 'I' =>  4,
+      'J'  =>  5, 'K' =>  8, 'L' =>  6, 'M' => 12, 'N' => 10, 'O' => 10,
+      'P'  =>  8, 'Q' => 10, 'R' =>  8, 'S' =>  7, 'T' =>  7, 'U' =>  9,
+      'V'  =>  9, 'W' => 13, 'X' =>  8, 'Y' =>  7, 'Z' =>  7, '[' =>  5,
+      '\\' =>  6, ']' =>  5, '^' =>  7, '_' =>  7, '`' =>  4, 'a' =>  7,
+      'b'  =>  8, 'c' =>  6, 'd' =>  8, 'e' =>  8, 'f' =>  5, 'g' =>  7,
+      'h'  =>  8, 'i' =>  4, 'j' =>  4, 'k' =>  7, 'l' =>  4, 'm' => 12,
+      'n'  =>  8, 'o' =>  8, 'p' =>  8, 'q' =>  8, 'r' =>  5, 's' =>  6,
+      't'  =>  5, 'u' =>  8, 'v' =>  7, 'w' => 11, 'x' =>  7, 'y' =>  7,
+      'z'  =>  6, '{' =>  5, '|' =>  7, '}' =>  5, '~' =>  7
+    }.freeze
 
     #
     # xl_rowcol_to_cell($row, col, row_absolute, col_absolute)
@@ -53,7 +71,12 @@ module Writexlsx
 
     def xl_col_to_name(col, col_absolute)
       col_str = ColName.instance.col_str(col)
-      "#{absolute_char(col_absolute)}#{col_str}"
+      if col_absolute
+        "#{absolute_char(col_absolute)}#{col_str}"
+      else
+        # Do not allocate new string
+        col_str
+      end
     end
 
     def xl_range(row_1, row_2, col_1, col_2,
@@ -79,6 +102,21 @@ module Writexlsx
       "=#{sheetname}!#{range1}:#{range2}"
     end
 
+    #
+    # xl_string_pixel_width($string)
+    #
+    # Get the pixel width of a string based on individual character widths taken
+    # from Excel. UTF8 characters are given a default width of 8.
+    #
+    # Note, Excel adds an additional 7 pixels padding to a cell.
+    #
+    def xl_string_pixel_width(string)
+      length = 0
+      string.to_s.split(//).each { |char| length += CHAR_WIDTHS[char] || 8 }
+
+      length
+    end
+
     #
     # Sheetnames used in references should be quoted if they contain any spaces,
     # special characters or if the look like something that isn't a sheet name.
@@ -252,12 +290,8 @@ module Writexlsx
     end
 
     # Check for a cell reference in A1 notation and substitute row and column
-    def row_col_notation(args)   # :nodoc:
-      if args[0].to_s =~ /^\D/
-        substitute_cellref(*args)
-      else
-        args
-      end
+    def row_col_notation(row_or_a1)   # :nodoc:
+      substitute_cellref(row_or_a1) if row_or_a1.respond_to?(:match) && row_or_a1.to_s =~ /^\D/
     end
 
     #
@@ -267,7 +301,7 @@ module Writexlsx
     # Ex: ("A4", "Hello") is converted to (3, 0, "Hello").
     #
     def substitute_cellref(cell, *args)       # :nodoc:
-      return [*args] if cell.respond_to?(:coerce) # Numeric
+      #      return [*args] if cell.respond_to?(:coerce) # Numeric
 
       normalized_cell = cell.upcase
 

data/lib/write_xlsx/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WriteXLSX_VERSION = "1.10.1"
+WriteXLSX_VERSION = "1.11.0"

data/lib/write_xlsx/workbook.rb

@@ -58,7 +58,7 @@ module Writexlsx
       @xf_formats          = []
       @dxf_formats         = []
       @font_count          = 0
-      @num_format_count    = 0
+      @num_formats         = []
       @defined_names       = []
       @named_ranges        = []
       @custom_colors       = []
@@ -560,7 +560,7 @@ module Writexlsx
         @xf_formats,
         @palette,
         @font_count,
-        @num_format_count,
+        @num_formats,
         @border_count,
         @fill_count,
         @custom_colors,
@@ -869,6 +869,9 @@ module Writexlsx
       @activesheet = @worksheets.visible_first.index if @activesheet == 0
       @worksheets[@activesheet].activate
 
+      # Convert the SST strings data structure.
+      prepare_sst_string_data
+
       # Prepare the worksheet VML elements such as comments and buttons.
       prepare_vml_objects
       # Set the defined names for the worksheets such as Print Titles.
@@ -917,6 +920,11 @@ module Writexlsx
       Dir.glob(File.join(tempdir, "**", "*"), File::FNM_DOTMATCH).select { |f| File.file?(f) }
     end
 
+    #
+    # prepare_sst_string_data
+    #
+    def prepare_sst_string_data; end
+
     #
     # Prepare all of the format properties prior to passing them to Styles.rb.
     #
@@ -977,9 +985,10 @@ module Writexlsx
     # User defined records start from index 0xA4.
     #
     def prepare_num_formats # :nodoc:
-      num_formats      = {}
-      index            = 164
-      num_format_count = 0
+      num_formats        = []
+      unique_num_formats = {}
+      index              = 164
+      num_format_count   = 0
 
       (@xf_formats + @dxf_formats).each do |format|
         num_format = format.num_format
@@ -1000,21 +1009,22 @@ module Writexlsx
           next
         end
 
-        if num_formats[num_format]
+        if unique_num_formats[num_format]
           # Number format has already been used.
-          format.num_format_index = num_formats[num_format]
+          format.num_format_index = unique_num_formats[num_format]
         else
           # Add a new number format.
-          num_formats[num_format] = index
+          unique_num_formats[num_format] = index
           format.num_format_index = index
           index += 1
 
-          # Only increase font count for XF formats (not for DXF formats).
-          num_format_count += 1 if ptrue?(format.xf_index)
+          # Only store/increase number format count for XF formats
+          # (not for DXF formats).
+          num_formats << num_format if ptrue?(format.xf_index)
         end
       end
 
-      @num_format_count = num_format_count
+      @num_formats = num_formats
     end
 
     #

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
+
+# frozen__literal: true
 
 module Writexlsx
   class Worksheet
@@ -24,8 +25,8 @@ module Writexlsx
         elsif worksheet.set_rows[row] && worksheet.set_rows[row][1]
           row_xf = worksheet.set_rows[row][1]
           attributes << ['s', row_xf.get_xf_index]
-        elsif worksheet.col_formats[col]
-          col_xf = worksheet.col_formats[col]
+        elsif worksheet.col_info[col] && worksheet.col_info[col].format
+          col_xf = worksheet.col_info[col].format
           attributes << ['s', col_xf.get_xf_index]
         end
         attributes
@@ -56,11 +57,12 @@ module Writexlsx
     end
 
     class StringCellData < CellData # :nodoc:
-      attr_reader :token
+      attr_reader :token, :raw_string
 
-      def initialize(index, xf)
+      def initialize(index, xf, raw_string)
         @token = index
         @xf = xf
+        @raw_string = raw_string
       end
 
       def data
@@ -81,6 +83,12 @@ module Writexlsx
       end
     end
 
+    class RichStringCellData < StringCellData # :nodoc:
+    end
+
+    class DateTimeCellData < NumberCellData # :nodoc:
+    end
+
     class FormulaCellData < CellData # :nodoc:
       attr_reader :token, :result, :range, :link_type, :url