Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-09-29 04:24:03 -05:00
commit 577ee839fd
2 changed files with 4 additions and 1 deletions

View File

@ -154,3 +154,6 @@ link-no-follow? off
[ "\n<ul><li> a</li>\n</ul><hr/>" ]
[ "\n- a\n___" convert-farkup ] unit-test
[ "<p>hello_world how are you today?\n<ul><li> hello_world how are you today?</li></ul></p>" ]
[ "hello_world how are you today?\n- hello_world how are you today?" convert-farkup ] unit-test

View File

@ -117,7 +117,7 @@ paragraph = ((paragraph-item paragraph-nl-item)+ nl+ => [[ first ]]
=> [[ paragraph boa ]]
list-item = (cell | inline-tag)*
list-item = (cell | inline-tag | inline-delimiter)*
ordered-list-item = '#' list-item
=> [[ second list-item boa ]]