some simplifications

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 2de6f920cde32ec3baeb96a9c8774c3299c35f92..94f4a5f433000c2a86cbd8eb19cc7ca1f8dffb8d 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,8 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre,List)
+       ,Markup (Text, Paragraph, Font, Link, Heading, Url, Pre,List)
+       ,FontOp (Bold, Emph, Mono, Underline, Strike)
        ,Document
        ,wikiParser
        ,htmlOutput
@@ -35,14 +36,13 @@ class Backend a where
 data Markup = Text String
        | Paragraph 
        | Link String String
-       | Bold [Markup]
-       | Emph [Markup]
+       | Font FontOp [Markup]
        | Heading Int [Markup]
        | Url String
-       | Underline [Markup]
-       | Strike [Markup]
-       | Pre String
-       | List [[Markup]]
+       | Pre [Markup]
+       | List Bool [[Markup]]
+
+data FontOp = Bold | Emph | Mono | Underline | Strike
 
 type Document = [Markup]
 
@@ -60,30 +60,32 @@ 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  
 pURL = do
        proto <- many1 letter
        string "://"
-       s <- many1 (alphaNum <|> oneOf "?.:&-/")
+       s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
        return (Url (proto++"://"++s))
 
 pMail :: Parser Markup
@@ -96,17 +98,19 @@ pMail = do
 
 pPre :: Parser Markup  
 pPre = string "<pre>" >> do
-       s <- pString "</pre>"
+       s <- pUntil (pOneLine <|> pEol) "</pre>"
        return (Pre s)
 
 pBold,pEmph,pUnderline,pStrike :: Parser Markup        
-pBold = pS "**" (\s -> Bold s)
-pEmph = pS "//" (\s -> Emph s)
-pUnderline = pS "__" (\s -> Underline s)
-pStrike = pS "--" (\s -> Strike s)
-pS s f = string s >> do
+pBold = pFont "**" Bold
+pEmph = pFont "//" Emph
+pUnderline = pFont "__" Underline
+pStrike = pFont "--" Strike
+pMono = pFont "||" Mono
+
+pFont s o = string s >> do
        s <- pStopAt s
-       return (f s)
+       return (Font o s)
 
 pOtherChar :: Parser Markup    
 pOtherChar = do
@@ -146,13 +150,15 @@ 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) 
        ,try(pEmph) 
        ,try(pUnderline) 
        ,try(pStrike) 
+       ,try(pMono) 
        ,try (pLink)
        ,try (pURL)
        ,try (pMail)
@@ -166,6 +172,7 @@ pOneLine = choice [
        ,try pEmph
        ,try pUnderline
        ,try pStrike
+       ,try pMono
        ,try pLink
        ,try pURL
        ,try pMail
@@ -235,14 +242,20 @@ toHtml [] = []
 toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
 toHtml ((Text s):xs) = s++toHtml xs
 toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
-toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
-toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
-toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
-toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Font o d):xs) = "<"++fontOp o++">"++toHtml d++"</"++fontOp o++">"++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 ((Pre s):xs) = "<pre>"++toHtml s++"</pre>"++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"
+
+fontOp Bold = "b"
+fontOp Emph = "em"
+fontOp Mono = "tt"
+fontOp Underline = "u"
+fontOp Strike = "strike"
 
 htmlOutput s = case parse wikiParser "" s of
                                        Right n -> putStr (toHtml n)