From 37130f911cb26f4513ee876b47bc6162d247458f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 24 Sep 2008 22:39:38 -0500 Subject: [PATCH] allow horizontal lines in paragraphs if they start at the beginning of a line --- basis/farkup/farkup-tests.factor | 6 ++++++ basis/farkup/farkup.factor | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor index f136ec91d4..693c559ac5 100644 --- a/basis/farkup/farkup-tests.factor +++ b/basis/farkup/farkup-tests.factor @@ -144,3 +144,9 @@ link-no-follow? off [ "

[ factor { 1 2 3 }]

" ] [ "[ factor { 1 2 3 }]" convert-farkup ] unit-test + +[ "

paragraph\n


" ] +[ "paragraph\n___" convert-farkup ] unit-test + +[ "

paragraph\n a ___ b

" ] +[ "paragraph\n a ___ b" convert-farkup ] unit-test diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index 37233447bc..7844cf8f41 100644 --- 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)