fix [[link]]-foo --- should not create a list

diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor
index f549e9c04cb276e5d8c1c5d537bba196f3224f6b..9120ec97f96e9d0f67b0cfae117bcc14471cdf10 100644 (file)
--- a/basis/farkup/farkup-tests.factor
+++ b/basis/farkup/farkup-tests.factor
@@ -139,5 +139,5 @@ link-no-follow? off
 [ "<p>before:\n<pre><span class='OPERATOR'>{</span> <span class='DIGIT'>1</span> <span class='DIGIT'>2</span> <span class='DIGIT'>3</span> <span class='OPERATOR'>}</span> <span class='DIGIT'>1</span> tail\n</pre></p>" ] 
 [ "before:\n[factor{{ 1 2 3 } 1 tail}]" convert-farkup ] unit-test
  
-[ "<a href='Factor'>Factor</a>-rific!" ]
-[ "[[Factor]]-rific" convert-farkup ] unit-test
+[ "<p><a href='Factor'>Factor</a>-rific!</p>" ]
+[ "[[Factor]]-rific!" convert-farkup ] unit-test

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index 2957e6f2ecccca1eaeb69d6ae6d40e635b447e07..ec49655d5a1c43043ce781bf4ad0d4f5f37a736d 100644 (file)
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -38,8 +38,6 @@ TUPLE: line ;
 
 EBNF: parse-farkup
 nl               = ("\r\n" | "\r" | "\n") => [[ drop "\n" ]]
-2nl              = nl nl
-
 
 heading1      = "=" (!("=" | nl).)+ "="
     => [[ second >string heading1 boa ]]
@@ -109,7 +107,7 @@ table            =  ((table-row nl => [[ first ]] )+ table-row? | table-row)
 text = (!(nl | code | heading | inline-delimiter | table ).)+
     => [[ >string ]]
 
-paragraph-item = (table | list | code | text | inline-tag | inline-delimiter)+
+paragraph-item = (table | nl list | code | text | inline-tag | inline-delimiter)+
 paragraph = ((paragraph-item nl => [[ first ]])+ nl+ => [[ first ]]
              | (paragraph-item nl)+ paragraph-item?
              | paragraph-item)