X-Git-Url: https://ruin.nu/git/index.pl?a=blobdiff_plain;f=Wiki.hs;h=2de6f920cde32ec3baeb96a9c8774c3299c35f92;hb=58e04761af30e092662dac331493200ccca48650;hp=37b43112fd856a35736c9b5dcd21aa9cd0fd0f92;hpb=01c59ac502d71c3c1ccac422b5665f9e5954a190;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index 37b4311..2de6f92 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
 	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
@@ -42,21 +42,17 @@ data Markup = Text String
 	| Underline [Markup]
 	| Strike [Markup]
 	| Pre String
+	| List [[Markup]]
 
 type Document = [Markup]
 
-wikiParser :: GenParser Char st Document	
+wikiParser :: Parser Document	
 wikiParser = many1 pMain
 
-pPara :: GenParser Char st Markup	
+pPara :: Parser 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 :: Parser Markup	
 pLink = do
 	string "[["
 	(l,d) <- pLinkContent
@@ -64,7 +60,18 @@ pLink = do
 		[] -> return (Link l l)
 		_ -> return (Link l d)
 
-pHeading :: GenParser Char st Markup	
+pList :: Parser Markup
+pList = do
+	list <- many1 $ try pListItem 
+	return (List list)
+
+pListItem :: Parser [Markup]
+pListItem = do
+	many1 pEol
+	char '*'
+	many pOneLine
+	
+pHeading :: Parser Markup	
 pHeading = do
 	many1 pEol
 	level <- many1 $ char '='
@@ -72,19 +79,27 @@ pHeading = do
 	s <- pStopAt (' ':level)
 	return (Heading (length level) s)
 
-pURL :: GenParser Char st Markup	
+pURL :: Parser Markup	
 pURL = do
 	proto <- many1 letter
 	string "://"
 	s <- many1 (alphaNum <|> oneOf "?.:&-/")
 	return (Url (proto++"://"++s))
 
-pPre :: GenParser Char st Markup	
+pMail :: Parser Markup
+pMail = do
+	user <- many1 (alphaNum <|> oneOf ".-_")
+	char '@'
+	server <- many1 (alphaNum <|> oneOf ".-_")
+	return (Url ("mailto:"++user++"@"++server))
+	
+
+pPre :: Parser Markup	
 pPre = string "<pre>" >> do
 	s <- pString "</pre>"
 	return (Pre s)
 
-pBold,pEmph,pUnderline,pStrike :: GenParser Char st Markup	
+pBold,pEmph,pUnderline,pStrike :: Parser Markup	
 pBold = pS "**" (\s -> Bold s)
 pEmph = pS "//" (\s -> Emph s)
 pUnderline = pS "__" (\s -> Underline s)
@@ -93,17 +108,17 @@ pS s f = string s >> do
 	s <- pStopAt s
 	return (f s)
 
-pOtherChar :: GenParser Char st Markup	
+pOtherChar :: Parser Markup	
 pOtherChar = do
-	c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+	c <- noneOf "\n\r"
 	return (Text (c:[]))
 
-pText :: GenParser Char st Markup	
+pText :: Parser Markup	
 pText = do
 	t <- many1 alphaNum
 	return (Text t)
 
-pLinkContent :: GenParser Char st (String, String)	
+pLinkContent :: Parser (String, String)	
 pLinkContent = do try (string "]]" >> return ([],[])) 
 	<|> try (do
 		string " | "
@@ -114,23 +129,25 @@ pLinkContent = do try (string "]]" >> return ([],[]))
 		(l,d) <- pLinkContent
 		return (c:l,d))
 
-pStopAt :: String -> GenParser Char st Document	
-pStopAt xs = pUntil pMain xs
+pStopAt :: String -> Parser Document	
+pStopAt xs = pUntil pOneLine xs
 
-pString :: String -> GenParser Char st String	
+pString :: String -> Parser String	
 pString xs = pUntil anyChar xs
 
-pEol :: GenParser Char st String	
-pEol = string "\n" <|> string "\r\n"
+pEol :: Parser Markup	
+pEol = do
+	(string "\n" <|> string "\r\n")
+	return (Text "\r\n")
 
-pUntil :: GenParser Char st a -> String -> GenParser Char st [a]	
+pUntil :: Parser a -> String -> Parser [a]	
 pUntil p xs = manyTill p (try $ string xs)
 	
-pMain :: GenParser Char st Markup	
+pMain :: Parser Markup	
 pMain = choice [
 	try (pHeading)
+	,try pList
 	,try (pPara) 
-	,pSpace 
 	,try(pPre) 
 	,try(pBold) 
 	,try(pEmph) 
@@ -138,8 +155,22 @@ pMain = choice [
 	,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
@@ -211,6 +242,7 @@ 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 ((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)