Backend (getCurrent,getList,get,setCurrent,update,listKeys)
,PGB
,createPGB
- ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
+ ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre,List)
,Document
,wikiParser
,htmlOutput
| Underline [Markup]
| Strike [Markup]
| Pre String
+ | List [[Markup]]
type Document = [Markup]
pPara :: GenParser Char st Markup
pPara = count 2 pEol >> return (Paragraph)
-pSpace :: GenParser Char st Markup
-pSpace = do
- c <- space
- return (Text (c:[]))
-
pLink :: GenParser Char st Markup
pLink = do
string "[["
[] -> return (Link l l)
_ -> return (Link l d)
+pList :: GenParser Char st Markup
+pList = do
+ list <- many1 $ try pListItem
+ return (List list)
+
+pListItem :: GenParser Char st [Markup]
+pListItem = do
+ many1 pEol
+ char '*'
+ many pOneLine
+
pHeading :: GenParser Char st Markup
pHeading = do
many1 pEol
s <- many1 (alphaNum <|> oneOf "?.:&-/")
return (Url (proto++"://"++s))
+pMail :: GenParser Char st Markup
+pMail = do
+ user <- many1 (alphaNum <|> oneOf ".-_")
+ char '@'
+ server <- many1 (alphaNum <|> oneOf ".-_")
+ return (Url ("mailto:"++user++"@"++server))
+
+
pPre :: GenParser Char st Markup
pPre = string "<pre>" >> do
s <- pString "</pre>"
pOtherChar :: GenParser Char st Markup
pOtherChar = do
- c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+ c <- noneOf "\n\r"
return (Text (c:[]))
pText :: GenParser Char st Markup
return (c:l,d))
pStopAt :: String -> GenParser Char st Document
-pStopAt xs = pUntil pMain xs
+pStopAt xs = pUntil pOneLine xs
pString :: String -> GenParser Char st String
pString xs = pUntil anyChar xs
-pEol :: GenParser Char st String
-pEol = string "\n" <|> string "\r\n"
+pEol :: GenParser Char st Markup
+pEol = do
+ (string "\n" <|> string "\r\n")
+ return (Text "\r\n")
pUntil :: GenParser Char st a -> String -> GenParser Char st [a]
pUntil p xs = manyTill p (try $ string xs)
pMain :: GenParser Char st Markup
pMain = choice [
try (pHeading)
+ ,try pList
,try (pPara)
- ,pSpace
,try(pPre)
,try(pBold)
,try(pEmph)
,try(pStrike)
,try (pLink)
,try (pURL)
+ ,try (pMail)
+ ,pText
,pOtherChar
+ ,pEol
+ ]
+
+pOneLine = choice [
+ try pBold
+ ,try pEmph
+ ,try pUnderline
+ ,try pStrike
+ ,try pLink
+ ,try pURL
+ ,try pMail
,pText
+ ,pOtherChar
]
newtype PGB = PGB DBService
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 ((List l):xs) = "<ul>\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</ul>"++toHtml xs
htmlOutput s = case parse wikiParser "" s of
Right n -> putStr (toHtml n)