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

diff --git a/basis/farkup/farkup-tests.factor b/basis/farkup/farkup-tests.factor
index 685b1e3a58d4db3ce05f940b87e52a11de5dd1d7..27911a8d13ea089ed141fa9bb5f54b501bd8746d 100644 (file)
--- a/basis/farkup/farkup-tests.factor
+++ b/basis/farkup/farkup-tests.factor
@@ -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

diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor
index 91863490b85b2d73eb9e3ba6b786d4dc747d9b84..959d53c904b5bc2b95ce5af3e8eac61cc6bfa144 100644 (file)
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
@@ -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 ]]