Merged r9853 from trunk (#10688)

fix PDF export tables problems.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9855 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e87a9136bbaf92d23cc76366b87a2012ec0f318e..147b45a5e441ce92d914a39cc809ad6347a9f8eb 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@ http://www.redmine.org/
 
 == TBD v1.4.4
 
+* Defect #10688: PDF export from Wiki - Problems with tables
 * Defect #11160: SQL Error on time report if a custom field has multiple values for an entry
 * Defect #11061: Cannot choose commit versions to view differences in Git/Mercurial repository view
 * Defect #11112: REST API - custom fields in POST/PUT ignored for time_entries

diff --git a/vendor/plugins/rfpdf/lib/tcpdf.rb b/vendor/plugins/rfpdf/lib/tcpdf.rb
index e8878934c047d3b30580e5b5d86742bd6efb42e2..56ae756e14014374c68e5438fa41ec0b1cb096e1 100755 (executable)
--- a/vendor/plugins/rfpdf/lib/tcpdf.rb
+++ b/vendor/plugins/rfpdf/lib/tcpdf.rb
@@ -283,6 +283,7 @@ class TCPDF
                @state ||= 0
        @tableborder ||= 0
        @tdbegin ||= false
+       @tdtext ||= ''
        @tdwidth ||= 0
        @tdheight ||= 0
        @tdalign ||= "L"
@@ -3510,28 +3511,12 @@ class TCPDF
                                
       else
         #Text
-                               if (@href)
+                               if (@tdbegin)
                                        element.gsub!(/[\t\r\n\f]/, "");
-                                       addHtmlLink(@href, element, fill);
-                               elsif (@tdbegin)
+                                       @tdtext << element.gsub(/&nbsp;/, " ");
+                               elsif (@href)
                                        element.gsub!(/[\t\r\n\f]/, "");
-                                       element.gsub!(/&nbsp;/, " ");
-                                       base_page = @page;
-                                       base_x = @x;
-                                       base_y = @y;
-
-                                       MultiCell(@tdwidth, @tdheight, unhtmlentities(element.strip), @tableborder, @tdalign, @tdfill, 1);
-                                       tr_end = @t_cells[@table_id][@tr_id][@td_id]['j1'] + 1;
-                                       if @max_td_page[tr_end].nil?  or (@max_td_page[tr_end] < @page)
-                                               @max_td_page[tr_end] = @page
-                                               @max_td_y[tr_end] = @y
-                                       elsif (@max_td_page[tr_end] == @page)
-                                               @max_td_y[tr_end] = @y if @max_td_y[tr_end].nil? or (@max_td_y[tr_end] < @y) 
-                                       end
-
-                                       @page = base_page;
-                                       @x = base_x + @tdwidth;
-                                       @y = base_y;
+                                       addHtmlLink(@href, element, fill);
                                elsif (@pre_state == true and element.length > 0)
                                        Write(@lasth, unhtmlentities(element), '', fill);
                                elsif (element.strip.length > 0)
@@ -3825,6 +3810,7 @@ class TCPDF
                                @x += 5;        
 
                        when 'table'
+                               Ln();
                                if @default_table_columns < @max_table_columns[@table_id]
                                        @table_columns = @max_table_columns[@table_id];
                                else
@@ -3921,6 +3907,11 @@ class TCPDF
                                
                        when 'img'
                                if (!attrs['src'].nil?)
+                                       # Don't generates image inside table tag
+                                       if (@tdbegin)
+                                               @tdtext << attrs['src'];
+                                               return
+                                       end
                                        # Only generates image include a pdf if RMagick is avalaible
                                        unless Object.const_defined?(:Magick)
                                                Write(@lasth, attrs['src'], '', fill);
@@ -4079,6 +4070,23 @@ class TCPDF
                                Ln();
 
                        when 'td','th'
+                               base_page = @page;
+                               base_x = @x;
+                               base_y = @y;
+
+                               MultiCell(@tdwidth, @tdheight, unhtmlentities(@tdtext.strip), @tableborder, @tdalign, @tdfill, 1);
+                               tr_end = @t_cells[@table_id][@tr_id][@td_id]['j1'] + 1;
+                               if @max_td_page[tr_end].nil?  or (@max_td_page[tr_end] < @page)
+                                       @max_td_page[tr_end] = @page
+                                       @max_td_y[tr_end] = @y
+                               elsif (@max_td_page[tr_end] == @page)
+                                       @max_td_y[tr_end] = @y if @max_td_y[tr_end].nil? or (@max_td_y[tr_end] < @y) 
+                               end
+
+                               @page = base_page;
+                               @x = base_x + @tdwidth;
+                               @y = base_y;
+                               @tdtext = '';
                                @tdbegin = false;
                                @tdwidth = 0;
                                @tdheight = 0;
@@ -4126,7 +4134,6 @@ class TCPDF
                                @l_margin -= 5;
                                @r_margin -= 5;
                                @tableborder=0;
-                               Ln();
                                @table_id += 1;
                                
                        when 'strong'