prawnx 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60737d0cdb31b35fd87d7ca956ab4e4f50328228d0b4073251c2285c0346c44
-  data.tar.gz: dea3be495ccff7a9b66aad18f3aa9ae7532ed939cca5f851ed21aa65a28302b0
+  metadata.gz: 1810084418cb875d2923b99bda0e35ac9554b06aabbe28a5b6018f2b1d8c9e70
+  data.tar.gz: c824566dad95353df788a7f4ec5d75990cdd2aebb850ede877fc871b381fd60c
 SHA512:
-  metadata.gz: 840c3fb787c44f77858586937b8a606a4d25e1a82b526c2746d1df4578f87f94564491bb81634a264756a6a4efc3cc3430bd889011f8a06a3f4f345f94f376f5
-  data.tar.gz: 2e8a93a63e8b4e920131f97df9e0a016e380b43c14ce4304515a48703315b51efa4675389877eb20b6de344fc94b2725eaddfb40c26dfb1d14c796129618d2b2
+  metadata.gz: e3620c13261d1a55bd031c38161a1613abe867d3ec7a78ba60288b7b7fc0f0c414fb73b560c7b3c6b1c10e72b923ca84e65edbfe889be5e61ccb3310e50f8e59
+  data.tar.gz: ed772792d477cf06e54ff27283b6d0dfb49b7759ea22fe763cbeb0f1de73cdc3d602765a0fb456d04483eec685a98f3b05ca0296ff42566c0bcb0a48ec14e707

data/lib/prawnx/true_type/file.rb

@@ -149,33 +149,13 @@ module PrawnX
         !read_unicode_cmap.nil?
       end
 
-      # The first kerning subtable's pairs of glyphs, in font units.
-      def kerning_by_glyph_pair
-        @kerning_by_glyph_pair ||= begin
-          kern = table("kern")
-          next_pairs = nil
-          if kern
-            version = kern.unpack1("n")
-            if version == 1
-              length, coverage = kern.unpack("@8 N n")
-              next_pairs = kern.byteslice(16, length - 8) if (coverage & 0xFF).zero?
-            elsif kern.unpack1("@2 n").positive?
-              coverage = kern.unpack1("@8 n")
-              next_pairs = kern.byteslice(10..) if (coverage >> 8).zero?
-            end
-          end
-          next_pairs ? format0_pairs(next_pairs) : {}
-        end
-      end
-
       def kerning?
-        !kerning_by_glyph_pair.empty?
+        !kerning_by_glyph_key.empty?
       end
 
       # Kerning between two glyphs, in font units, or nil.
       def kerning_offset(left, right)
-        @kerning_by_glyph_key ||= kerning_by_glyph_pair.transform_keys { |(first, second)| (first << 16) | second }
-        @kerning_by_glyph_key[(left << 16) | right]
+        kerning_by_glyph_key[(left << 16) | right]
       end
 
       def glyph_data(glyph)
@@ -201,7 +181,7 @@ module PrawnX
         header
         advance_widths
         read_unicode_cmap
-        kerning_by_glyph_pair
+        kerning_by_glyph_key
         validate_glyph_offsets! if outline_format == :true_type
       end
 
@@ -237,16 +217,31 @@ module PrawnX
           end
       end
 
-      def format0_pairs(subtable)
-        pair_count = subtable.unpack1("n")
-        values = subtable.unpack("@8 n#{pair_count * 3}")
-        values.each_slice(3).each_with_object({}) do |(left, right, value), pairs|
-          break pairs if value.nil?
-
-          pairs[[left, right]] = value >= 0x8000 ? value - 0x10000 : value
+      # The first kerning subtable's values, keyed by `left << 16 | right` like its records.
+      def kerning_by_glyph_key
+        @kerning_by_glyph_key ||= begin
+          kern = table("kern")
+          subtable = nil
+          if kern
+            version = kern.unpack1("n")
+            if version == 1
+              length, coverage = kern.unpack("@8 N n")
+              subtable = kern.byteslice(16, length - 8) if (coverage & 0xFF).zero?
+            elsif kern.unpack1("@2 n").positive?
+              coverage = kern.unpack1("@8 n")
+              subtable = kern.byteslice(10..) if (coverage >> 8).zero?
+            end
+          end
+          subtable ? format0_kerning_by_glyph_key(subtable) : {}
         end
       end
 
+      # A format 0 record is a uint32 glyph pair key then an int16 value: `N s>` reads both as they are stored.
+      def format0_kerning_by_glyph_key(subtable)
+        pair_count = [subtable.unpack1("n"), (subtable.bytesize - 8) / 6].min
+        Hash[*subtable.unpack("@8 #{"N s>" * pair_count}")]
+      end
+
       def read_table_directory
         version, table_count = @bytes.unpack("@#{@offset} a4 n")
         raise Error, "Not a TrueType font" unless TRUE_TYPE_VERSIONS.include?(version) || version == "OTTO"

data/lib/prawnx/version.rb

@@ -3,5 +3,5 @@
 module PrawnX
   # The Prawn API PrawnX reproduces. Prawn is PrawnX, so this is also Prawn::VERSION, which prawn-svg and others check.
   VERSION = "2.5.0"
-  GEM_VERSION = "0.1.1"
+  GEM_VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawnx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Clément Joubert