ttfunk 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78159985ca295665778e7a61bc86f5fb60e64576
-  data.tar.gz: f4c79101f0f684003183e32d9251ca96c3e72222
+  metadata.gz: b26efe5c04617356a8a8fdcc35a89bb20c995dd8
+  data.tar.gz: 117c4486162e7ef29d4f7f517005a733250affe1
 SHA512:
-  metadata.gz: 6b7fa90240e932b32b7f8e5423783bdc295856a3154ac42be83606d5a67cf466f0fab02bcdd2a6a60f5297d69adfcd7fe25f0d7b542fd81500710b1b2a1a8203
-  data.tar.gz: 9d66adee4258dec0600aa5fb76838f583872aaec2d6ef6772b13596f4b1bda9af1370f50123af195f38bb67accb48e10925ba6542a538d730e80395a6a92f05a
+  metadata.gz: 45ce04b7124a8ccea39d8bbe06094ccaf09039f4a55f24f31ed676a397373ffd2dafb930d72c6e97cbf3c6ea5bc99f5877f83de46cec5db19b9ac55844c37722
+  data.tar.gz: a3ab18306f52ec8bd0c6bbe163458236b3e4ba4c4713fe19eb9aa1e9d50bd42b291ed4e41ebac21ef17e224f90b09b49598d758d17114d6088efe2391721b324

data/CHANGELOG.md

@@ -0,0 +1,114 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/).
+
+
+## [Unreleased]
+
+## [1.5.0] - 2017-02-13
+
+### Added
+
+* Support for reading TTF fonts from TTC files
+
+### Changed
+
+* Subset font naming is consistent now and depends on content
+
+
+## [1.4.0] - 2014-09-21
+
+### Added
+
+* sbix table support
+
+
+## [1.3.0] - 2014-09-10
+
+### Removed
+
+* Post table version 2.5
+
+
+## [1.2.2] - 2014-08-29
+
+### Fixed
+
+* Ignore unsupported cmap table versions
+
+
+## [1.2.1] - 2014-08-28
+
+### Fixed
+
+* Added missing Pathname require
+
+
+## [1.2.0] - 2014-06-23
+
+### Added
+
+* Rubocop checks
+* Ability to parse IO objects
+
+### Changed
+
+* Improved preferred family name selection
+
+
+## [1.1.1] - 2014-02-24
+
+### Changed
+
+* Clarified licensing
+
+### Removed
+
+* comicsans.ttf
+
+
+## [1.1.0] - 2014-01-21
+
+### Added
+
+* Improved Unicode astral planes support
+* Support for cmap table formats 6, 10, 12
+* RSpec-based specs
+
+### Fixed
+
+* Subsetting in JRuby
+
+
+## [1.0.3] - 2011-10-11
+
+### Added
+
+* Authorship information
+
+
+## 1.0.2 - 2011-08-08
+
+### Fixed
+
+* Ruby 1.9.2 segmentation fault on Enumerable#zip(range)
+
+
+## 1.0.0 - 2011-04-02 [YANKED]
+
+Initial release as a standalone gem
+
+
+
+[Unreleased]: https://github.com/prawnpdf/ttfunk/compare/1.5.0...HEAD
+[1.5.0]: https://github.com/prawnpdf/ttfunk/compare/1.4.0...1.5.0
+[1.4.0]: https://github.com/prawnpdf/ttfunk/compare/1.3.0...1.4.0
+[1.3.0]: https://github.com/prawnpdf/ttfunk/compare/1.2.2...1.3.0
+[1.2.2]: https://github.com/prawnpdf/ttfunk/compare/1.2.1...1.2.2
+[1.2.1]: https://github.com/prawnpdf/ttfunk/compare/1.2.0...1.2.1
+[1.2.0]: https://github.com/prawnpdf/ttfunk/compare/1.1.1...1.2.0
+[1.1.1]: https://github.com/prawnpdf/ttfunk/compare/1.1.0...1.1.1
+[1.1.0]: https://github.com/prawnpdf/ttfunk/compare/1.0.3...1.1.0
+[1.0.3]: https://github.com/prawnpdf/ttfunk/compare/1.0.2...1.0.3

data/{README.rdoc → README.md}

@@ -1,12 +1,16 @@
+# TTFunk
+
+![Maintained: yes](https://img.shields.io/badge/maintained-yes-brightgreen.png)
+
 TTFunk is a TrueType font parser written in pure ruby.
 
-= Installation
+## Installation
 
 The recommended installation method is via Rubygems.
 
-  gem install ttfunk
+    gem install ttfunk
 
-= Usage
+## Usage
 
 Basic usage:
 
@@ -19,11 +23,11 @@ Basic usage:
 
 For more detailed examples, explore the examples directory.
 
-= Licensing
+## Licensing
 
 Matz's terms for Ruby, GPLv2, or GPLv3. See LICENSE for details.
 
-= Authorship
+##  Authorship
 
 This project is maintained by the same folks who run the Prawn PDF project.
 
@@ -32,10 +36,10 @@ to ttfunk at:
 
   https://github.com/prawnpdf/ttfunk/contributors
 
-= Mailing List
+## Mailing List
 
-TTFunk is maintained as a dependency of prawn, the ruby PDF generation library.
+TTFunk is maintained as a dependency of Prawn, the ruby PDF generation library.
 
 Any questions or feedback should be sent to the Prawn google group.
 
-http://groups.google.com/group/prawn-ruby
+https://groups.google.com/group/prawn-ruby

data/lib/ttfunk.rb

@@ -3,6 +3,7 @@ require 'pathname'
 
 require_relative 'ttfunk/directory'
 require_relative 'ttfunk/resource_file'
+require_relative 'ttfunk/collection'
 
 module TTFunk
   class File
@@ -13,8 +14,12 @@ module TTFunk
       new verify_and_open(io_or_path).read
     end
 
-    def self.from_dfont(file, which=0)
-      new(ResourceFile.open(file) { |dfont| dfont["sfnt", which] })
+    def self.from_dfont(file, which = 0)
+      new(ResourceFile.open(file) { |dfont| dfont['sfnt', which] })
+    end
+
+    def self.from_ttc(file, which = 0)
+      Collection.open(file) { |ttc| ttc[which] }
     end
 
     def self.verify_and_open(io_or_path)
@@ -36,29 +41,30 @@ module TTFunk
       io
     end
 
-    def initialize(contents)
+    def initialize(contents, offset = 0)
       @contents = StringIO.new(contents)
-      @directory = Directory.new(@contents)
+      @directory = Directory.new(@contents, offset)
     end
 
-
     def ascent
-      @ascent ||= (os2.exists? && os2.ascent && os2.ascent.nonzero?) || horizontal_header.ascent
+      @ascent ||= (os2.exists? && os2.ascent && os2.ascent.nonzero?) ||
+        horizontal_header.ascent
     end
 
     def descent
-      @descent ||= (os2.exists? && os2.descent && os2.descent.nonzero?) || horizontal_header.descent
+      @descent ||= (os2.exists? && os2.descent && os2.descent.nonzero?) ||
+        horizontal_header.descent
     end
 
     def line_gap
-      @line_gap ||= (os2.exists? && os2.line_gap && os2.line_gap.nonzero?) || horizontal_header.line_gap
+      @line_gap ||= (os2.exists? && os2.line_gap && os2.line_gap.nonzero?) ||
+        horizontal_header.line_gap
     end
 
     def bbox
       [header.x_min, header.y_min, header.x_max, header.y_max]
     end
 
-
     def directory_info(tag)
       directory.tables[tag.to_s]
     end
@@ -113,15 +119,15 @@ module TTFunk
   end
 end
 
-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"
-require_relative "ttfunk/table/sbix"
+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'
+require_relative 'ttfunk/table/sbix'

data/lib/ttfunk/collection.rb

@@ -0,0 +1,41 @@
+require 'ttfunk'
+
+module TTFunk
+  class Collection
+    include Enumerable
+
+    def self.open(path)
+      ::File.open(path, 'rb') do |io|
+        yield new(io)
+      end
+    end
+
+    def initialize(io)
+      tag = io.read(4)
+      raise ArgumentError, 'not a TTC file' unless tag == 'ttcf'
+
+      _major, _minor = io.read(4).unpack('n*')
+      count = io.read(4).unpack('N').first
+      @offsets = io.read(count * 4).unpack('N*')
+
+      io.rewind
+      @contents = io.read
+      @cache = []
+    end
+
+    def count
+      @offsets.length
+    end
+
+    def each
+      count.times do |index|
+        yield self[index]
+      end
+      self
+    end
+
+    def [](index)
+      @cache[index] ||= TTFunk::File.new(@contents, @offsets[index])
+    end
+  end
+end

data/lib/ttfunk/directory.rb

@@ -3,13 +3,19 @@ module TTFunk
     attr_reader :tables
     attr_reader :scaler_type
 
-    def initialize(io)
-      @scaler_type, table_count = io.read(12).unpack("Nn")
+    def initialize(io, offset = 0)
+      io.seek(offset)
+      @scaler_type, table_count = io.read(12).unpack('Nn')
 
       @tables = {}
       table_count.times do
-        tag, checksum, offset, length = io.read(16).unpack("a4N*")
-        @tables[tag] = { :tag => tag, :checksum => checksum, :offset => offset, :length => length }
+        tag, checksum, offset, length = io.read(16).unpack('a4N*')
+        @tables[tag] = {
+          tag: tag,
+          checksum: checksum,
+          offset: offset,
+          length: length
+        }
       end
     end
   end

data/lib/ttfunk/encoding/mac_roman.rb

@@ -1,44 +1,52 @@
 module TTFunk
   module Encoding
     class MacRoman
-      # XXX: Ruby 1.9.2 on OS X Lion segfaults on range1.zip(range2)
-      TO_UNICODE = Hash[*(0..255).zip((0..255).to_a).flatten]
+      # rubocop: disable Style/ExtraSpacing
 
-      TO_UNICODE.update(
-        0x81 => 0x00C5, 0x82 => 0x00C7, 0x83 => 0x00C9, 0x84 => 0x00D1, 0x85 => 0x00D6,
-        0x86 => 0x00DC, 0x87 => 0x00E1, 0x88 => 0x00E0, 0x89 => 0x00E2, 0x8A => 0x00E4,
-        0x8B => 0x00E3, 0x8C => 0x00E5, 0x8D => 0x00E7, 0x8E => 0x00E9, 0x8F => 0x00E8,
-        0x90 => 0x00EA, 0x91 => 0x00EB, 0x92 => 0x00ED, 0x93 => 0x00EC, 0x94 => 0x00EE,
-        0x95 => 0x00EF, 0x96 => 0x00F1, 0x97 => 0x00F3, 0x98 => 0x00F2, 0x99 => 0x00F4,
-        0x9A => 0x00F6, 0x9B => 0x00F5, 0x9C => 0x00FA, 0x9D => 0x00F9, 0x9E => 0x00FB,
-        0x9F => 0x00FC, 0xA0 => 0x2020, 0xA1 => 0x00B0, 0xA4 => 0x00A7, 0xA5 => 0x2022,
-        0xA6 => 0x00B6, 0xA7 => 0x00DF, 0xA8 => 0x00AE, 0xAA => 0x2122, 0xAB => 0x00B4,
-        0xAC => 0x00A8, 0xAD => 0x2260, 0xAE => 0x00C6, 0xAF => 0x00D8, 0xB0 => 0x221E,
-        0xB2 => 0x2264, 0xB3 => 0x2265, 0xB4 => 0x00A5, 0xB6 => 0x2202, 0xB7 => 0x2211,
-        0xB8 => 0x220F, 0xB9 => 0x03C0, 0xBA => 0x222B, 0xBB => 0x00AA, 0xBC => 0x00BA,
-        0xBD => 0x03A9, 0xBE => 0x00E6, 0xBF => 0x00F8, 0xC0 => 0x00BF, 0xC1 => 0x00A1,
-        0xC2 => 0x00AC, 0xC3 => 0x221A, 0xC4 => 0x0192, 0xC5 => 0x2248, 0xC6 => 0x2206,
-        0xC7 => 0x00AB, 0xC8 => 0x00BB, 0xC9 => 0x2026, 0xCA => 0x00A0, 0xCB => 0x00C0,
-        0xCC => 0x00C3, 0xCD => 0x00D5, 0xCE => 0x0152, 0xCF => 0x0153, 0xD0 => 0x2013,
-        0xD1 => 0x2014, 0xD2 => 0x201C, 0xD3 => 0x201D, 0xD4 => 0x2018, 0xD5 => 0x2019,
-        0xD6 => 0x00F7, 0xD7 => 0x25CA, 0xD8 => 0x00FF, 0xD9 => 0x0178, 0xDA => 0x2044,
-        0xDB => 0x20AC, 0xDC => 0x2039, 0xDD => 0x203A, 0xDE => 0xFB01, 0xDF => 0xFB02,
-        0xE0 => 0x2021, 0xE1 => 0x00B7, 0xE2 => 0x201A, 0xE3 => 0x201E, 0xE4 => 0x2030,
-        0xE5 => 0x00C2, 0xE6 => 0x00CA, 0xE7 => 0x00C1, 0xE8 => 0x00CB, 0xE9 => 0x00C8,
-        0xEA => 0x00CD, 0xEB => 0x00CE, 0xEC => 0x00CF, 0xED => 0x00CC, 0xEE => 0x00D3,
-        0xEF => 0x00D4, 0xF0 => 0xF8FF, 0xF1 => 0x00D2, 0xF2 => 0x00DA, 0xF3 => 0x00DB,
-        0xF4 => 0x00D9, 0xF5 => 0x0131, 0xF6 => 0x02C6, 0xF7 => 0x02DC, 0xF8 => 0x00AF,
-        0xF9 => 0x02D8, 0xFA => 0x02D9, 0xFB => 0x02DA, 0xFC => 0x00B8, 0xFD => 0x02DD,
-        0xFE => 0x02DB, 0xFF => 0x02C7
-      )
+      TO_UNICODE =
+        Hash[*(0..255).zip(0..255).flatten]
+        .update(
+          0x81 => 0x00C5, 0x82 => 0x00C7, 0x83 => 0x00C9, 0x84 => 0x00D1,
+          0x85 => 0x00D6, 0x86 => 0x00DC, 0x87 => 0x00E1, 0x88 => 0x00E0,
+          0x89 => 0x00E2, 0x8A => 0x00E4, 0x8B => 0x00E3, 0x8C => 0x00E5,
+          0x8D => 0x00E7, 0x8E => 0x00E9, 0x8F => 0x00E8, 0x90 => 0x00EA,
+          0x91 => 0x00EB, 0x92 => 0x00ED, 0x93 => 0x00EC, 0x94 => 0x00EE,
+          0x95 => 0x00EF, 0x96 => 0x00F1, 0x97 => 0x00F3, 0x98 => 0x00F2,
+          0x99 => 0x00F4, 0x9A => 0x00F6, 0x9B => 0x00F5, 0x9C => 0x00FA,
+          0x9D => 0x00F9, 0x9E => 0x00FB, 0x9F => 0x00FC, 0xA0 => 0x2020,
+          0xA1 => 0x00B0, 0xA4 => 0x00A7, 0xA5 => 0x2022, 0xA6 => 0x00B6,
+          0xA7 => 0x00DF, 0xA8 => 0x00AE, 0xAA => 0x2122, 0xAB => 0x00B4,
+          0xAC => 0x00A8, 0xAD => 0x2260, 0xAE => 0x00C6, 0xAF => 0x00D8,
+          0xB0 => 0x221E, 0xB2 => 0x2264, 0xB3 => 0x2265, 0xB4 => 0x00A5,
+          0xB6 => 0x2202, 0xB7 => 0x2211, 0xB8 => 0x220F, 0xB9 => 0x03C0,
+          0xBA => 0x222B, 0xBB => 0x00AA, 0xBC => 0x00BA, 0xBD => 0x03A9,
+          0xBE => 0x00E6, 0xBF => 0x00F8, 0xC0 => 0x00BF, 0xC1 => 0x00A1,
+          0xC2 => 0x00AC, 0xC3 => 0x221A, 0xC4 => 0x0192, 0xC5 => 0x2248,
+          0xC6 => 0x2206, 0xC7 => 0x00AB, 0xC8 => 0x00BB, 0xC9 => 0x2026,
+          0xCA => 0x00A0, 0xCB => 0x00C0, 0xCC => 0x00C3, 0xCD => 0x00D5,
+          0xCE => 0x0152, 0xCF => 0x0153, 0xD0 => 0x2013, 0xD1 => 0x2014,
+          0xD2 => 0x201C, 0xD3 => 0x201D, 0xD4 => 0x2018, 0xD5 => 0x2019,
+          0xD6 => 0x00F7, 0xD7 => 0x25CA, 0xD8 => 0x00FF, 0xD9 => 0x0178,
+          0xDA => 0x2044, 0xDB => 0x20AC, 0xDC => 0x2039, 0xDD => 0x203A,
+          0xDE => 0xFB01, 0xDF => 0xFB02, 0xE0 => 0x2021, 0xE1 => 0x00B7,
+          0xE2 => 0x201A, 0xE3 => 0x201E, 0xE4 => 0x2030, 0xE5 => 0x00C2,
+          0xE6 => 0x00CA, 0xE7 => 0x00C1, 0xE8 => 0x00CB, 0xE9 => 0x00C8,
+          0xEA => 0x00CD, 0xEB => 0x00CE, 0xEC => 0x00CF, 0xED => 0x00CC,
+          0xEE => 0x00D3, 0xEF => 0x00D4, 0xF0 => 0xF8FF, 0xF1 => 0x00D2,
+          0xF2 => 0x00DA, 0xF3 => 0x00DB, 0xF4 => 0x00D9, 0xF5 => 0x0131,
+          0xF6 => 0x02C6, 0xF7 => 0x02DC, 0xF8 => 0x00AF, 0xF9 => 0x02D8,
+          0xFA => 0x02D9, 0xFB => 0x02DA, 0xFC => 0x00B8, 0xFD => 0x02DD,
+          0xFE => 0x02DB, 0xFF => 0x02C7
+        ).freeze
 
-      FROM_UNICODE = {}
-      (0..255).each { |key| FROM_UNICODE[TO_UNICODE[key]] = key }
+      FROM_UNICODE = TO_UNICODE.invert.freeze
 
       # Maps MacRoman codes to their corresponding index in the Postscript glyph
-      # table (see TTFunk::Table::Post::Format10). If any entry in this array is a string,
-      # it is a postscript glyph that is not in the standard list, and which should be
-      # emitted specially in the TTF postscript table ('post', see format 2).
+      # table (see TTFunk::Table::Post::Format10). If any entry in this array is
+      # a string, it is a postscript glyph that is not in the standard list, and
+      # which should be emitted specially in the TTF postscript table ('post',
+      # see format 2).
+      # rubocop: disable Metrics/LineLength,Style/AlignArray,Style/IndentArray
       POSTSCRIPT_GLYPH_MAPPING = [
           0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, # 0x0F
           0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, # 0x1F
@@ -53,29 +61,31 @@ module TTFunk
         130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, # 0xAF
         146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, # 0xBF
         162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, # 0xCF
-        178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, "Euro", 190, 191, 192, 193, # 0xDF
+        178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 'Euro', 190, 191, 192, 193, # 0xDF
         194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, # 0xEF
         210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225  # 0xFF
-      ]
+      ].freeze
+
+      # rubocop: enable Style/AlignArray,Metrics/LineLength,Style/ExtraSpacing,Style/IndentArray
 
       def self.covers?(character)
         !FROM_UNICODE[character].nil?
       end
 
       def self.to_utf8(string)
-        to_unicode_codepoints(string.unpack("C*")).pack("U*")
+        to_unicode_codepoints(string.unpack('C*')).pack('U*')
       end
 
       def self.to_unicode(string)
-        to_unicode_codepoints(string.unpack("C*")).pack("n*")
+        to_unicode_codepoints(string.unpack('C*')).pack('n*')
       end
 
       def self.from_utf8(string)
-        from_unicode_codepoints(string.unpack("U*")).pack("C*")
+        from_unicode_codepoints(string.unpack('U*')).pack('C*')
       end
 
       def self.from_unicode(string)
-        from_unicode_codepoints(string.unpack("n*")).pack("C*")
+        from_unicode_codepoints(string.unpack('n*')).pack('C*')
       end
 
       def self.to_unicode_codepoints(array)