Merged r8001 from trunk

pdf: fix textilized outputs of coderay line numbers.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8003 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-11-30 08:25:01 +00:00
parent 80f5d3d041
commit 27ac3193e3
1 changed files with 4 additions and 4 deletions

View File

@ -3532,11 +3532,11 @@ class TCPDF
@page = base_page;
@x = base_x + @tdwidth;
@y = base_y;
elsif (@pre_state == true and element.length > 0)
Write(@lasth, unhtmlentities(element), '', fill);
elsif (element.strip.length > 0)
if @pre_state != true
element.gsub!(/[\t\r\n\f]/, "");
element.gsub!(/ /, " ");
end
element.gsub!(/[\t\r\n\f]/, "");
element.gsub!(/ /, " ");
Write(@lasth, unhtmlentities(element), '', fill);
end
end