@@ -1,3 +1,6 @@ +v0.2.1 (18th November 2008) +- Small bugfix to prevent unnecesary STDERR output by pango + v0.2.0 (15th September 2008) - API INCOMPATIBLE CHANGE: render() and render_file() are now deprecated. - Use the output parameter of the constructor instead CHANGELOG @@ -6,7 +6,7 @@ require 'rake/testtask' require "rake/gempackagetask" require 'spec/rake/spectask' -PKG_VERSION = "0.2.0" +PKG_VERSION = "0.2.1" PKG_NAME = "pdf-wrapper" PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" Rakefile @@ -84,15 +84,20 @@ module PDF # TODO: when calculating the min cell width, we basically want the width of the widest character. At the # moment I'm stripping all pango markup tags from the string, which means if any character is made # intentioanlly large, we'll miss it and it might not fit into our table cell. - # TODO: allow column widths to be set manually # calculate the min and max width of every cell in the table t.cells.each_with_index do |row, row_idx| row.each_with_index do |cell, col_idx| opts = t.options_for(col_idx, row_idx).only(default_text_options.keys) padding = opts[:padding] || 3 - cell.min_width = text_width(cell.data.to_s.dup.gsub(/<.+?>/,"").gsub(/\b|\B/,"\n"), opts) + (padding * 4) - cell.max_width = text_width(cell.data, opts) + (padding * 4) + if opts[:markup] == :pango + str = cell.data.to_s.dup.gsub(/<.+?>/,"").gsub("&amp;","&").gsub("&lt;","<").gsub("&gt;",">") + opts.delete(:markup) + else + str = cell.data.to_s.dup + end + cell.min_width = text_width(str.gsub(/\b|\B/,"\n"), opts) + (padding * 4) + cell.max_width = text_width(str, opts) + (padding * 4) end end @@ -101,15 +106,21 @@ module PDF t.headers.each_with_index do |cell, col_idx| opts = t.options_for(col_idx, :headers).only(default_text_options.keys) padding = opts[:padding] || 3 - cell.min_width = text_width(cell.data.to_s.dup.gsub(/<.+?>/,"").gsub(/\b|\B/,"\n"), opts) + (padding * 4) - cell.max_width = text_width(cell.data, opts) + (padding * 4) + if opts[:markup] == :pango + str = cell.data.to_s.dup.gsub(/<.+?>/,"").gsub("&amp;","&").gsub("&lt;","<").gsub("&gt;",">") + opts.delete(:markup) + else + str = cell.data.to_s.dup + end + cell.min_width = text_width(str.gsub(/\b|\B/,"\n"), opts) + (padding * 4) + cell.max_width = text_width(str, opts) + (padding * 4) end end # let the table decide on the actual widths it will use for each col t.calc_col_widths! - # now that we know how wide each column will be, we can calculate the + # now that we know how wide each column will be, we can calculate the # height of every cell in the table t.cells.each_with_index do |row, row_idx| row.each_with_index do |cell, col_idx| lib/pdf/wrapper/table.rb aca88c0562ed0b0348181ee3bdd97a3807c37066 James Healy jimmy@deefa.com http://github.com/yob/pdf-wrapper/commit/e2b1651d3b8b2ea023aa7c07c064b37c92a59d49 e2b1651d3b8b2ea023aa7c07c064b37c92a59d49 2008-11-17T06:31:52-08:00 2008-11-17T06:31:52-08:00 Prevent unnecesary output to STDERR by pango - when calculating the min width of each table column cell, we essentailly want the width of the widest character. When I split the string into chars, I needed to leave the pango markup entities entact, otherwise I was trying to add plain ampersands to the layout that calculates the width 76f07a7abbf9aceef477c238aad3d6fae2ced7cd James Healy jimmy@deefa.com