pre

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index 83827cc1a6e6fbb9e04059f91350b99a0ae824cd..9db2541a9dcff880b840770e91d9db40a5b2a020 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, Bold, Emph, Heading, Url, Underline, Strike)
+       ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
        ,Document
        ,wikiParser
 
@@ -37,6 +37,7 @@ data Markup = Text String
        | Url String
        | Underline [Markup]
        | Strike [Markup]
+       | Pre String
 
 type Document = [Markup]
 
@@ -77,30 +78,20 @@ pLink = do
                [] -> return (Link l l)
                _ -> return (Link l d)
 
-pBold = do
-       string "**"
-       s <- pStringParser "**"
-       return (Bold s)
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
 
-pEmph = do
-       string "//"
-       s <- pStringParser "//"
-       return (Emph s)
+pS s f = do
+       string s
+       s <- pStopAt s
+       return (f s)
 
-pUnderline = do
-       string "__"
-       s <- pStringParser "__"
-       return (Underline s)
-
-pStrike = do
-       string "--"
-       s <- pStringParser "--"
-       return (Strike s)
-
-pStringParser xs = do 
+pStopAt xs = do 
        try (string xs >> return []) <|> (do
                s <- pMain 
-               ss <- pStringParser xs
+               ss <- pStopAt xs
                return (s:ss))
 
 pString xs = do
@@ -113,7 +104,7 @@ pHeading = do
        many1 pEol
        level <- many1 $ char '='
        char ' '
-       s <- pStringParser (' ':level)
+       s <- pStopAt (' ':level)
        return (Heading (length level) s)
 
 pURL = do
@@ -121,10 +112,16 @@ pURL = do
        string "://"
        s <- many1 (alphaNum <|> oneOf "?.:&-/")
        return (Url (proto++"://"++s))
+
+pPre = do
+       string "<pre>"
+       s <- pString "</pre>"
+       return (Pre s)
        
 pMain = try (pHeading)
        <|> (try (pPara) 
        <|> pSpace 
+       <|> try(pPre) 
        <|> try(pBold) 
        <|> try(pEmph) 
        <|> try(pUnderline)