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:
parent
80f5d3d041
commit
27ac3193e3
|
@ -3532,11 +3532,11 @@ class TCPDF
|
||||||
@page = base_page;
|
@page = base_page;
|
||||||
@x = base_x + @tdwidth;
|
@x = base_x + @tdwidth;
|
||||||
@y = base_y;
|
@y = base_y;
|
||||||
|
elsif (@pre_state == true and element.length > 0)
|
||||||
|
Write(@lasth, unhtmlentities(element), '', fill);
|
||||||
elsif (element.strip.length > 0)
|
elsif (element.strip.length > 0)
|
||||||
if @pre_state != true
|
|
||||||
element.gsub!(/[\t\r\n\f]/, "");
|
element.gsub!(/[\t\r\n\f]/, "");
|
||||||
element.gsub!(/ /, " ");
|
element.gsub!(/ /, " ");
|
||||||
end
|
|
||||||
Write(@lasth, unhtmlentities(element), '', fill);
|
Write(@lasth, unhtmlentities(element), '', fill);
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue