Rewrote the bold parser and added emphasis

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index c8d5524c32af97a80f24876fc408de25e029f950..2457b058632e32edc520c090bf631d33f86b5063 100644 (file)
--- 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,19 @@ 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
+ex ((Emph d):xs) = do
+       em (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
+ex2 ((Emph d):xs) = "<em>"++ex2 d++"</em>"++ex2 xs
 
 
 test s = case parse wikiParser "" s of