From 735db3dae5c16d13bf7ae3af992bb9b23644a4fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 4 Jun 2008 17:12:59 +0000
Subject: Allow empty cells in wiki tables.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1490 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'lib/redcloth.rb')

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 344fd6c78..3880eb9d3 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -504,26 +504,19 @@ class RedCloth < String
             tatts = shelve( tatts ) if tatts
             rows = []
 
-            fullrow.
-            split( /\|$/m ).
-            delete_if { |x| x.empty? }.
-            each do |row|
-
+            fullrow.each_line do |row|
                 ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
-                
                 cells = []
-                #row.split( /\(?!\[\[[^\]])|(?![^\[]\]\])/ ).each do |cell|
-                row.split( /\|(?![^\[\|]*\]\])/ ).each do |cell|
+                row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
+                    next if cell == '|'
                     ctyp = 'd'
                     ctyp = 'h' if cell =~ /^_/
 
                     catts = ''
                     catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
 
-                    unless cell.strip.empty?
-                        catts = shelve( catts ) if catts
-                        cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>" 
-                    end
+                    catts = shelve( catts ) if catts
+                    cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>" 
                 end
                 ratts = shelve( ratts ) if ratts
                 rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
-- 
cgit v1.2.3