keyword field and link instead of button

[yawbih.git] / Wiki.hs

diff --git a/Wiki.hs b/Wiki.hs
index dee41a10e38dbba467d315c164f5f7aff81b0885..337d715eb9160b83cd94e2fa2549de67e09fd6da 100644 (file)
--- 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