X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Wiki.hs;fp=Wiki.hs;h=9db2541a9dcff880b840770e91d9db40a5b2a020;hp=c531f8ac271c90d9bad964bced24d963ffe7209d;hb=1f195ec53bd48d4471e92d60f1e83808679a79ce;hpb=a7ff060c616ef83fcd3fac49ba1ef874c44ab8b1

diff --git a/Wiki.hs b/Wiki.hs
index c531f8a..9db2541 100644
--- 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)