@@ -3,10 +3,25 @@ require "prawn" Prawn::Document.generate "kerning.pdf" do text "To kern?", :at => [200,720], :size => 24, :kerning => true - text "To not kern?", :at => [200,690], :size => 24, :kerning => false + text "To not kern?", :at => [200,690], :size => 24, :kerning => false - font "#{Prawn::BASEDIR}/data/fonts/Dustismo_Roman.ttf" + move_down 100 + + pad(30) do + text "To kern and wrap. " * 5, :size => 24, :kerning => true + end + + text "To not kern and wrap. " * 5, :size => 24, :kerning => false + + font "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf" text "To kern?", :at => [200,660], :size => 24, :kerning => true - text "To not kern?", :at => [200,630], :size => 24, :kerning => false + text "To not kern?", :at => [200,630], :size => 24, :kerning => false + + pad(30) do + text "To kern and wrap. " * 5, :size => 24, :kerning => true + end + + text "To not kern and wrap. " * 5, :size => 24, :kerning => false + end examples/kerning.rb @@ -81,9 +81,8 @@ module Prawn x,y = translate(options[:at]) font_size(options[:size] || current_font_size) do font_name = font_registry[fonts[@font]] - - - text = @font_metrics.convert_text(text,options) + + text = @font_metrics.convert_text(text,options) add_content %Q{ BT @@ -180,27 +179,31 @@ module Prawn # TODO: Get kerning working with wrapped text def wrapped_text(text,options) - options[:kerning] = false font_size(options[:size] || current_font_size) do font_name = font_registry[fonts[@font]] text = @font_metrics.naive_wrap(text, bounds.right, current_font_size, - :kerning => options[:kerning]) + :kerning => options[:kerning]) - lines = text.lines.map { |t| - @font_metrics.convert_text(t, options) } + lines = text.lines lines.each do |e| move_text_position(@font_metrics.font_height(current_font_size) + - @font_metrics.descender / 1000.0 * current_font_size) - + @font_metrics.descender / 1000.0 * current_font_size) + + add_content %Q{ BT /#{font_name} #{current_font_size} Tf #{@bounding_box.absolute_left} #{y} Td - #{Prawn::PdfObject(e.to_s.chomp)} Tj + } + + add_content Prawn::PdfObject(@font_metrics.convert_text(e,options)) << + " #{options[:kerning] ? 'TJ' : 'Tj'}\n" + + add_content %Q{ ET - } + } move_text_position(-@font_metrics.descender / 1000.0 * current_font_size) end @@ -297,7 +300,8 @@ module Prawn def enctables #:nodoc @enctables ||= {} - end + end + def font_registry #:nodoc: @font_registry ||= {} end lib/prawn/document/text.rb @@ -107,7 +107,7 @@ module Prawn end end - def kern(string) + def kern(string) kerned = string.unpack("U*").inject([]) do |a,r| if a.last.is_a? Array if kern = latin_kern_pairs_table[[a.last.last, r]] @@ -243,10 +243,10 @@ module Prawn def string_width(string, font_size, options = {}) scale = font_size / 1000.0 if options[:kerning] - kern(string).inject(0) do |s,r| - if r.is_a? String + kern(string,:skip_conversion => true).inject(0) do |s,r| + if r.is_a? String s + string_width(r, font_size, :kerning => false) - else + else s + r * scale end end @@ -255,10 +255,10 @@ module Prawn s + character_width_by_code(r) end * scale end - end + end # TODO: NASTY. - def kern(string) + def kern(string,options={}) string.unpack("U*").inject([]) do |a,r| if a.last.is_a? Array if kern = kern_pairs_table[[cmap[a.last.last], cmap[r]]] @@ -272,17 +272,21 @@ module Prawn end a end.map { |r| - i = r.is_a?(Array) ? r.pack("U*") : r - x = if i.is_a?(String) - unicode_codepoints = i.unpack("U*") - glyph_codes = unicode_codepoints.map { |u| - enc_table.get_glyph_id_for_unicode(u) - } - glyph_codes.pack("n*") + if options[:skip_conversion] + r.is_a?(Array) ? r.pack("U*") : r else - i + i = r.is_a?(Array) ? r.pack("U*") : r + x = if i.is_a?(String) + unicode_codepoints = i.unpack("U*") + glyph_codes = unicode_codepoints.map { |u| + enc_table.get_glyph_id_for_unicode(u) + } + glyph_codes.pack("n*") + else + i + end + x.is_a?(Numeric) ? -x : x end - x.is_a?(Numeric) ? -x : x } end lib/prawn/font/metrics.rb @@ -15,9 +15,9 @@ module Prawn string.lines.each do |line| accumulated_width = 0 segments = line.scan(/\S+|\s+/) - - segments.each do |segment| - segment_width = string_width(segment, font_size, :kerning => options[:kerning]) + + segments.each do |segment| + segment_width = string_width(segment, font_size, :kerning => options[:kerning]) if (accumulated_width + segment_width).round > line_width.round output << "\n" lib/prawn/font/wrapping.rb @@ -97,6 +97,11 @@ class TableTextObserver def show_text(*params) @strings << params[0] end + + def show_text_with_positioning(*params) + # ignore kerning information + @strings << params[0].reject { |e| Numeric === e }.join + end end spec/table_spec.rb 5b085020154b07cd031951b877b14858900ca90e Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/77dba18246fd9008bc841b9ebda8df409b38d68b 77dba18246fd9008bc841b9ebda8df409b38d68b 2008-07-21T12:08:34-07:00 2008-07-21T12:08:34-07:00 Now I think the kerning stuff is all patched up. But we're looking at some pure evil here a9163c8809e228bf18b913596af172eb7cf151a1 Gregory Brown gregory.t.brown@gmail.com