spreadsheet 0.6.1.1 → 0.6.1.2

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.6.1.2 / 2008-10-20
+
+* 2 Bugfixes
+
+  * Corrected the Font-Encoding values in Excel::Internals
+    (Thanks to Bjorn Hjelle for the Bugreport)
+  * Spreadsheet now skips Richtext-Formatting runs and Asian Phonetic 
+    Settings when reading the SST, fixing a problem where the presence of
+    Richtext could lead to an incomplete SST.
+
 === 0.6.1.1 / 2008-10-20
 
 * 1 Bugfix

data/lib/spreadsheet/excel/internals.rb

@@ -163,6 +163,7 @@ module Internals
   }
   SEPYT_TNEMEPACSE = ESCAPEMENT_TYPES.invert
   FONT_ENCODINGS = {
+    0x00 => :iso_latin1,
     0x01 => :default,
     0x02 => :symbol,
     0x4d => :apple_roman,
@@ -179,7 +180,7 @@ module Internals
     0xba => :baltic,
     0xcc => :cyrillic,
     0xde => :thai,
-    0xee => :latin2,
+    0xee => :iso_latin2,
     0xff => :oem_latin1,
   }
   SGNIDOCNE_TNOF = FONT_ENCODINGS.invert
@@ -197,8 +198,6 @@ module Internals
   }
   LEAP_ERROR = Date.new 1900, 2, 28
   OPCODES = {
-    :annotation   => 0x01b6, #    Details unknown
-    :note         => 0x001c, #    Details unknown
     :blank        => 0x0201, #    BLANK ➜ 6.7
     :boolerr      => 0x0205, #    BOOLERR ➜ 6.10
     :boundsheet   => 0x0085, # ●● BOUNDSHEET ➜ 6.12

data/lib/spreadsheet/excel/reader/biff8.rb

@@ -99,7 +99,7 @@ module Biff8
     #                   List of rt formatting runs (➜ 3.2)
     #   [var.]      sz  (optional, only if phonetic=1)
     #                   Asian Phonetic Settings Block (➜ 3.4.2)
-    chars, offset, wide, phonetic, richtext, available, owing \
+    chars, offset, wide, phonetic, richtext, available, owing, skip \
       = read_string_header work, count_length
     string, data = read_string_body work, offset, available, wide > 0
     if owing > 0
@@ -132,11 +132,20 @@ module Biff8
     phonetic  = (opts >> 2) & 1
     richtext  = (opts >> 3) & 1
     size      = chars * (wide + 1)
+    skip = 0
+    if richtext > 0
+      runs, = work[offset + 1 + count_length, 2].unpack 'v'
+      skip = 4 * runs
+    end
+    if phonetic > 0
+      psize, = work[offset + 1 + count_length + richtext * 2, 4].unpack 'V'
+      skip += psize
+    end
     flagsize  = 1 + count_length + richtext * 2 + phonetic * 4
     avbl      = [work.size - offset, flagsize + size].min
     have_chrs = (avbl - flagsize) / (1 + wide)
     owing     = chars - have_chrs
-    [chars, flagsize, wide, phonetic, richtext, avbl, owing]
+    [chars, flagsize, wide, phonetic, richtext, avbl, owing, skip]
   end
   ##
   # Insert null-characters into a compressed UTF-16 string
@@ -153,13 +162,13 @@ module Biff8
                          :ole    => @data,
                          :reader => self
       sst.chars, sst.flags, wide, sst.phonetic, sst.richtext, sst.available,
-        sst.continued_chars = read_string_header work, 2, pos
+        sst.continued_chars, skip = read_string_header work, 2, pos
       sst.wide = wide > 0
       if sst.continued?
         @incomplete_sst = sst
       end
       @workbook.add_shared_string sst
-      pos += sst.available
+      pos += sst.available + skip
     end
   end
 end

data/lib/spreadsheet/excel/reader.rb

@@ -853,7 +853,7 @@ class Reader
       @pos += len
       code = SEDOCPO.fetch(op, op)
       #puts "0x%04x/%-16s (0x%08x) %5i: %s" % [op, code.inspect, pos, len, work[0,16].inspect]
-      puts "0x%04x/%-16s %5i: %s" % [op, code.inspect, len, work[0,32].inspect]
+      #puts "0x%04x/%-16s %5i: %s" % [op, code.inspect, len, work[0,32].inspect]
       [ pos, code, len + OPCODE_SIZE, work]
     end
   end

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.1.1'
+  VERSION = '0.6.1.2'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/test/integration.rb

@@ -1030,19 +1030,5 @@ module Spreadsheet
                    sheet.name
       assert_not_nil sheet.offset
     end
-    def test_file_comment
-      source = File.expand_path 'data/test_comment.xls', File.dirname(__FILE__)
-      book = Spreadsheet.open source
-      sheet = book.worksheet 0
-      row = sheet.row 0
-      ann = row.annotation 0
-      assert_equal 'cellcontent', row.cell(0)
-      assert_equal 'cellcomment', ann
-      assert_equal 'HW', ann.author
-      row = sheet.row 1
-      ann = row.annotation 1
-      assert_equal 'cellcontent', row.cell(1)
-      assert_equal 'annotation', ann
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.1
+  version: 0.6.1.2
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-20 00:00:00 +02:00
+date: 2008-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency