From 3d92c0e1bd33252d8a4c44f4f7b1bab0d437576e Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 25 May 2008 23:11:35 -0500
Subject: [PATCH] handle farkup tables better

---
 extra/farkup/farkup-tests.factor | 12 ++++++------
 extra/farkup/farkup.factor       | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extra/farkup/farkup-tests.factor b/extra/farkup/farkup-tests.factor
index b6e46cfe7d..9a3862d097 100755
--- a/extra/farkup/farkup-tests.factor
+++ b/extra/farkup/farkup-tests.factor
@@ -36,17 +36,17 @@ IN: farkup.tests
 [ "<p>|a</p>" ]
 [ "|a" convert-farkup ] unit-test
 
-[ "<p>|a|</p>" ]
+[ "<table><tr><td>a</td></tr></table>" ]
 [ "|a|" convert-farkup ] unit-test
 
 [ "<table><tr><td>a</td><td>b</td></tr></table>" ]
-[ "a|b" convert-farkup ] unit-test
+[ "|a|b|" convert-farkup ] unit-test
 
-[ "<table><tr><td>a</td><td>b</td></tr></table>\n<table><tr><td>c</td><td>d</td></tr></table>" ]
-[ "a|b\nc|d" convert-farkup ] unit-test
+[ "<table><tr><td>a</td><td>b</td></tr><tr><td>c</td><td>d</td></tr></table>" ]
+[ "|a|b|\n|c|d|" convert-farkup ] unit-test
 
-[ "<table><tr><td>a</td><td>b</td></tr></table>\n<table><tr><td>c</td><td>d</td></tr></table>\n" ]
-[ "a|b\nc|d\n" convert-farkup ] unit-test
+[ "<table><tr><td>a</td><td>b</td></tr><tr><td>c</td><td>d</td></tr></table>" ]
+[ "|a|b|\n|c|d|\n" convert-farkup ] unit-test
 
 [ "<p><strong>foo</strong>\n</p><h1>aheading</h1>\n<p>adfasd</p>" ]
 [ "*foo*\n=aheading=\nadfasd" convert-farkup ] unit-test
diff --git a/extra/farkup/farkup.factor b/extra/farkup/farkup.factor
index 51a5a10bd9..98f0d0245f 100755
--- a/extra/farkup/farkup.factor
+++ b/extra/farkup/farkup.factor
@@ -129,12 +129,14 @@ MEMO: table-column ( -- parser )
     text [ "td" surround-with-foo ] action ;
 
 MEMO: table-row ( -- parser )
-    [
-        table-column "|" token hide list-of-many ,
-    ] seq* [ "tr" surround-with-foo ] action ;
+    "|" token hide
+    table-column "|" token hide list-of
+    "|" token hide nl hide optional 4seq
+    [ "tr" surround-with-foo ] action ;
 
 MEMO: table ( -- parser )
-    table-row repeat1 [ "table" surround-with-foo ] action ;
+    table-row repeat1
+    [ "table" surround-with-foo ] action ;
 
 MEMO: code ( -- parser )
     [