ttfunk 1.4.0 → 1.5.0

data/lib/ttfunk/table/kern.rb

@@ -11,67 +11,76 @@ module TTFunk
         tables = kerning.tables.map { |table| table.recode(mapping) }.compact
         return nil if tables.empty?
 
-        [0, tables.length, tables.join].pack("nnA*")
+        [0, tables.length, tables.join].pack('nnA*')
       end
 
       private
 
-        def parse!
-          @version, num_tables = read(4, "n*")
-          @tables = []
+      def parse!
+        @version, num_tables = read(4, 'n*')
+        @tables = []
 
-          if @version == 1 # Mac OS X fonts
-            @version = (@version << 16) + num_tables
-            num_tables = read(4, "N").first
-            parse_version_1_tables(num_tables)
-          else
-            parse_version_0_tables(num_tables)
-          end
+        if @version == 1 # Mac OS X fonts
+          @version = (@version << 16) + num_tables
+          num_tables = read(4, 'N').first
+          parse_version_1_tables(num_tables)
+        else
+          parse_version_0_tables(num_tables)
         end
+      end
 
-        def parse_version_0_tables(num_tables)
-          # It looks like some MS fonts report their kerning subtable lengths
-          # wrong. In one case, the length was reported to be some 19366, and yet
-          # the table also claimed to hold 14148 pairs (each pair consisting of 6 bytes).
-          # You do the math!
-          #
-          # We're going to assume that the microsoft fonts hold only a single kerning
-          # subtable, which occupies the entire length of the kerning table. Worst
-          # case, we lose any other subtables that the font contains, but it's better
-          # than reading a truncated kerning table.
-          #
-          # And what's more, it appears to work. So.
-          version, length, coverage = read(6, "n*")
-          format = coverage >> 8
+      def parse_version_0_tables(_num_tables)
+        # It looks like some MS fonts report their kerning subtable lengths
+        # wrong. In one case, the length was reported to be some 19366, and yet
+        # the table also claimed to hold 14148 pairs (each pair consisting of
+        # 6 bytes).  You do the math!
+        #
+        # We're going to assume that the microsoft fonts hold only a single
+        # kerning subtable, which occupies the entire length of the kerning
+        # table. Worst case, we lose any other subtables that the font contains,
+        # but it's better than reading a truncated kerning table.
+        #
+        # And what's more, it appears to work. So.
+        version, length, coverage = read(6, 'n*')
+        format = coverage >> 8
 
-          add_table format, :version => version, :length => length,
-            :coverage => coverage, :data => raw[10..-1],
-            :vertical => (coverage & 0x1 == 0),
-            :minimum => (coverage & 0x2 != 0),
-            :cross => (coverage & 0x4 != 0),
-            :override => (coverage & 0x8 != 0)
-        end
+        add_table(
+          format,
+          version: version,
+          length: length,
+          coverage: coverage,
+          data: raw[10..-1],
+          vertical: (coverage & 0x1 == 0),
+          minimum: (coverage & 0x2 != 0),
+          cross: (coverage & 0x4 != 0),
+          override: (coverage & 0x8 != 0)
+        )
+      end
 
-        def parse_version_1_tables(num_tables)
-          num_tables.times do
-            length, coverage, tuple_index = read(8, "Nnn")
-            format = coverage & 0x0FF
+      def parse_version_1_tables(num_tables)
+        num_tables.times do
+          length, coverage, tuple_index = read(8, 'Nnn')
+          format = coverage & 0x0FF
 
-            add_table format, :length => length, :coverage => coverage,
-              :tuple_index => tuple_index, :data => io.read(length-8),
-              :vertical => (coverage & 0x8000 != 0),
-              :cross => (coverage & 0x4000 != 0),
-              :variation => (coverage & 0x2000 != 0)
-          end
+          add_table(
+            format,
+            length: length,
+            coverage: coverage,
+            tuple_index: tuple_index,
+            data: io.read(length - 8),
+            vertical: (coverage & 0x8000 != 0),
+            cross: (coverage & 0x4000 != 0),
+            variation: (coverage & 0x2000 != 0)
+          )
         end
+      end
 
-        def add_table(format, attributes={})
-          if format == 0
-            @tables << Kern::Format0.new(attributes)
-          else
-            # silently ignore unsupported kerning tables
-          end
+      def add_table(format, attributes = {})
+        if format == 0
+          @tables << Kern::Format0.new(attributes)
         end
+        # Unsupported kerning tables are silently ignored
+      end
     end
   end
 end

data/lib/ttfunk/table/kern/format0.rb

@@ -9,17 +9,18 @@ module TTFunk
         attr_reader :attributes
         attr_reader :pairs
 
-        def initialize(attributes={})
+        def initialize(attributes = {})
           @attributes = attributes
 
-          num_pairs, *pairs = attributes.delete(:data).unpack("nx6n*")
+          num_pairs, *pairs = attributes.delete(:data).unpack('nx6n*')
 
           @pairs = {}
           num_pairs.times do |i|
-            break if i*3+2 > pairs.length # sanity check, in case there's a bad length somewhere
-            left = pairs[i*3]
-            right = pairs[i*3+1]
-            value = to_signed(pairs[i*3+2])
+            # sanity check, in case there's a bad length somewhere
+            break if i * 3 + 2 > pairs.length
+            left = pairs[i * 3]
+            right = pairs[i * 3 + 1]
+            value = to_signed(pairs[i * 3 + 2])
             @pairs[[left, right]] = value
           end
         end
@@ -47,13 +48,20 @@ module TTFunk
           return nil if subset.empty?
 
           num_pairs = subset.length
-          search_range = 2 * 2 ** (Math.log(num_pairs) / Math.log(2)).to_i
+          search_range = 2 * 2**(Math.log(num_pairs) / Math.log(2)).to_i
           entry_selector = (Math.log(search_range / 2) / Math.log(2)).to_i
           range_shift = (2 * num_pairs) - search_range
 
-          [attributes[:version], num_pairs * 6 + 14, attributes[:coverage],
-            num_pairs, search_range, entry_selector, range_shift, subset].
-            flatten.pack("n*")
+          [
+            attributes[:version],
+            num_pairs * 6 + 14,
+            attributes[:coverage],
+            num_pairs,
+            search_range,
+            entry_selector,
+            range_shift,
+            subset
+          ].flatten.pack('n*')
         end
       end
     end

data/lib/ttfunk/table/loca.rb

@@ -14,9 +14,9 @@ module TTFunk
       # * :type  - the type of offset (to be encoded in the 'head' table)
       def self.encode(offsets)
         if offsets.any? { |ofs| ofs > 0xFFFF }
-          { :type => 1, :table => offsets.pack("N*") }
+          { type: 1, table: offsets.pack('N*') }
         else
-          { :type => 0, :table => offsets.map { |o| o/2 }.pack("n*") }
+          { type: 0, table: offsets.map { |o| o / 2 }.pack('n*') }
         end
       end
 
@@ -25,19 +25,19 @@ module TTFunk
       end
 
       def size_of(glyph_id)
-        @offsets[glyph_id+1] - @offsets[glyph_id]
+        @offsets[glyph_id + 1] - @offsets[glyph_id]
       end
 
       private
 
-        def parse!
-          type = file.header.index_to_loc_format == 0 ? "n" : "N"
-          @offsets = read(length, "#{type}*")
+      def parse!
+        type = file.header.index_to_loc_format == 0 ? 'n' : 'N'
+        @offsets = read(length, "#{type}*")
 
-          if file.header.index_to_loc_format == 0
-            @offsets.map! { |v| v * 2 }
-          end
+        if file.header.index_to_loc_format == 0
+          @offsets.map! { |v| v * 2 }
         end
+      end
     end
   end
 end

data/lib/ttfunk/table/maxp.rb

@@ -22,19 +22,19 @@ module TTFunk
       def self.encode(maxp, mapping)
         num_glyphs = mapping.length
         raw = maxp.raw
-        raw[4,2] = [num_glyphs].pack("n")
-        return raw
+        raw[4, 2] = [num_glyphs].pack('n')
+        raw
       end
 
       private
 
-        def parse!
-          @version, @num_glyphs, @max_points, @max_contours, @max_component_points,
-            @max_component_contours, @max_zones, @max_twilight_points, @max_storage,
-            @max_function_defs, @max_instruction_defs, @max_stack_elements,
-            @max_size_of_instructions, @max_component_elements, @max_component_depth =
-              read(length, "Nn*")
-        end
+      def parse!
+        @version, @num_glyphs, @max_points, @max_contours,
+          @max_component_points, @max_component_contours, @max_zones,
+          @max_twilight_points, @max_storage, @max_function_defs,
+          @max_instruction_defs, @max_stack_elements, @max_size_of_instructions,
+          @max_component_elements, @max_component_depth = read(length, 'Nn*')
+      end
     end
   end
 end

data/lib/ttfunk/table/name.rb

@@ -1,4 +1,5 @@
 require_relative '../table'
+require 'digest/sha1'
 
 module TTFunk
   class Table
@@ -16,9 +17,9 @@ module TTFunk
         end
 
         def strip_extended
-          stripped = gsub(/[\x00-\x19\x80-\xff]/n, "")
-          stripped = "[not-postscript]" if stripped.empty?
-          return stripped
+          stripped = gsub(/[\x00-\x19\x80-\xff]/n, '')
+          stripped = '[not-postscript]' if stripped.empty?
+          stripped
         end
       end
 
@@ -43,24 +44,26 @@ module TTFunk
       attr_reader :compatible_full
       attr_reader :sample_text
 
-      @@subset_tag = "AAAAAA"
+      def self.encode(names, key = '')
+        tag = Digest::SHA1.hexdigest(key)[0, 6]
 
-      def self.encode(names)
-        tag = @@subset_tag.dup
-        @@subset_tag.succ!
-
-        postscript_name = Name::String.new("#{tag}+#{names.postscript_name}", 1, 0, 0)
+        postscript_name = Name::String.new(
+          "#{tag}+#{names.postscript_name}", 1, 0, 0
+        )
 
         strings = names.strings.dup
         strings[6] = [postscript_name]
         str_count = strings.inject(0) { |sum, (_, list)| sum + list.length }
 
-        table = [0, str_count, 6 + 12 * str_count].pack("n*")
-        strtable = ""
+        table = [0, str_count, 6 + 12 * str_count].pack('n*')
+        strtable = ''
 
         strings.each do |id, list|
           list.each do |string|
-            table << [string.platform_id, string.encoding_id, string.language_id, id, string.length, strtable.length].pack("n*")
+            table << [
+              string.platform_id, string.encoding_id, string.language_id, id,
+              string.length, strtable.length
+            ].pack('n*')
             strtable << string
           end
         end
@@ -70,56 +73,62 @@ module TTFunk
 
       def postscript_name
         return @postscript_name if @postscript_name
-        font_family.first || "unnamed"
+        font_family.first || 'unnamed'
       end
 
       private
 
-        def parse!
-          count, string_offset = read(6, "x2n*")
-
-          entries = []
-          count.times do
-            platform, encoding, language, id, length, start_offset = read(12, "n*")
-            entries << {
-              :platform_id => platform,
-              :encoding_id => encoding,
-              :language_id => language,
-              :name_id => id,
-              :length => length,
-              :offset => offset + string_offset + start_offset
-            }
-          end
-
-          @strings = Hash.new { |h,k| h[k] = [] }
-
-          count.times do |i|
-            io.pos = entries[i][:offset]
-            text = io.read(entries[i][:length])
-            @strings[entries[i][:name_id]] << Name::String.new(text,
-              entries[i][:platform_id], entries[i][:encoding_id], entries[i][:language_id])
-          end
+      def parse!
+        count, string_offset = read(6, 'x2n*')
+
+        entries = []
+        count.times do
+          platform, encoding, language, id, length, start_offset =
+            read(12, 'n*')
+          entries << {
+            platform_id: platform,
+            encoding_id: encoding,
+            language_id: language,
+            name_id: id,
+            length: length,
+            offset: offset + string_offset + start_offset
+          }
+        end
 
-          @copyright = @strings[0]
-          @font_family = @strings[1]
-          @font_subfamily = @strings[2]
-          @unique_subfamily = @strings[3]
-          @font_name = @strings[4]
-          @version = @strings[5]
-          @postscript_name = @strings[6].first.strip_extended # should only be ONE postscript name
-          @trademark = @strings[7]
-          @manufacturer = @strings[8]
-          @designer = @strings[9]
-          @description = @strings[10]
-          @vendor_url = @strings[11]
-          @designer_url = @strings[12]
-          @license = @strings[13]
-          @license_url = @strings[14]
-          @preferred_family = @strings[16]
-          @preferred_subfamily = @strings[17]
-          @compatible_full = @strings[18]
-          @sample_text = @strings[19]
+        @strings = Hash.new { |h, k| h[k] = [] }
+
+        count.times do |i|
+          io.pos = entries[i][:offset]
+          text = io.read(entries[i][:length])
+          @strings[entries[i][:name_id]] << Name::String.new(
+            text,
+            entries[i][:platform_id],
+            entries[i][:encoding_id],
+            entries[i][:language_id]
+          )
         end
+
+        @copyright = @strings[0]
+        @font_family = @strings[1]
+        @font_subfamily = @strings[2]
+        @unique_subfamily = @strings[3]
+        @font_name = @strings[4]
+        @version = @strings[5]
+        # should only be ONE postscript name
+        @postscript_name = @strings[6].first.strip_extended
+        @trademark = @strings[7]
+        @manufacturer = @strings[8]
+        @designer = @strings[9]
+        @description = @strings[10]
+        @vendor_url = @strings[11]
+        @designer_url = @strings[12]
+        @license = @strings[13]
+        @license_url = @strings[14]
+        @preferred_family = @strings[16]
+        @preferred_subfamily = @strings[17]
+        @compatible_full = @strings[18]
+        @sample_text = @strings[19]
+      end
     end
   end
 end

data/lib/ttfunk/table/os2.rb

@@ -41,38 +41,38 @@ module TTFunk
       attr_reader :max_context
 
       def tag
-        "OS/2"
+        'OS/2'
       end
 
       private
 
-        def parse!
-          @version = read(2, "n").first
+      def parse!
+        @version = read(2, 'n').first
 
-          @ave_char_width = read_signed(1)
-          @weight_class, @width_class = read(4, "nn")
-          @type, @y_subscript_x_size, @y_subscript_y_size, @y_subscript_x_offset,
-            @y_subscript_y_offset, @y_superscript_x_size, @y_superscript_y_size,
-            @y_superscript_x_offset, @y_superscript_y_offset, @y_strikeout_size,
-            @y_strikeout_position, @family_class = read_signed(12)
-          @panose = io.read(10)
+        @ave_char_width = read_signed(1)
+        @weight_class, @width_class = read(4, 'nn')
+        @type, @y_subscript_x_size, @y_subscript_y_size, @y_subscript_x_offset,
+          @y_subscript_y_offset, @y_superscript_x_size, @y_superscript_y_size,
+          @y_superscript_x_offset, @y_superscript_y_offset, @y_strikeout_size,
+          @y_strikeout_position, @family_class = read_signed(12)
+        @panose = io.read(10)
 
-          @char_range = io.read(16)
-          @vendor_id = io.read(4)
+        @char_range = io.read(16)
+        @vendor_id = io.read(4)
 
-          @selection, @first_char_index, @last_char_index = read(6, "n*")
+        @selection, @first_char_index, @last_char_index = read(6, 'n*')
 
-          if @version > 0
-            @ascent, @descent, @line_gap = read_signed(3)
-            @win_ascent, @win_descent = read(4, "nn")
-            @code_page_range = io.read(8)
+        if @version > 0
+          @ascent, @descent, @line_gap = read_signed(3)
+          @win_ascent, @win_descent = read(4, 'nn')
+          @code_page_range = io.read(8)
 
-            if @version > 1
-              @x_height, @cap_height = read_signed(2)
-              @default_char, @break_char, @max_context = read(6, "nnn")
-            end
+          if @version > 1
+            @x_height, @cap_height = read_signed(2)
+            @default_char, @break_char, @max_context = read(6, 'nnn')
           end
         end
+      end
     end
   end
 end