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
| Url String
| Underline [Markup]
| Strike [Markup]
- | Pre String
+ | Pre [Markup]
| List Bool [[Markup]]
type Document = [Markup]
pURL = do
proto <- many1 letter
string "://"
- s <- many1 (alphaNum <|> oneOf "?.:&-/")
+ s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
return (Url (proto++"://"++s))
pMail :: Parser Markup
pPre :: Parser Markup
pPre = string "<pre>" >> do
- s <- pString "</pre>"
+ s <- pUntil (pOneLine <|> pEol) "</pre>"
return (Pre s)
pBold,pEmph,pUnderline,pStrike :: Parser Markup
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"