writeexcel 0.3.5 → 0.4.0

data/lib/writeexcel/worksheet.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ###############################################################################
 #
 # Worksheet - A writer class for Excel Worksheets.
@@ -29,12 +30,13 @@ class MaxSizeError < StandardError   #:nodoc:
 #  worksheet2 = workbook.add_worksheet
 #
 class Worksheet < BIFFWriter
+  require 'writeexcel/helper'
+  private :convert_to_ascii_if_ascii
 
   RowMax   = 65536  # :nodoc:
   ColMax   = 256    # :nodoc:
   StrMax   = 0      # :nodoc:
   Buffer   = 4096   # :nodoc:
-  NonAscii = /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]^` ~\0\n]/   # :nodoc:
 
   ###############################################################################
   #
@@ -190,9 +192,7 @@ def initialize(name, index, encoding, url_format, parser, tempdir,
   # Add data to the beginning of the workbook (note the reverse order)
   # and to the end of the workbook.
   #
-  def close(*sheetnames) #:nodoc:
-    num_sheets = sheetnames.size
-
+  def close #:nodoc:
     ################################################
     # Prepend in reverse order!!
     #
@@ -303,6 +303,10 @@ def close(*sheetnames) #:nodoc:
     store_bof(0x0010)
   end
 
+  def cleanup
+    super
+  end
+
   ###############################################################################
   #
   # _compatibility_mode()
@@ -452,8 +456,8 @@ def set_first_sheet
   # itself. In Excel a cell's locked property is on by default.
   #
   #     # Set some format properties
-  #     unlocked  = workbook.add_format(locked => 0)
-  #     hidden    = workbook.add_format(hidden => 1)
+  #     unlocked  = workbook.add_format(:locked => 0)
+  #     hidden    = workbook.add_format(:hidden => 1)
   #
   #     # Enable worksheet protection
   #     worksheet.protect
@@ -1653,15 +1657,17 @@ def set_margin_bottom(margin = 1.00)
   # distribution.
   #
   def set_header(string = '', margin = 0.50, encoding = 0)
+    string = convert_to_ascii_if_ascii(string)
+
     limit    = encoding != 0 ? 255 *2 : 255
 
     # Handle utf8 strings
-    if string =~ NonAscii
-      string = NKF.nkf('-w16B0 -m0 -W', string)
+    if string.encoding == Encoding::UTF_8
+      string = string.encode('UTF-16BE')
       encoding = 1
     end
 
-    if string.length >= limit
+    if string.bytesize >= limit
       #           carp 'Header string must be less than 255 characters';
       return
     end
@@ -1678,15 +1684,17 @@ def set_header(string = '', margin = 0.50, encoding = 0)
   # there.
   #
   def set_footer(string = '', margin = 0.50, encoding = 0)
+    string = convert_to_ascii_if_ascii(string)
+
     limit    = encoding != 0 ? 255 *2 : 255
 
     # Handle utf8 strings
-    if string =~ NonAscii
-      string = NKF.nkf('-w16B0 -m0 -W', string)
+    if string.encoding == Encoding::UTF_8
+      string = string.encode('UTF-16BE')
       encoding = 1
     end
 
-    if string.length >= limit
+    if string.bytesize >= limit
       #           carp 'Header string must be less than 255 characters';
       return
     end
@@ -2048,7 +2056,7 @@ def extract_filter_tokens(expression = nil)   #:nodoc:
       end
     end
 
-    return tokens
+    tokens
   end
 #  private :extract_filter_tokens
 
@@ -2133,7 +2141,7 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
       end
 
       if (tokens[2] == '%')
-        operator = operator + 1
+        operator += 1
       end
 
       token    = value
@@ -2175,7 +2183,7 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
       operator = 22
     end
 
-    return [operator, token]
+    [operator, token]
   end
   private :parse_filter_tokens
 
@@ -2205,8 +2213,8 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
   #    worksheet.write('A1', '01209')
   #
   #    # Write a zero padded number using a format: 01209
-  #    my $format1 = $workbook.add_format(num_format => '00000')
-  #    $worksheet.write('A2', '01209', $format1)
+  #    my $format1 = $workbook.add_format(:num_format => '00000')
+  #    $worksheet.write('A2', '01209', format1)
   #
   #    # Write explicitly as a string: 01209
   #    $worksheet.write_string('A3', '01209')
@@ -2235,8 +2243,8 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
   # behaviour. To avoid this you can use the text format @:
   #
   #    # Format as a string (01209)
-  #    format2 = workbook.add_format(num_format => '@')
-  #    worksheet.write_string('A5', '01209', $format2)
+  #    format2 = workbook.add_format(:num_format => '@')
+  #    worksheet.write_string('A5', '01209', format2)
   #
   # The keep_leading_zeros() property is off by default. The keep
   #_leading_zeros() method takes 0 or 1 as an argument. It defaults to 1 if
@@ -2264,12 +2272,12 @@ def keep_leading_zeros(val = true)
   # Individual comments can be made visible using the visible parameter of the
   # write_comment method (see above):
   #
-  #     worksheet.write_comment('C3', 'Hello', visible => 1)
+  #     worksheet.write_comment('C3', 'Hello', :visible => 1)
   #
   # If all of the cell comments have been made visible you can hide individual
   # comments as follows:
   #
-  #     worksheet.write_comment('C3', 'Hello', visible => 0)
+  #     worksheet.write_comment('C3', 'Hello', :visible => 0)
   #
   #
   def show_comments(val = nil)
@@ -2628,7 +2636,7 @@ def write_number(*args)
       append(header, data, xl_double)
     end
 
-    return 0
+    0
   end
 
   #
@@ -2669,7 +2677,7 @@ def write_number(*args)
   # number. To get around this you can use the Excel text format @:
   #
   #    # Format as a string. Doesn't change to a number when edited
-  #    format1 = workbook.add_format(num_format => '@')
+  #    format1 = workbook.add_format(:num_format => '@')
   #    worksheet.write_string('A2', '01209', format1)
   #
   def write_string(*args)
@@ -2686,14 +2694,18 @@ def write_string(*args)
     row         = args[0]                       # Zero indexed row
     col         = args[1]                       # Zero indexed column
     str         = args[2].to_s
-    strlen      = str.length
+    strlen      = str.bytesize
     xf          = xf_record_index(row, col, args[3])   # The cell format
     encoding    = 0x0
     str_error   = 0
 
+    str = convert_to_ascii_if_ascii(str)
+
     # Handle utf8 strings
-    if str =~ NonAscii
-      return write_utf16le_string(row, col, NKF.nkf('-w16L0 -m0 -W', str), args[3])
+    if str.encoding == Encoding::UTF_8
+      str_utf16le = NKF.nkf('-w16L0 -m0 -W', str)
+      str_utf16le.force_encoding('UTF-16LE')
+      return write_utf16le_string(row, col, str_utf16le, args[3])
     end
 
     # Check that row and col are valid and store max and min values
@@ -2729,7 +2741,7 @@ def write_string(*args)
       append(header, data)
     end
 
-    return str_error
+    str_error
   end
 
   #
@@ -2802,7 +2814,7 @@ def write_blank(*args)
       append(header, data)
     end
 
-    return 0
+    0
   end
 
   #
@@ -3131,7 +3143,7 @@ def write_formula(*args)
     #           croak $@       # Re-raise the error
     #       }
 
-    formlen = formula.length     # Length of the binary string
+    formlen = formula.bytesize     # Length of the binary string
     length  = 0x16 + formlen     # Length of the record data
 
     header  = [record, length].pack("vv")
@@ -3153,7 +3165,7 @@ def write_formula(*args)
       append(header, data, formula, string)
     end
 
-    return 0
+    0
   end
 
   #
@@ -3258,7 +3270,7 @@ def write_row(*args)
         col += 1
       end
     end
-    return error
+    error
   end
 
 
@@ -3358,7 +3370,7 @@ def write_col(*args)
         row += 1
       end
     end
-    return error
+    error
   end
 
   #
@@ -3398,7 +3410,7 @@ def write_col(*args)
   # several optional key/value pairs to control the format of the comment.
   # For example:
   #
-  #     worksheet.write_comment('C3', 'Hello', visible => 1, author => 'Ruby')
+  #     worksheet.write_comment('C3', 'Hello', :visible => 1, :author => 'Ruby')
   #
   # Most of these options are quite specific and in general the default comment
   # behaviour will be all that you need. However, should you need greater
@@ -3770,15 +3782,15 @@ def cell_to_rowcol(cell)       #:nodoc:
 
     while (!chars.empty?)
       char = chars.pop   # LS char first
-      col = col + (char[0] - "A"[0] +1) * (26**expn)
-      expn = expn + 1
+      col += (char.ord - "A".ord + 1) * (26 ** expn)
+      expn += 1
     end
 
     # Convert 1-index to zero-index
     row -= 1
     col -= 1
 
-    return [row, col]
+    [row, col]
   end
   private :cell_to_rowcol
 
@@ -3878,7 +3890,7 @@ def encode_formula_result(value = nil)       #:nodoc:
       end
     end
 
-    return [num, grbit, is_string]
+    [num, grbit, is_string]
   end
   private :encode_formula_result
 
@@ -3890,24 +3902,26 @@ def encode_formula_result(value = nil)       #:nodoc:
   # be calculated by the module and thus must be supplied by the user.
   #
   def get_formula_string(string)       #:nodoc:
+    string = convert_to_ascii_if_ascii(string)
+
     record    = 0x0207         # Record identifier
     length    = 0x00           # Bytes to follow
     # string                   # Formula string.
-    strlen    = string.length  # Length of the formula string (chars).
+    strlen    = string.bytesize  # Length of the formula string (chars).
     encoding  = 0              # String encoding.
 
-    # Handle utf8 strings in perl 5.8.
-    if string =~ NonAscii
-      string = NKF.nkf('-w16B0 -m0 -W', string)
+    # Handle utf8 strings.
+    if string.encoding == Encoding::UTF_8
+      string = string.encode('UTF-16BE')
       encoding = 1
     end
 
-    length    = 0x03 + string.length  # Length of the record data
+    length    = 0x03 + string.bytesize  # Length of the record data
 
     header    = [record, length].pack("vv")
     data      = [strlen, encoding].pack("vC")
 
-    return header + data + string
+    header + data + string
   end
   private :get_formula_string
 
@@ -3963,13 +3977,13 @@ def store_formula(formula)       #:nodoc:
     #       }
 
     # Return the parsed tokens in an anonymous array
-    return [*tokens]
+    [*tokens]
   end
 
   #
   # :call-seq:
-  #    repeat_formula(row, col,    formula, format, ([pattern => replace, ...]) -> Fixnum
-  #    repeat_formula(A1_notation, formula, format, ([pattern => replace, ...]) -> Fixnum
+  #    repeat_formula(row, col,    formula, format, ([:pattern => replace, ...]) -> Fixnum
+  #    repeat_formula(A1_notation, formula, format, ([:pattern => replace, ...]) -> Fixnum
   #
   # Write a formula to the specified row and column (zero indexed) by
   # substituting _pattern_ _replacement_ pairs in the formula created via
@@ -4121,7 +4135,7 @@ def repeat_formula(*args)       #:nodoc:
 
 
     # As a temporary and undocumented measure we allow the user to specify the
-    # result of the formula by appending a result => $value pair to the end
+    # result of the formula by appending a result => value pair to the end
     # of the arguments.
     value = nil
     if pairs[-2] == 'result'
@@ -4162,7 +4176,7 @@ def repeat_formula(*args)       #:nodoc:
     return -2 if check_dimensions(row, col) != 0
 
 
-    formlen   = formula.length     # Length of the binary string
+    formlen   = formula.bytesize     # Length of the binary string
     length    = 0x16 + formlen     # Length of the record data
 
     header    = [record, length].pack("vv")
@@ -4185,7 +4199,7 @@ def repeat_formula(*args)       #:nodoc:
       append(header, data, formula, string)
     end
 
-    return 0
+    0
   end
 
   #
@@ -4282,7 +4296,7 @@ def write_url(*args)
     return -1 if args.size < 3
 
     # Add start row and col to arg list
-    return write_url_range(args[0], args[1], *args)
+    write_url_range(args[0], args[1], *args)
   end
 
   #
@@ -4338,7 +4352,7 @@ def write_url_range(*args)
     # Check for internal/external sheet links or default to web link
     return write_url_internal(*args) if url =~ /^internal:/
     return write_url_external(*args) if url =~ /^external:/
-    return write_url_web(*args)
+    write_url_web(*args)
   end
 
   ###############################################################################
@@ -4358,6 +4372,8 @@ def write_url_range(*args)
   # See also write_url() above for a general description and return values.
   #
   def write_url_web(row1, col1, row2, col2, url, str = nil, format = nil)       #:nodoc:
+    url = convert_to_ascii_if_ascii(url)
+
     record = 0x01B8                       # Record identifier
     length = 0x00000                      # Bytes to follow
 
@@ -4381,23 +4397,23 @@ def write_url_web(row1, col1, row2, col2, url, str = nil, format = nil)       #:
     encoding    = 0
 
     # Convert an Utf8 URL type and to a null terminated wchar string.
-    if url =~ NonAscii
-      url = NKF.nkf('-w16B0 -m0 -W', url)
-      url += "\0\0"   # URL is null terminated.
+    if url.encoding == Encoding::UTF_8
+      url = url.encode('UTF-16BE')
+      url += "\0\0".force_encoding('UTF-16BE')   # URL is null terminated.
       encoding = 1
     end
 
     # Convert an Ascii URL type and to a null terminated wchar string.
     if encoding == 0
-      url += "\0"
+      url  = url.force_encoding('BINARY') + "\0".force_encoding('BINARY')
       url  = url.unpack('c*').pack('v*')
     end
 
     # Pack the length of the URL
-    url_len     = [url.length].pack("V")
+    url_len     = [url.bytesize].pack("V")
 
     # Calculate the data length
-    length         = 0x34 + url.length
+    length         = 0x34 + url.bytesize
 
     # Pack the header data
     header      = [record, length].pack("vv")
@@ -4407,7 +4423,7 @@ def write_url_web(row1, col1, row2, col2, url, str = nil, format = nil)       #:
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append( header, data,unknown1,options,unknown2,url_len,url)
 
-    return error
+    error
   end
   private :write_url_web
 
@@ -4451,16 +4467,16 @@ def write_url_internal(row1, col1, row2, col2, url, str = nil, format = nil)
     encoding    = 0
 
     # Convert an Utf8 URL type and to a null terminated wchar string.
-    if str =~ NonAscii
+    if str.encoding == Encoding::UTF_8
       # Quote sheet name if not already, i.e., Sheet!A1 to 'Sheet!A1'.
       url.sub!(/^(.+)!/, "'\1'!") if not url =~ /^'/;
-      url      = NKF.nkf('-w16L0 -m0 -W', url) + "\0\0"  # URL is null terminated.
+      url = url.encode('UTF-16LE') + "\0\0"  # URL is null terminated.
       encoding = 1
     end
 
     # Convert an Ascii URL type and to a null terminated wchar string.
     if encoding == 0
-      url = url + "\0"
+      url += "\0"
       url = url.unpack('c*').pack('v*')
     end
 
@@ -4468,7 +4484,7 @@ def write_url_internal(row1, col1, row2, col2, url, str = nil, format = nil)
     url_len     = [(url.length/2).to_i].pack("V")
 
     # Calculate the data length
-    length         = 0x24 + url.length
+    length         = 0x24 + url.bytesize
 
     # Pack the header data
     header      = [record, length].pack("vv")
@@ -4478,7 +4494,7 @@ def write_url_internal(row1, col1, row2, col2, url, str = nil, format = nil)
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append( header, data, unknown1, options, url_len, url)
 
-    return error
+    error
   end
   private :write_url_internal
 
@@ -4535,7 +4551,7 @@ def write_url_external(row1, col1, row2, col2, url, str = nil, format = nil)
 
     unless sheet.nil?
       link_type |= 0x08
-      sheet_len  = [sheet.length + 0x01].pack("V")
+      sheet_len  = [sheet.bytesize + 0x01].pack("V")
       sheet      = sheet.split('').join("\0") + "\0\0\0"
     else
       sheet_len   = ''
@@ -4548,7 +4564,7 @@ def write_url_external(row1, col1, row2, col2, url, str = nil, format = nil)
     # Calculate the up-level dir count e.g. (..\..\..\ == 3)
     up_count    = 0
     while dir_long.sub!(/^\.\.\\/, '')
-      up_count = up_count + 1
+      up_count += 1
     end
     up_count    = [up_count].pack("v")
 
@@ -4559,9 +4575,9 @@ def write_url_external(row1, col1, row2, col2, url, str = nil, format = nil)
     dir_long = dir_long.split('').join("\0") + "\0"
 
     # Pack the lengths of the dir strings
-    dir_short_len = [dir_short.length].pack("V")
-    dir_long_len  = [dir_long.length].pack("V")
-    stream_len    = [dir_long.length + 0x06].pack("V")
+    dir_short_len = [dir_short.bytesize].pack("V")
+    dir_long_len  = [dir_long.bytesize].pack("V")
+    stream_len    = [dir_long.bytesize + 0x06].pack("V")
 
     # Pack the undocumented parts of the hyperlink stream
     unknown1 = ['D0C9EA79F9BACE118C8200AA004BA90B02000000'].pack("H*")
@@ -4586,14 +4602,14 @@ def write_url_external(row1, col1, row2, col2, url, str = nil, format = nil)
     sheet
 
     # Pack the header data
-    length      = data.length
+    length      = data.bytesize
     header      = [record, length].pack("vv")
 
     # Write the packed data
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
 
-    return error
+    error
   end
   private :write_url_external
 
@@ -4633,7 +4649,7 @@ def write_url_external_net(row1, col1, row2, col2, url, str, format)       #:nod
 
     unless sheet.nil?
       link_type |= 0x08
-      sheet_len  = [sheet.length + 0x01].pack("V")
+      sheet_len  = [sheet.bytesize + 0x01].pack("V")
       sheet      = sheet.split('').join("\0") + "\0\0\0"
     else
       sheet_len   = ''
@@ -4645,10 +4661,10 @@ def write_url_external_net(row1, col1, row2, col2, url, str, format)       #:nod
 
 
     # Make the string null terminated
-    dir_long       = dir_long + "\0"
+    dir_long      += "\0"
 
     # Pack the lengths of the dir string
-    dir_long_len  = [dir_long.length].pack("V")
+    dir_long_len  = [dir_long.bytesize].pack("V")
 
     # Store the long dir name as a wchar string (non-null terminated)
     dir_long = dir_long.split('').join("\0") + "\0"
@@ -4666,14 +4682,14 @@ def write_url_external_net(row1, col1, row2, col2, url, str, format)       #:nod
     sheet
 
     # Pack the header data
-    length      = data.length
+    length      = data.bytesize
     header      = [record, length].pack("vv")
 
     # Write the packed data
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
 
-    return error
+    error
   end
   private :write_url_external_net
 
@@ -4751,7 +4767,7 @@ def write_date_time(*args)
       write_string(row, col, str, args[3])
       error = -3
     end
-    return error
+    error
   end
 
   #
@@ -4868,9 +4884,9 @@ def convert_date_time(date_time_string)       #:nodoc:
     days -= leap                             # Already counted above
 
     # Adjust for Excel erroneously treating 1900 as a leap year.
-    days = days + 1 if !@date_1904 and days > 59
+    days += 1 if !@date_1904 and days > 59
 
-    return days + seconds
+    days + seconds
   end
 
   ###############################################################################
@@ -4941,7 +4957,7 @@ def check_dimensions(row, col, ignore_row = 0, ignore_col = 0)       #:nodoc:
       end
     end
 
-    return 0
+    0
   end
   private :check_dimensions
 
@@ -5318,8 +5334,8 @@ def store_externsheet(sheetname)   #:nodoc:
       cch       = 1     # The following byte
       rgch      = 0x02  # Self reference
     else
-      length    = 0x02 + sheetname.length
-      cch       = sheetname.length
+      length    = 0x02 + sheetname.bytesize
+      cch       = sheetname.bytesize
       rgch      = 0x03  # Reference to a sheet in the current workbook
     end
 
@@ -5464,7 +5480,7 @@ def store_header   #:nodoc:
     # length                          # Bytes to follow
 
     str         = @header             # header string
-    cch         = str.length          # Length of header string
+    cch         = str.bytesize          # Length of header string
     encoding    = @header_encoding    # Character encoding
 
 
@@ -5474,7 +5490,7 @@ def store_header   #:nodoc:
     # Change the UTF-16 name from BE to LE
     str         = str.unpack('v*').pack('n*') if encoding != 0
 
-    length      = 3 + str.length
+    length      = 3 + str.bytesize
 
     header      = [record, length].pack('vv')
     data        = [cch, encoding].pack('vC')
@@ -5495,7 +5511,7 @@ def store_footer   #:nodoc:
     # length;                                     # Bytes to follow
 
     str         = @footer             # footer string
-    cch         = str.length                 # Length of ooter string
+    cch         = str.bytesize                 # Length of ooter string
     encoding    = @footer_encoding    # Character encoding
 
 
@@ -5505,7 +5521,7 @@ def store_footer   #:nodoc:
     # Change the UTF-16 name from BE to LE
     str         = str.unpack('v*').pack('n*') if encoding != 0
 
-    length      = 3 + str.length
+    length      = 3 + str.bytesize
 
     header      = [record, length].pack('vv')
     data        =  [cch, encoding].pack('vC')
@@ -5838,7 +5854,7 @@ def store_hbreak   #:nodoc:
 
     # Append each page break
     breaks.each do |brk|
-      data = data + [brk, 0x0000, 0x00ff].pack("vvv")
+      data += [brk, 0x0000, 0x00ff].pack("vvv")
     end
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
@@ -5868,7 +5884,7 @@ def store_vbreak   #:nodoc:
 
     # Append each page break
     breaks.each do |brk|
-      data = data + [brk, 0x0000, 0x00ff].pack("vvv")
+      data += [brk, 0x0000, 0x00ff].pack("vvv")
     end
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
@@ -6026,15 +6042,15 @@ def store_table   #:nodoc:
         # Write the cell data in each row and sum their lengths for the
         # cell offsets.
         #
-        written_rows.each do |row|
+        written_rows.each do |rw|
           cell_offset = 0
 
-          if @table[row]
-            @table[row].each do |col|
-              next unless col
+          if @table[rw]
+            @table[rw].each do |clm|
+              next unless clm
               print "sheet #{@name} : #{__FILE__}(#{__LINE__}) cell_data\n" if defined?($debug)
-              append(col)
-              length = col.length
+              append(clm)
+              length = clm.bytesize
               row_offset  += length
               cell_offset += length
             end
@@ -6075,7 +6091,7 @@ def store_dbcell(row_offset, cell_offsets)   #:nodoc:
     header          = [record, length].pack('vv')
     data            = [row_offset].pack('V')
     cell_offsets.each do |co|
-      data = data + [co].pack('v')
+      data += [co].pack('v')
     end
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
@@ -6106,7 +6122,7 @@ def store_index   #:nodoc:
     data        = [reserved, row_min, row_max, reserved].pack('VVVV')
 
     indices.each do |index|
-      data = data + [index + @offset + 20 + length + 4].pack('V')
+      data += [index + @offset + 20 + length + 4].pack('V')
     end
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
@@ -6344,22 +6360,22 @@ def position_object(col_start, row_start, x1, y1, width, height)   #:nodoc:
 
     # Adjust start column for offsets that are greater than the col width
     while x1 >= size_col(col_start)
-      x1 = x1 - size_col(col_start)
-      col_start = col_start + 1
+      x1 -= size_col(col_start)
+      col_start += 1
     end
 
     # Adjust start row for offsets that are greater than the row height
     while y1 >= size_row(row_start)
-      y1 = y1 - size_row(row_start)
-      row_start = row_start + 1
+      y1 -= size_row(row_start)
+      row_start += 1
     end
 
     # Initialise end cell to the same as the start cell
     col_end    = col_start
     row_end    = row_start
 
-    width      = width  + x1
-    height     = height + y1
+    width     += x1
+    height    += y1
 
     # Subtract the underlying cell widths to find the end cell of the image
     while width >= size_col(col_end)
@@ -6393,7 +6409,7 @@ def position_object(col_start, row_start, x1, y1, width, height)   #:nodoc:
     x2 = (x2 +0.5).to_i
     y2 = (y2 +0.5).to_i
 
-    return [
+    [
       col_start, x1,
       row_start, y1,
       col_end,   x2,
@@ -6496,7 +6512,7 @@ def write_utf16be_string(*args)
 
     row         = args[0]                         # Zero indexed row
     col         = args[1]                         # Zero indexed column
-    strlen      = args[2].length
+    strlen      = args[2].bytesize
     str         = args[2]
     xf          = xf_record_index(row, col, args[3]) # The cell format
     encoding    = 0x1
@@ -6511,7 +6527,7 @@ def write_utf16be_string(*args)
       str_error = -3
     end
 
-    num_bytes = str.length
+    num_bytes = str.bytesize
     num_chars = (num_bytes / 2).to_i
 
     # Check for a valid 2-byte char string.
@@ -6544,7 +6560,7 @@ def write_utf16be_string(*args)
       append(header, data)
     end
 
-    return str_error
+    str_error
   end
 
   ###############################################################################
@@ -6577,7 +6593,7 @@ def write_utf16le_string(*args)
     # Change from UTF16 big-endian to little endian
     str = str.unpack('n*').pack("v*")
 
-    return write_utf16be_string(row, col, str, format)
+    write_utf16be_string(row, col, str, format)
   end
 
 
@@ -6694,10 +6710,10 @@ def store_autofilter(index, operator_1, token_1,   #:nodoc:
     string_2 = '' if string_2.nil?
 
     data = [index].pack('v')
-    data = data + [grbit].pack('v')
-    data = data + doper_1 + doper_2 + string_1 + string_2
+    data += [grbit].pack('v')
+    data += doper_1 + doper_2 + string_1 + string_2
 
-    length  = data.length
+    length  = data.bytesize
     header  = [record, length].pack('vv')
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
@@ -6727,24 +6743,25 @@ def pack_doper(operator, token)   #:nodoc:
       !(token.to_s  =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/)
       # Excel treats all tokens as strings if the operator is equality, =.
       string = token.to_s
+      string = convert_to_ascii_if_ascii(string)
 
       encoding = 0
-      length   = string.length
+      length   = string.bytesize
 
       # Handle utf8 strings
-      if string =~ NonAscii
-        string = NKF.nkf('-w16B0 -m0 -W', string)
+      if string.encoding == Encoding::UTF_8
+        string = string.encode('UTF-16BE')
         encodign = 1
       end
 
-      string = [encoding].pack('C') + string
+      string = [encoding].pack('C') + string.force_encoding('BINARY')
       doper  = pack_string_doper(operator, length)
     else
       string = ''
       doper  = pack_number_doper(operator, token)
     end
 
-    return [doper, string]
+    [doper, string]
   end
   private :pack_doper
 
@@ -6755,7 +6772,7 @@ def pack_doper(operator, token)   #:nodoc:
   # Pack an empty Doper structure.
   #
   def pack_unused_doper   #:nodoc:
-    return [0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0].pack('C10')
+    [0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0].pack('C10')
   end
   private :pack_unused_doper
 
@@ -6774,11 +6791,10 @@ def pack_blanks_doper(operator, token)   #:nodoc:
       operator = 5
     end
 
-    doper = [type,       # Data type
+    [type,       # Data type
       operator,
       0x0000, 0x0000     # Reserved
     ].pack('CCVV')
-    return doper
   end
   private :pack_blanks_doper
 
@@ -6789,13 +6805,12 @@ def pack_blanks_doper(operator, token)   #:nodoc:
   # Pack an string Doper structure.
   #
   def pack_string_doper(operator, length)   #:nodoc:
-    doper = [0x06,     # Data type
+    [0x06,     # Data type
       operator,
       0x0000,         #Reserved
       length,         # String char length
       0x0, 0x0, 0x0   # Reserved
     ].pack('CCVCCCC')
-    return doper
   end
   private :pack_string_doper
 
@@ -6809,8 +6824,7 @@ def pack_number_doper(operator, number)   #:nodoc:
     number = [number].pack('d')
     number.reverse! if @byte_order != '' && @byte_order != 0
 
-    doper  = [0x04, operator].pack('CC') + number
-    return doper
+    [0x04, operator].pack('CC') + number
   end
   private :pack_number_doper
 
@@ -6844,7 +6858,7 @@ def prepare_images   #:nodoc:
     @images       = {}
     @images_array = images
 
-    return count
+    count
   end
 #  private :prepare_images
 
@@ -6872,7 +6886,7 @@ def prepare_comments   #:nodoc:
     @comments       = {}
     @comments_array = comments
 
-    return count
+    count
   end
 #  private :prepare_comments
 
@@ -6972,7 +6986,7 @@ def store_images   #:nodoc:
         spid = spid + 1
         data = data                              +
           store_mso_opt_image(image_id)          +
-          store_mso_client_anchor(2, *vertices)   +
+          store_mso_client_anchor(2, *vertices)  +
           store_mso_client_data()
       else
         # Write the child MSODRAWIING record.
@@ -6981,10 +6995,10 @@ def store_images   #:nodoc:
           spid = spid + 1
         data = data                              +
           store_mso_opt_image(image_id)          +
-          store_mso_client_anchor(2, *vertices)   +
+          store_mso_client_anchor(2, *vertices)  +
           store_mso_client_data
       end
-      length      = data.length
+      length      = data.bytesize
       header      = [record, length].pack("vv")
       print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
       append(header, data)
@@ -7056,29 +7070,29 @@ def store_charts   #:nodoc:
               spgr_length += 128 *num_comments
 
 
-              data        = store_mso_dg_container(dg_length)     +
-                            store_mso_dg(*ids)                     +
-                            store_mso_spgr_container(spgr_length) +
-                            store_mso_sp_container(40)            +
-                            store_mso_spgr()                      +
-                            store_mso_sp(0x0, spid, 0x0005)
+              data  = store_mso_dg_container(dg_length)     +
+                      store_mso_dg(*ids)                     +
+                      store_mso_spgr_container(spgr_length) +
+                      store_mso_sp_container(40)            +
+                      store_mso_spgr()                      +
+                      store_mso_sp(0x0, spid, 0x0005)
               spid += 1
-              data = data + store_mso_sp_container(112)           +
-                            store_mso_sp(201, spid, 0x0A00)
+              data += store_mso_sp_container(112)           +
+                      store_mso_sp(201, spid, 0x0A00)
               spid += 1
-              data = data + store_mso_opt_chart()                 +
-                            store_mso_client_anchor(0, *vertices)  +
-                            store_mso_client_data()
+              data += store_mso_opt_chart()                 +
+                      store_mso_client_anchor(0, *vertices)  +
+                      store_mso_client_data()
           else
               # Write the child MSODRAWIING record.
-              data        = store_mso_sp_container(112)           +
-                            store_mso_sp(201, spid, 0x0A00)
+              data  = store_mso_sp_container(112)           +
+                      store_mso_sp(201, spid, 0x0A00)
               spid += 1
-              data = data + store_mso_opt_chart()                 +
-                            store_mso_client_anchor(0, *vertices)  +
-                            store_mso_client_data()
+              data += store_mso_opt_chart()                 +
+                      store_mso_client_anchor(0, *vertices)  +
+                      store_mso_client_data()
           end
-          length      = data.length
+          length      = data.bytesize
           header      = [record, length].pack("vv")
           print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
           append(header, data)
@@ -7151,16 +7165,16 @@ def store_filters   #:nodoc:
     row1, row2, col1, col2 = @filter_area
 
     (0 .. num_filters-1).each do |i|
-      vertices = [ col1 +i,    0, row1   , 0,
-      col1 +i +1, 0, row1 +1, 0]
+      vertices = [ col1 + i,    0, row1   , 0,
+      col1 +i +1, 0, row1 + 1, 0]
 
       if i == 0 and !num_objects.nil?
         # Write the parent MSODRAWIING record.
-        dg_length   = 168 + 96*(num_filters -1)
-        spgr_length = 144 + 96*(num_filters -1)
+        dg_length   = 168 + 96 * (num_filters -1)
+        spgr_length = 144 + 96 * (num_filters -1)
 
-        dg_length   = dg_length   + 128 *num_comments
-        spgr_length = spgr_length + 128 *num_comments
+        dg_length   += 128 * num_comments
+        spgr_length += 128 * num_comments
 
         data = store_mso_dg_container(dg_length)          +
           store_mso_dg(*ids)                              +
@@ -7168,24 +7182,24 @@ def store_filters   #:nodoc:
           store_mso_sp_container(40)                      +
           store_mso_spgr()                                +
           store_mso_sp(0x0, spid, 0x0005)
-        spid = spid + 1
-        data = data + store_mso_sp_container(88)          +
+        spid += 1
+        data += store_mso_sp_container(88)                +
           store_mso_sp(201, spid, 0x0A00)                 +
           store_mso_opt_filter()                          +
-          store_mso_client_anchor(1, *vertices)            +
+          store_mso_client_anchor(1, *vertices)           +
           store_mso_client_data()
-        spid = spid + 1
+        spid += 1
 
       else
         # Write the child MSODRAWIING record.
         data = store_mso_sp_container(88)                 +
           store_mso_sp(201, spid, 0x0A00)                 +
           store_mso_opt_filter()                          +
-          store_mso_client_anchor(1, *vertices)            +
+          store_mso_client_anchor(1, *vertices)           +
           store_mso_client_data()
-        spid = spid + 1
+        spid += 1
       end
-      length      = data.length
+      length      = data.bytesize
       header      = [record, length].pack("vv")
       print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
       append(header, data)
@@ -7243,7 +7257,7 @@ def store_comments   #:nodoc:
       visible     = comments[i][6]
       color       = comments[i][7]
       vertices    = comments[i][8]
-      str_len     = str.length
+      str_len     = str.bytesize
       str_len     = str_len / 2 if encoding != 0 # Num of chars not bytes.
       formats     = [[0, 9], [str_len, 0]]
 
@@ -7270,7 +7284,7 @@ def store_comments   #:nodoc:
         store_mso_opt_comment(0x80, visible, color)    +
         store_mso_client_anchor(3, *vertices)          +
         store_mso_client_data
-      length      = data.length
+      length      = data.bytesize
       header      = [record, length].pack("vv")
       print "sheet #{@name} : #{__FILE__}(#{__LINE__})\n" if defined?($debug)
       append(header, data)
@@ -7307,7 +7321,7 @@ def store_mso_dg_container(length)   #:nodoc:
     version     = 15
     instance    = 0
     data        = ''
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_dg_container
 
@@ -7324,7 +7338,7 @@ def store_mso_dg(instance, num_shapes, max_spid)   #:nodoc:
     length      = 8
     data        = [num_shapes, max_spid].pack("VV")
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_dg
 
@@ -7340,7 +7354,7 @@ def store_mso_spgr_container(length)   #:nodoc:
     instance    = 0
     data        = ''
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_spgr_container
 
@@ -7356,7 +7370,7 @@ def store_mso_sp_container(length)   #:nodoc:
     instance    = 0
     data        = ''
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_sp_container
 
@@ -7373,7 +7387,7 @@ def store_mso_spgr   #:nodoc:
     data        = [0, 0, 0, 0].pack("VVVV")
     length      = 16
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_spgr
 
@@ -7390,7 +7404,7 @@ def store_mso_sp(instance, spid, options)   #:nodoc:
     length      = 8
     data        = [spid, options].pack('VV')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_sp
 
@@ -7423,7 +7437,7 @@ def store_mso_opt_comment(spid, visible = nil, colour = 0x50)   #:nodoc:
     [visible].pack('v')                             +
     ['0A00'].pack('H*')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_opt_comment
 
@@ -7447,7 +7461,7 @@ def store_mso_opt_image(spid)   #:nodoc:
     [0x03BF].pack( 'v')     +
     [0x00080000].pack( 'V')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_opt_image
 
@@ -7484,7 +7498,7 @@ def store_mso_opt_chart   #:nodoc:
     [0x03BF].pack('v')           +        # Group Shape -> fPrint
     [0x00080000].pack('V')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_opt_chart
 
@@ -7512,7 +7526,7 @@ def store_mso_opt_filter   #:nodoc:
     [0x03BF].pack('v')    +        # Group Shape -> fPrint
     [0x000A0000].pack('V')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_opt_filter
 
@@ -7543,7 +7557,7 @@ def store_mso_client_anchor(flag, col_start, x1, row_start, y1, col_end, x2, row
 
     data = [flag, col_start, x1, row_start, y1, col_end, x2, row_end, y2].pack('v9')
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_client_anchor
 
@@ -7560,7 +7574,7 @@ def store_mso_client_data   #:nodoc:
     data        = ''
     length      = 0
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_client_data
 
@@ -7594,12 +7608,12 @@ def store_obj_comment(obj_id)   #:nodoc:
     sub_record  = 0x000D   # ftNts
     sub_length  = 0x0016
     sub_data    = [reserved,reserved,reserved,reserved,reserved,reserved].pack( "VVVVVv")
-    data        = data + [sub_record, sub_length].pack("vv") + sub_data
+    data        += [sub_record, sub_length].pack("vv") + sub_data
 
     # Add ftEnd (end of object) subobject
     sub_record  = 0x0000   # ftNts
     sub_length  = 0x0000
-    data        = data + [sub_record, sub_length].pack("vv")
+    data        += [sub_record, sub_length].pack("vv")
 
     # Pack the record.
     header      = [record, length].pack("vv")
@@ -7640,18 +7654,18 @@ def store_obj_image(obj_id)   #:nodoc:
     sub_record  = 0x0007   # ftCf
     sub_length  = 0x0002
     sub_data    = [0xFFFF].pack( 'v')
-    data        = data + [sub_record, sub_length].pack('vv') + sub_data
+    data        += [sub_record, sub_length].pack('vv') + sub_data
 
     # Add ftPioGrbit (Picture option flags) subobject
     sub_record  = 0x0008   # ftPioGrbit
     sub_length  = 0x0002
     sub_data    = [0x0001].pack('v')
-    data        = data + [sub_record, sub_length].pack('vv') + sub_data
+    data        += [sub_record, sub_length].pack('vv') + sub_data
 
     # Add ftEnd (end of object) subobject
     sub_record  = 0x0000   # ftNts
     sub_length  = 0x0000
-    data        = data + [sub_record, sub_length].pack('vv')
+    data        += [sub_record, sub_length].pack('vv')
 
     # Pack the record.
     header  = [record, length].pack('vv')
@@ -7691,7 +7705,7 @@ def store_obj_chart(obj_id)   #:nodoc:
     # Add ftEnd (end of object) subobject
     sub_record  = 0x0000   # ftNts
     sub_length  = 0x0000
-    data        = data + [sub_record, sub_length].pack('vv')
+    data        += [sub_record, sub_length].pack('vv')
 
     # Pack the record.
     header  = [record, length].pack('vv')
@@ -7733,7 +7747,7 @@ def store_obj_filter(obj_id, col)   #:nodoc:
     sub_record  = 0x000C   # ftSbs
     sub_length  = 0x0014
     sub_data    = ['0000000000000000640001000A00000010000100'].pack('H*')
-    data        = data + [sub_record, sub_length].pack('vv') + sub_data
+    data        += [sub_record, sub_length].pack('vv') + sub_data
 
     # Add ftLbsData (List box data) subobject
     sub_record  = 0x0013   # ftLbsData
@@ -7747,12 +7761,12 @@ def store_obj_filter(obj_id, col)   #:nodoc:
       sub_data       = ['00000000010001030000020008005700'].pack('H*')
     end
 
-    data        = data + [sub_record, sub_length].pack('vv') + sub_data
+    data        += [sub_record, sub_length].pack('vv') + sub_data
 
     # Add ftEnd (end of object) subobject
     sub_record  = 0x0000   # ftNts
     sub_length  = 0x0000
-    data        = data + [sub_record, sub_length].pack('vv')
+    data        += [sub_record, sub_length].pack('vv')
 
     # Pack the record.
     header  = [record, length].pack('vv')
@@ -7793,7 +7807,7 @@ def store_mso_client_text_box   #:nodoc:
     data        = ''
     length      = 0
 
-    return add_mso_generic(type, version, instance, data, length)
+    add_mso_generic(type, version, instance, data, length)
   end
 #  private :store_mso_client_text_box
 
@@ -7843,11 +7857,11 @@ def store_txo_continue_1(string, encoding = 0)   #:nodoc:
     # so that UTF16 chars occur in the same block.
     #
     limit = 8218
-    while string.length > limit
+    while string.bytesize > limit
       string[0 .. limit] = ""
       tmp_str = string
-      data    = [encoding].pack("C") + tmp_str
-      length  = data.length
+      data    = [encoding].pack("C") + tmp_str.force_encoding('ASCII-8BIT')
+      length  = data.bytesize
       header  = [record, length].pack('vv')
 
       print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
@@ -7855,8 +7869,8 @@ def store_txo_continue_1(string, encoding = 0)   #:nodoc:
     end
 
     # Pack the record.
-    data    = [encoding].pack("C") + string
-    length  = data.length
+    data    = [encoding].pack("C") + string.force_encoding('ASCII-8BIT')
+    length  = data.bytesize
     header  = [record, length].pack('vv')
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
@@ -7880,10 +7894,10 @@ def store_txo_continue_2(formats)   #:nodoc:
     data = ''
 
     formats.each do |a_ref|
-      data = data + [a_ref[0], a_ref[1], 0x0].pack('vvV')
+      data += [a_ref[0], a_ref[1], 0x0].pack('vvV')
     end
 
-    length  = data.length
+    length  = data.bytesize
     header  = [record, length].pack("vv")
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
@@ -7904,6 +7918,7 @@ def store_txo_continue_2(formats)   #:nodoc:
   # Write the worksheet NOTE record that is part of cell comments.
   #
   def store_note(row, col, obj_id, author = nil, author_enc = nil, visible = nil)   #:nodoc:
+    ruby_19 { author = [author].pack('a*') if author.ascii_only? }
     record      = 0x001C               # Record identifier
     length      = 0x000C               # Bytes to follow
 
@@ -7920,16 +7935,16 @@ def store_note(row, col, obj_id, author = nil, author_enc = nil, visible = nil)
     end
 
     # Get the number of chars in the author string (not bytes).
-    num_chars  = author.length
+    num_chars  = author.bytesize
     num_chars  = num_chars / 2 if author_enc != 0 && !author_enc.nil?
 
     # Null terminate the author string.
-    author += "\0"
+    author = author.force_encoding('BINARY') + "\0".force_encoding('BINARY')
 
     # Pack the record.
     data    = [row, col, visible, obj_id, num_chars, author_enc].pack("vvvvvC")
 
-    length  = data.length + author.length
+    length  = data.bytesize + author.bytesize
     header  = [record, length].pack("vv")
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
@@ -7945,6 +7960,8 @@ def store_note(row, col, obj_id, author = nil, author_enc = nil, visible = nil)
   # well as calculating the comment object position and vertices.
   #
   def comment_params(row, col, string, options = {})   #:nodoc:
+    string = convert_to_ascii_if_ascii(string)
+
     default_width   = 128
     default_height  = 74
 
@@ -7974,24 +7991,29 @@ def comment_params(row, col, string, options = {})   #:nodoc:
     params[:height] = default_height if params[:height].nil? || params[:height] == 0
 
     # Check that utf16 strings have an even number of bytes.
+    convert_to_ascii_if_ascii(string)
     if params[:encoding] != 0
-      raise "Uneven number of bytes in comment string" if string.length % 2 != 0
+      raise "Uneven number of bytes in comment string" if string.bytesize % 2 != 0
 
       # Change from UTF-16BE to UTF-16LE
       string = string.unpack('n*').pack('v*')
     # Handle utf8 strings
-    elsif string =~ NonAscii
+    elsif string.encoding == Encoding::UTF_8
       string = NKF.nkf('-w16L0 -m0 -W', string)
+      string.force_encoding('UTF-16LE')
       params[:encoding] = 1
     end
 
+    params[:author] = convert_to_ascii_if_ascii(params[:author])
+
     if params[:author_encoding] != 0
-      raise "Uneven number of bytes in author string"  if params[:author].length % 2 != 0
+      raise "Uneven number of bytes in author string"  if params[:author].bytesize % 2 != 0
 
       # Change from UTF-16BE to UTF-16LE
       params[:author] = params[:author].unpack('n*').pack('v*')
-    elsif params[:author] =~ NonAscii
+    elsif params[:author].encoding == Encoding::UTF_8
       params[:author] = NKF.nkf('-w16L0 -m0 -W', params[:author])
+      params[:author].force_encoding('UTF-16LE')
       params[:author_encoding] = 1
     end
 
@@ -7999,7 +8021,7 @@ def comment_params(row, col, string, options = {})   #:nodoc:
     max_len = 32767
     max_len = max_len * 2 if params[:encoding] != 0
 
-    if string.length > max_len
+    if string.bytesize > max_len
       string = string[0 .. max_len]
     end
 
@@ -8074,7 +8096,7 @@ def comment_params(row, col, string, options = {})   #:nodoc:
       params[:height]
     )
 
-    return [row, col, string,
+    [row, col, string,
       params[:encoding],
       params[:author],
       params[:author_encoding],
@@ -8889,7 +8911,7 @@ def store_dv(cells, validation_type, criteria_type,   #:nodoc:
     dv_count = cells.size
     dv_data  = [dv_count].pack('v')
     cells.each do |range|
-      dv_data = dv_data + [range[0], range[2], range[1], range[3]].pack('vvvv')
+      dv_data += [range[0], range[2], range[1], range[3]].pack('vvvv')
     end
 
     # Pack the record.
@@ -8902,7 +8924,7 @@ def store_dv(cells, validation_type, criteria_type,   #:nodoc:
       formula_2                    +
       dv_data
 
-    header = [record, data.length].pack('vv')
+    header = [record, data.bytesize].pack('vv')
 
     print "sheet #{@name} : #{__FILE__}(#{__LINE__}) \n" if defined?($debug)
     append(header, data)
@@ -8922,26 +8944,26 @@ def pack_dv_string(string = nil, max_length = 0)   #:nodoc:
 
     # The default empty string is "\0".
     if string.nil? || string == ''
-      string = "\0"
+      string = "\0".encode('BINARY')
     end
 
     # Excel limits DV captions to 32 chars and messages to 255.
-    if string.length > max_length
+    if string.bytesize > max_length
       string = string[0 .. max_length-1]
     end
 
-    str_length = string.length
+    str_length = string.bytesize
+
+    string = convert_to_ascii_if_ascii(string)
 
     # Handle utf8 strings
-    if string =~ NonAscii
-      $KCODE = 'u'
-      require 'jcode'
-      str_length = string.jlength
-      string = NKF.nkf('-w16L0 -m0 -W', string)
+    if string.encoding == Encoding::UTF_8
+      str_length = string.gsub(/[^\Wa-zA-Z_\d]/, ' ').bytesize   # jlength
+      string = string.encode('UTF-16LE')
       encoding = 1
     end
 
-    return [str_length, encoding].pack('vC') + string
+    [str_length, encoding].pack('vC') + string.force_encoding('BINARY')
   end
 #  private :pack_dv_string
 
@@ -9000,8 +9022,6 @@ def pack_dv_formula(formula = nil)   #:nodoc:
     # Parse the tokens into a formula string.
     formula = parser.parse_tokens(tokens)
 
-    return [formula.length, unused].pack('vv') + formula
+    [formula.length, unused].pack('vv') + formula
   end
-#  private :pack_dv_formula
-
 end