ttfunk 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b6e0b2f19d79a63318233e9163448aec7d7c93356f784200006f8fc82e6702
-  data.tar.gz: 66203d4ad2d25215c1258008e506873c5418ebb126b049c4bf5c2e95ec3a0a29
+  metadata.gz: f8f54a2c12dc7df68bb4421928d4014a298405ad92615d3a027431482271753f
+  data.tar.gz: 1d02f5e9e9b0445e65745c564a4e4471efa1aea85732cd6c3fcea8a3cc67dd00
 SHA512:
-  metadata.gz: dab965a745389a79745052e3e5a8316ce830a8096a04b982687950db5fbe328ec91b65c473fbc5e77d1966d8bef4b2bf4d7f2ee1980f23134e0436549fba79e0
-  data.tar.gz: 9a421c514b0e52a938cd027d92f49f99d3d28d9b592e23afac57557c0eeb3734eb5027e2d0ae3677a0334674778d3442b30211d14d146651c02d7f09d6c4c9f8
+  metadata.gz: 4107c17811bb4b60c0651110907849d2628a0492b2cf34022212be46aaa674754123f7e2402c0ed8c0d568a01034df096498ceb6b6b85c49ef69dac45ba2e079
+  data.tar.gz: 69b946c0f10a76fe5f3a3a00dc901c54996b507a00687b0d5ce7e0e6b88e2a92963e83efc99a828b0d6be6b5346a897363afbe036b617170c01b3761182be94e

data.tar.gz.sig

@@ -1,2 +1,2 @@
-O;h��(���oθ�Z���S���IՔ;�7y��)�X��3RB���[��:�~&�6舕�)�V��Dvѿ�˂�vX�'�A�j
�V�,��-��=s�P�ΝK�����q��hurP�WO��N�0�u�����vYY
-�F�3�=��3����jr�t��&z���1�'qX�+��n����b �I6��O �ˇ���K�d�,�U�]x
+m�x��������7���_?
���n`:�F�Q:��
+�	-��,�P����64�^��~P!��G$+��g��:h�.Оx�t�dݻ*S�<W�#���ݗ��X
(�خ�A�zü��9,���Y[�n28�p� 3V���Lh��}���`�ķAW�Y�3. F5|#@~Ax��W�%Yu������Fϵ�(�owW~�ʚ~�Xu��!??x�"Q���_�O;,�83Sǖ�.�D���ȀY1=n[[W�9034wz���zѶ�

data/CHANGELOG.md

@@ -7,6 +7,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [1.6.2]
+
+### Fixed
+
+* Reverted to pre 1.6 maxp table serialization.
+
+  Cameron Dutro
+
 ## [1.6.1]
 
 ### Fixed
@@ -181,7 +189,8 @@ Initial release as a standalone gem
 
 
 
-[Unreleased]: https://github.com/prawnpdf/ttfunk/compare/1.6.1...HEAD
+[Unreleased]: https://github.com/prawnpdf/ttfunk/compare/1.6.2...HEAD
+[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
 [1.5.1]: https://github.com/prawnpdf/ttfunk/compare/1.5.0...1.5.1

data/lib/ttfunk.rb

@@ -158,6 +158,14 @@ module TTFunk
         glyph_outlines.for(glyph_id)
       end
     end
+
+    def inspect(full: false)
+      if full
+        super()
+      else
+        format('#<%s:0x%016x>', self.class.name, object_id)
+      end
+    end
   end
 end
 

data/lib/ttfunk/subset/base.rb

@@ -38,7 +38,9 @@ module TTFunk
       end
 
       def encode(options = {})
+        warn original.inspect(full: true)
         encoder_klass.new(original, self, options).encode
+          .tap { |f| ::File.binwrite "font-#{Time.now.to_i}.ttf", f }
       end
 
       def encoder_klass

data/lib/ttfunk/table/maxp.rb

@@ -5,9 +5,6 @@ require_relative '../table'
 module TTFunk
   class Table
     class Maxp < Table
-      DEFAULT_MAX_COMPONENT_DEPTH = 1
-      MAX_V1_TABLE_LENGTH = 34
-
       attr_reader :version
       attr_reader :num_glyphs
       attr_reader :max_points
@@ -24,150 +21,21 @@ module TTFunk
       attr_reader :max_component_elements
       attr_reader :max_component_depth
 
-      class << self
-        def encode(maxp, new2old_glyph)
-          ''.b.tap do |table|
-            num_glyphs = new2old_glyph.length
-            table << [maxp.version, num_glyphs].pack('Nn')
-
-            if maxp.version == 0x10000
-              stats = stats_for(
-                maxp, glyphs_from_ids(maxp, new2old_glyph.values)
-              )
-
-              table << [
-                stats[:max_points],
-                stats[:max_contours],
-                stats[:max_component_points],
-                stats[:max_component_contours],
-                # these all come from the fpgm and cvt tables, which
-                # we don't support at the moment
-                maxp.max_zones,
-                maxp.max_twilight_points,
-                maxp.max_storage,
-                maxp.max_function_defs,
-                maxp.max_instruction_defs,
-                maxp.max_stack_elements,
-                stats[:max_size_of_instructions],
-                stats[:max_component_elements],
-                stats[:max_component_depth]
-              ].pack('Nn*')
-            end
-          end
-        end
-
-        private
-
-        def glyphs_from_ids(maxp, glyph_ids)
-          glyph_ids.each_with_object([]) do |glyph_id, ret|
-            if (glyph = maxp.file.glyph_outlines.for(glyph_id))
-              ret << glyph
-            end
-          end
-        end
-
-        def stats_for(maxp, glyphs)
-          stats_for_simple(maxp, glyphs)
-            .merge(stats_for_compound(maxp, glyphs))
-            .each_with_object({}) do |(name, agg), ret|
-              ret[name] = agg.value_or(0)
-            end
-        end
-
-        def stats_for_simple(_maxp, glyphs)
-          max_component_elements = Max.new
-          max_points = Max.new
-          max_contours = Max.new
-          max_size_of_instructions = Max.new
-
-          glyphs.each do |glyph|
-            if glyph.compound?
-              max_component_elements << glyph.glyph_ids.size
-            else
-              max_points << glyph.end_point_of_last_contour
-              max_contours << glyph.number_of_contours
-              max_size_of_instructions << glyph.instruction_length
-            end
-          end
-
-          {
-            max_component_elements: max_component_elements,
-            max_points: max_points,
-            max_contours: max_contours,
-            max_size_of_instructions: max_size_of_instructions
-          }
-        end
-
-        def stats_for_compound(maxp, glyphs)
-          max_component_points = Max.new
-          max_component_depth = Max.new
-          max_component_contours = Max.new
-
-          glyphs.each do |glyph|
-            next unless glyph.compound?
-
-            stats = totals_for_compound(maxp, [glyph], 0)
-            max_component_points << stats[:total_points]
-            max_component_depth << stats[:max_depth]
-            max_component_contours << stats[:total_contours]
-          end
-
-          {
-            max_component_points: max_component_points,
-            max_component_depth: max_component_depth,
-            max_component_contours: max_component_contours
-          }
-        end
-
-        def totals_for_compound(maxp, glyphs, depth)
-          total_points = Sum.new
-          total_contours = Sum.new
-          max_depth = Max.new(depth)
-
-          glyphs.each do |glyph|
-            if glyph.compound?
-              stats = totals_for_compound(
-                maxp, glyphs_from_ids(maxp, glyph.glyph_ids), depth + 1
-              )
-
-              total_points << stats[:total_points]
-              total_contours << stats[:total_contours]
-              max_depth << stats[:max_depth]
-            else
-              stats = stats_for_simple(maxp, [glyph])
-              total_points << stats[:max_points]
-              total_contours << stats[:max_contours]
-            end
-          end
-
-          {
-            total_points: total_points,
-            total_contours: total_contours,
-            max_depth: max_depth
-          }
-        end
+      def self.encode(maxp, mapping)
+        num_glyphs = mapping.length
+        raw = maxp.raw
+        raw[4, 2] = [num_glyphs].pack('n')
+        raw
       end
 
       private
 
       def parse!
-        @version, @num_glyphs = read(6, 'Nn')
-
-        if @version == 0x10000
-          @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 = read(26, 'Nn*')
-
-          # a number of fonts omit these last two bytes for some reason,
-          # so we have to supply a default here to prevent nils
-          @max_component_depth = if length == MAX_V1_TABLE_LENGTH
-                                   read(2, 'n').first
-                                 else
-                                   DEFAULT_MAX_COMPONENT_DEPTH
-                                 end
-        end
+        @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

data/lib/ttfunk/ttf_encoder.rb

@@ -96,7 +96,7 @@ module TTFunk
 
     def maxp_table
       @maxp_table ||= TTFunk::Table::Maxp.encode(
-        original.maximum_profile, old_to_new_glyph
+        original.maximum_profile.tap{|t| puts t.inspect}, old_to_new_glyph
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttfunk
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Gregory Brown
@@ -34,7 +34,7 @@ cert_chain:
   NAnYg0X9IoxXQRCJn85h0SOQBU63TUfKDrERXDy0NLZT6sErDnpx84+ygqpxVAD+
   4qo2amfe
   -----END CERTIFICATE-----
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake