ttfunk 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a769f887e0602c169c60cd4dd6bc124abc7381e4
-  data.tar.gz: 24f486228876268dc8d9f7ce7eb9150c39f70642
+  metadata.gz: 177f0f3efc15ab66c0ea79eb2487cf99c490ba6c
+  data.tar.gz: 7626c05ec3d7e39f747ad0d057ad9b7deef0953a
 SHA512:
-  metadata.gz: 6d9690af986ed9ff9d4a0d395e84a7fd79b7ee112a03c88085d6670c8eb2d2f5c637193da617da0b2f9dca562da56701aebd0dd35cf0921a930da801096af058
-  data.tar.gz: 43fc358d94b88e59668c8954f08e633de8dbd5f0e90497b2e606a6d21d9e768c67342ce227c52d7af1fb33253f3eb1446796ee891f640cbf5fb901fc63f7b719
+  metadata.gz: cc35b7fecf4001efabab23ddbac642f852506ed574c9d2a1ebcb54fd03f7b70819d3de3ca81b711116564eb8ea91dfa01f649ca6d244598d8d1048077bd534be
+  data.tar.gz: 92a5ad612492679643e34e5c231b9de256afb0a5f3c7cf1d178c0f6f3f5e68bc108a35cf773675ad02da000b233bc9b370b0a43763080135e02248801859cfa9

data/examples/metrics.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
-require "ttfunk"
+require_relative "../lib/ttfunk"
 
 def character_lookup(file, character)
   puts "character     : #{character}"

data/lib/ttfunk/directory.rb

@@ -4,9 +4,8 @@ module TTFunk
     attr_reader :scaler_type
 
     def initialize(io)
-      @scaler_type, table_count, search_range,
-        entry_selector, range_shift = io.read(12).unpack("Nn*")
-      
+      @scaler_type, table_count = io.read(12).unpack("Nn")
+
       @tables = {}
       table_count.times do
         tag, checksum, offset, length = io.read(16).unpack("a4N*")

data/lib/ttfunk/resource_file.rb

@@ -12,7 +12,7 @@ module TTFunk
     def initialize(io)
       @io = io
 
-      data_offset, map_offset, data_length, map_length = @io.read(16).unpack("N*")
+      data_offset, map_offset, map_length = @io.read(16).unpack("NNx4N")
 
       @map = {}
       @io.pos = map_offset + 24 # skip header copy, next map handle, file reference, and attrs

data/lib/ttfunk/subset/base.rb

@@ -1,14 +1,14 @@
-require 'ttfunk/table/cmap'
-require 'ttfunk/table/glyf'
-require 'ttfunk/table/head'
-require 'ttfunk/table/hhea'
-require 'ttfunk/table/hmtx'
-require 'ttfunk/table/kern'
-require 'ttfunk/table/loca'
-require 'ttfunk/table/maxp'
-require 'ttfunk/table/name'
-require 'ttfunk/table/post'
-require 'ttfunk/table/simple'
+require_relative '../table/cmap'
+require_relative '../table/glyf'
+require_relative '../table/head'
+require_relative '../table/hhea'
+require_relative '../table/hmtx'
+require_relative '../table/kern'
+require_relative '../table/loca'
+require_relative '../table/maxp'
+require_relative '../table/name'
+require_relative '../table/post'
+require_relative '../table/simple'
 
 module TTFunk
   module Subset
@@ -31,11 +31,11 @@ module TTFunk
         cmap_table = new_cmap_table(options)
         glyphs = collect_glyphs(original_glyph_ids)
 
-        old2new_glyph = cmap_table[:charmap].inject({ 0 => 0 }) { |map, (code, ids)| map[ids[:old]] = ids[:new]; map }
+        old2new_glyph = cmap_table[:charmap].inject({ 0 => 0 }) { |map, (_, ids)| map[ids[:old]] = ids[:new]; map }
         next_glyph_id = cmap_table[:max_glyph_id]
 
         glyphs.keys.each do |old_id|
-          unless old2new_glyph.key?(old_id) 
+          unless old2new_glyph.key?(old_id)
             old2new_glyph[old_id] = next_glyph_id
             next_glyph_id += 1
           end

data/lib/ttfunk/subset/mac_roman.rb

@@ -1,6 +1,7 @@
 require 'set'
-require 'ttfunk/subset/base'
-require 'ttfunk/encoding/mac_roman'
+
+require_relative 'base'
+require_relative '../encoding/mac_roman'
 
 module TTFunk
   module Subset

data/lib/ttfunk/subset/unicode.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'ttfunk/subset/base'
+require_relative 'base'
 
 module TTFunk
   module Subset

data/lib/ttfunk/subset/unicode_8bit.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'ttfunk/subset/base'
+require_relative 'base'
 
 module TTFunk
   module Subset

data/lib/ttfunk/subset/windows_1252.rb

@@ -1,6 +1,7 @@
 require 'set'
-require 'ttfunk/subset/base'
-require 'ttfunk/encoding/windows_1252'
+
+require_relative 'base'
+require_relative '../encoding/windows_1252'
 
 module TTFunk
   module Subset

data/lib/ttfunk/subset.rb

@@ -1,7 +1,7 @@
-require 'ttfunk/subset/unicode'
-require 'ttfunk/subset/unicode_8bit'
-require 'ttfunk/subset/mac_roman'
-require 'ttfunk/subset/windows_1252'
+require_relative 'subset/unicode'
+require_relative 'subset/unicode_8bit'
+require_relative 'subset/mac_roman'
+require_relative 'subset/windows_1252'
 
 module TTFunk
   module Subset

data/lib/ttfunk/subset_collection.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/subset'
+require_relative 'subset'
 
 module TTFunk
   class SubsetCollection

data/lib/ttfunk/table/cmap/format00.rb

@@ -1,5 +1,5 @@
-require 'ttfunk/encoding/mac_roman'
-require 'ttfunk/encoding/windows_1252'
+require_relative '../../encoding/mac_roman'
+require_relative '../../encoding/windows_1252'
 
 module TTFunk
   class Table
@@ -16,7 +16,7 @@ module TTFunk
         # ids. The returned hash also includes a :subtable key, which contains
         # the encoded subtable for the given charmap.
         def self.encode(charmap)
-          next_id = 0 
+          next_id = 0
           glyph_indexes = Array.new(256, 0)
           glyph_map = { 0 => 0 }
 
@@ -44,7 +44,7 @@ module TTFunk
         private
 
           def parse_cmap!
-            length, @language = read(4, "nn")
+            @language = read(4, "x2n")
             @code_map = read(256, "C*")
           end
       end

data/lib/ttfunk/table/cmap/format06.rb

@@ -7,7 +7,7 @@ module TTFunk
         attr_reader :code_map
 
         def self.encode(charmap)
-          next_id = 0 
+          next_id = 0
           glyph_map = { 0 => 0 }
 
           sorted_chars = charmap.keys.sort
@@ -37,7 +37,7 @@ module TTFunk
 
         private
           def parse_cmap!
-            length, @language, firstcode, entrycount = read(8, 'nnnn')
+            @language, firstcode, entrycount = read(8, 'x2nnn')
             @code_map = {}
             (firstcode...(firstcode+entrycount)).each do |code|
               @code_map[code] = read(2, 'n').first & 0xFFFF

data/lib/ttfunk/table/cmap/format10.rb

@@ -7,7 +7,7 @@ module TTFunk
         attr_reader :code_map
 
         def self.encode(charmap)
-          next_id = 0 
+          next_id = 0
           glyph_map = { 0 => 0 }
 
           sorted_chars = charmap.keys.sort
@@ -37,7 +37,7 @@ module TTFunk
 
         private
           def parse_cmap!
-            fractional_version, length, @language, firstcode, entrycount = read(18, 'nNNNN')
+            fractional_version, @language, firstcode, entrycount = read(18, 'nx4NNN')
             raise NotImplementedError, "cmap version 10.#{fractional_version} is not supported" if fractional_version != 0
             @code_map = {}
             (firstcode...(firstcode+entrycount)).each do |code|

data/lib/ttfunk/table/cmap/format12.rb

@@ -7,7 +7,7 @@ module TTFunk
         attr_reader :code_map
 
         def self.encode(charmap)
-          next_id = 0 
+          next_id = 0
           glyph_map = { 0 => 0 }
           range_firstglyphs, range_firstcodes, range_lengths = [], [], []
           last_glyph = last_code = -999
@@ -18,7 +18,7 @@ module TTFunk
 
             if code > last_code+1 || glyph_map[charmap[code]] > last_glyph+1
               range_firstcodes << code
-              range_firstglyphs << glyph_map[charmap[code]] 
+              range_firstglyphs << glyph_map[charmap[code]]
               range_lengths << 1
             else
               range_lengths.push(range_lengths.pop) + 1
@@ -48,7 +48,7 @@ module TTFunk
 
         private
           def parse_cmap!
-            fractional_version, length, @language, groupcount = read(14, 'nNNN')
+            fractional_version, @language, groupcount = read(14, 'nx4NN')
             raise NotImplementedError, "cmap version 12.#{fractional_version} is not supported" if fractional_version != 0
             @code_map = {}
             (1..groupcount).each do

data/lib/ttfunk/table/cmap/subtable.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/reader'
+require_relative '../../reader'
 
 module TTFunk
   class Table
@@ -81,8 +81,8 @@ module TTFunk
   end
 end
 
-require 'ttfunk/table/cmap/format00'
-require 'ttfunk/table/cmap/format04'
-require 'ttfunk/table/cmap/format06'
-require 'ttfunk/table/cmap/format10'
-require 'ttfunk/table/cmap/format12'
+require_relative 'format00'
+require_relative 'format04'
+require_relative 'format06'
+require_relative 'format10'
+require_relative 'format12'

data/lib/ttfunk/table/cmap.rb

@@ -34,4 +34,4 @@ module TTFunk
   end
 end
 
-require 'ttfunk/table/cmap/subtable'
+require_relative 'cmap/subtable'

data/lib/ttfunk/table/glyf/compound.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/reader'
+require_relative '../../reader'
 
 module TTFunk
   class Table

data/lib/ttfunk/table/glyf/simple.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/reader'
+require_relative '../../reader'
 
 module TTFunk
   class Table

data/lib/ttfunk/table/glyf.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table
@@ -60,5 +60,5 @@ module TTFunk
   end
 end
 
-require 'ttfunk/table/glyf/compound'
-require 'ttfunk/table/glyf/simple'
+require_relative 'glyf/compound'
+require_relative 'glyf/simple'

data/lib/ttfunk/table/head.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk  
   class Table

data/lib/ttfunk/table/hhea.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk  
   class Table

data/lib/ttfunk/table/hmtx.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk  
   class Table 

data/lib/ttfunk/table/kern/format0.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/reader'
+require_relative '../../reader'
 
 module TTFunk
   class Table
@@ -12,8 +12,7 @@ module TTFunk
         def initialize(attributes={})
           @attributes = attributes
 
-          num_pairs, search_range, entry_selector, range_shift, *pairs =
-            attributes.delete(:data).unpack("n*")
+          num_pairs, *pairs = attributes.delete(:data).unpack("nx6n*")
 
           @pairs = {}
           num_pairs.times do |i|

data/lib/ttfunk/table/kern.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table
@@ -76,4 +76,4 @@ module TTFunk
   end
 end
 
-require 'ttfunk/table/kern/format0'
+require_relative 'kern/format0'

data/lib/ttfunk/table/loca.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table

data/lib/ttfunk/table/maxp.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table

data/lib/ttfunk/table/name.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table
@@ -53,7 +53,7 @@ module TTFunk
 
         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 = ""
@@ -76,7 +76,7 @@ module TTFunk
       private
 
         def parse!
-          format, count, string_offset = read(6, "n*")
+          count, string_offset = read(6, "x2n*")
 
           entries = []
           count.times do

data/lib/ttfunk/table/os2.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table

data/lib/ttfunk/table/post/format20.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table/post/format10'
+require_relative 'format10'
 require 'stringio'
 
 module TTFunk

data/lib/ttfunk/table/post.rb

@@ -1,6 +1,6 @@
-require 'ttfunk/table'
+require_relative '../table'
 
-module TTFunk  
+module TTFunk
   class Table
     class Post < Table
       attr_reader :format
@@ -60,17 +60,21 @@ module TTFunk
 
         def parse!
           @format, @italic_angle, @underline_position, @underline_thickness,
-            @fixed_pitch, @min_mem_type42, @max_mem_type42, 
+            @fixed_pitch, @min_mem_type42, @max_mem_type42,
             @min_mem_type1, @max_mem_type1 = read(32, "N2n2N*")
 
-          end_of_table = offset + length
-
           @subtable = case @format
-            when 0x00010000 then extend(Post::Format10)
-            when 0x00020000 then extend(Post::Format20)
-            when 0x00025000 then extend(Post::Format25)
-            when 0x00030000 then extend(Post::Format30)
-            when 0x00040000 then extend(Post::Format40)
+            when 0x00010000 
+              extend(Post::Format10)
+            when 0x00020000
+              extend(Post::Format20)
+            when 0x00025000
+              raise NotImplementedError, 
+                    "Post format 2.5 is not supported by TTFunk"
+            when 0x00030000 
+              extend(Post::Format30)
+            when 0x00040000 
+              extend(Post::Format40)
             end
 
           parse_format!
@@ -80,12 +84,11 @@ module TTFunk
           warn "postscript table format 0x%08X is not supported" % @format
         end
     end
-    
+
   end
 end
 
-require 'ttfunk/table/post/format10'
-require 'ttfunk/table/post/format20'
-require 'ttfunk/table/post/format25'
-require 'ttfunk/table/post/format30'
-require 'ttfunk/table/post/format40'
+require_relative 'post/format10'
+require_relative 'post/format20'
+require_relative 'post/format30'
+require_relative 'post/format40'

data/lib/ttfunk/table/simple.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/table'
+require_relative '../table'
 
 module TTFunk
   class Table

data/lib/ttfunk/table.rb

@@ -1,4 +1,4 @@
-require 'ttfunk/reader'
+require_relative 'reader'
 
 module TTFunk
   class Table

data/lib/ttfunk.rb

@@ -1,7 +1,8 @@
 require 'stringio'
 require 'pathname'
-require 'ttfunk/directory'
-require 'ttfunk/resource_file'
+
+require_relative 'ttfunk/directory'
+require_relative 'ttfunk/resource_file'
 
 module TTFunk
   class File
@@ -108,15 +109,14 @@ module TTFunk
   end   
 end
 
-require "ttfunk/table/cmap"
-require "ttfunk/table/glyf"
-require "ttfunk/table/head"
-require "ttfunk/table/hhea"
-require "ttfunk/table/hmtx"
-require "ttfunk/table/kern"
-require "ttfunk/table/loca"
-require "ttfunk/table/maxp"
-require "ttfunk/table/name"
-require "ttfunk/table/os2"
-require "ttfunk/table/post"
-
+require_relative "ttfunk/table/cmap"
+require_relative "ttfunk/table/glyf"
+require_relative "ttfunk/table/head"
+require_relative "ttfunk/table/hhea"
+require_relative "ttfunk/table/hmtx"
+require_relative "ttfunk/table/kern"
+require_relative "ttfunk/table/loca"
+require_relative "ttfunk/table/maxp"
+require_relative "ttfunk/table/name"
+require_relative "ttfunk/table/os2"
+require_relative "ttfunk/table/post"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttfunk
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -125,7 +125,6 @@ files:
 - lib/ttfunk/table/post.rb
 - lib/ttfunk/table/post/format10.rb
 - lib/ttfunk/table/post/format20.rb
-- lib/ttfunk/table/post/format25.rb
 - lib/ttfunk/table/post/format30.rb
 - lib/ttfunk/table/post/format40.rb
 - lib/ttfunk/table/simple.rb

data/lib/ttfunk/table/post/format25.rb

@@ -1,23 +0,0 @@
-require 'ttfunk/table/post/format10'
-require 'stringio'
-
-module TTFunk
-  class Table
-    class Post
-      module Format25
-        include Format10
-
-        def glyph_for(code)
-          POSTSCRIPT_GLYPHS[code + @offsets[code]] || ".notdef"
-        end
-
-        private
-
-          def parse_format!
-            number_of_glyphs = read(2, 'n').first
-            @offsets = read(@number_of_glyphs, "c*")
-          end
-      end
-    end
-  end
-end