ttfunk 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 901b4b6c09e1f0dfb7c327b51321af55a3f75237
-  data.tar.gz: 504c1cc9444c543617c02963df1df04cc662d211
+SHA256:
+  metadata.gz: 1036e45ae6026254c29d0d105dfab5e55864994d6b97bc88dbb0db9cd645f761
+  data.tar.gz: c8a8e0cd09c56f408949fb86ed2b6b19a062d3cf5697c2bc451fa363efb61238
 SHA512:
-  metadata.gz: 767f9103f60beee020c5a36ff5efb448326f94ea23650eb4cd6c09e497e3194e0692340aeee60519b2dab3e92ac7d751cecb805b240fa87cf5247d9bebef2f12
-  data.tar.gz: 92c600ec5bfcf601261f3c8b50df01fce414c8208451d491b359338057fccd372cf7a8ef7c655238914ae067af30e50d89df88dd6b69708754b0e2493bbfbb78
+  metadata.gz: 42012ccb4f26b39bcf82ff620a5d42417e1cfa1f678c5e398e1536c87abbe354e7caea988a0b5eb7141497e148ac8f338c3917b5a985ef5b64e153b3c2730cdc
+  data.tar.gz: bfb13cd6a01acfd9bbdff89a18b8261605d9acc235a229b2f75692653fe2a5761f524c53b699a587e49997685fd2bf3212536157645c41a51b77d2feedf25c52

data/CHANGELOG.md

@@ -7,6 +7,66 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Added
+
+* OpenType fonts support
+
+  * Added support for CFF-flavored fonts (also known as CID-keyed or OpenType fonts)
+  * Added support for the VORG and DSIG tables
+  * Improved charset encoding support
+  * Improved font metrics calculations in the head, maxp, hhea, hmtx, and os/2 tables
+  * Subsetted fonts verified with Font-Validator, fontlint, and Mac OS's Font Book
+
+  Cameron Dutro
+
+* Ruby 2.6 support
+
+  Alexander Mankuta
+
+* JRuby 9.2 support
+
+  Alexander Mankuta
+
+### Removed
+
+* Dropped Ruby 2.1 & 2.2 support
+
+  Alexander Mankuta
+
+* Removed JRuby 9.1 support
+
+  Alexander Mankuta
+
+### Fixed
+
+* Sort name table entries when generating subset font
+
+  Matjaz Gregoric
+
+* Map the 0xFFFF char code to glyph 0 in cmap format 4
+
+  Matjaz Gregoric
+
+* Order tables by tag when generating font subset
+
+  Matjaz Gregoric
+
+* Fix typo in TTFunk::Subset::Unicode#includes?
+
+  Matjaz Gregoric
+
+* Fixe calculation of search_range for font subsets
+
+  Matjaz Gregoric
+
+* Fixed instance variable @offset and @length not initialized
+
+  Katsuya HIDAKA
+
+* Code style fixes
+
+  Katsuya HIDAKA, Matjaz Gregoric, Alexander Mankuta
+
 ## [1.5.1]
 
 ### Fixed

data/README.md

@@ -1,6 +1,7 @@
 # TTFunk
 
-![Maintained: yes](https://img.shields.io/badge/maintained-yes-brightgreen.png)
+![Maintained: yes](https://img.shields.io/badge/maintained-yes-brightgreen.svg)
+![CI status](https://github.com/prawnpdf/ttfunk/workflows/CI/badge.svg)
 
 TTFunk is a TrueType font parser written in pure ruby.
 

data/lib/ttfunk.rb

@@ -1,9 +1,24 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'pathname'
 
+require_relative 'ttfunk/aggregate'
 require_relative 'ttfunk/directory'
 require_relative 'ttfunk/resource_file'
 require_relative 'ttfunk/collection'
+require_relative 'ttfunk/ttf_encoder'
+require_relative 'ttfunk/encoded_string'
+require_relative 'ttfunk/placeholder'
+require_relative 'ttfunk/otf_encoder'
+require_relative 'ttfunk/sci_form'
+require_relative 'ttfunk/bit_field'
+require_relative 'ttfunk/bin_utils'
+require_relative 'ttfunk/sub_table'
+require_relative 'ttfunk/min'
+require_relative 'ttfunk/max'
+require_relative 'ttfunk/sum'
+require_relative 'ttfunk/one_based_array'
 
 module TTFunk
   class File
@@ -37,6 +52,7 @@ module TTFunk
       # String or Pathname
       io_or_path = Pathname.new(io_or_path)
       raise ArgumentError, "#{io_or_path} not found" unless io_or_path.file?
+
       io = io_or_path.open('rb')
       io
     end
@@ -116,10 +132,38 @@ module TTFunk
     def sbix
       @sbix ||= TTFunk::Table::Sbix.new(self)
     end
+
+    def cff
+      @cff ||= TTFunk::Table::Cff.new(self)
+    end
+
+    def vertical_origins
+      @vertical_origins ||=
+        if directory.tables.include?(TTFunk::Table::Vorg::TAG)
+          TTFunk::Table::Vorg.new(self)
+        end
+    end
+
+    def digital_signature
+      @digital_signature ||=
+        if directory.tables.include?(TTFunk::Table::Dsig::TAG)
+          TTFunk::Table::Dsig.new(self)
+        end
+    end
+
+    def find_glyph(glyph_id)
+      if cff.exists?
+        cff.top_index[0].charstrings_index[glyph_id].glyph
+      else
+        glyph_outlines.for(glyph_id)
+      end
+    end
   end
 end
 
+require_relative 'ttfunk/table/cff'
 require_relative 'ttfunk/table/cmap'
+require_relative 'ttfunk/table/dsig'
 require_relative 'ttfunk/table/glyf'
 require_relative 'ttfunk/table/head'
 require_relative 'ttfunk/table/hhea'
@@ -131,3 +175,4 @@ require_relative 'ttfunk/table/name'
 require_relative 'ttfunk/table/os2'
 require_relative 'ttfunk/table/post'
 require_relative 'ttfunk/table/sbix'
+require_relative 'ttfunk/table/vorg'

data/lib/ttfunk/aggregate.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module TTFunk
+  class Aggregate
+    private
+
+    def coerce(other)
+      if other.respond_to?(:value_or)
+        other.value_or(0)
+      else
+        other
+      end
+    end
+  end
+end

data/lib/ttfunk/bin_utils.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module TTFunk
+  module BinUtils
+    # assumes big-endian
+    def stitch_int(arr, bit_width:)
+      value = 0
+
+      arr.each_with_index do |element, index|
+        value |= element << bit_width * index
+      end
+
+      value
+    end
+
+    # assumes big-endian
+    def slice_int(value, bit_width:, slice_count:)
+      mask = 2**bit_width - 1
+
+      Array.new(slice_count) do |i|
+        (value >> bit_width * i) & mask
+      end
+    end
+
+    def twos_comp_to_int(num, bit_width:)
+      if num >> (bit_width - 1) == 1
+        # we want all ones
+        mask = (2**bit_width) - 1
+
+        # find 2's complement, i.e. flip bits (xor with mask) and add 1
+        -((num ^ mask) + 1)
+      else
+        num
+      end
+    end
+
+    # turns a (sorted) sequence of values into a series of two-element arrays
+    # where the first element is the start and the second is the length
+    def rangify(values)
+      values
+        .slice_when { |a, b| b - a > 1 }
+        .map { |span| [span.first, span.length - 1] }
+    end
+  end
+
+  BinUtils.extend(BinUtils)
+end

data/lib/ttfunk/bit_field.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module TTFunk
+  class BitField
+    attr_reader :value
+
+    def initialize(value = 0)
+      @value = value
+    end
+
+    def on(pos)
+      @value |= 2**pos
+    end
+
+    def on?(pos)
+      value & 2**pos > 0
+    end
+
+    def off(pos)
+      @value &= 2**Math.log2(value).ceil - 2**pos - 1
+    end
+
+    def off?(pos)
+      !on?(pos)
+    end
+
+    def dup
+      self.class.new(value)
+    end
+  end
+end

data/lib/ttfunk/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TTFunk
   class Collection
     include Enumerable
@@ -13,7 +15,7 @@ module TTFunk
       raise ArgumentError, 'not a TTC file' unless tag == 'ttcf'
 
       _major, _minor = io.read(4).unpack('n*')
-      count = io.read(4).unpack('N').first
+      count = io.read(4).unpack1('N')
       @offsets = io.read(count * 4).unpack('N*')
 
       io.rewind

data/lib/ttfunk/directory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TTFunk
   class Directory
     attr_reader :tables
@@ -5,6 +7,10 @@ module TTFunk
 
     def initialize(io, offset = 0)
       io.seek(offset)
+
+      # https://www.microsoft.com/typography/otspec/otff.htm#offsetTable
+      # We're ignoring searchRange, entrySelector, and rangeShift here, but
+      # skipping past them to get to the table information.
       @scaler_type, table_count = io.read(12).unpack('Nn')
 
       @tables = {}

data/lib/ttfunk/encoded_string.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'stringio'
+
+module TTFunk
+  class UnresolvedPlaceholderError < StandardError
+  end
+
+  class DuplicatePlaceholderError < StandardError
+  end
+
+  class EncodedString
+    def initialize
+      yield self if block_given?
+    end
+
+    def <<(obj)
+      case obj
+      when String
+        io << obj
+      when Placeholder
+        add_placeholder(obj)
+        io << "\0" * obj.length
+      when self.class
+        # adjust placeholders to be relative to the entire encoded string
+        obj.placeholders.each_pair do |_, placeholder|
+          add_placeholder(placeholder.dup, placeholder.position + io.length)
+        end
+
+        self << obj.unresolved_string
+      end
+
+      self
+    end
+
+    def align!(width = 4)
+      if length % width > 0
+        self << "\0" * (width - length % width)
+      end
+
+      self
+    end
+
+    def length
+      io.length
+    end
+
+    def string
+      unless placeholders.empty?
+        raise UnresolvedPlaceholderError, 'string contains '\
+          "#{placeholders.size} unresolved placeholder(s)"
+      end
+
+      io.string
+    end
+
+    def bytes
+      string.bytes
+    end
+
+    def unresolved_string
+      io.string
+    end
+
+    def resolve_placeholder(name, value)
+      last_pos = io.pos
+
+      if (placeholder = placeholders[name])
+        io.seek(placeholder.position)
+        io.write(value[0..placeholder.length])
+        placeholders.delete(name)
+      end
+    ensure
+      io.seek(last_pos)
+    end
+
+    def placeholders
+      @placeholders ||= {}
+    end
+
+    private
+
+    def add_placeholder(new_placeholder, pos = io.pos)
+      if placeholders.include?(new_placeholder.name)
+        raise DuplicatePlaceholderError,
+          "placeholder #{new_placeholder.name} already exists"
+      end
+
+      new_placeholder.position = pos
+      placeholders[new_placeholder.name] = new_placeholder
+    end
+
+    def io
+      @io ||= StringIO.new(''.b).binmode
+    end
+  end
+end

data/lib/ttfunk/max.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module TTFunk
+  class Max < Aggregate
+    attr_reader :value
+
+    def initialize(init_value = nil)
+      @value = init_value
+    end
+
+    def <<(new_value)
+      new_value = coerce(new_value)
+
+      if value.nil? || new_value > value
+        @value = new_value
+      end
+    end
+
+    def value_or(default)
+      return default if value.nil?
+
+      value
+    end
+  end
+end

data/lib/ttfunk/min.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module TTFunk
+  class Min < Aggregate
+    attr_reader :value
+
+    def initialize(init_value = nil)
+      @value = init_value
+    end
+
+    def <<(new_value)
+      new_value = coerce(new_value)
+
+      if value.nil? || new_value < value
+        @value = new_value
+      end
+    end
+
+    def value_or(default)
+      return default if value.nil?
+
+      value
+    end
+  end
+end