allow horizontal lines in paragraphs if they start at the beginning of a line

diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor
index f136ec91d40aebd40a3019add3069cbffa7baa36..693c559ac5d5c0b7a566c7ebc7575542164086af 100644 (file)
--- a/basis/farkup/farkup-tests.factor
+++ b/basis/farkup/farkup-tests.factor
@@ -144,3 +144,9 @@ link-no-follow? off
 
 [ "<p>[ factor { 1 2 3 }]</p>" ]
 [ "[ factor { 1 2 3 }]" convert-farkup ] unit-test
+
+[ "<p>paragraph\n<hr/></p>" ]
+[ "paragraph\n___" convert-farkup ] unit-test
+
+[ "<p>paragraph\n a ___ b</p>" ]
+[ "paragraph\n a ___ b" convert-farkup ] unit-test

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index 37233447bc9aa5430e143014c19620c532a82c12..7844cf8f411072a07778bf67900aef6cea10fda6 100644 (file)
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -108,7 +108,7 @@ table            =  ((table-row nl => [[ first ]] )+ table-row? | table-row)
 text = (!(nl | code | heading | inline-delimiter | table ).)+
     => [[ >string ]]
 
-paragraph-item = (table | nl list | code | text | inline-tag | inline-delimiter)+
+paragraph-item = (table | nl list | nl line | code | text | inline-tag | inline-delimiter)+
 paragraph = ((paragraph-item nl => [[ first ]])+ nl+ => [[ first ]]
              | (paragraph-item nl)+ paragraph-item?
              | paragraph-item)