Backend (getCurrent,getList,get,setCurrent,update,listKeys)
,PGB
,createPGB
- ,Markup (Text, Paragraph, Link, Bold, Emph, Heading, Url, Underline, Strike, Pre)
+ ,Markup (Text, Paragraph, Font, Link, Heading, Url, Pre,List)
+ ,FontOp (Bold, Emph, Mono, Underline, Strike)
,Document
,wikiParser
- ,htmlOutput
+ ,toHtml
+ ,toLatex
) where
data Markup = Text String
| Paragraph
| Link String String
- | Bold [Markup]
- | Emph [Markup]
+ | Font FontOp [Markup]
| Heading Int [Markup]
| Url String
- | Underline [Markup]
- | Strike [Markup]
- | Pre String
+ | Pre [Markup]
+ | List Bool [[Markup]]
+
+data FontOp = Bold | Emph | Mono | Underline | Strike
type Document = [Markup]
-wikiParser :: GenParser Char st Document
+wikiParser :: Parser Document
wikiParser = many1 pMain
-pPara :: GenParser Char st Markup
-pPara = count 2 pEol >> return (Paragraph)
+firstInLineChars = "#*="
-pSpace :: GenParser Char st Markup
-pSpace = do
- c <- space
- return (Text (c:[]))
+pPara :: Parser Markup
+pPara = do
+ count 2 pEol
+ notFollowedBy $ oneOf firstInLineChars
+ return (Paragraph)
-pLink :: GenParser Char st Markup
+pLink :: Parser Markup
pLink = do
string "[["
(l,d) <- pLinkContent
[] -> return (Link l l)
_ -> return (Link l d)
-pHeading :: GenParser Char st Markup
+pList :: Bool -> Parser Markup
+pList enum = do
+ list <- many1 $ try $ pListItem enum
+ return (List enum list)
+
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
+ pEol
+ char $ listToken enum
+ many (pOneLine <|> try (pOneEol))
+
+pOneEol = do
+ c <- pEol
+ notFollowedBy (oneOf $ firstInLineChars++"\r\n")
+ return c
+
+listToken True = '#'
+listToken False = '*'
+
+pHeading :: Parser Markup
pHeading = do
- many1 pEol
+ pEol
level <- many1 $ char '='
- char ' '
- s <- pStopAt (' ':level)
+ s <- pStopAt level
return (Heading (length level) s)
-pURL :: GenParser Char st Markup
+pURL :: Parser Markup
pURL = do
proto <- many1 letter
string "://"
- s <- many1 (alphaNum <|> oneOf "?.:&-/")
+ s <- many1 (alphaNum <|> oneOf "?.:&-/~%=\\_")
return (Url (proto++"://"++s))
-pPre :: GenParser Char st Markup
+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 <- pString "</pre>"
+ s <- pUntil (pOneLine <|> pEol) "</pre>"
return (Pre s)
-pBold,pEmph,pUnderline,pStrike :: GenParser Char st Markup
-pBold = pS "**" (\s -> Bold s)
-pEmph = pS "//" (\s -> Emph s)
-pUnderline = pS "__" (\s -> Underline s)
-pStrike = pS "--" (\s -> Strike s)
-pS s f = string s >> do
+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 (f s)
+ return (Font o s)
-pOtherChar :: GenParser Char st Markup
+pOtherChar :: Parser Markup
pOtherChar = do
- c <- oneOf "*,;.:!?[]()'\"=-%$£<>/\\|"
+ c <- noneOf "\n\r"
return (Text (c:[]))
-pText :: GenParser Char st Markup
+pText :: Parser Markup
pText = do
t <- many1 alphaNum
return (Text t)
-pLinkContent :: GenParser Char st (String, String)
+pLinkContent :: Parser (String, String)
pLinkContent = do try (string "]]" >> return ([],[]))
<|> try (do
string " | "
(l,d) <- pLinkContent
return (c:l,d))
-pStopAt :: String -> GenParser Char st Document
-pStopAt xs = pUntil pMain xs
+pStopAt :: String -> Parser Document
+pStopAt xs = pUntil pOneLine xs
-pString :: String -> GenParser Char st String
+pString :: String -> Parser String
pString xs = pUntil anyChar xs
-pEol :: GenParser Char st String
-pEol = string "\n" <|> string "\r\n"
+pEol :: Parser Markup
+pEol = do
+ (string "\n" <|> string "\r\n")
+ return (Text "\r\n")
-pUntil :: GenParser Char st a -> String -> GenParser Char st [a]
+pUntil :: Parser a -> String -> Parser [a]
pUntil p xs = manyTill p (try $ string xs)
-pMain :: GenParser Char st Markup
+pMain :: Parser Markup
pMain = choice [
try (pHeading)
+ ,try $ pList True
+ ,try $ pList False
,try (pPara)
- ,pSpace
,try(pPre)
,try(pBold)
,try(pEmph)
,try(pUnderline)
,try(pStrike)
+ ,try(pMono)
,try (pLink)
,try (pURL)
+ ,try (pMail)
+ ,pText
,pOtherChar
+ ,pEol
+ ]
+
+pOneLine = choice [
+ try pBold
+ ,try pEmph
+ ,try pUnderline
+ ,try pStrike
+ ,try pMono
+ ,try pLink
+ ,try pURL
+ ,try pMail
,pText
+ ,pOtherChar
]
newtype PGB = PGB DBService
toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
toHtml ((Text s):xs) = s++toHtml xs
toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
-toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
-toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
-toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
-toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Font o d):xs) = "<"++htmlFontOp o++">"++toHtml d++"</"++htmlFontOp o++">"++toHtml xs
toHtml ((Heading n d):xs) = "\n<h"++show n++">"++toHtml d++"</h"++show n++">\n"++toHtml xs
toHtml ((Url l):xs) = "<link: "++l++">"++toHtml xs
-toHtml ((Pre s):xs) = "<pre>"++s++"</pre>"++toHtml xs
-
-htmlOutput s = case parse wikiParser "" s of
- Right n -> putStr (toHtml n)
+toHtml ((Pre s):xs) = "<pre>"++toHtml s++"</pre>"++toHtml xs
+toHtml ((List o l):xs) = "<"++htmlListType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++htmlListType o++">"++toHtml xs
+
+htmlFontOp Bold = "b"
+htmlFontOp Emph = "em"
+htmlFontOp Mono = "tt"
+htmlFontOp Underline = "u"
+htmlFontOp Strike = "strike"
+
+htmlListType True = "ol"
+htmlListType False = "ul"
+
+toLatex :: [Markup] -> String
+toLatex [] = []
+toLatex ((Paragraph):xs) = "\n\n"++toLatex xs
+toLatex ((Text s):xs) = s++toLatex xs
+toLatex ((Link l d):xs) = "{\\em "++d++"}"++toLatex xs
+toLatex ((Font o d):xs) = "{\\"++latexFontOp o++" "++toLatex d++"}"++toHtml xs
+toLatex ((Heading n d):xs) = "\n\\"++(unwords $ take (n-1) $ repeat "sub")++"section{"++toLatex d++"}"++"\n\n"++toLatex xs
+toLatex ((Url l):xs) = "{\\bf "++l++"}"++toLatex xs
+toLatex ((Pre s):xs) = "<pre>"++toLatex s++"</pre>"++toLatex xs
+toLatex ((List o l):xs) = "\n\\begin{"++latexListType o++"}\n"++(unlines $ map (\s -> "\\item "++toLatex s++"\n") l) ++ "\\end{"++latexListType o++"}"++toLatex xs
+
+latexFontOp Bold = "bf"
+latexFontOp Emph = "em"
+latexFontOp Mono = "tt"
+latexFontOp Underline = "u"
+latexFontOp Strike = "strike"
+
+latexListType True = "enumeration"
+latexListType False = "itemize"
+
+output s f = case parse wikiParser "" s of
+ Right n -> putStr (f n)
Left e -> print e
+
+htmlOutput s = output s toHtml
+latexOutput s = output s toLatex
projects / yawbih.git / blobdiff