kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r11227 from trunk (#9842).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11235 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-20 17:06:46 +00:00
parent 4620b8b8db
commit ed891e2733
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/redmine/export/pdf.rb
View File

@ -109,6 +109,13 @@ module Redmine
RDMPdfEncoding::rdm_from_utf8(txt, l(:general_pdf_encoding)) RDMPdfEncoding::rdm_from_utf8(txt, l(:general_pdf_encoding))
end end
def formatted_text(text)
html = Redmine::WikiFormatting.to_html(Setting.text_formatting, text)
# Strip {{toc}} tags
html.gsub!(/<p>\{\{([<>]?)toc\}\}<\/p>/i, '')
html
end
def RDMCell(w ,h=0, txt='', border=0, ln=0, align='', fill=0, link='') def RDMCell(w ,h=0, txt='', border=0, ln=0, align='', fill=0, link='')
Cell(w, h, fix_text_encoding(txt), border, ln, align, fill, link) Cell(w, h, fix_text_encoding(txt), border, ln, align, fill, link)
end end
@ -120,8 +127,7 @@ module Redmine
def RDMwriteHTMLCell(w, h, x, y, txt='', attachments=[], border=0, ln=1, fill=0) def RDMwriteHTMLCell(w, h, x, y, txt='', attachments=[], border=0, ln=1, fill=0)
@attachments = attachments @attachments = attachments
writeHTMLCell(w, h, x, y, writeHTMLCell(w, h, x, y,
fix_text_encoding( fix_text_encoding(formatted_text(txt)),
Redmine::WikiFormatting.to_html(Setting.text_formatting, txt)),
border, ln, fill) border, ln, fill)
end end