Index: lib/redmine/export/pdf.rb =================================================================== --- lib/redmine/export/pdf.rb (revision 13333) +++ lib/redmine/export/pdf.rb (working copy) @@ -18,14 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. require 'tcpdf' -require 'fpdf/chinese' -require 'fpdf/japanese' -require 'fpdf/korean' -if RUBY_VERSION < '1.9' - require 'iconv' -end - module Redmine module Export module PDF @@ -42,72 +35,53 @@ FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache) set_language_if_valid lang pdf_encoding = l(:general_pdf_encoding).upcase - super(orientation, 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding) + super(orientation, 'mm', 'A4') + set_print_header(false) + set_rtl(l(:direction) == 'rtl') + set_temp_rtl(l(:direction) == 'rtl' ? 'R' : 'L') + case current_language.to_s.downcase when 'vi' @font_for_content = 'DejaVuSans' @font_for_footer = 'DejaVuSans' + when 'ja' + @font_for_content = 'kozminproregular' + @font_for_footer = 'kozminproregular' + when 'zh-tw' # Traditional Chinese (BIG5) + @font_for_content = 'msungstdlight' + @font_for_footer = 'msungstdlight' + when 'zh' # Simplified Chinese (GB18030) + @font_for_content = 'stsongstdlight' + @font_for_footer = 'stsongstdlight' + when 'ko' # Korean (UHC) + @font_for_content = 'hysmyeongjostdmedium' + @font_for_footer = 'hysmyeongjostdmedium' + when 'th' # Thai + @font_for_content = 'freeserif' + @font_for_footer = 'freeserif' else case pdf_encoding when 'UTF-8' - @font_for_content = 'FreeSans' - @font_for_footer = 'FreeSans' - when 'CP949' - extend(PDF_Korean) - AddUHCFont() - @font_for_content = 'UHC' - @font_for_footer = 'UHC' - when 'CP932', 'SJIS', 'SHIFT_JIS' - extend(PDF_Japanese) - AddSJISFont() - @font_for_content = 'SJIS' - @font_for_footer = 'SJIS' - when 'GB18030' - extend(PDF_Chinese) - AddGBFont() - @font_for_content = 'GB' - @font_for_footer = 'GB' - when 'BIG5' - extend(PDF_Chinese) - AddBig5Font() - @font_for_content = 'Big5' - @font_for_footer = 'Big5' + @font_for_content = 'freesans' + @font_for_footer = 'freesans' else - @font_for_content = 'Arial' - @font_for_footer = 'Helvetica' + @font_for_content = 'helvetica' + @font_for_footer = 'helvetica' end end - SetCreator(Redmine::Info.app_name) - SetFont(@font_for_content) - @outlines = [] - @outlineRoot = nil + set_creator(Redmine::Info.app_name) + set_font(@font_for_content) + + set_header_font([@font_for_content, '', 10]) + set_footer_font([@font_for_content, '', 8]) + set_default_monospaced_font(@font_for_content) end def SetFontStyle(style, size) - SetFont(@font_for_content, style, size) + style.delete!('B') if current_language.to_s.downcase == 'th' # FreeSerif Bold Thai font has problem. + set_font(@font_for_content, style, size) end - def SetTitle(txt) - txt = begin - utf16txt = to_utf16(txt) - hextxt = "" - rescue - txt - end || '' - super(txt) - end - - def textstring(s) - # Format a text string - if s =~ /^ + table, td { + border: 2px #ff0000 solid; + } + th { background-color:#EEEEEE; padding: 4px; white-space:nowrap; text-align: center; font-style: bold;} + pre { + background-color: #fafafa; + } + ' + writeHTMLCell(w, h, x, y, - fix_text_encoding(formatted_text(txt)), + css_tag + formatted_text(txt), border, ln, fill) end - def getImageFilename(attrname) + def get_image_filename(attrname) # attrname: general_pdf_encoding string file/uri name - atta = RDMPdfEncoding.attach(@attachments, attrname, l(:general_pdf_encoding)) + atta = RDMPdfEncoding.attach(@attachments, attrname, "UTF-8") if atta return atta.diskfile else @@ -153,103 +129,25 @@ end end - def Footer - SetFont(@font_for_footer, 'I', 8) - SetY(-15) - SetX(15) - RDMCell(0, 5, @footer_date, 0, 0, 'L') - SetY(-15) - SetX(-30) - RDMCell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C') - end - - def Bookmark(txt, level=0, y=0) - if (y == -1) - y = GetY() + def get_sever_url(url) + if !empty_string(url) and (url[0, 1] == '/') + Setting.host_name.split('/')[0] + url + else + url end - @outlines << {:t => txt, :l => level, :p => PageNo(), :y => (@h - y)*@k} end - def bookmark_title(txt) - txt = begin - utf16txt = to_utf16(txt) - hextxt = "" - rescue - txt - end || '' - end - - def putbookmarks - nb=@outlines.size - return if (nb==0) - lru=[] - level=0 - @outlines.each_with_index do |o, i| - if(o[:l]>0) - parent=lru[o[:l]-1] - #Set parent and last pointers - @outlines[i][:parent]=parent - @outlines[parent][:last]=i - if (o[:l]>level) - #Level increasing: set first pointer - @outlines[parent][:first]=i - end - else - @outlines[i][:parent]=nb - end - if (o[:l]<=level && i>0) - #Set prev and next pointers - prev=lru[o[:l]] - @outlines[prev][:next]=i - @outlines[i][:prev]=prev - end - lru[o[:l]]=i - level=o[:l] + def Footer + set_font(@font_for_footer, 'I', 8) + set_x(15) + if get_rtl + RDMCell(0, 5, @footer_date, 0, 0, 'R') + else + RDMCell(0, 5, @footer_date, 0, 0, 'L') end - #Outline items - n=self.n+1 - @outlines.each_with_index do |o, i| - newobj() - out('<>') - out('endobj') - end - #Outline root - newobj() - @outlineRoot=self.n - out("<>") - out('endobj') + set_x(-30) + RDMCell(0, 5, get_alias_num_page() + '/' + get_alias_nb_pages(), 0, 0, 'C') end - - def putresources() - super - putbookmarks() - end - - def putcatalog() - super - if(@outlines.size > 0) - out("/Outlines #{@outlineRoot} 0 R") - out('/PageMode /UseOutlines') - end - end end # fetch row values @@ -280,14 +178,27 @@ # calculate statistics # by captions pdf.SetFontStyle('B',8) - col_padding = pdf.GetStringWidth('OO') - col_width_min = query.inline_columns.map {|v| pdf.GetStringWidth(v.caption) + col_padding} + margins = pdf.get_margins + col_padding = margins['cell'] + col_width_min = query.inline_columns.map {|v| pdf.get_string_width(v.caption) + col_padding} col_width_max = Array.new(col_width_min) col_width_avg = Array.new(col_width_min) + col_min = pdf.get_string_width('OO') + col_padding * 2 + if table_width > col_min * col_width_avg.length + table_width -= col_min * col_width_avg.length + else + col_min = pdf.get_string_width('O') + col_padding * 2 + if table_width > col_min * col_width_avg.length + table_width -= col_min * col_width_avg.length + else + ratio = table_width / col_width_avg.inject(0, :+) + return col_width = col_width_avg.map {|w| w * ratio} + end + end word_width_max = query.inline_columns.map {|c| n = 10 c.caption.split.each {|w| - x = pdf.GetStringWidth(w) + col_padding + x = pdf.get_string_width(w) + col_padding n = x if n < x } n @@ -295,18 +206,17 @@ # by properties of issues pdf.SetFontStyle('',8) - col_padding = pdf.GetStringWidth('OO') k = 1 issue_list(issues) {|issue, level| k += 1 values = fetch_row_values(issue, query, level) values.each_with_index {|v,i| - n = pdf.GetStringWidth(v) + col_padding + n = pdf.get_string_width(v) + col_padding * 2 col_width_max[i] = n if col_width_max[i] < n col_width_min[i] = n if col_width_min[i] > n col_width_avg[i] += n v.split.each {|w| - x = pdf.GetStringWidth(w) + col_padding + x = pdf.get_string_width(w) + col_padding word_width_max[i] = x if word_width_max[i] < x } } @@ -342,23 +252,8 @@ while done == 0 # calculate free & locked columns width done = 1 - fix_col_width = 0 - free_col_width = 0 - col_width.each_with_index do |w,i| - if col_fix[i] == 1 - fix_col_width += w - else - free_col_width += w - end - end + ratio = table_width / col_width.inject(0, :+) - # calculate column normalizing ratio - if free_col_width == 0 - ratio = table_width / col_width.inject(0, :+) - else - ratio = (table_width - fix_col_width) / free_col_width - end - # correct columns width col_width.each_with_index do |w,i| if col_fix[i] == 0 @@ -377,29 +272,28 @@ end end end + + ratio = table_width / col_width.inject(0, :+) + col_width.map! {|v| v * ratio + col_min} col_width end def render_table_header(pdf, query, col_width, row_height, table_width) # headers pdf.SetFontStyle('B',8) - pdf.SetFillColor(230, 230, 230) + pdf.set_fill_color(230, 230, 230) - # render it background to find the max height used - base_x = pdf.GetX - base_y = pdf.GetY - max_height = issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true) - pdf.Rect(base_x, base_y, table_width, max_height, 'FD') - pdf.SetXY(base_x, base_y) + base_x = pdf.get_x + base_y = pdf.get_y + max_height = get_issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, true) # write the cells on page - issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, row_height, true) - issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width) - pdf.SetY(base_y + max_height) + issues_to_pdf_write_cells(pdf, query.inline_columns, col_width, max_height, true) + pdf.set_xy(base_x, base_y + max_height) # rows pdf.SetFontStyle('',8) - pdf.SetFillColor(255, 255, 255) + pdf.set_fill_color(255, 255, 255) end # Returns a PDF string of a list of issues @@ -407,18 +301,18 @@ pdf = ITCPDF.new(current_language, "L") title = query.new_record? ? l(:label_issue_plural) : query.name title = "#{project} - #{title}" if project - pdf.SetTitle(title) + pdf.set_title(title) pdf.alias_nb_pages pdf.footer_date = format_date(Date.today) - pdf.SetAutoPageBreak(false) - pdf.AddPage("L") + pdf.set_auto_page_break(false) + pdf.add_page("L") # Landscape A4 = 210 x 297 mm - page_height = 210 - page_width = 297 - left_margin = 10 - right_margin = 10 - bottom_margin = 20 + page_height = pdf.get_page_height # 210 + page_width = pdf.get_page_width # 297 + left_margin = pdf.get_original_margins['left'] # 10 + right_margin = pdf.get_original_margins['right'] # 10 + bottom_margin = pdf.get_footer_margin row_height = 4 # column widths @@ -438,7 +332,8 @@ # title pdf.SetFontStyle('B',11) pdf.RDMCell(190,10, title) - pdf.Ln + pdf.ln + render_table_header(pdf, query, col_width, row_height, table_width) previous_group = false issue_list(issues) do |issue, level| @@ -447,7 +342,7 @@ pdf.SetFontStyle('B',10) group_label = group.blank? ? 'None' : group.to_s.dup group_label << " (#{query.issue_count_by_group[group]})" - pdf.Bookmark group_label, 0, -1 + pdf.bookmark group_label, 0, -1 pdf.RDMCell(table_width, row_height * 2, group_label, 1, 1, 'L') pdf.SetFontStyle('',8) previous_group = group @@ -456,32 +351,25 @@ # fetch row values col_values = fetch_row_values(issue, query, level) - # render it off-page to find the max height used - base_x = pdf.GetX - base_y = pdf.GetY - pdf.SetY(2 * page_height) - max_height = issues_to_pdf_write_cells(pdf, col_values, col_width, row_height) - pdf.SetXY(base_x, base_y) - # make new page if it doesn't fit on the current one + base_y = pdf.get_y + max_height = get_issues_to_pdf_write_cells(pdf, col_values, col_width) space_left = page_height - base_y - bottom_margin if max_height > space_left - pdf.AddPage("L") + pdf.add_page("L") render_table_header(pdf, query, col_width, row_height, table_width) - base_x = pdf.GetX - base_y = pdf.GetY + base_y = pdf.get_y end # write the cells on page - issues_to_pdf_write_cells(pdf, col_values, col_width, row_height) - issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width) - pdf.SetY(base_y + max_height) + issues_to_pdf_write_cells(pdf, col_values, col_width, max_height) + pdf.set_y(base_y + max_height) if query.has_column?(:description) && issue.description? - pdf.SetX(10) - pdf.SetAutoPageBreak(true, 20) - pdf.RDMwriteHTMLCell(0, 5, 10, 0, issue.description.to_s, issue.attachments, "LRBT") - pdf.SetAutoPageBreak(false) + pdf.set_x(10) + pdf.set_auto_page_break(true, bottom_margin) + pdf.RDMwriteHTMLCell(0, 5, 10, '', issue.description.to_s, issue.attachments, "LRBT") + pdf.set_auto_page_break(false) end end @@ -489,56 +377,59 @@ pdf.SetFontStyle('B',10) pdf.RDMCell(0, row_height, '...') end - pdf.Output + pdf.output end + # returns the maximum height of MultiCells + def get_issues_to_pdf_write_cells(pdf, col_values, col_widths, head=false) + heights = [] + col_values.each_with_index do |column, i| + heights << pdf.get_string_height(col_widths[i], head ? column.caption : column) + end + return heights.max + end + # Renders MultiCells and returns the maximum height used def issues_to_pdf_write_cells(pdf, col_values, col_widths, row_height, head=false) - base_y = pdf.GetY - max_height = row_height col_values.each_with_index do |column, i| - col_x = pdf.GetX - if head == true - pdf.RDMMultiCell(col_widths[i], row_height, column.caption, "T", 'L', 1) - else - pdf.RDMMultiCell(col_widths[i], row_height, column, "T", 'L', 1) - end - max_height = (pdf.GetY - base_y) if (pdf.GetY - base_y) > max_height - pdf.SetXY(col_x + col_widths[i], base_y) + pdf.RDMMultiCell(col_widths[i], row_height, head ? column.caption : column.strip, 1, '', 1, 0) end - return max_height end # Draw lines to close the row (MultiCell border drawing in not uniform) # # parameter "col_id_width" is not used. it is kept for compatibility. def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, - col_id_width, col_widths) + col_id_width, col_widths, rtl=false) col_x = top_x - pdf.Line(col_x, top_y, col_x, lower_y) # id right border + pdf.line(col_x, top_y, col_x, lower_y) # id right border col_widths.each do |width| - col_x += width - pdf.Line(col_x, top_y, col_x, lower_y) # columns right border + if rtl + col_x -= width + else + col_x += width + end + pdf.line(col_x, top_y, col_x, lower_y) # columns right border end - pdf.Line(top_x, top_y, top_x, lower_y) # left border - pdf.Line(top_x, lower_y, col_x, lower_y) # bottom border + pdf.line(top_x, top_y, top_x, lower_y) # left border + pdf.line(top_x, lower_y, col_x, lower_y) # bottom border end # Returns a PDF string of a single issue def issue_to_pdf(issue, assoc={}) pdf = ITCPDF.new(current_language) - pdf.SetTitle("#{issue.project} - #{issue.tracker} ##{issue.id}") + pdf.set_title("#{issue.project} - #{issue.tracker} ##{issue.id}") pdf.alias_nb_pages pdf.footer_date = format_date(Date.today) - pdf.AddPage + pdf.add_page pdf.SetFontStyle('B',11) buf = "#{issue.project} - #{issue.tracker} ##{issue.id}" pdf.RDMMultiCell(190, 5, buf) pdf.SetFontStyle('',8) - base_x = pdf.GetX + base_x = pdf.get_x i = 1 issue.ancestors.visible.each do |ancestor| - pdf.SetX(base_x + i) + pdf.set_x(base_x + i) buf = "#{ancestor.tracker} # #{ancestor.id} (#{ancestor.status.to_s}): #{ancestor.subject}" pdf.RDMMultiCell(190 - i, 5, buf) i += 1 if i < 35 @@ -547,7 +438,7 @@ pdf.RDMMultiCell(190 - i, 5, issue.subject.to_s) pdf.SetFontStyle('',8) pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}") - pdf.Ln + pdf.ln left = [] left << [l(:field_status), issue.status] @@ -576,20 +467,46 @@ (i < half ? left : right) << [custom_value.custom_field.name, show_value(custom_value, false)] end + if pdf.get_rtl + border_first_top = 'RT' + border_last_top = 'LT' + border_first = 'R' + border_last = 'L' + else + border_first_top = 'LT' + border_last_top = 'RT' + border_first = 'L' + border_last = 'R' + end + rows = left.size > right.size ? left.size : right.size rows.times do |i| + heights = [] + pdf.SetFontStyle('B',9) item = left[i] + heights << pdf.get_string_height(35, item ? "#{item.first}:" : "") + item = right[i] + heights << pdf.get_string_height(35, item ? "#{item.first}:" : "") + pdf.SetFontStyle('',9) + item = left[i] + heights << pdf.get_string_height(60, item ? item.last.to_s : "") + item = right[i] + heights << pdf.get_string_height(60, item ? item.last.to_s : "") + height = heights.max + + item = left[i] pdf.SetFontStyle('B',9) - pdf.RDMCell(35,5, item ? "#{item.first}:" : "", i == 0 ? "LT" : "L") + pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0) pdf.SetFontStyle('',9) - pdf.RDMCell(60,5, item ? item.last.to_s : "", i == 0 ? "RT" : "R") + pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 0) item = right[i] pdf.SetFontStyle('B',9) - pdf.RDMCell(35,5, item ? "#{item.first}:" : "", i == 0 ? "LT" : "L") + pdf.RDMMultiCell(35, height, item ? "#{item.first}:" : "", (i == 0 ? border_first_top : border_first), '', 0, 0) pdf.SetFontStyle('',9) - pdf.RDMCell(60,5, item ? item.last.to_s : "", i == 0 ? "RT" : "R") - pdf.Ln + pdf.RDMMultiCell(60, height, item ? item.last.to_s : "", (i == 0 ? border_last_top : border_last), '', 0, 2) + + pdf.set_x(base_x) end pdf.SetFontStyle('B',9) @@ -597,8 +514,8 @@ pdf.SetFontStyle('',9) # Set resize image scale - pdf.SetImageScale(1.6) - pdf.RDMwriteHTMLCell(35+155, 5, 0, 0, + pdf.set_image_scale(1.6) + pdf.RDMwriteHTMLCell(35+155, 5, '', '', issue.description.to_s, issue.attachments, "LRB") unless issue.leaf? @@ -606,16 +523,16 @@ truncate_length = ( l(:general_pdf_encoding).upcase == "UTF-8" ? 90 : 65 ) pdf.SetFontStyle('B',9) pdf.RDMCell(35+155,5, l(:label_subtask_plural) + ":", "LTR") - pdf.Ln + pdf.ln issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level| buf = "#{child.tracker} # #{child.id}: #{child.subject}". truncate(truncate_length) level = 10 if level >= 10 pdf.SetFontStyle('',8) - pdf.RDMCell(35+135,5, (level >=1 ? " " * level : "") + buf, "L") + pdf.RDMCell(35+135,5, (level >=1 ? " " * level : "") + buf, border_first) pdf.SetFontStyle('B',8) - pdf.RDMCell(20,5, child.status.to_s, "R") - pdf.Ln + pdf.RDMCell(20,5, child.status.to_s, border_last) + pdf.ln end end @@ -625,7 +542,7 @@ truncate_length = ( l(:general_pdf_encoding).upcase == "UTF-8" ? 80 : 60 ) pdf.SetFontStyle('B',9) pdf.RDMCell(35+155,5, l(:label_related_issues) + ":", "LTR") - pdf.Ln + pdf.ln relations.each do |relation| buf = "" buf += "#{l(relation.label_for(issue))} " @@ -639,121 +556,121 @@ " # #{relation.other_issue(issue).id}: #{relation.other_issue(issue).subject}" buf = buf.truncate(truncate_length) pdf.SetFontStyle('', 8) - pdf.RDMCell(35+155-60, 5, buf, "L") + pdf.RDMCell(35+155-60, 5, buf, border_first) pdf.SetFontStyle('B',8) pdf.RDMCell(20,5, relation.other_issue(issue).status.to_s, "") pdf.RDMCell(20,5, format_date(relation.other_issue(issue).start_date), "") - pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), "R") - pdf.Ln + pdf.RDMCell(20,5, format_date(relation.other_issue(issue).due_date), border_last) + pdf.ln end end pdf.RDMCell(190,5, "", "T") - pdf.Ln + pdf.ln if issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project) pdf.SetFontStyle('B',9) pdf.RDMCell(190,5, l(:label_associated_revisions), "B") - pdf.Ln + pdf.ln for changeset in issue.changesets pdf.SetFontStyle('B',8) csstr = "#{l(:label_revision)} #{changeset.format_identifier} - " csstr += format_time(changeset.committed_on) + " - " + changeset.author.to_s pdf.RDMCell(190, 5, csstr) - pdf.Ln + pdf.ln unless changeset.comments.blank? pdf.SetFontStyle('',8) - pdf.RDMwriteHTMLCell(190,5,0,0, + pdf.RDMwriteHTMLCell(190,5,'','', changeset.comments.to_s, issue.attachments, "") end - pdf.Ln + pdf.ln end end if assoc[:journals].present? pdf.SetFontStyle('B',9) pdf.RDMCell(190,5, l(:label_history), "B") - pdf.Ln + pdf.ln assoc[:journals].each do |journal| pdf.SetFontStyle('B',8) title = "##{journal.indice} - #{format_time(journal.created_on)} - #{journal.user}" title << " (#{l(:field_private_notes)})" if journal.private_notes? pdf.RDMCell(190,5, title) - pdf.Ln + pdf.ln pdf.SetFontStyle('I',8) details_to_strings(journal.visible_details, true).each do |string| pdf.RDMMultiCell(190,5, "- " + string) end if journal.notes? - pdf.Ln unless journal.details.empty? + pdf.ln unless journal.details.empty? pdf.SetFontStyle('',8) - pdf.RDMwriteHTMLCell(190,5,0,0, + pdf.RDMwriteHTMLCell(190,5,'','', journal.notes.to_s, issue.attachments, "") end - pdf.Ln + pdf.ln end end if issue.attachments.any? pdf.SetFontStyle('B',9) pdf.RDMCell(190,5, l(:label_attachment_plural), "B") - pdf.Ln + pdf.ln for attachment in issue.attachments pdf.SetFontStyle('',8) pdf.RDMCell(80,5, attachment.filename) pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R") pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R") pdf.RDMCell(65,5, attachment.author.name,0,0,"R") - pdf.Ln + pdf.ln end end - pdf.Output + pdf.output end # Returns a PDF string of a set of wiki pages def wiki_pages_to_pdf(pages, project) pdf = ITCPDF.new(current_language) - pdf.SetTitle(project.name) + pdf.set_title(project.name) pdf.alias_nb_pages pdf.footer_date = format_date(Date.today) - pdf.AddPage + pdf.add_page pdf.SetFontStyle('B',11) pdf.RDMMultiCell(190,5, project.name) - pdf.Ln + pdf.ln # Set resize image scale - pdf.SetImageScale(1.6) + pdf.set_image_scale(1.6) pdf.SetFontStyle('',9) write_page_hierarchy(pdf, pages.group_by(&:parent_id)) - pdf.Output + pdf.output end # Returns a PDF string of a single wiki page def wiki_page_to_pdf(page, project) pdf = ITCPDF.new(current_language) - pdf.SetTitle("#{project} - #{page.title}") + pdf.set_title("#{project} - #{page.title}") pdf.alias_nb_pages pdf.footer_date = format_date(Date.today) - pdf.AddPage + pdf.add_page pdf.SetFontStyle('B',11) pdf.RDMMultiCell(190,5, "#{project} - #{page.title} - # #{page.content.version}") - pdf.Ln + pdf.ln # Set resize image scale - pdf.SetImageScale(1.6) + pdf.set_image_scale(1.6) pdf.SetFontStyle('',9) write_wiki_page(pdf, page) - pdf.Output + pdf.output end def write_page_hierarchy(pdf, pages, node=nil, level=0) if pages[node] pages[node].each do |page| if @new_page - pdf.AddPage + pdf.add_page else @new_page = true end - pdf.Bookmark page.title, level + pdf.bookmark page.title, level write_wiki_page(pdf, page) write_page_hierarchy(pdf, pages, page.id, level + 1) if pages[page.id] end @@ -761,20 +678,20 @@ end def write_wiki_page(pdf, page) - pdf.RDMwriteHTMLCell(190,5,0,0, + pdf.RDMwriteHTMLCell(190,5,'','', page.content.text.to_s, page.attachments, 0) if page.attachments.any? - pdf.Ln + pdf.ln(5) pdf.SetFontStyle('B',9) pdf.RDMCell(190,5, l(:label_attachment_plural), "B") - pdf.Ln + pdf.ln for attachment in page.attachments pdf.SetFontStyle('',8) pdf.RDMCell(80,5, attachment.filename) pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R") pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R") pdf.RDMCell(65,5, attachment.author.name,0,0,"R") - pdf.Ln + pdf.ln end end end Index: lib/redmine/helpers/gantt.rb =================================================================== --- lib/redmine/helpers/gantt.rb (revision 13333) +++ lib/redmine/helpers/gantt.rb (working copy) @@ -856,6 +856,9 @@ end def pdf_task(params, coords, options={}) + cell_height_ratio = params[:pdf].get_cell_height_ratio() + params[:pdf].set_cell_height_ratio(0.1) + height = options[:height] || 2 # Renders the task bar, with progress and late if coords[:bar_start] && coords[:bar_end] @@ -896,6 +899,8 @@ params[:pdf].SetX(params[:subject_width] + (coords[:bar_end] || 0) + 5) params[:pdf].RDMCell(30, 2, options[:label]) end + + params[:pdf].set_cell_height_ratio(cell_height_ratio) end def image_task(params, coords, options={}) Index: Gemfile =================================================================== --- Gemfile (revision 13333) +++ Gemfile (working copy) @@ -7,6 +7,7 @@ gem "builder", ">= 3.0.4" gem "request_store", "1.0.5" gem "mime-types" +gem "rfpdf", "~> 1.17.4" # Optional gem for LDAP authentication group :ldap do