ttfunk 1.6.2.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71064b02c8c85fc71ceada9b60f6952e63bbfb8455ef8515b6c7177ab47ac011
-  data.tar.gz: a38f13b6e110788e6f4104e0923976ad4a549fb1768be6311ec2769786effd88
+  metadata.gz: 8c6a1d61ab884e88dd7424c80680f5dac53de5d891645f5b3fb5699ebbcffce3
+  data.tar.gz: 7031ece12dacbf351ea1e98fceccca054bca245ddd7437a62ca746e1d85b40e9
 SHA512:
-  metadata.gz: c5b344b9ef01adc031d7c518ad86ddf9dade4ccc8bc5722622c55a19baee775a99c34b1873a6ed59cc91532dc492b977dc868013857e3ef56716e38d6f2db0e9
-  data.tar.gz: fe3b0ebad333cc6710f756db0b39de990113869e51fea20f8f5da532be8237c5bf6854604a9b3faf3f781804762dd761e267e1dc7b6d3aebcfb65e8bf057fbb3
+  metadata.gz: f2481488976f0015fb0abf49c8fa510cf6b8ee6120d17eebd04a01d4fcda5c96397c8bcf729bf42efae8f08238ebe3cba914f082bac2966d92f867f62e87b92b
+  data.tar.gz: fc4561d7ff2892a7a8f1c752c473a4b6e0a1e7b17042e60c175c98ef83bea9cbbdf6893ddab92c841f9ec9759af9fa41617445d304903c585a6f20d111e59e6e

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-���9o��P�w��֤�V��=��mc�<�ۦʾmΧ���9��U}�|�-��~��d���~uAv=�B~O��}��w��v��9�l�&髽�ȤaC����Dd� �c=nȘ��2$�cմ�m�T�J���Z$|T��(#��=�z�=s~Z�y��0�f�2��0�.ܽ54��gdޗa�Da��'�$Mn��!�f��A�r�Ùѹ��a��<�_YQ���bi��ز���n�O��/)h<.�k"�rm�s��
+��5�*���pl�}�[���@p��-Q�������Ɗ������Ogs{s_IfBy��.˥�����y䩙��G�y&�@ӳ��B)<�w�U�D@4o���}�S#����q�e�NP�ki|x�}�B�sj��٭؏
+AD�

data/CHANGELOG.md

@@ -7,6 +7,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+## 1.7.0
+
+### Changes
+
+* Allow gem installation on Ruby 3.0
+
+  Pavel Lobashov
+
+* Allow TTC files to be read from IO object
+
+  Tom de Grunt
+
 ## [1.6.2.1]
 
 ### Fixed
@@ -198,7 +210,9 @@ Initial release as a standalone gem
 
 
 
-[Unreleased]: https://github.com/prawnpdf/ttfunk/compare/1.6.2...HEAD
+[Unreleased]: https://github.com/prawnpdf/ttfunk/compare/1.7.0...HEAD
+[1.7.0]: https://github.com/prawnpdf/ttfunk/compare/1.6.2.1...1.7.0
+[1.6.2.1]: https://github.com/prawnpdf/ttfunk/compare/1.6.2...1.6.2.1
 [1.6.2]: https://github.com/prawnpdf/ttfunk/compare/1.6.1...1.6.2
 [1.6.1]: https://github.com/prawnpdf/ttfunk/compare/1.6.0...1.6.1
 [1.6.0]: https://github.com/prawnpdf/ttfunk/compare/1.5.1...1.6.0

data/lib/ttfunk.rb

@@ -21,6 +21,8 @@ require_relative 'ttfunk/sum'
 require_relative 'ttfunk/one_based_array'
 
 module TTFunk
+  class Error < StandardError; end
+
   class File
     attr_reader :contents
     attr_reader :directory
@@ -53,8 +55,7 @@ module TTFunk
       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
+      io_or_path.open('rb')
     end
 
     def initialize(contents, offset = 0)

data/lib/ttfunk/bit_field.rb

@@ -13,7 +13,7 @@ module TTFunk
     end
 
     def on?(pos)
-      value & 2**pos > 0
+      (value & 2**pos).positive?
     end
 
     def off(pos)

data/lib/ttfunk/collection.rb

@@ -5,8 +5,14 @@ module TTFunk
     include Enumerable
 
     def self.open(path)
-      ::File.open(path, 'rb') do |io|
-        yield new(io)
+      if path.respond_to?(:read)
+        result = yield new(path)
+        path.rewind
+        result
+      else
+        ::File.open(path, 'rb') do |io|
+          yield new(io)
+        end
       end
     end
 

data/lib/ttfunk/encoded_string.rb

@@ -34,7 +34,7 @@ module TTFunk
     end
 
     def align!(width = 4)
-      if length % width > 0
+      if (length % width).positive?
         self << "\0" * (width - length % width)
       end
 
@@ -47,8 +47,8 @@ module TTFunk
 
     def string
       unless placeholders.empty?
-        raise UnresolvedPlaceholderError, 'string contains '\
-          "#{placeholders.size} unresolved placeholder(s)"
+        raise UnresolvedPlaceholderError,
+          "string contains #{placeholders.size} unresolved placeholder(s)"
       end
 
       io.string

data/lib/ttfunk/max.rb

@@ -5,6 +5,7 @@ module TTFunk
     attr_reader :value
 
     def initialize(init_value = nil)
+      super()
       @value = init_value
     end
 

data/lib/ttfunk/min.rb

@@ -5,6 +5,7 @@ module TTFunk
     attr_reader :value
 
     def initialize(init_value = nil)
+      super()
       @value = init_value
     end
 

data/lib/ttfunk/one_based_array.rb

@@ -9,7 +9,7 @@ module TTFunk
     end
 
     def [](idx)
-      if idx == 0
+      if idx.zero?
         raise IndexError,
           "index #{idx} was outside the bounds of the array"
       end

data/lib/ttfunk/otf_encoder.rb

@@ -39,7 +39,7 @@ module TTFunk
         'BASE' => base_table,
         'VORG' => vorg_table,
         'CFF ' => cff_table
-      ).reject { |_tag, table| table.nil? }
+      ).compact
     end
 
     def optimal_table_order

data/lib/ttfunk/reader.rb

@@ -33,15 +33,15 @@ module TTFunk
       bytes = string.unpack('C*')
       bytes.each_with_index do |c, i|
         printf('%02X', c)
-        if (i + 1) % 16 == 0
+        if ((i + 1) % 16).zero?
           puts
-        elsif (i + 1) % 8 == 0
+        elsif ((i + 1) % 8).zero?
           print '  '
         else
           print ' '
         end
       end
-      puts unless bytes.length % 16 == 0
+      puts unless (bytes.length % 16).zero?
     end
   end
 end

data/lib/ttfunk/sci_form.rb

@@ -17,7 +17,7 @@ module TTFunk
     def ==(other)
       case other
       when Float
-        other == to_f
+        other == to_f # rubocop: disable Lint/FloatComparison
       when self.class
         other.significand == significand &&
           other.exponent == exponent

data/lib/ttfunk/subset.rb

@@ -9,10 +9,10 @@ module TTFunk
   module Subset
     def self.for(original, encoding)
       case encoding.to_sym
-      when :unicode      then Unicode.new(original)
+      when :unicode then Unicode.new(original)
       when :unicode_8bit then Unicode8Bit.new(original)
-      when :mac_roman    then MacRoman.new(original)
-      when :windows_1252 then Windows1252.new(original)
+      when :mac_roman then MacRoman.new(original)
+      when :windows_1252 then Windows1252.new(original) # rubocop: disable Naming/VariableNumber
       else raise NotImplementedError, "encoding #{encoding} is not supported"
       end
     end

data/lib/ttfunk/subset/base.rb

@@ -54,14 +54,15 @@ module TTFunk
       end
 
       def collect_glyphs(glyph_ids)
-        collected = glyph_ids.each_with_object({}) do |id, h|
-          h[id] = glyph_for(id)
-        end
+        collected =
+          glyph_ids.each_with_object({}) do |id, h|
+            h[id] = glyph_for(id)
+          end
 
         additional_ids = collected.values
-                                  .select { |g| g && g.compound? }
-                                  .map(&:glyph_ids)
-                                  .flatten
+          .select { |g| g && g.compound? }
+          .map(&:glyph_ids)
+          .flatten
 
         collected.update(collect_glyphs(additional_ids)) if additional_ids.any?
 
@@ -69,23 +70,25 @@ module TTFunk
       end
 
       def old_to_new_glyph
-        @old_to_new_glyph ||= begin
-          charmap = new_cmap_table[:charmap]
-          old_to_new = charmap.each_with_object(0 => 0) do |(_, ids), map|
-            map[ids[:old]] = ids[:new]
-          end
-
-          next_glyph_id = new_cmap_table[:max_glyph_id]
-
-          glyphs.keys.each do |old_id|
-            unless old_to_new.key?(old_id)
-              old_to_new[old_id] = next_glyph_id
-              next_glyph_id += 1
+        @old_to_new_glyph ||=
+          begin
+            charmap = new_cmap_table[:charmap]
+            old_to_new =
+              charmap.each_with_object(0 => 0) do |(_, ids), map|
+                map[ids[:old]] = ids[:new]
+              end
+
+            next_glyph_id = new_cmap_table[:max_glyph_id]
+
+            glyphs.each_key do |old_id|
+              unless old_to_new.key?(old_id)
+                old_to_new[old_id] = next_glyph_id
+                next_glyph_id += 1
+              end
             end
-          end
 
-          old_to_new
-        end
+            old_to_new
+          end
       end
 
       def new_to_old_glyph

data/lib/ttfunk/subset/code_page.rb

@@ -9,19 +9,15 @@ module TTFunk
     class CodePage < Base
       class << self
         def unicode_mapping_for(encoding)
-          mapping_cache[encoding] ||= (0..255).each_with_object({}) do |c, ret|
-            # rubocop:disable Lint/SuppressedException
-            begin
-              ret[c] = c.chr(encoding)
-                        .encode(Encoding::UTF_8)
-                        .codepoints
-                        .first
-            rescue Encoding::UndefinedConversionError
-              # There is not a strict 1:1 mapping between all code page
-              # characters and unicode.
+          mapping_cache[encoding] ||=
+            (0..255).each_with_object({}) do |c, ret|
+              codepoint =
+                c.chr(encoding)
+                  .encode(Encoding::UTF_8, undef: :replace, replace: '')
+                  .codepoints
+                  .first
+              ret[c] = codepoint if codepoint
             end
-            # rubocop:enable Lint/SuppressedException
-          end
         end
 
         private
@@ -65,15 +61,16 @@ module TTFunk
       end
 
       def new_cmap_table
-        @new_cmap_table ||= begin
-          mapping = {}
+        @new_cmap_table ||=
+          begin
+            mapping = {}
 
-          @subset.each_with_index do |unicode, roman|
-            mapping[roman] = unicode_cmap[unicode]
-          end
+            @subset.each_with_index do |unicode, roman|
+              mapping[roman] = unicode_cmap[unicode]
+            end
 
-          TTFunk::Table::Cmap.encode(mapping, :mac_roman)
-        end
+            TTFunk::Table::Cmap.encode(mapping, :mac_roman)
+          end
       end
 
       def original_glyph_ids

data/lib/ttfunk/subset/unicode.rb

@@ -39,13 +39,15 @@ module TTFunk
       end
 
       def new_cmap_table
-        @new_cmap_table ||= begin
-          mapping = @subset.each_with_object({}) do |code, map|
-            map[code] = unicode_cmap[code]
+        @new_cmap_table ||=
+          begin
+            mapping =
+              @subset.each_with_object({}) do |code, map|
+                map[code] = unicode_cmap[code]
+              end
+
+            TTFunk::Table::Cmap.encode(mapping, :unicode)
           end
-
-          TTFunk::Table::Cmap.encode(mapping, :unicode)
-        end
       end
 
       def original_glyph_ids

data/lib/ttfunk/subset/unicode_8bit.rb

@@ -42,19 +42,21 @@ module TTFunk
       end
 
       def new_cmap_table
-        @new_cmap_table ||= begin
-          mapping = @subset.each_with_object({}) do |(code, unicode), map|
-            map[code] = unicode_cmap[unicode]
-            map
-          end
+        @new_cmap_table ||=
+          begin
+            mapping =
+              @subset.each_with_object({}) do |(code, unicode), map|
+                map[code] = unicode_cmap[unicode]
+                map
+              end
 
-          # since we're mapping a subset of the unicode glyphs into an
-          # arbitrary 256-character space, the actual encoding we're
-          # using is irrelevant. We choose MacRoman because it's a 256-character
-          # encoding that happens to be well-supported in both TTF and
-          # PDF formats.
-          TTFunk::Table::Cmap.encode(mapping, :mac_roman)
-        end
+            # since we're mapping a subset of the unicode glyphs into an
+            # arbitrary 256-character space, the actual encoding we're
+            # using is irrelevant. We choose MacRoman because it's a 256-character
+            # encoding that happens to be well-supported in both TTF and
+            # PDF formats.
+            TTFunk::Table::Cmap.encode(mapping, :mac_roman)
+          end
       end
 
       def original_glyph_ids

data/lib/ttfunk/sum.rb

@@ -5,6 +5,7 @@ module TTFunk
     attr_reader :value
 
     def initialize(init_value = 0)
+      super()
       @value = init_value
     end
 

data/lib/ttfunk/table/cff.rb

@@ -3,24 +3,24 @@
 module TTFunk
   class Table
     class Cff < TTFunk::Table
-      autoload :Charset,          'ttfunk/table/cff/charset'
-      autoload :Charsets,         'ttfunk/table/cff/charsets'
-      autoload :Charstring,       'ttfunk/table/cff/charstring'
+      autoload :Charset, 'ttfunk/table/cff/charset'
+      autoload :Charsets, 'ttfunk/table/cff/charsets'
+      autoload :Charstring, 'ttfunk/table/cff/charstring'
       autoload :CharstringsIndex, 'ttfunk/table/cff/charstrings_index'
-      autoload :Dict,             'ttfunk/table/cff/dict'
-      autoload :Encoding,         'ttfunk/table/cff/encoding'
-      autoload :Encodings,        'ttfunk/table/cff/encodings'
-      autoload :FdSelector,       'ttfunk/table/cff/fd_selector'
-      autoload :FontDict,         'ttfunk/table/cff/font_dict'
-      autoload :FontIndex,        'ttfunk/table/cff/font_index'
-      autoload :Header,           'ttfunk/table/cff/header'
-      autoload :Index,            'ttfunk/table/cff/index'
-      autoload :OneBasedIndex,    'ttfunk/table/cff/one_based_index'
-      autoload :Path,             'ttfunk/table/cff/path'
-      autoload :PrivateDict,      'ttfunk/table/cff/private_dict'
-      autoload :SubrIndex,        'ttfunk/table/cff/subr_index'
-      autoload :TopDict,          'ttfunk/table/cff/top_dict'
-      autoload :TopIndex,         'ttfunk/table/cff/top_index'
+      autoload :Dict, 'ttfunk/table/cff/dict'
+      autoload :Encoding, 'ttfunk/table/cff/encoding'
+      autoload :Encodings, 'ttfunk/table/cff/encodings'
+      autoload :FdSelector, 'ttfunk/table/cff/fd_selector'
+      autoload :FontDict, 'ttfunk/table/cff/font_dict'
+      autoload :FontIndex, 'ttfunk/table/cff/font_index'
+      autoload :Header, 'ttfunk/table/cff/header'
+      autoload :Index, 'ttfunk/table/cff/index'
+      autoload :OneBasedIndex, 'ttfunk/table/cff/one_based_index'
+      autoload :Path, 'ttfunk/table/cff/path'
+      autoload :PrivateDict, 'ttfunk/table/cff/private_dict'
+      autoload :SubrIndex, 'ttfunk/table/cff/subr_index'
+      autoload :TopDict, 'ttfunk/table/cff/top_dict'
+      autoload :TopIndex, 'ttfunk/table/cff/top_index'
 
       TAG = 'CFF ' # the extra space is important
 

data/lib/ttfunk/table/cff/charset.rb

@@ -56,7 +56,7 @@ module TTFunk
         end
 
         def [](glyph_id)
-          return FIRST_GLYPH_STRING if glyph_id == 0
+          return FIRST_GLYPH_STRING if glyph_id.zero?
 
           find_string(sid_for(glyph_id))
         end
@@ -83,12 +83,13 @@ module TTFunk
           ranges = TTFunk::BinUtils.rangify(sids)
           range_max = ranges.map(&:last).max
 
-          range_bytes = if range_max > 0
-                          (Math.log2(range_max) / 8).floor + 1
-                        else
-                          # for cases when there are no sequences at all
-                          Float::INFINITY
-                        end
+          range_bytes =
+            if range_max.positive?
+              (Math.log2(range_max) / 8).floor + 1
+            else
+              # for cases when there are no sequences at all
+              Float::INFINITY
+            end
 
           # calculate whether storing the charset as a series of ranges is
           # more efficient (i.e. takes up less space) vs storing it as an
@@ -99,7 +100,7 @@ module TTFunk
           if total_array_size <= total_range_size
             ([format_int(:array_format)] + sids).pack('Cn*')
           else
-            fmt = range_bytes == 1 ? :range_format_8 : :range_format_16
+            fmt = range_bytes == 1 ? :range_format8 : :range_format16
             element_fmt = element_format(fmt)
             result = [format_int(fmt)].pack('C')
             ranges.each { |range| result << range.pack(element_fmt) }
@@ -110,7 +111,7 @@ module TTFunk
         private
 
         def sid_for(glyph_id)
-          return 0 if glyph_id == 0
+          return 0 if glyph_id.zero?
 
           # rather than validating the glyph as part of one of the predefined
           # charsets, just pass it through
@@ -120,8 +121,8 @@ module TTFunk
           when :array_format
             entries[glyph_id]
 
-          when :range_format_8, :range_format_16
-            entries.inject(glyph_id) do |remaining, range|
+          when :range_format8, :range_format16
+            entries.reduce(glyph_id) do |remaining, range|
               if range.size >= remaining
                 break (range.first + remaining) - 1
               end
@@ -156,7 +157,7 @@ module TTFunk
             @length = count * element_width
             @entries = OneBasedArray.new(read(length, 'n*'))
 
-          when :range_format_8, :range_format_16
+          when :range_format8, :range_format16
             # The number of ranges is not explicitly specified in the font.
             # Instead, software utilizing this data simply processes ranges
             # until all glyphs in the font are covered.
@@ -174,37 +175,37 @@ module TTFunk
         end
 
         def element_width(fmt = format_sym)
-          case fmt
-          when :array_format then 2 # SID
-          when :range_format_8 then 3 # SID + Card8
-          when :range_format_16 then 4 # SID + Card16
-          end
+          {
+            array_format: 2, # SID
+            range_format8: 3, # SID + Card8
+            range_format16: 4 # SID + Card16
+          }[fmt]
         end
 
         def element_format(fmt = format_sym)
-          case fmt
-          when :array_format then 'n'
-          when :range_format_8 then 'nC'
-          when :range_format_16 then 'nn'
-          end
+          {
+            array_format: 'n',
+            range_format8: 'nC',
+            range_format16: 'nn'
+          }[fmt]
         end
 
         def format_sym
           case @format
           when ARRAY_FORMAT then :array_format
-          when RANGE_FORMAT_8 then :range_format_8
-          when RANGE_FORMAT_16 then :range_format_16
+          when RANGE_FORMAT_8 then :range_format8
+          when RANGE_FORMAT_16 then :range_format16
           else
-            raise "unsupported charset format '#{fmt}'"
+            raise Error, "unsupported charset format '#{fmt}'"
           end
         end
 
         def format_int(sym = format_sym)
-          case sym
-          when :array_format then ARRAY_FORMAT
-          when :range_format_8 then RANGE_FORMAT_8
-          when :range_format_16 then RANGE_FORMAT_16
-          end
+          {
+            array_format: ARRAY_FORMAT,
+            range_format8: RANGE_FORMAT_8,
+            range_format16: RANGE_FORMAT_16
+          }[sym]
         end
       end
     end