toWash ((Link l d):xs) = do
hlink (URL {unURL = ("wiki?"++l)}) (text d)
toWash xs
-toWash ((Bold d):xs) = do
- b (toWash d)
- toWash xs
-toWash ((Emph d):xs) = do
- em (toWash d)
- toWash xs
-toWash ((Mono d):xs) = do
- tt (toWash d)
- toWash xs
-toWash ((Underline d):xs) = do
- u (toWash d)
- toWash xs
-toWash ((Strike d):xs) = do
- strike (toWash d)
+toWash ((Font o d):xs) = do
+ fontOp o (toWash d)
toWash xs
toWash ((Heading n d):xs) = do
heading n $ toWash d
stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
stripMailto xs = xs
+fontOp Bold = b
+fontOp Emph = em
+fontOp Mono = tt
+fontOp Underline = u
+fontOp Strike = strike
+
heading 1 = h1
heading 2 = h2
heading 3 = h3
Backend (getCurrent,getList,get,setCurrent,update,listKeys)
,PGB
,createPGB
- ,Markup (Text, Paragraph, Link, Bold, Emph, Mono, Heading, Url, Underline, Strike, Pre,List)
+ ,Markup (Text, Paragraph, Font, Link, Heading, Url, Pre,List)
+ ,FontOp (Bold, Emph, Mono, Underline, Strike)
,Document
,wikiParser
,htmlOutput
data Markup = Text String
| Paragraph
| Link String String
- | Bold [Markup]
- | Emph [Markup]
- | Mono [Markup]
+ | Font FontOp [Markup]
| Heading Int [Markup]
| Url String
- | Underline [Markup]
- | Strike [Markup]
| Pre [Markup]
| List Bool [[Markup]]
+data FontOp = Bold | Emph | Mono | Underline | Strike
+
type Document = [Markup]
wikiParser :: Parser Document
return (Pre s)
pBold,pEmph,pUnderline,pStrike :: Parser Markup
-pBold = pS "**" (\s -> Bold s)
-pEmph = pS "//" (\s -> Emph s)
-pUnderline = pS "__" (\s -> Underline s)
-pStrike = pS "--" (\s -> Strike s)
-pMono = pS "||" (\s -> Mono s)
-pS s f = string s >> do
+pBold = pFont "**" Bold
+pEmph = pFont "//" Emph
+pUnderline = pFont "__" Underline
+pStrike = pFont "--" Strike
+pMono = pFont "||" Mono
+
+pFont s o = string s >> do
s <- pStopAt s
- return (f s)
+ return (Font o s)
pOtherChar :: Parser Markup
pOtherChar = do
toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
toHtml ((Text s):xs) = s++toHtml xs
toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
-toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
-toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
-toHtml ((Mono d):xs) = "<tt>"++toHtml d++"</tt>"++toHtml xs
-toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
-toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Font o d):xs) = "<"++fontOp o++">"++toHtml d++"</"++fontOp o++">"++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>"++toHtml s++"</pre>"++toHtml xs
listType True = "ol"
listType False = "ul"
+fontOp Bold = "b"
+fontOp Emph = "em"
+fontOp Mono = "tt"
+fontOp Underline = "u"
+fontOp Strike = "strike"
+
htmlOutput s = case parse wikiParser "" s of
Right n -> putStr (toHtml n)
Left e -> print e