From: Michael Andreen <harv@ruin.nu>
Date: Sun, 12 Dec 2004 00:11:23 +0000 (+0000)
Subject: more
X-Git-Url: https://ruin.nu/git/?p=yawbih.git;a=commitdiff_plain;h=6dc23e95f52602a2718045d57c8d3b441c40bbe5

more
---

diff --git a/Main.hs b/Main.hs
index c8d5524..bd0df8a 100644
--- a/Main.hs
+++ b/Main.hs
@@ -52,7 +52,7 @@ showPage db key = do
 			Nothing -> text "No text added for this keyword"
 			Just (full, date) -> do
 				parseText full	
-				p $ text $ "Last edited: "++date
+				p $ tt $ text $ "Last edited: "++date
 		footer db key
 
 parseText full = case parse wikiParser "" full of
@@ -112,11 +112,15 @@ ex ((Text s):xs) = do
 ex ((Link l d):xs) = do
 	hlink (URL {unURL = ("wiki?"++l)}) (text d)
 	ex xs
+ex ((Bold d):xs) = do
+	b (ex d)
+	ex xs
 
 ex2 [] = []
 ex2 ((Paragraph):xs) = "<p>"++ex2 xs
 ex2 ((Text s):xs) = s++ex2 xs
 ex2 ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++ex2 xs
+ex2 ((Bold d):xs) = "<b>"++ex2 d++"</b>"++ex2 xs
 
 
 test s = case parse wikiParser "" s of
diff --git a/Wiki.hs b/Wiki.hs
index 7d337c9..0b9e337 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,7 @@ module Wiki (
 	Backend (getCurrent,getList,get,setCurrent,update)
 	,PGB
 	,createPGB
-	,Markup (Text, Paragraph, Link)
+	,Markup (Text, Paragraph, Link, Bold)
 	,Document
 	,wikiParser
 
@@ -31,6 +31,7 @@ class Backend a where
 data Markup = Text String
 	| Paragraph 
 	| Link String String
+	| Bold [Markup]
 
 type Document = [Markup]
 
@@ -66,6 +67,12 @@ pLinkLong = do
 	d <- many1 $ noneOf "]" 
 	string "]]"
 	return (Link l d)
+
+pBold = do
+	string "'''"
+	s <- wikiParser
+	return (Bold s)
+
 pLink = do
 	string "[["
 	l <- many1 $ noneOf "]"