ttfunk 1.0.3 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ed69e97b1e7115a2f520ccce3e11cc4c45049e0c
+  data.tar.gz: 53b854789acf1d696429c11f205a3563d9181ee4
+SHA512:
+  metadata.gz: a629cedf256c3cbb06853f19c17f5aceb8fc6c400cf50e39535905f02a817297f89a17e9f41d8f90ae4f2939eb953031231ab077d62d6e578fd7dc204e16bdaa
+  data.tar.gz: 5a75eb4d88249046dfd77cf45d5a64794a0da8d6a60b0c43f2809d667e0673b6ea6e20b3bb649590b4b38fe41fe9a01884e770407a724a2255ff72e0cc762eec

data/GPLv2

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

data/README.rdoc

@@ -21,6 +21,7 @@ For more detailed examples, explore the examples directory.
 
 = Maintainers
 
+- Gregory Brown
 - Brad Ediger
 - Daniel Nelson
 - Jonathan Greenberg

data/lib/ttfunk/subset_collection.rb

@@ -55,7 +55,11 @@ module TTFunk
           char = @subsets[current_subset].from_unicode(char)
 
           if parts.empty? || parts.last[0] != current_subset
-            parts << [current_subset, char.chr]
+            encoded_char = char.chr
+            if encoded_char.respond_to?(:force_encoding)
+              encoded_char.force_encoding("ASCII-8BIT")
+            end
+            parts << [current_subset, encoded_char]
           else
             parts.last[1] << char
           end

data/lib/ttfunk/table/cmap.rb

@@ -13,7 +13,9 @@ module TTFunk
       end
 
       def unicode
-        @unicode ||= @tables.select { |table| table.unicode? }
+        # Because most callers just call .first on the result, put tables with highest-number format first.
+        # (Tables with higher format numbers tend to be more complete, especially in higher/astral Unicode ranges.)
+        @unicode ||= @tables.select { |table| table.unicode? }.sort{|a,b| b.format <=> a.format }
       end
 
       private

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

@@ -0,0 +1,51 @@
+module TTFunk
+  class Table
+    class Cmap
+
+      module Format06
+        attr_reader :language
+        attr_reader :code_map
+
+        def self.encode(charmap)
+          next_id = 0 
+          glyph_map = { 0 => 0 }
+
+          sorted_chars = charmap.keys.sort
+          low_char, high_char = sorted_chars.first, sorted_chars.last
+          entry_count = (1+high_char-low_char)
+          glyph_indexes = Array.new(entry_count, 0)
+
+          new_map = charmap.keys.sort.inject({}) do |map, code|
+            glyph_map[charmap[code]] ||= next_id += 1
+            map[code] = { :old => charmap[code], :new => glyph_map[charmap[code]] }
+            glyph_indexes[code - low_char] = glyph_map[charmap[code]]
+            map
+          end
+
+          subtable = [6, 10+entry_count*2, 0, low_char, entry_count, *glyph_indexes].pack('n*')
+
+          { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
+        end
+
+        def [](code)
+          @code_map[code] || 0
+        end
+
+        def supported?
+          true
+        end
+
+        private
+          def parse_cmap!
+            length, @language, firstcode, entrycount = read(8, 'nnnn')
+            @code_map = {}
+            (firstcode...(firstcode+entrycount)).each do |code|
+              @code_map[code] = read(2, 'n').first & 0xFFFF
+            end
+          end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module TTFunk
+  class Table
+    class Cmap
+
+      module Format10
+        attr_reader :language
+        attr_reader :code_map
+
+        def self.encode(charmap)
+          next_id = 0 
+          glyph_map = { 0 => 0 }
+
+          sorted_chars = charmap.keys.sort
+          low_char, high_char = sorted_chars.first, sorted_chars.last
+          entry_count = (1+high_char-low_char)
+          glyph_indexes = Array.new(entry_count, 0)
+
+          new_map = charmap.keys.sort.inject({}) do |map, code|
+            glyph_map[charmap[code]] ||= next_id += 1
+            map[code] = { :old => charmap[code], :new => glyph_map[charmap[code]] }
+            glyph_indexes[code - low_char] = glyph_map[charmap[code]]
+            map
+          end
+
+          subtable = [10, 0, 20+entry_count*4, 0, low_char, entry_count, *glyph_indexes].pack('nnN*')
+
+          { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
+        end
+
+        def [](code)
+          @code_map[code] || 0
+        end
+
+        def supported?
+          true
+        end
+
+        private
+          def parse_cmap!
+            fractional_version, length, @language, firstcode, entrycount = read(18, 'nNNNN')
+            raise NotImplementedError, "cmap version 10.#{fractional_version} is not supported" if fractional_version != 0
+            @code_map = {}
+            (firstcode...(firstcode+entrycount)).each do |code|
+              @code_map[code] = read(2, 'n').first & 0xFFFF
+            end
+          end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+module TTFunk
+  class Table
+    class Cmap
+
+      module Format12
+        attr_reader :language
+        attr_reader :code_map
+
+        def self.encode(charmap)
+          next_id = 0 
+          glyph_map = { 0 => 0 }
+          range_firstglyphs, range_firstcodes, range_lengths = [], [], []
+          last_glyph = last_code = -999
+
+          new_map = charmap.keys.sort.inject({}) do |map, code|
+            glyph_map[charmap[code]] ||= next_id += 1
+            map[code] = { :old => charmap[code], :new => glyph_map[charmap[code]] }
+
+            if code > last_code+1 || glyph_map[charmap[code]] > last_glyph+1
+              range_firstcodes << code
+              range_firstglyphs << glyph_map[charmap[code]] 
+              range_lengths << 1
+            else
+              range_lengths.push(range_lengths.pop) + 1
+            end
+            last_code = code
+            last_glyph = glyph_map[charmap[code]]
+
+            map
+          end
+
+          subtable = [12, 0, 16+12*range_lengths.size, 0, range_lengths.size].pack('nnNNN')
+          range_lengths.each_with_index do |length, i|
+            firstglyph, firstcode = range_firstglyphs[i], range_firstcodes[i]
+            subtable << [firstcode, firstcode+length-1, firstglyph].pack('NNN')
+          end
+
+          { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
+        end
+
+        def [](code)
+          @code_map[code] || 0
+        end
+
+        def supported?
+          true
+        end
+
+        private
+          def parse_cmap!
+            fractional_version, length, @language, groupcount = read(14, 'nNNN')
+            raise NotImplementedError, "cmap version 12.#{fractional_version} is not supported" if fractional_version != 0
+            @code_map = {}
+            (1..groupcount).each do
+              startchar, endchar, startglyph = read(12, 'NNN')
+              (0..(endchar-startchar)).each do |offset|
+                @code_map[startchar+offset] = startglyph+offset
+              end
+            end
+          end
+
+      end
+
+    end
+  end
+end

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

@@ -13,7 +13,8 @@ module TTFunk
         ENCODING_MAPPINGS = {
           :mac_roman    => { :platform_id => 1, :encoding_id => 0 },
           # use microsoft unicode, instead of generic unicode, for optimal windows support
-          :unicode      => { :platform_id => 3, :encoding_id => 1 }
+          :unicode      => { :platform_id => 3, :encoding_id => 1 },
+          :unicode_ucs4 => { :platform_id => 3, :encoding_id => 10 }
         }
 
         def self.encode(charmap, encoding)
@@ -22,6 +23,8 @@ module TTFunk
             result = Format00.encode(charmap)
           when :unicode
             result = Format04.encode(charmap)
+          when :unicode_ucs4
+            result = Format12.encode(charmap)
           else
             raise NotImplementedError, "encoding #{encoding.inspect} is not supported"
           end
@@ -44,8 +47,11 @@ module TTFunk
             @format = read(2, "n").first
 
             case @format
-              when 0 then extend(TTFunk::Table::Cmap::Format00)
-              when 4 then extend(TTFunk::Table::Cmap::Format04)
+              when 0  then extend(TTFunk::Table::Cmap::Format00)
+              when 4  then extend(TTFunk::Table::Cmap::Format04)
+              when 6  then extend(TTFunk::Table::Cmap::Format06)
+              when 10 then extend(TTFunk::Table::Cmap::Format10)
+              when 12 then extend(TTFunk::Table::Cmap::Format12)
             end
 
             parse_cmap!
@@ -53,8 +59,8 @@ module TTFunk
         end
 
         def unicode?
-          platform_id == 3 && encoding_id == 1 && format == 4 ||
-          platform_id == 0 && format == 4
+          platform_id == 3 && (encoding_id == 1 || encoding_id == 10) && format != 0 ||
+          platform_id == 0 && format != 0
         end
 
         def supported?
@@ -77,3 +83,6 @@ 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'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttfunk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -13,9 +12,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000 -05:00
-default_executable: 
-dependencies: []
+date: 2014-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Get Ya TrueType Funk On! (Font Metrics Parser for Prawn)
 email:
 - gregory.t.brown@gmail.com
@@ -27,42 +67,45 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ttfunk/encoding/windows_1252.rb
-- lib/ttfunk/encoding/mac_roman.rb
 - lib/ttfunk/directory.rb
-- lib/ttfunk/table/cmap/subtable.rb
+- lib/ttfunk/encoding/mac_roman.rb
+- lib/ttfunk/encoding/windows_1252.rb
+- lib/ttfunk/reader.rb
+- lib/ttfunk/resource_file.rb
+- lib/ttfunk/subset/base.rb
+- lib/ttfunk/subset/mac_roman.rb
+- lib/ttfunk/subset/unicode.rb
+- lib/ttfunk/subset/unicode_8bit.rb
+- lib/ttfunk/subset/windows_1252.rb
+- lib/ttfunk/subset.rb
+- lib/ttfunk/subset_collection.rb
 - lib/ttfunk/table/cmap/format00.rb
 - lib/ttfunk/table/cmap/format04.rb
-- lib/ttfunk/table/post.rb
-- lib/ttfunk/table/loca.rb
-- lib/ttfunk/table/post/format40.rb
-- lib/ttfunk/table/post/format20.rb
-- lib/ttfunk/table/post/format10.rb
-- lib/ttfunk/table/post/format30.rb
-- lib/ttfunk/table/post/format25.rb
+- lib/ttfunk/table/cmap/format06.rb
+- lib/ttfunk/table/cmap/format10.rb
+- lib/ttfunk/table/cmap/format12.rb
+- lib/ttfunk/table/cmap/subtable.rb
 - lib/ttfunk/table/cmap.rb
-- lib/ttfunk/table/os2.rb
 - lib/ttfunk/table/glyf/compound.rb
 - lib/ttfunk/table/glyf/simple.rb
-- lib/ttfunk/table/hhea.rb
-- lib/ttfunk/table/maxp.rb
-- lib/ttfunk/table/kern.rb
 - lib/ttfunk/table/glyf.rb
 - lib/ttfunk/table/head.rb
-- lib/ttfunk/table/simple.rb
+- lib/ttfunk/table/hhea.rb
 - lib/ttfunk/table/hmtx.rb
 - lib/ttfunk/table/kern/format0.rb
+- lib/ttfunk/table/kern.rb
+- lib/ttfunk/table/loca.rb
+- lib/ttfunk/table/maxp.rb
 - lib/ttfunk/table/name.rb
-- lib/ttfunk/subset.rb
-- lib/ttfunk/subset_collection.rb
-- lib/ttfunk/reader.rb
-- lib/ttfunk/subset/base.rb
-- lib/ttfunk/subset/unicode.rb
-- lib/ttfunk/subset/windows_1252.rb
-- lib/ttfunk/subset/unicode_8bit.rb
-- lib/ttfunk/subset/mac_roman.rb
+- lib/ttfunk/table/os2.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/post.rb
+- lib/ttfunk/table/simple.rb
 - lib/ttfunk/table.rb
-- lib/ttfunk/resource_file.rb
 - lib/ttfunk.rb
 - data/fonts/comicsans.ttf
 - data/fonts/DejaVuSans.ttf
@@ -73,29 +116,28 @@ files:
 - LICENSE
 - GPLv2
 - GPLv3
-has_rdoc: true
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: TrueType Font Metrics Parser
 test_files: []
+has_rdoc: