X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Wiki.hs;h=337d715eb9160b83cd94e2fa2549de67e09fd6da;hp=dee41a10e38dbba467d315c164f5f7aff81b0885;hb=0c6dd605b59c2f36cdd76eabdf4540dae424d105;hpb=a7c0523b9e2d6fcc0ff25f1fac48aba435599a8a

diff --git a/Wiki.hs b/Wiki.hs
index dee41a1..337d715 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -63,46 +63,22 @@ pLinkLong = do
 	string "[["
 	l <- many1 $ noneOf ['|']
 	char '|'
-	d <- many1 $ noneOf [']'] 
+	d <- many1 $ noneOf "]" 
 	string "]]"
 	return (Link l d)
 pLink = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
+	l <- many1 $ noneOf "]"
 	string "]]"
 	return (Link l l)
 pOtherChar = do
-	c <- satisfy validChar
+	c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
 	return (Text (c:[]))
 
 pText = do
 	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 '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
 
 newtype PGB = PGB DBService