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

[factor.git] / extra / farkup / farkup.factor

diff --git a/extra/farkup/farkup.factor b/extra/farkup/farkup.factor
index d58b54af3752e38a39a778e39b0ad47605579356..1b51bb57524efb283a311751537aaf493454f924 100755 (executable)
--- a/extra/farkup/farkup.factor
+++ b/extra/farkup/farkup.factor
@@ -121,12 +121,14 @@ MEMO: labelled-link ( -- parser )
         "]]" token hide ,
     ] seq* [ first2 make-link ] action ;
 
-MEMO: link ( -- parser ) [ image-link , simple-link , labelled-link , ] choice* ;
+MEMO: link ( -- parser )
+    [ image-link , simple-link , labelled-link , ] choice* ;
 
 DEFER: line
 MEMO: list-item ( -- parser )
     [
-        "-" token hide , line ,
+        "-" token hide , ! text ,
+        [ "\r\n" member? not ] satisfy repeat1 [ >string escape-string ] action ,
     ] seq* [ "li" surround-with-foo ] action ;
 
 MEMO: list ( -- parser )
@@ -157,6 +159,8 @@ MEMO: code ( -- parser )
 
 MEMO: line ( -- parser )
     [
+        nl table 2seq ,
+        nl list 2seq ,
         text , strong , emphasis , link ,
         superscript , subscript , inline-code ,
         escaped-char , delimiter , eq ,