From f2ea564c4116ac2969a6eb7056daee49ce4948e0 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 12 Mar 2008 10:34:54 -0500 Subject: [PATCH] farkup works a little better --- extra/farkup/farkup-tests.factor | 12 +++++++++++- extra/farkup/farkup.factor | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/extra/farkup/farkup-tests.factor b/extra/farkup/farkup-tests.factor index f4b3025fcd..bdb08bd29a 100755 --- a/extra/farkup/farkup-tests.factor +++ b/extra/farkup/farkup-tests.factor @@ -43,6 +43,16 @@ IN: farkup.tests [ "

foo\n

aheading

\n

adfasd

" ] [ "*foo*\n=aheading=\nadfasd" convert-farkup ] unit-test -[ "

=foo\n

" ] [ "=foo\n" convert-farkup ] unit-test [ "

foo

\n" ] [ "=foo=\n" convert-farkup ] unit-test [ "

lol

foo

\n" ] [ "lol=foo=\n" convert-farkup ] unit-test +[ "

=foo\n

" ] [ "=foo\n" convert-farkup ] unit-test +[ "

=foo

" ] [ "=foo" convert-farkup ] unit-test +[ "

==foo

" ] [ "==foo" convert-farkup ] unit-test +[ "

=

foo

" ] [ "==foo=" convert-farkup ] unit-test +[ "

foo

" ] [ "==foo==" convert-farkup ] unit-test +[ "

foo

" ] [ "==foo==" convert-farkup ] unit-test +[ "

=

foo

" ] [ "===foo==" convert-farkup ] unit-test + + +[ "

foo

=

" ] [ "=foo==" convert-farkup ] unit-test + diff --git a/extra/farkup/farkup.factor b/extra/farkup/farkup.factor index dac4359d90..ded376b1e4 100755 --- a/extra/farkup/farkup.factor +++ b/extra/farkup/farkup.factor @@ -42,6 +42,10 @@ MEMO: h2 ( -- parser ) "==" "h2" delimited ; MEMO: h3 ( -- parser ) "===" "h3" delimited ; MEMO: h4 ( -- parser ) "====" "h4" delimited ; +MEMO: eq ( -- parser ) + h1 ensure-not + "=" token 2seq ; + : render-code ( string mode -- string' ) >r string-lines r> [ [ htmlize-lines ] with-html-stream ] with-string-writer ; @@ -105,7 +109,7 @@ MEMO: line ( -- parser ) [ text , strong , emphasis , link , superscript , subscript , inline-code , - escaped-char , delimiter , + escaped-char , delimiter , eq , ] choice* repeat1 ; MEMO: paragraph ( -- parser )