lib/ttfunk/table/name.rb in ttfunk-1.2.2 vs lib/ttfunk/table/name.rb in ttfunk-1.3.0

@@ -1,6 +1,6 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table
     class Name < Table
       class String < ::String
@@ -51,11 +51,11 @@
 
         postscript_name = Name::String.new("#{tag}+#{names.postscript_name}", 1, 0, 0)
 
         strings = names.strings.dup
         strings[6] = [postscript_name]
-        str_count = strings.inject(0) { |sum, (id, list)| sum + list.length }
+        str_count = strings.inject(0) { |sum, (_, list)| sum + list.length }
 
         table = [0, str_count, 6 + 12 * str_count].pack("n*")
         strtable = ""
 
         strings.each do |id, list|
@@ -74,10 +74,10 @@
       end
 
       private
 
         def parse!
-          format, count, string_offset = read(6, "n*")
+          count, string_offset = read(6, "x2n*")
 
           entries = []
           count.times do
             platform, encoding, language, id, length, start_offset = read(12, "n*")
             entries << {