diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor index f549e9c04c..9120ec97f9 100644 --- a/basis/farkup/farkup-tests.factor +++ b/basis/farkup/farkup-tests.factor @@ -139,5 +139,5 @@ link-no-follow? off [ "

before:\n

{ 1 2 3 } 1 tail\n

" ] [ "before:\n[factor{{ 1 2 3 } 1 tail}]" convert-farkup ] unit-test -[ "Factor-rific!" ] -[ "[[Factor]]-rific" convert-farkup ] unit-test +[ "

Factor-rific!

" ] +[ "[[Factor]]-rific!" convert-farkup ] unit-test diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index 2957e6f2ec..ec49655d5a 100644 --- 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)