picowiki

commit feae1e88a4ef512cd15a84b3426d87260e3b9995
parent 5ee05dfac2bf2ecb0cfadea21aed30466b26afb6
Author: tomas <tomas@logand.com>
Date:   Thu, 29 Jul 2010 21:04:22 +0200

minor list markup change

Diffstat:
M
picowiki.l
 | 
32
++++++++++++--------------------

1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/picowiki.l b/picowiki.l
@@ -309,28 +309,20 @@
           (<xml> pre
              (while (= " " (car L))
                 (xprin (eatLine 'L) "^J") ) ) )
-         ((listMarkup? (car L))
+         ((= 1 (listLevel L))
           (let N 1
              (recur (N)
-                (if (= "-" (pop 'L))
-                   (<xml> ul
-                      (if (listMarkup? (car L))
-                         (recurse (+ 1 N))
-                         (<xml> li (markupLine (eatLine 'L)))
-                         (while (<= N (listLevel L))
-                            (if (= N (listLevel L))
-                               (<xml> li (markupLine (eatLine 'L N)) )
-                               (cut N 'L)
-                               (recurse (+ 1 N)) ) ) ) )
-                   (<xml> ol
-                      (if (listMarkup? (car L))
-                         (recurse (+ 1 N))
-                         (<xml> li (markupLine (eatLine 'L)))
-                         (while (<= N (listLevel L))
-                            (if (= N (listLevel L))
-                               (<xml> li (markupLine (eatLine 'L N)) )
-                               (cut N 'L)
-                               (recurse (+ 1 N)) ) ) ) ) ) ) ) )
+                (let li '(() (if (listMarkup? (car L))
+                                (recurse (+ 1 N))
+                                (<xml> li (markupLine (eatLine 'L)))
+                                (while (<= N (listLevel L))
+                                   (if (= N (listLevel L))
+                                      (<xml> li (markupLine (eatLine 'L N)) )
+                                      (cut N 'L)
+                                      (recurse (+ 1 N)) ) ) ) )
+                   (if (= "-" (pop 'L))
+                      (<xml> ul (li))
+                      (<xml> ol (li)) ) ) ) ) )
          ((= ">" (car L)) (<xml> blockquote (xprin (eatLine 'L 1))))
          ((= "|" (car L))               # TODO table
           (<xml> pre