ttfunk 1.5.1 → 1.6.0

data/lib/ttfunk/table/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../table'
 
 module TTFunk
@@ -17,6 +19,7 @@ module TTFunk
 
       def self.encode(post, mapping)
         return nil unless post.exists?
+
         post.recode(mapping)
       end
 
@@ -82,7 +85,11 @@ module TTFunk
       end
 
       def parse_format!
-        warn format('postscript table format 0x%08X is not supported', @format)
+        warn(
+          Kernel.format(
+            'postscript table format 0x%08X is not supported', @format
+          )
+        )
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TTFunk
   class Table
     class Post

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'format10'
 require 'stringio'
 
@@ -9,6 +11,8 @@ module TTFunk
 
         def glyph_for(code)
           index = @glyph_name_index[code]
+          return '.notdef' unless index
+
           if index <= 257
             POSTSCRIPT_GLYPHS[index]
           else
@@ -25,7 +29,7 @@ module TTFunk
 
           strings = StringIO.new(io.read(offset + length - io.pos))
           until strings.eof?
-            length = strings.read(1).unpack('C').first
+            length = strings.read(1).unpack1('C')
             @names << strings.read(length)
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TTFunk
   class Table
     class Post

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TTFunk
   class Table
     class Post

data/lib/ttfunk/table/sbix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../table'
 
 module TTFunk

data/lib/ttfunk/table/simple.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../table'
 
 module TTFunk

data/lib/ttfunk/table/vorg.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative '../table'
+
+module TTFunk
+  class Table
+    class Vorg < Table
+      TAG = 'VORG'
+
+      attr_reader :major_version, :minor_version
+      attr_reader :default_vert_origin_y, :count
+
+      def self.encode(vorg)
+        return nil unless vorg
+
+        ''.b.tap do |table|
+          table << [
+            vorg.major_version, vorg.minor_version,
+            vorg.default_vert_origin_y, vorg.count
+          ].pack('n*')
+
+          vorg.origins.each_pair do |glyph_id, vert_origin_y|
+            table << [glyph_id, vert_origin_y].pack('n*')
+          end
+        end
+      end
+
+      def for(glyph_id)
+        @origins.fetch(glyph_id, default_vert_origin_y)
+      end
+
+      def tag
+        TAG
+      end
+
+      def origins
+        @origins ||= {}
+      end
+
+      private
+
+      def parse!
+        @major_version, @minor_version = read(4, 'n*')
+        @default_vert_origin_y = read_signed(1).first
+        @count = read(2, 'n').first
+
+        count.times do
+          glyph_id = read(2, 'n').first
+          origins[glyph_id] = read_signed(1).first
+        end
+      end
+    end
+  end
+end

data/lib/ttfunk/ttf_encoder.rb

@@ -0,0 +1,220 @@
+# frozen_string_literal: true
+
+module TTFunk
+  class TTFEncoder
+    OPTIMAL_TABLE_ORDER = [
+      'head', 'hhea', 'maxp', 'OS/2', 'hmtx', 'LTSH', 'VDMX',
+      'hdmx', 'cmap', 'fpgm', 'prep', 'cvt ', 'loca', 'glyf',
+      'kern', 'name', 'post', 'gasp', 'PCLT'
+    ].freeze
+
+    attr_reader :original, :subset, :options
+
+    def initialize(original, subset, options = {})
+      @original = original
+      @subset = subset
+      @options = options
+    end
+
+    def encode
+      # https://www.microsoft.com/typography/otspec/otff.htm#offsetTable
+      search_range = 2**Math.log2(tables.length).floor * 16
+      entry_selector = Math.log2(2**Math.log2(tables.length).floor).to_i
+      range_shift = tables.length * 16 - search_range
+      range_shift = 0 if range_shift < 0
+
+      newfont = EncodedString.new
+
+      newfont << [
+        original.directory.scaler_type,
+        tables.length,
+        search_range,
+        entry_selector,
+        range_shift
+      ].pack('Nn*')
+
+      # Tables are supposed to be listed in ascending order whereas there is a
+      # known optimal order for table data.
+      tables.keys.sort.each do |tag|
+        newfont << [tag, checksum(tables[tag])].pack('A4N')
+        newfont << Placeholder.new(tag, length: 4)
+        newfont << [tables[tag].length].pack('N')
+      end
+
+      optimal_table_order.each do |optimal_tag|
+        next unless tables.include?(optimal_tag)
+
+        newfont.resolve_placeholder(optimal_tag, [newfont.length].pack('N'))
+        newfont << tables[optimal_tag]
+        newfont.align!(4)
+      end
+
+      sum = checksum(newfont)
+      adjustment = 0xB1B0AFBA - sum
+      newfont.resolve_placeholder(:checksum, [adjustment].pack('N'))
+
+      newfont.string
+    end
+
+    private
+
+    def optimal_table_order
+      OPTIMAL_TABLE_ORDER +
+        (tables.keys - ['DSIG'] - OPTIMAL_TABLE_ORDER) +
+        ['DSIG']
+    end
+
+    # "mandatory" tables. Every font should ("should") have these
+
+    def cmap_table
+      @cmap_table ||= subset.new_cmap_table
+    end
+
+    def glyf_table
+      @glyf_table ||= TTFunk::Table::Glyf.encode(
+        glyphs, new_to_old_glyph, old_to_new_glyph
+      )
+    end
+
+    def loca_table
+      @loca_table ||= TTFunk::Table::Loca.encode(
+        glyf_table[:offsets]
+      )
+    end
+
+    def hmtx_table
+      @hmtx_table ||= TTFunk::Table::Hmtx.encode(
+        original.horizontal_metrics, new_to_old_glyph
+      )
+    end
+
+    def hhea_table
+      @hhea_table = TTFunk::Table::Hhea.encode(
+        original.horizontal_header, hmtx_table, original, new_to_old_glyph
+      )
+    end
+
+    def maxp_table
+      @maxp_table ||= TTFunk::Table::Maxp.encode(
+        original.maximum_profile, old_to_new_glyph
+      )
+    end
+
+    def post_table
+      @post_table ||= TTFunk::Table::Post.encode(
+        original.postscript, new_to_old_glyph
+      )
+    end
+
+    def name_table
+      @name_table ||= TTFunk::Table::Name.encode(
+        original.name, glyf_table.fetch(:table, '')
+      )
+    end
+
+    def head_table
+      @head_table ||= TTFunk::Table::Head.encode(
+        original.header, loca_table, new_to_old_glyph
+      )
+    end
+
+    # "optional" tables. Fonts may omit these if they do not need them.
+    # Because they apply globally, we can simply copy them over, without
+    # modification, if they exist.
+
+    def os2_table
+      @os2_table ||= TTFunk::Table::OS2.encode(original.os2, subset)
+    end
+
+    def cvt_table
+      @cvt_table ||= TTFunk::Table::Simple.new(original, 'cvt ').raw
+    end
+
+    def fpgm_table
+      @fpgm_table ||= TTFunk::Table::Simple.new(original, 'fpgm').raw
+    end
+
+    def prep_table
+      @prep_table ||= TTFunk::Table::Simple.new(original, 'prep').raw
+    end
+
+    def gasp_table
+      @gasp_table ||= TTFunk::Table::Simple.new(original, 'gasp').raw
+    end
+
+    def kern_table
+      # for PDFs, the kerning info is all included in the PDF as the text is
+      # drawn. Thus, the PDF readers do not actually use the kerning info in
+      # embedded fonts. If the library is used for something else, the
+      # generated subfont may need a kerning table... in that case, you need
+      # to opt into it.
+      if options[:kerning]
+        @kern_table ||= TTFunk::Table::Kern.encode(
+          original.kerning, old_to_new_glyph
+        )
+      end
+    end
+
+    def vorg_table
+      @vorg_table ||= TTFunk::Table::Vorg.encode(
+        original.vertical_origins
+      )
+    end
+
+    def dsig_table
+      @dsig_table ||= TTFunk::Table::Dsig.encode(
+        original.digital_signature
+      )
+    end
+
+    def tables
+      @tables ||= {
+        'cmap' => cmap_table[:table],
+        'glyf' => glyf_table[:table],
+        'loca' => loca_table[:table],
+        'kern' => kern_table,
+        'hmtx' => hmtx_table[:table],
+        'hhea' => hhea_table,
+        'maxp' => maxp_table,
+        'OS/2' => os2_table,
+        'post' => post_table,
+        'name' => name_table,
+        'head' => head_table,
+        'prep' => prep_table,
+        'fpgm' => fpgm_table,
+        'cvt ' => cvt_table,
+        'VORG' => vorg_table,
+        'DSIG' => dsig_table,
+        'gasp' => gasp_table
+      }.reject { |_tag, table| table.nil? }
+    end
+
+    def glyphs
+      subset.glyphs
+    end
+
+    def new_to_old_glyph
+      subset.new_to_old_glyph
+    end
+
+    def old_to_new_glyph
+      subset.old_to_new_glyph
+    end
+
+    def checksum(data)
+      align(raw(data), 4).unpack('N*').reduce(0, :+) & 0xFFFF_FFFF
+    end
+
+    def raw(data)
+      data.respond_to?(:unresolved_string) ? data.unresolved_string : data
+    end
+
+    def align(data, width)
+      if data.length % width > 0
+        data + "\0" * (width - data.length % width)
+      else
+        data
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttfunk
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -9,14 +9,15 @@ authors:
 - Daniel Nelson
 - Jonathan Greenberg
 - James Healy
+- Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ0wCwYDVQQDDARhbGV4
+  MIIDMjCCAhqgAwIBAgIBAjANBgkqhkiG9w0BAQsFADA/MQ0wCwYDVQQDDARhbGV4
   MRkwFwYKCZImiZPyLGQBGRYJcG9pbnRsZXNzMRMwEQYKCZImiZPyLGQBGRYDb25l
-  MB4XDTE3MDEwNDExNDAzM1oXDTE4MDEwNDExNDAzM1owPzENMAsGA1UEAwwEYWxl
+  MB4XDTE5MTIwMjEwMjAzNVoXDTIwMTIwMTEwMjAzNVowPzENMAsGA1UEAwwEYWxl
   eDEZMBcGCgmSJomT8ixkARkWCXBvaW50bGVzczETMBEGCgmSJomT8ixkARkWA29u
   ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM85Us8YQr55o/rMl+J+
   ula89ODiqjdc0kk+ibzRLCpfaFUJWxEMrhFiApRCopFDMeGXHXjBkfBYsRMFVs0M
@@ -24,17 +25,16 @@ cert_chain:
   K6f/TAggK0+/K1j1NjT+WSVaMBuyomM067ejwhiQkEA3+tT3oT/paEXCOfEtxOdX
   1F8VFd2MbmMK6CGgHbFLApfyDBtDx+ydplGZ3IMZg2nPqwYXTPJx+IuRO21ssDad
   gBMIAvL3wIeezJk2xONvhYg0K5jbIQOPB6zD1/9E6Q0LrwSBDkz5oyOn4PRZxgZ/
-  OiMCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFE+A
-  jBJVt6ie5r83L/znvqjF1RuuMB0GA1UdEQQWMBSBEmFsZXhAcG9pbnRsZXNzLm9u
-  ZTAdBgNVHRIEFjAUgRJhbGV4QHBvaW50bGVzcy5vbmUwDQYJKoZIhvcNAQEFBQAD
-  ggEBAEmhsdVfgxHfXtOG6AP3qe7/PBjJPdUzNOkE/elj6TgpdvvJkOZ6QNyyqvpl
-  CsoDWL0EXPM5pIETaj5z9iBRK9fAi8YNS3zckhBJwhR78cb4+MiCPIBC+iiGx5bw
-  BFER2ASPeeY4uC0AHWHnURDLdxyZr+xp6pb/TitTAaCm18Kvkk1u60lOa4Jtdb+9
-  2U1KICEBoX6UAzdT3N0nZ3VKq/vHVrvV2oePYCMIlNkghWp+VUE91OTBDMjnjjj8
-  wxx1aB3kGoI0T6JXywKpPnzUt/qji/qpzCNiVJ0RZxzDHyZuL8NEoA9ORZnAIGiW
-  5u3JK+T0toNEYkMuV6W8NU+gVyo=
+  OiMCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFE+A
+  jBJVt6ie5r83L/znvqjF1RuuMA0GCSqGSIb3DQEBCwUAA4IBAQBE9BhVReOpWN3A
+  S5L3I9rCVg3aj5/7Z2K3Op6Q1VlCgv9UR+r8wqox9NxA94HAsmOexr5tmRVHO4WC
+  nEZRHK9j4MzjKKChiRxLgWh78o/Mwvn2QT6cGCtUzfboWuVKACB5oJyAmfwomhUw
+  4/zDsx6J4v1dDLy3vNu062uYbFLf94qRAo34r5cMt2Z3bC68zrbcRxfUE8fOudkt
+  u8IGMi8WtDe3DkNUiV3rZ1XOdcg5q5vJye4wsy+TJ3733jrdqa+XnI7r8joFuJry
+  NAnYg0X9IoxXQRCJn85h0SOQBU63TUfKDrERXDy0NLZT6sErDnpx84+ygqpxVAD+
+  4qo2amfe
   -----END CERTIFICATE-----
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,14 +70,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.68'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.68'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.32'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.32'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +127,7 @@ email:
 - dnelson@bluejade.com
 - greenberg@entryway.net
 - jimmy@deefa.com
+- camertron@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -110,20 +139,56 @@ files:
 - LICENSE
 - README.md
 - lib/ttfunk.rb
+- lib/ttfunk/aggregate.rb
+- lib/ttfunk/bin_utils.rb
+- lib/ttfunk/bit_field.rb
 - lib/ttfunk/collection.rb
 - lib/ttfunk/directory.rb
-- lib/ttfunk/encoding/mac_roman.rb
-- lib/ttfunk/encoding/windows_1252.rb
+- lib/ttfunk/encoded_string.rb
+- lib/ttfunk/max.rb
+- lib/ttfunk/min.rb
+- lib/ttfunk/one_based_array.rb
+- lib/ttfunk/otf_encoder.rb
+- lib/ttfunk/placeholder.rb
 - lib/ttfunk/reader.rb
 - lib/ttfunk/resource_file.rb
+- lib/ttfunk/sci_form.rb
+- lib/ttfunk/sub_table.rb
 - lib/ttfunk/subset.rb
 - lib/ttfunk/subset/base.rb
+- lib/ttfunk/subset/code_page.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_collection.rb
+- lib/ttfunk/sum.rb
 - lib/ttfunk/table.rb
+- lib/ttfunk/table/cff.rb
+- lib/ttfunk/table/cff/charset.rb
+- lib/ttfunk/table/cff/charsets.rb
+- lib/ttfunk/table/cff/charsets/expert.rb
+- lib/ttfunk/table/cff/charsets/expert_subset.rb
+- lib/ttfunk/table/cff/charsets/iso_adobe.rb
+- lib/ttfunk/table/cff/charsets/standard_strings.rb
+- lib/ttfunk/table/cff/charstring.rb
+- lib/ttfunk/table/cff/charstrings_index.rb
+- lib/ttfunk/table/cff/dict.rb
+- lib/ttfunk/table/cff/encoding.rb
+- lib/ttfunk/table/cff/encodings.rb
+- lib/ttfunk/table/cff/encodings/expert.rb
+- lib/ttfunk/table/cff/encodings/standard.rb
+- lib/ttfunk/table/cff/fd_selector.rb
+- lib/ttfunk/table/cff/font_dict.rb
+- lib/ttfunk/table/cff/font_index.rb
+- lib/ttfunk/table/cff/header.rb
+- lib/ttfunk/table/cff/index.rb
+- lib/ttfunk/table/cff/one_based_index.rb
+- lib/ttfunk/table/cff/path.rb
+- lib/ttfunk/table/cff/private_dict.rb
+- lib/ttfunk/table/cff/subr_index.rb
+- lib/ttfunk/table/cff/top_dict.rb
+- lib/ttfunk/table/cff/top_index.rb
 - lib/ttfunk/table/cmap.rb
 - lib/ttfunk/table/cmap/format00.rb
 - lib/ttfunk/table/cmap/format04.rb
@@ -131,8 +196,10 @@ files:
 - lib/ttfunk/table/cmap/format10.rb
 - lib/ttfunk/table/cmap/format12.rb
 - lib/ttfunk/table/cmap/subtable.rb
+- lib/ttfunk/table/dsig.rb
 - lib/ttfunk/table/glyf.rb
 - lib/ttfunk/table/glyf/compound.rb
+- lib/ttfunk/table/glyf/path_based.rb
 - lib/ttfunk/table/glyf/simple.rb
 - lib/ttfunk/table/head.rb
 - lib/ttfunk/table/hhea.rb
@@ -150,6 +217,8 @@ files:
 - lib/ttfunk/table/post/format40.rb
 - lib/ttfunk/table/sbix.rb
 - lib/ttfunk/table/simple.rb
+- lib/ttfunk/table/vorg.rb
+- lib/ttfunk/ttf_encoder.rb
 homepage: https://prawnpdf.org
 licenses:
 - Nonstandard
@@ -164,15 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: TrueType Font Metrics Parser