X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Wiki.hs;h=f2a68f28e432b1f8005e7ebc31c2b1c4aab5a295;hp=64c46028bdcd8dd51d204037457e5bba4302866b;hb=0faacae411100c8ba6606c22a453bff6a5517a11;hpb=d18786bdb428f24b6a5aea32c1b1e64339591708

diff --git a/Wiki.hs b/Wiki.hs
index 64c4602..f2a68f2 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -37,9 +37,10 @@ type Document = [Markup]
 wikiParser :: GenParser Char st Document	
 wikiParser = do 
 	s <- (try (pPara) 
-		<|> pOneEol 
+		<|> pSpace 
 		<|> try (pLinkLong)
-		<|> pLink
+		<|> try (pLink)
+		<|> pOtherChar
 		<|> pText)
 	ss <- (wikiParser <|> return [])
 	return (s:ss)
@@ -49,8 +50,9 @@ pPara = do
 	pEol
 	return (Paragraph)
 
-pOneEol = do
-	pEol
+
+pSpace = do
+	space 
 	return (Text " ")
 
 pEol = char '\n' <|> do
@@ -59,9 +61,9 @@ pEol = char '\n' <|> do
 
 pLinkLong = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
+	l <- many1 $ noneOf ['|']
 	char '|'
-	d <- many1 $ noneOf ['|','[',']'] 
+	d <- many1 $ noneOf [']'] 
 	string "]]"
 	return (Link l d)
 pLink = do
@@ -69,11 +71,35 @@ pLink = do
 	l <- many1 $ noneOf ['|','[',']']
 	string "]]"
 	return (Link l l)
+pOtherChar = do
+	c <- satisfy validChar
+	return (Text (c:[]))
 
 pText = do
-	t <- many1 (noneOf ['\n','\r','[',']'])
+	t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
 	return (Text t)
 
+validChar ',' = True
+validChar '.' = True
+validChar '!' = True
+validChar '?' = True
+validChar '[' = True
+validChar ']' = True
+validChar '\'' = True
+validChar '"' = True
+validChar '=' = True
+validChar '-' = True
+validChar '%' = True
+validChar '$' = True
+validChar '£' = True
+validChar '<' = True
+validChar '>' = True
+validChar '/' = True
+validChar '\\' = True
+validChar '|' = True
+validChar _ = False
+
+
 newtype PGB = PGB DBService
 
 createPGB :: String -> String -> String -> String -> IO PGB