X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Wiki.hs;h=2b8b31383779ae576115b14cdc106522b4bf99d1;hb=402636b8fc1d0a38a550f7a678bbfdcebb932686;hp=1371c453e597351ede57c674fb807afb993ecd5b;hpb=0fa0fc355546141e597b7c483f8c6b9e54ac17ce;p=yawbih.git

diff --git a/Wiki.hs b/Wiki.hs
index 1371c45..2b8b313 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -42,17 +42,17 @@ data Markup = Text String
 	| Underline [Markup]
 	| Strike [Markup]
 	| Pre String
-	| List [[Markup]]
+	| List Bool [[Markup]]
 
 type Document = [Markup]
 
-wikiParser :: GenParser Char st Document	
+wikiParser :: Parser Document	
 wikiParser = many1 pMain
 
-pPara :: GenParser Char st Markup	
+pPara :: Parser Markup	
 pPara = count 2 pEol >> return (Paragraph)
 
-pLink :: GenParser Char st Markup	
+pLink :: Parser Markup	
 pLink = do
 	string "[["
 	(l,d) <- pLinkContent
@@ -60,33 +60,35 @@ pLink = do
 		[] -> return (Link l l)
 		_ -> return (Link l d)
 
-pList :: GenParser Char st Markup
-pList = do
-	list <- many1 $ try pListItem 
-	return (List list)
+pList :: Bool -> Parser Markup
+pList enum = do
+	list <- many1 $ try $ pListItem enum
+	return (List enum list)
 
-pListItem :: GenParser Char st [Markup]
-pListItem = do
+pListItem :: Bool -> Parser [Markup]
+pListItem enum = do
 	many1 pEol
-	char '*'
+	char $ listToken enum
 	many pOneLine
+
+listToken True = '#'
+listToken False = '*'
 	
-pHeading :: GenParser Char st Markup	
+pHeading :: Parser Markup	
 pHeading = do
 	many1 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 "?.:&-/")
 	return (Url (proto++"://"++s))
 
-pMail :: GenParser Char st Markup
+pMail :: Parser Markup
 pMail = do
 	user <- many1 (alphaNum <|> oneOf ".-_")
 	char '@'
@@ -94,12 +96,12 @@ pMail = do
 	return (Url ("mailto:"++user++"@"++server))
 	
 
-pPre :: GenParser Char st Markup	
+pPre :: Parser Markup	
 pPre = string "<pre>" >> do
 	s <- pString "</pre>"
 	return (Pre s)
 
-pBold,pEmph,pUnderline,pStrike :: GenParser Char st Markup	
+pBold,pEmph,pUnderline,pStrike :: Parser Markup	
 pBold = pS "**" (\s -> Bold s)
 pEmph = pS "//" (\s -> Emph s)
 pUnderline = pS "__" (\s -> Underline s)
@@ -108,17 +110,17 @@ pS s f = string s >> do
 	s <- pStopAt s
 	return (f s)
 
-pOtherChar :: GenParser Char st Markup	
+pOtherChar :: Parser Markup	
 pOtherChar = do
 	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 " | "
@@ -129,24 +131,25 @@ pLinkContent = do try (string "]]" >> return ([],[]))
 		(l,d) <- pLinkContent
 		return (c:l,d))
 
-pStopAt :: String -> GenParser Char st Document	
+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 Markup	
+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
+	,try $ pList True
+	,try $ pList False
 	,try (pPara) 
 	,try(pPre) 
 	,try(pBold) 
@@ -242,7 +245,10 @@ toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++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
-toHtml ((List l):xs) = "<ul>\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</ul>"++toHtml xs
+toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++toHtml s++"</li>\n") l) ++ "</"++listType o++">"++toHtml xs
+
+listType True = "ol"
+listType False = "ul"
 
 htmlOutput s = case parse wikiParser "" s of
 					Right n -> putStr (toHtml n)