comparison lib/redmine/export/pdf.rb @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch

 # encoding: utf-8
 #
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'iconv'
 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
       include ActionView::Helpers::TextHelper

           SetFont(@font_for_content, style, size)
         end
 
         def SetTitle(txt)
           txt = begin
-            utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
+            utf16txt = to_utf16(txt)
             hextxt = "<FEFF"  # FEFF is BOM
             hextxt << utf16txt.unpack("C*").map {|x| sprintf("%02X",x) }.join
             hextxt << ">"
           rescue
             txt

         def formatted_text(text)
           html = Redmine::WikiFormatting.to_html(Setting.text_formatting, text)
           # Strip {{toc}} tags
           html.gsub!(/<p>\{\{([<>]?)toc\}\}<\/p>/i, '')
           html
+        end
+
+        # Encodes an UTF-8 string to UTF-16BE
+        def to_utf16(str)
+          if str.respond_to?(:encode)
+            str.encode('UTF-16BE')
+          else
+            Iconv.conv('UTF-16BE', 'UTF-8', str)
+          end
         end
 
         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)
         end

           @outlines << {:t => txt, :l => level, :p => PageNo(), :y => (@h - y)*@k}
         end
 
         def bookmark_title(txt)
           txt = begin
-            utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
+            utf16txt = to_utf16(txt)
             hextxt = "<FEFF"  # FEFF is BOM
             hextxt << utf16txt.unpack("C*").map {|x| sprintf("%02X",x) }.join
             hextxt << ">"
           rescue
             txt

           end
         end
         col_width
       end
 
-      def render_table_header(pdf, query, col_width, row_height, col_id_width, table_width)
+      def render_table_header(pdf, query, col_width, row_height, table_width)
         # headers
         pdf.SetFontStyle('B',8)
         pdf.SetFillColor(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 + col_id_width, max_height, 'FD');
+        pdf.Rect(base_x, base_y, table_width, max_height, 'FD');
         pdf.SetXY(base_x, base_y);
 
         # write the cells on page
-        pdf.RDMCell(col_id_width, row_height, "#", "T", 0, 'C', 1)
         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, col_id_width, col_width)
+        issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
         pdf.SetY(base_y + max_height);
 
         # rows
         pdf.SetFontStyle('',8)
         pdf.SetFillColor(255, 255, 255)

         pdf.AddPage("L")
 
         # Landscape A4 = 210 x 297 mm
         page_height   = 210
         page_width    = 297
+        left_margin   = 10
         right_margin  = 10
         bottom_margin = 20
-        col_id_width  = 10
         row_height    = 4
 
         # column widths
-        table_width = page_width - right_margin - 10  # fixed left margin
+        table_width = page_width - right_margin - left_margin
         col_width = []
         unless query.inline_columns.empty?
-          col_width = calc_col_width(issues, query, table_width - col_id_width, pdf)
+          col_width = calc_col_width(issues, query, table_width, pdf)
           table_width = col_width.inject(0) {|s,v| s += v}
         end
 
-				# use full width if the description is displayed
+        # use full width if the description is displayed
         if table_width > 0 && query.has_column?(:description)
-          col_width = col_width.map {|w| w = w * (page_width - right_margin - 10 - col_id_width) / table_width}
+          col_width = col_width.map {|w| w * (page_width - right_margin - left_margin) / table_width}
           table_width = col_width.inject(0) {|s,v| s += v}
         end
 
         # title
         pdf.SetFontStyle('B',11)
         pdf.RDMCell(190,10, title)
         pdf.Ln
-        render_table_header(pdf, query, col_width, row_height, col_id_width, table_width)
+        render_table_header(pdf, query, col_width, row_height, table_width)
         previous_group = false
         issue_list(issues) do |issue, level|
           if query.grouped? &&
                (group = query.group_by_column.value(issue)) != previous_group
             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.RDMCell(table_width + col_id_width, row_height * 2, group_label, 1, 1, 'L')
+            pdf.RDMCell(table_width, row_height * 2, group_label, 1, 1, 'L')
             pdf.SetFontStyle('',8)
             previous_group = group
           end
 
           # fetch row values

 
           # make new page if it doesn't fit on the current one
           space_left = page_height - base_y - bottom_margin
           if max_height > space_left
             pdf.AddPage("L")
-            render_table_header(pdf, query, col_width, row_height, col_id_width, table_width)
+            render_table_header(pdf, query, col_width, row_height, table_width)
             base_x = pdf.GetX
             base_y = pdf.GetY
           end
 
           # write the cells on page
-          pdf.RDMCell(col_id_width, row_height, issue.id.to_s, "T", 0, 'C', 1)
           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, col_id_width, col_width)
+          issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, 0, col_width)
           pdf.SetY(base_y + max_height);
 
           if query.has_column?(:description) && issue.description?
             pdf.SetX(10)
             pdf.SetAutoPageBreak(true, 20)

         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,
-                                     id_width, col_widths)
-        col_x = top_x + id_width
+                                     col_id_width, col_widths)
+        col_x = top_x
         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
         end