From: Michael Andreen <harv@ruin.nu>
Date: Wed, 26 Jan 2005 11:22:33 +0000 (+0000)
Subject: Some parsing inside <pre>
X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=commitdiff_plain;h=85eacfb829b94b0e1d7a6ca77f39546f6285fb4c

Some parsing inside <pre>
---

diff --git a/Main.hs b/Main.hs
index 194fffd..2dafbcc 100644
--- a/Main.hs
+++ b/Main.hs
@@ -147,7 +147,7 @@ toWash ((Url l):xs) = do
 	hlink (URL {unURL = (l)}) (text $ stripMailto l)
 	toWash xs
 toWash ((Pre s):xs) = do
-	pre $ text s
+	pre $ toWash s
 	toWash xs
 toWash ((List o l):xs) = do
 	listType o $ mapM (\s -> li $ toWash s) l
diff --git a/Wiki.hs b/Wiki.hs
index 2b8b313..2d394b8 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -41,7 +41,7 @@ data Markup = Text String
 	| Url String
 	| Underline [Markup]
 	| Strike [Markup]
-	| Pre String
+	| Pre [Markup]
 	| List Bool [[Markup]]
 
 type Document = [Markup]
@@ -85,7 +85,7 @@ pURL :: Parser Markup
 pURL = do
 	proto <- many1 letter
 	string "://"
-	s <- many1 (alphaNum <|> oneOf "?.:&-/")
+	s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
 	return (Url (proto++"://"++s))
 
 pMail :: Parser Markup
@@ -98,7 +98,7 @@ pMail = do
 
 pPre :: Parser Markup	
 pPre = string "<pre>" >> do
-	s <- pString "</pre>"
+	s <- pUntil (pOneLine <|> pEol) "</pre>"
 	return (Pre s)
 
 pBold,pEmph,pUnderline,pStrike :: Parser Markup	
@@ -244,7 +244,7 @@ toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
 toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
 toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
 toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
-toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
+toHtml ((Pre s):xs) = "<pre>"++toHtml s++"</pre>"++toHtml xs
 toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
 
 listType True = "ol"