@@ -155,23 +155,21 @@ module Prawn # String *must* be encoded as WinAnsi # def kern(string) - kerned = string.unpack("C*").inject([]) do |a,r| - if a.last.is_a? Array - if k = latin_kern_pairs_table[[a.last.last, r]] - a << k << [r] - else - a.last << r - end + kerned = [[]] + last_byte = nil + + string.unpack("C*").each do |byte| + if k = last_byte && latin_kern_pairs_table[[last_byte, byte]] + kerned << -k << [byte] else - a << [r] - end - a + kerned.last << byte + end + last_byte = byte end - kerned.map { |r| - i = r.is_a?(Array) ? r.pack("C*") : r - i.force_encoding("Windows-1252") if i.respond_to?(:force_encoding) - i.is_a?(Numeric) ? -i : i + kerned.map { |e| + e = (Array === e ? e.pack("C*") : e) + e.respond_to?(:force_encoding) ? e.force_encoding("Windows-1252") : e } end lib/prawn/font/afm.rb @@ -1 +1 @@ -Subproject commit 900032abee9272485e77f6b68e87c9ad6346f69b +Subproject commit 158a82ab543f319cd8ed4870e0735c353b747e3b vendor/ttfunk 21baf934a22aaae29f6aac1abeef76bc54af9ca6 Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/b71547730203a4c92c83e914a97abd8b8c4dda7e b71547730203a4c92c83e914a97abd8b8c4dda7e 2009-01-23T13:56:03-08:00 2009-01-23T12:41:40-08:00 Small cleanup 33c42b14fa2efc5fb7507d2b1426a26ecaeecc30 Gregory Brown gregory.t.brown@gmail.com