- l <- many1 $ noneOf "]"
- string "]]"
- return (Link l l)
-
-pBold = do
- string "**"
- s <- pStringParser "**"
- return (Bold s)
-
-pEmph = do
- string "//"
- s <- pStringParser "//"
- return (Emph s)
-
-pStringParser xs = do
- (string xs >> return []) <|> (do
+ (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