Ordered lists and some cleanup

diff --git a/Main.hs b/Main.hs
index 3c634d36796ec7e71fb86a52138c7974d4b26acd..c89ebf27f6fe76e54e40bb372944a69219cba3e8 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -149,10 +149,13 @@ toWash ((Url l):xs) = do
 toWash ((Pre s):xs) = do
        pre $ text s
        toWash xs
-toWash ((List l):xs) = do
-       ul $ mapM (\s -> li $ toWash s) l
+toWash ((List o l):xs) = do
+       listType o $ mapM (\s -> li $ toWash s) l
        toWash xs
 
+listType True = ol
+listType False = ul
+
 stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
 stripMailto xs = xs
 

diff --git a/Wiki.hs b/Wiki.hs
index 2de6f920cde32ec3baeb96a9c8774c3299c35f92..2b8b31383779ae576115b14cdc106522b4bf99d1 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -42,7 +42,7 @@ data Markup = Text String
        | Underline [Markup]
        | Strike [Markup]
        | Pre String
-       | List [[Markup]]
+       | List Bool [[Markup]]
 
 type Document = [Markup]
 
@@ -60,23 +60,25 @@ pLink = do
                [] -> return (Link l l)
                _ -> return (Link l d)
 
-pList :: Parser Markup
-pList = do
-       list <- many1 $ try pListItem 
-       return (List list)
+pList :: Bool -> Parser Markup
+pList enum = do
+       list <- many1 $ try $ pListItem enum
+       return (List enum list)
 
-pListItem :: Parser [Markup]
-pListItem = do
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
        many1 pEol
-       char '*'
+       char $ listToken enum
        many pOneLine
+
+listToken True = '#'
+listToken False = '*'
        
 pHeading :: Parser Markup      
 pHeading = do
        many1 pEol
        level <- many1 $ char '='
-       char ' '
-       s <- pStopAt (' ':level)
+       s <- pStopAt level
        return (Heading (length level) s)
 
 pURL :: Parser Markup  
@@ -146,7 +148,8 @@ pUntil p xs = manyTill p (try $ string xs)
 pMain :: Parser Markup 
 pMain = choice [
        try (pHeading)
-       ,try pList
+       ,try $ pList True
+       ,try $ pList False
        ,try (pPara) 
        ,try(pPre) 
        ,try(pBold) 
@@ -242,7 +245,10 @@ toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
 toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
 toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
 toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
-toHtml ((List l):xs) = "<ul>\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</ul>"++toHtml xs
+toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
+
+listType True = "ol"
+listType False = "ul"
 
 htmlOutput s = case parse wikiParser "" s of
                                        Right n -> putStr (toHtml n)