X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=blobdiff_plain;f=Wiki.hs;h=64c46028bdcd8dd51d204037457e5bba4302866b;hp=ab89fff9de0e8c6a9a6e6bd834b67fd589d26c81;hb=d18786bdb428f24b6a5aea32c1b1e64339591708;hpb=69ecfedf2b7e27f50f7c2cedf534a036fe16907e diff --git a/Wiki.hs b/Wiki.hs index ab89fff..64c4602 100644 --- a/Wiki.hs +++ b/Wiki.hs @@ -38,7 +38,8 @@ wikiParser :: GenParser Char st Document wikiParser = do s <- (try (pPara) <|> pOneEol - <|> pLinkLong + <|> try (pLinkLong) + <|> pLink <|> pText) ss <- (wikiParser <|> return []) return (s:ss) @@ -63,6 +64,12 @@ pLinkLong = do d <- many1 $ noneOf ['|','[',']'] string "]]" return (Link l d) +pLink = do + string "[[" + l <- many1 $ noneOf ['|','[',']'] + string "]]" + return (Link l l) + pText = do t <- many1 (noneOf ['\n','\r','[',']']) return (Text t)