@@ -107,11 +107,9 @@ module Prawn @row_colors = ["ffffff","cccccc"] if @row_colors == :pdf_writer - @original_row_colors = @row_colors.dup if @row_colors - calculate_column_widths - (options[:widths] || {}).each do |index,width| - @col_widths[index] = width - end + @original_row_colors = @row_colors.dup if @row_colors + + calculate_column_widths(options[:widths]) end # Width of the table in PDF points @@ -142,8 +140,8 @@ module Prawn private - def calculate_column_widths - @col_widths = [0] * @data[0].length + def calculate_column_widths(manual_widths=nil) + @col_widths = [0] * @data[0].length renderable_data.each do |row| row.each_with_index do |cell,i| length = cell.lines.map { |e| @@ -151,7 +149,10 @@ module Prawn 2*@horizontal_padding @col_widths[i] = length if length > @col_widths[i] end - end + end + + # TODO: Could optimize here + manual_widths.each { |k,v| @col_widths[k] = v } if manual_widths end def renderable_data lib/prawn/document/table.rb @@ -93,11 +93,11 @@ module Prawn scale = font_size / 1000.0 if options[:kerning] - kern(string).inject(0) do |s,r| + kern(string).inject(0) do |s,r| if r.is_a? String s + string_width(r, font_size, :kerning => false) - else - s + (r * scale) + else + s - (r * scale) end end else lib/prawn/font/metrics.rb @@ -17,10 +17,10 @@ describe "adobe font metrics" do end it "should kern a string" do - @times.kern("To").should == ["T", -80, "o"] - @times.kern("Télé").should == ["T", -70, "élé"] - @times.kern("Technology").should == ["T", -70, "echnology"] - @times.kern("Technology...").should == ["T", -70, "echnology", -65, "..."] + @times.kern("To").should == ["T", 80, "o"] + @times.kern("Télé").should == ["T", 70, "élé"] + @times.kern("Technology").should == ["T", 70, "echnology"] + @times.kern("Technology...").should == ["T", 70, "echnology", 65, "..."] end end @@ -41,15 +41,18 @@ describe "ttf font metrics" do end it "should kern a string" do - @activa.kern("To").should == ["T", -186, "o"] + @activa.kern("To").should == ["\0007", 186.0, "\000R"] # Does activa use kerning classes here? Ruby/TTF doesn't support # format 2 kerning tables, so don't bother for now. # @activa.kern("Télé").should == ["T", -186, "élé"] - @activa.kern("Technology").should == ["T", -186, "echnology"] - @activa.kern("Technology...").should == ["T", -186, "echnology", -88, "..."] + @activa.kern("Technology").should == ["\0007", 186.0, + "\000H\000F\000K\000Q\000R\000O\000R\000J\000\\"] + @activa.kern("Technology...").should == ["\0007", 186.0, + "\000H\000F\000K\000Q\000R\000O\000R\000J\000\\", 88.0, + "\000\021\000\021\000\021"] end end \ No newline at end of file spec/metrics_spec.rb aeb22386528574317e9babd84904fc3ef0c458fd Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/5b085020154b07cd031951b877b14858900ca90e 5b085020154b07cd031951b877b14858900ca90e 2008-07-21T10:52:38-07:00 2008-07-21T10:52:38-07:00 Kern also prepares the string for the TJ operator now. Perhaps it needs a better name? 506582d52c2bc468dbc1b40503207512176b68fb Gregory Brown gregory.t.brown@gmail.com