ttfunk 1.4.0 → 1.5.0

data/lib/ttfunk/table/cmap/format12.rb

@@ -1,7 +1,6 @@
 module TTFunk
   class Table
     class Cmap
-
       module Format12
         attr_reader :language
         attr_reader :code_map
@@ -9,14 +8,16 @@ module TTFunk
         def self.encode(charmap)
           next_id = 0
           glyph_map = { 0 => 0 }
-          range_firstglyphs, range_firstcodes, range_lengths = [], [], []
+          range_firstglyphs = []
+          range_firstcodes = []
+          range_lengths = []
           last_glyph = last_code = -999
 
-          new_map = charmap.keys.sort.inject({}) do |map, code|
+          new_map = charmap.keys.sort.each_with_object({}) do |code, map|
             glyph_map[charmap[code]] ||= next_id += 1
-            map[code] = { :old => charmap[code], :new => glyph_map[charmap[code]] }
+            map[code] = { old: charmap[code], new: glyph_map[charmap[code]] }
 
-            if code > last_code+1 || glyph_map[charmap[code]] > last_glyph+1
+            if code > last_code + 1 || glyph_map[charmap[code]] > last_glyph + 1
               range_firstcodes << code
               range_firstglyphs << glyph_map[charmap[code]]
               range_lengths << 1
@@ -25,17 +26,20 @@ module TTFunk
             end
             last_code = code
             last_glyph = glyph_map[charmap[code]]
-
-            map
           end
 
-          subtable = [12, 0, 16+12*range_lengths.size, 0, range_lengths.size].pack('nnNNN')
+          subtable = [
+            12, 0, 16 + 12 * range_lengths.size, 0, range_lengths.size
+          ].pack('nnNNN')
           range_lengths.each_with_index do |length, i|
-            firstglyph, firstcode = range_firstglyphs[i], range_firstcodes[i]
-            subtable << [firstcode, firstcode+length-1, firstglyph].pack('NNN')
+            firstglyph = range_firstglyphs[i]
+            firstcode = range_firstcodes[i]
+            subtable << [
+              firstcode, firstcode + length - 1, firstglyph
+            ].pack('NNN')
           end
 
-          { :charmap => new_map, :subtable => subtable, :max_glyph_id => next_id+1 }
+          { charmap: new_map, subtable: subtable, max_glyph_id: next_id + 1 }
         end
 
         def [](code)
@@ -47,20 +51,22 @@ module TTFunk
         end
 
         private
-          def parse_cmap!
-            fractional_version, @language, groupcount = read(14, 'nx4NN')
-            raise NotImplementedError, "cmap version 12.#{fractional_version} is not supported" if fractional_version != 0
-            @code_map = {}
-            (1..groupcount).each do
-              startchar, endchar, startglyph = read(12, 'NNN')
-              (0..(endchar-startchar)).each do |offset|
-                @code_map[startchar+offset] = startglyph+offset
-              end
+
+        def parse_cmap!
+          fractional_version, @language, groupcount = read(14, 'nx4NN')
+          if fractional_version != 0
+            raise NotImplementedError,
+              "cmap version 12.#{fractional_version} is not supported"
+          end
+          @code_map = {}
+          (1..groupcount).each do
+            startchar, endchar, startglyph = read(12, 'NNN')
+            (0..(endchar - startchar)).each do |offset|
+              @code_map[startchar + offset] = startglyph + offset
             end
           end
-
+        end
       end
-
     end
   end
 end

data/lib/ttfunk/table/cmap/subtable.rb

@@ -11,11 +11,12 @@ module TTFunk
         attr_reader :format
 
         ENCODING_MAPPINGS = {
-          :mac_roman    => { :platform_id => 1, :encoding_id => 0 },
-          # use microsoft unicode, instead of generic unicode, for optimal windows support
-          :unicode      => { :platform_id => 3, :encoding_id => 1 },
-          :unicode_ucs4 => { :platform_id => 3, :encoding_id => 10 }
-        }
+          mac_roman: { platform_id: 1, encoding_id: 0 }.freeze,
+          # Use microsoft unicode, instead of generic unicode, for optimal
+          # Windows support
+          unicode: { platform_id: 3, encoding_id: 1 }.freeze,
+          unicode_ucs4: { platform_id: 3, encoding_id: 10 }.freeze
+        }.freeze
 
         def self.encode(charmap, encoding)
           case encoding
@@ -26,32 +27,37 @@ module TTFunk
           when :unicode_ucs4
             result = Format12.encode(charmap)
           else
-            raise NotImplementedError, "encoding #{encoding.inspect} is not supported"
+            raise NotImplementedError,
+              "encoding #{encoding.inspect} is not supported"
           end
 
           mapping = ENCODING_MAPPINGS[encoding]
 
           # platform-id, encoding-id, offset
-          result[:subtable] = [mapping[:platform_id], mapping[:encoding_id],
-            12, result[:subtable]].pack("nnNA*")
-
-          return result
+          result[:subtable] = [
+            mapping[:platform_id],
+            mapping[:encoding_id],
+            12,
+            result[:subtable]
+          ].pack('nnNA*')
+
+          result
         end
 
         def initialize(file, table_start)
           @file = file
-          @platform_id, @encoding_id, @offset = read(8, "nnN")
+          @platform_id, @encoding_id, @offset = read(8, 'nnN')
           @offset += table_start
 
           parse_from(@offset) do
-            @format = read(2, "n").first
+            @format = read(2, 'n').first
 
             case @format
-              when 0  then extend(TTFunk::Table::Cmap::Format00)
-              when 4  then extend(TTFunk::Table::Cmap::Format04)
-              when 6  then extend(TTFunk::Table::Cmap::Format06)
-              when 10 then extend(TTFunk::Table::Cmap::Format10)
-              when 12 then extend(TTFunk::Table::Cmap::Format12)
+            when 0  then extend(TTFunk::Table::Cmap::Format00)
+            when 4  then extend(TTFunk::Table::Cmap::Format04)
+            when 6  then extend(TTFunk::Table::Cmap::Format06)
+            when 10 then extend(TTFunk::Table::Cmap::Format10)
+            when 12 then extend(TTFunk::Table::Cmap::Format12)
             end
 
             parse_cmap!
@@ -59,23 +65,24 @@ module TTFunk
         end
 
         def unicode?
-          platform_id == 3 && (encoding_id == 1 || encoding_id == 10) && format != 0 ||
-          platform_id == 0 && format != 0
+          platform_id == 3 && (encoding_id == 1 || encoding_id == 10) &&
+            format != 0 ||
+            platform_id == 0 && format != 0
         end
 
         def supported?
           false
         end
 
-        def [](code)
+        def [](_code)
           raise NotImplementedError, "cmap format #{@format} is not supported"
         end
 
         private
 
-          def parse_cmap!
-            # do nothing...
-          end
+        def parse_cmap!
+          # do nothing...
+        end
       end
     end
   end

data/lib/ttfunk/table/glyf.rb

@@ -7,12 +7,12 @@ module TTFunk
       # mapping old glyph-ids to new glyph-ids.
       #
       # Returns a hash containing:
-      # 
+      #
       # * :table - a string representing the encoded 'glyf' table containing
       #   the given glyphs.
       # * :offsets - an array of offsets for each glyph
       def self.encode(glyphs, new2old, old2new)
-        result = { :table => "", :offsets => [] }
+        result = { table: '', offsets: [] }
 
         new2old.keys.sort.each do |new_id|
           glyph = glyphs[new2old[new_id]]
@@ -23,7 +23,7 @@ module TTFunk
         # include an offset at the end of the table, for use in computing the
         # size of the last glyph
         result[:offsets] << result[:table].length
-        return result
+        result
       end
 
       def for(glyph_id)
@@ -32,16 +32,18 @@ module TTFunk
         index = file.glyph_locations.index_of(glyph_id)
         size  = file.glyph_locations.size_of(glyph_id)
 
-        if size.zero? # blank glyph, e.g. space character
+        if size == 0 # blank glyph, e.g. space character
           @cache[glyph_id] = nil
           return nil
         end
 
         parse_from(offset + index) do
           raw = io.read(size)
-          number_of_contours, x_min, y_min, x_max, y_max = raw.unpack("n5").map { |i| to_signed(i) }
+          number_of_contours, x_min, y_min, x_max, y_max =
+            raw.unpack('n5').map { |i| to_signed(i) }
 
-          @cache[glyph_id] = if number_of_contours == -1
+          @cache[glyph_id] =
+            if number_of_contours == -1
               Compound.new(raw, x_min, y_min, x_max, y_max)
             else
               Simple.new(raw, number_of_contours, x_min, y_min, x_max, y_max)
@@ -51,11 +53,11 @@ module TTFunk
 
       private
 
-        def parse!
-          # because the glyf table is rather complex to parse, we defer
-          # the parse until we need a specific glyf, and then cache it.
-          @cache = {}
-        end
+      def parse!
+        # because the glyf table is rather complex to parse, we defer
+        # the parse until we need a specific glyf, and then cache it.
+        @cache = {}
+      end
     end
   end
 end

data/lib/ttfunk/table/glyf/compound.rb

@@ -21,7 +21,10 @@ module TTFunk
 
         def initialize(raw, x_min, y_min, x_max, y_max)
           @raw = raw
-          @x_min, @y_min, @x_max, @y_max = x_min, y_min, x_max, y_max
+          @x_min = x_min
+          @y_min = y_min
+          @x_max = x_max
+          @y_max = y_max
 
           # Because TTFunk only cares about glyphs insofar as they (1) provide
           # a bounding box for each glyph, and (2) can be rewritten into a
@@ -37,18 +40,19 @@ module TTFunk
           offset = 10 # 2 bytes for each of num-contours, min x/y, max x/y
 
           loop do
-            flags, glyph_id = @raw[offset, 4].unpack("n*")
+            flags, glyph_id = @raw[offset, 4].unpack('n*')
             @glyph_ids << glyph_id
             @glyph_id_offsets << offset + 2
 
             break unless flags & MORE_COMPONENTS != 0
             offset += 4
 
-            if flags & ARG_1_AND_2_ARE_WORDS != 0
-              offset += 4
-            else
-              offset += 2
-            end
+            offset +=
+              if flags & ARG_1_AND_2_ARE_WORDS != 0
+                4
+              else
+                2
+              end
 
             if flags & WE_HAVE_A_TWO_BY_TWO != 0
               offset += 8
@@ -69,13 +73,12 @@ module TTFunk
           new_ids = glyph_ids.map { |id| mapping[id] }
 
           new_ids.zip(@glyph_id_offsets).each do |new_id, offset|
-            result[offset, 2] = [new_id].pack("n")
+            result[offset, 2] = [new_id].pack('n')
           end
 
-          return result
+          result
         end
       end
     end
   end
 end
-

data/lib/ttfunk/table/glyf/simple.rb

@@ -11,8 +11,10 @@ module TTFunk
         def initialize(raw, number_of_contours, x_min, y_min, x_max, y_max)
           @raw = raw
           @number_of_contours = number_of_contours
-          @x_min, @y_min = x_min, y_min
-          @x_max, @y_max = x_max, y_max
+          @x_min = x_min
+          @y_min = y_min
+          @x_max = x_max
+          @y_max = y_max
 
           # Because TTFunk is, at this time, a library for simply pulling
           # metrics out of font files, or for writing font subsets, we don't
@@ -27,11 +29,10 @@ module TTFunk
           false
         end
 
-        def recode(mapping)
+        def recode(_mapping)
           raw
         end
       end
     end
   end
 end
-

data/lib/ttfunk/table/head.rb

@@ -1,6 +1,6 @@
 require_relative '../table'
 
-module TTFunk  
+module TTFunk
   class Table
     class Head < TTFunk::Table
       attr_reader :version
@@ -23,22 +23,22 @@ module TTFunk
 
       def self.encode(head, loca)
         table = head.raw
-        table[8,4] = "\0\0\0\0" # set checksum adjustment to 0 initially
-        table[-4,2] = [loca[:type]].pack("n") # set index_to_loc_format
-        return table
+        table[8, 4] = "\0\0\0\0" # set checksum adjustment to 0 initially
+        table[-4, 2] = [loca[:type]].pack('n') # set index_to_loc_format
+        table
       end
 
       private
 
-        def parse!
-          @version, @font_revision, @check_sum_adjustment, @magic_number,
-            @flags, @units_per_em, @created, @modified = read(36, "N4n2q2")
-      
-          @x_min, @y_min, @x_max, @y_max = read_signed(4)
-      
-          @mac_style, @lowest_rec_ppem, @font_direction_hint,
-            @index_to_loc_format, @glyph_data_format = read(10, "n*")
-        end
+      def parse!
+        @version, @font_revision, @check_sum_adjustment, @magic_number,
+          @flags, @units_per_em, @created, @modified = read(36, 'N4n2q2')
+
+        @x_min, @y_min, @x_max, @y_max = read_signed(4)
+
+        @mac_style, @lowest_rec_ppem, @font_direction_hint,
+          @index_to_loc_format, @glyph_data_format = read(10, 'n*')
+      end
     end
   end
 end

data/lib/ttfunk/table/hhea.rb

@@ -1,6 +1,6 @@
 require_relative '../table'
 
-module TTFunk  
+module TTFunk
   class Table
     class Hhea < Table
       attr_reader :version
@@ -18,24 +18,24 @@ module TTFunk
 
       def self.encode(hhea, hmtx)
         raw = hhea.raw
-        raw[-2,2] = [hmtx[:number_of_metrics]].pack("n")
-        return raw
+        raw[-2, 2] = [hmtx[:number_of_metrics]].pack('n')
+        raw
       end
 
       private
 
-        def parse!
-          @version = read(4, "N").first
-          @ascent, @descent, @line_gap = read_signed(3)
-          @advance_width_max = read(2, "n").first
+      def parse!
+        @version = read(4, 'N').first
+        @ascent, @descent, @line_gap = read_signed(3)
+        @advance_width_max = read(2, 'n').first
 
-          @min_left_side_bearing, @min_right_side_bearing, @x_max_extent,
-            @carot_slope_rise, @carot_slope_run, @caret_offset,
-            reserved, reserved, reserved, reserved,
-            @metric_data_format = read_signed(11)
+        @min_left_side_bearing, @min_right_side_bearing, @x_max_extent,
+          @carot_slope_rise, @carot_slope_run, @caret_offset,
+          _reserved, _reserved, _reserved, _reserved,
+          @metric_data_format = read_signed(11)
 
-          @number_of_metrics = read(2, "n").first
-        end
+        @number_of_metrics = read(2, 'n').first
+      end
     end
   end
 end

data/lib/ttfunk/table/hmtx.rb

@@ -1,7 +1,7 @@
 require_relative '../table'
 
-module TTFunk  
-  class Table 
+module TTFunk
+  class Table
     class Hmtx < Table
       attr_reader :metrics
       attr_reader :left_side_bearings
@@ -13,35 +13,40 @@ module TTFunk
           [metric.advance_width, metric.left_side_bearing]
         end
 
-        { :number_of_metrics => metrics.length,
-          :table => metrics.flatten.pack("n*") }
+        {
+          number_of_metrics: metrics.length,
+          table: metrics.flatten.pack('n*')
+        }
       end
 
       HorizontalMetric = Struct.new(:advance_width, :left_side_bearing)
 
       def for(glyph_id)
         @metrics[glyph_id] ||
-          HorizontalMetric.new(@metrics.last.advance_width,
-            @left_side_bearings[glyph_id - @metrics.length])
+          HorizontalMetric.new(
+            @metrics.last.advance_width,
+            @left_side_bearings[glyph_id - @metrics.length]
+          )
       end
 
       private
 
-        def parse!
-          @metrics = []
+      def parse!
+        @metrics = []
 
-          file.horizontal_header.number_of_metrics.times do
-            advance = read(2, "n").first
-            lsb     = read_signed(1).first
-            @metrics.push HorizontalMetric.new(advance, lsb)
-          end
+        file.horizontal_header.number_of_metrics.times do
+          advance = read(2, 'n').first
+          lsb     = read_signed(1).first
+          @metrics.push HorizontalMetric.new(advance, lsb)
+        end
 
-          lsb_count = file.maximum_profile.num_glyphs - file.horizontal_header.number_of_metrics
-          @left_side_bearings = read_signed(lsb_count)
+        lsb_count = file.maximum_profile.num_glyphs -
+          file.horizontal_header.number_of_metrics
+        @left_side_bearings = read_signed(lsb_count)
 
-          @widths = @metrics.map { |metric| metric.advance_width }
-          @widths += [@widths.last] * @left_side_bearings.length
-        end
+        @widths = @metrics.map(&:advance_width)
+        @widths += [@widths.last] * @left_side_bearings.length
+      end
     end
   end
 end