headings, urls and maybe some more

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 7d337c9f679b3b14ce01e1bf6716864a3390fb6d..59e592938df2e7fbb25634bb30b65dd357f05735 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url)
        ,Document
        ,wikiParser
 
@@ -31,17 +31,16 @@ class Backend a where
 data Markup = Text String
        | Paragraph 
        | Link String String
+       | Bold [Markup]
+       | Emph [Markup]
+       | Heading Int [Markup]
+       | Url String
 
 type Document = [Markup]
 
 wikiParser :: GenParser Char st Document       
 wikiParser = do 
-       s <- (try (pPara) 
-               <|> pSpace 
-               <|> try (pLinkLong)
-               <|> try (pLink)
-               <|> pOtherChar
-               <|> pText)
+       s <- pMain
        ss <- (wikiParser <|> return [])
        return (s:ss)
 
@@ -66,13 +65,55 @@ pLinkLong = do
        d <- many1 $ noneOf "]" 
        string "]]"
        return (Link l d)
+
 pLink = do
        string "[["
        l <- many1 $ noneOf "]"
        string "]]"
        return (Link l l)
+
+pBold = do
+       string "**"
+       s <- pStringParser "**"
+       return (Bold s)
+
+pEmph = do
+       string "//"
+       s <- pStringParser "//"
+       return (Emph s)
+
+pStringParser xs = do 
+       try (string xs >> return []) <|> (do
+               s <- pMain 
+               ss <- pStringParser xs
+               return (s:ss))
+
+pHeading = do
+       many1 pEol
+       level <- many1 $ char '='
+       char ' '
+       s <- pStringParser (' ':level)
+       return (Heading (length level) s)
+
+pURL = do
+       proto <- many1 letter
+       string "://"
+       s <- many1 (alphaNum <|> oneOf "?.:&-/")
+       return (Url (proto++"://"++s))
+       
+pMain = try (pHeading)
+       <|> (try (pPara) 
+       <|> pSpace 
+       <|> try(pBold) 
+       <|> try(pEmph) 
+       <|> try (pLinkLong)
+       <|> try (pLink)
+       <|> try (pURL)
+       <|> pOtherChar
+       <|> pText)      
+
 pOtherChar = do
-       c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
+       c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
        return (Text (c:[]))
 
 pText = do