Index: lib/redmine/export/pdf.rb =================================================================== --- lib/redmine/export/pdf.rb (revision 6129) +++ lib/redmine/export/pdf.rb (working copy) @@ -111,10 +111,14 @@ Cell(w,h,fix_text_encoding(txt),border,ln,align,fill,link) end - def RDMMultiCell(w,h=0,txt='',border=0,align='',fill=0) - MultiCell(w,h,fix_text_encoding(txt),border,align,fill) + def RDMMultiCell(w,h=0,txt='',border=0,align='',fill=0,ln=1) + MultiCell(w,h,fix_text_encoding(txt),border,align,fill,ln) end + def RDMwriteHTMLCell(w, h, x, y, html='', border=0, ln=1, fill=0) + writeHTMLCell(w, h, x, y, fix_text_encoding(html), border, ln, fill) + end + def Footer SetFont(@font_for_footer, 'I', 8) SetY(-15) @@ -282,8 +286,6 @@ "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}") pdf.Ln - y0 = pdf.GetY - pdf.SetFontStyle('B',9) pdf.RDMCell(35,5, l(:field_status) + ":","LT") pdf.SetFontStyle('',9) @@ -331,18 +333,18 @@ pdf.RDMMultiCell(155,5, (show_value custom_value),"R") end + y0 = pdf.GetY; pdf.SetFontStyle('B',9) pdf.RDMCell(35,5, l(:field_subject) + ":","LT") pdf.SetFontStyle('',9) pdf.RDMMultiCell(155,5, issue.subject,"RT") + pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY) pdf.SetFontStyle('B',9) - pdf.RDMCell(35,5, l(:field_description) + ":","LT") + pdf.RDMCell(35 + 155,5, l(:field_description),"LRT", 1) pdf.SetFontStyle('',9) - pdf.RDMMultiCell(155,5, issue.description.to_s,"RT") + pdf.RDMwriteHTMLCell(35 + 155,5,0,0, Redmine::WikiFormatting.to_html(Setting.text_formatting, issue.description.to_s),"LRB") - pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY) - pdf.Line(pdf.GetX, pdf.GetY, pdf.GetX + 190, pdf.GetY) pdf.Ln if issue.changesets.any? && @@ -380,7 +382,7 @@ if journal.notes? pdf.Ln unless journal.details.empty? pdf.SetFontStyle('',8) - pdf.RDMMultiCell(190,5, journal.notes.to_s) + pdf.RDMwriteHTMLCell(190,5,0,0, Redmine::WikiFormatting.to_html(Setting.text_formatting, journal.notes.to_s), "") end pdf.Ln end