-pLinkLong = do
- string "[["
- l <- many1 $ noneOf ['|']
- char '|'
- d <- many1 $ noneOf "]"
- string "]]"
- return (Link l d)
-pLink = do
- string "[["
- l <- many1 $ noneOf "]"
- string "]]"
- return (Link l l)
+listToken True = '#'
+listToken False = '*'
+
+pHeading :: Parser Markup
+pHeading = do
+ many1 pEol
+ level <- many1 $ char '='
+ s <- pStopAt level
+ return (Heading (length level) s)
+
+pURL :: Parser Markup
+pURL = do
+ proto <- many1 letter
+ string "://"
+ s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
+ return (Url (proto++"://"++s))
+
+pMail :: Parser Markup
+pMail = do
+ user <- many1 (alphaNum <|> oneOf ".-_")
+ char '@'
+ server <- many1 (alphaNum <|> oneOf ".-_")
+ return (Url ("mailto:"++user++"@"++server))
+
+
+pPre :: Parser Markup
+pPre = string "<pre>" >> do
+ s <- pUntil (pOneLine <|> pEol) "</pre>"
+ return (Pre s)
+
+pBold,pEmph,pUnderline,pStrike :: Parser Markup
+pBold = pFont "**" Bold
+pEmph = pFont "//" Emph
+pUnderline = pFont "__" Underline
+pStrike = pFont "--" Strike
+pMono = pFont "||" Mono
+
+pFont s o = string s >> do
+ s <- pStopAt s
+ return (Font o s)
+
+pOtherChar :: Parser Markup