pre

diff --git a/Main.hs b/Main.hs
index b1b4f5736db06aa1a13c2935873ccda28360d129..260e9788febb9169fb01f3323725b0a888cbb1e5 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -130,6 +130,9 @@ ex ((Heading n d):xs) = do
 ex ((Url l):xs) = do
        hlink (URL {unURL = (l)}) (text l)
        ex xs
+ex ((Pre s):xs) = do
+       pre $ text s
+       ex xs
 
 heading 1 = h1
 heading 2 = h2
@@ -148,6 +151,7 @@ ex2 ((Underline d):xs) = "<u>"++ex2 d++"</u>"++ex2 xs
 ex2 ((Strike d):xs) = "<strike>"++ex2 d++"</strike>"++ex2 xs
 ex2 ((Heading n d):xs) = "\n<h"++show n++">"++ex2 d++"</h"++show n++">\n"++ex2 xs
 ex2 ((Url l):xs) = "<link: "++l++">"++ex2 xs
+ex2 ((Pre s):xs) = "<pre>"++s++"</pre>"++ex2 xs
 
 
 test s = case parse wikiParser "" s of

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)