otf_encoder.rb in ttfunk-1.8.0

- old
+ new

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module TTFunk
+  # Encodes a CFF-based OpenType font subset to its binary representation.
   class OTFEncoder < TTFEncoder
-    OPTIMAL_TABLE_ORDER = [
-      'head', 'hhea', 'maxp', 'OS/2', 'name', 'cmap', 'post', 'CFF '
-    ].freeze
+    # Optimal table order according to OpenType specification.
+    OPTIMAL_TABLE_ORDER = ['head', 'hhea', 'maxp', 'OS/2', 'name', 'cmap', 'post', 'CFF '].freeze
 
     private
 
     # CFF fonts don't maintain a glyf table, all glyph information is stored
     # in the charstrings index. Return an empty hash here to indicate a glyf
@@ -25,37 +25,28 @@
     def base_table
       @base_table ||= TTFunk::Table::Simple.new(original, 'BASE').raw
     end
 
     def cff_table
-      @cff_table ||= original.cff.encode(new_to_old_glyph, old_to_new_glyph)
+      @cff_table ||= original.cff.encode(subset)
     end
 
     def vorg_table
       @vorg_table ||= TTFunk::Table::Vorg.encode(original.vertical_origins)
     end
 
     def tables
       @tables ||= super.merge(
         'BASE' => base_table,
         'VORG' => vorg_table,
-        'CFF ' => cff_table
+        'CFF ' => cff_table,
       ).compact
     end
 
     def optimal_table_order
       # DSIG is always last
       OPTIMAL_TABLE_ORDER +
         (tables.keys - ['DSIG'] - OPTIMAL_TABLE_ORDER) +
         ['DSIG']
-    end
-
-    def collect_glyphs(glyph_ids)
-      # CFF top indexes are supposed to contain only one font, although they're
-      # capable of supporting many (no idea why this is true, maybe for CFF
-      # v2??). Anyway it's cool to do top_index[0], don't worry about it.
-      glyph_ids.each_with_object({}) do |id, h|
-        h[id] = original.cff.top_index[0].charstrings_index[id]
-      end
     end
   end
 end