Backend (getCurrent,getList,get,setCurrent,update)
,PGB
,createPGB
- ,Markup (Text, Paragraph, Link, Bold, Emph)
+ ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url)
,Document
,wikiParser
| Link String String
| Bold [Markup]
| Emph [Markup]
+ | Heading Int [Markup]
+ | Url String
type Document = [Markup]
return (Emph s)
pStringParser xs = do
- (string xs >> return []) <|> (do
+ try (string xs >> return []) <|> (do
s <- pMain
ss <- pStringParser 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 (pPara)
- <|> pSpace
- <|> try(pBold)
- <|> try(pEmph)
- <|> try (pLinkLong)
- <|> try (pLink)
- <|> pOtherChar
- <|> pText)
+pMain = try (pHeading)
+ <|> (try (pPara)
+ <|> pSpace
+ <|> try(pBold)
+ <|> try(pEmph)
+ <|> try (pLinkLong)
+ <|> try (pLink)
+ <|> try (pURL)
+ <|> pOtherChar
+ <|> pText)
pOtherChar = do
c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"