X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=9db2541a9dcff880b840770e91d9db40a5b2a020;hb=1f195ec53bd48d4471e92d60f1e83808679a79ce;hp=0b9e337da4bd7e50f7ebb266c88ca2d9c7bf6c28;hpb=6dc23e95f52602a2718045d57c8d3b441c40bbe5;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index 0b9e337..9db2541 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
 	Backend (getCurrent,getList,get,setCurrent,update)
 	,PGB
 	,createPGB
-	,Markup (Text, Paragraph, Link, Bold)
+	,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
 	,Document
 	,wikiParser
 
@@ -32,17 +32,18 @@ data Markup = Text String
 	| Paragraph 
 	| Link String String
 	| Bold [Markup]
+	| Emph [Markup]
+	| Heading Int [Markup]
+	| Url String
+	| Underline [Markup]
+	| Strike [Markup]
+	| Pre String
 
 type Document = [Markup]
 
 wikiParser :: GenParser Char st Document	
 wikiParser = do 
-	s <- (try (pPara) 
-		<|> pSpace 
-		<|> try (pLinkLong)
-		<|> try (pLink)
-		<|> pOtherChar
-		<|> pText)
+	s <- pMain
 	ss <- (wikiParser <|> return [])
 	return (s:ss)
 
@@ -60,26 +61,78 @@ pEol = char '\n' <|> do
 	char '\r'
 	char '\n'
 
-pLinkLong = do
-	string "[["
-	l <- many1 $ noneOf ['|']
-	char '|'
-	d <- many1 $ noneOf "]" 
-	string "]]"
-	return (Link l d)
-
-pBold = do
-	string "'''"
-	s <- wikiParser
-	return (Bold s)
+pLinkParser = do try (string "]]" >> return ([],[])) 
+	<|> try (do
+		string " | "
+		d <- pString "]]"
+		return ([],d))
+	<|> (do
+		c <- anyChar
+		(l,d) <- pLinkParser
+		return (c:l,d))
 
 pLink = do
 	string "[["
-	l <- many1 $ noneOf "]"
-	string "]]"
-	return (Link l l)
+	(l,d) <- pLinkParser
+	case d of
+		[] -> return (Link l l)
+		_ -> return (Link l d)
+
+pBold = pS "**" (\s -> Bold s)
+pEmph = pS "//" (\s -> Emph s)
+pUnderline = pS "__" (\s -> Underline s)
+pStrike = pS "--" (\s -> Strike s)
+
+pS s f = do
+	string s
+	s <- pStopAt s
+	return (f s)
+
+pStopAt xs = do 
+	try (string xs >> return []) <|> (do
+		s <- pMain 
+		ss <- pStopAt xs
+		return (s:ss))
+
+pString xs = do
+	try (string xs >> return []) <|> (do
+	s <- anyChar
+	ss <- pString xs
+	return (s:ss))
+	
+pHeading = do
+	many1 pEol
+	level <- many1 $ char '='
+	char ' '
+	s <- pStopAt (' ':level)
+	return (Heading (length level) s)
+
+pURL = do
+	proto <- many1 letter
+	string "://"
+	s <- many1 (alphaNum <|> oneOf "?.:&-/")
+	return (Url (proto++"://"++s))
+
+pPre = do
+	string "<pre>"
+	s <- pString "</pre>"
+	return (Pre s)
+	
+pMain = try (pHeading)
+	<|> (try (pPara) 
+	<|> pSpace 
+	<|> try(pPre) 
+	<|> try(pBold) 
+	<|> try(pEmph) 
+	<|> try(pUnderline) 
+	<|> try(pStrike) 
+	<|> try (pLink)
+	<|> try (pURL)
+	<|> pOtherChar
+	<|> pText)	
+
 pOtherChar = do
-	c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
+	c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
 	return (Text (c:[]))
 
 pText = do
@@ -105,7 +158,9 @@ instance Backend PGB where
 
 	getList (PGB db) key = do
 		list <- selectReturnTuples db $ "SELECT id, timestamp, author, comment from fulltexts WHERE keyword = "++tov key
-		return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
+		case list of
+			[[]] -> return []
+			_ -> return $ map (\[id,date,author,comment] -> (id,date,author,comment)) list
 
 	get (PGB db) key id = do
 		list <- selectReturnTuples db $ "SELECT fulltext from fulltexts WHERE id = "++tov id