pre

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index c531f8ac271c90d9bad964bced24d963ffe7209d..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]
 
@@ -111,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)