- l <- many1 $ noneOf ['|','[',']']
- char '|'
- d <- many1 $ noneOf ['|','[',']']
- string "]]"
- return (Link l d)
+ (l,d) <- pLinkParser
+ case d of
+ [] -> return (Link l l)
+ _ -> return (Link l d)
+
+pBold = do
+ string "**"
+ s <- pStringParser "**"
+ return (Bold s)
+
+pEmph = do
+ string "//"
+ s <- pStringParser "//"
+ return (Emph s)
+
+pUnderline = do
+ string "__"
+ s <- pStringParser "__"
+ return (Underline s)
+
+pStrike = do
+ string "--"
+ s <- pStringParser "--"
+ return (Strike s)
+
+pStringParser xs = do
+ try (string xs >> return []) <|> (do
+ s <- pMain
+ ss <- pStringParser xs
+ return (s:ss))
+
+pString xs = do
+ try (string xs >> return []) <|> (do
+ s <- anyChar
+ ss <- pString xs
+ return (s:ss))
+
+pHeading = do
+ many1 pEol
+ level <- many1 $ char '='
+ char ' '
+ s <- pStringParser (' ':level)
+ return (Heading (length level) s)
+
+pURL = do
+ proto <- many1 letter
+ string "://"
+ s <- many1 (alphaNum <|> oneOf "?.:&-/")
+ return (Url (proto++"://"++s))
+
+pMain = try (pHeading)
+ <|> (try (pPara)
+ <|> pSpace
+ <|> try(pBold)
+ <|> try(pEmph)
+ <|> try(pUnderline)
+ <|> try(pStrike)
+ <|> try (pLink)
+ <|> try (pURL)
+ <|> pOtherChar
+ <|> pText)
+
+pOtherChar = do
+ c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+ return (Text (c:[]))
+