more

diff --git a/Main.hs b/Main.hs
index c8d5524c32af97a80f24876fc408de25e029f950..bd0df8ae027d732a2e8bcef0715bfca6a9b4a500 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,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 7d337c9f679b3b14ce01e1bf6716864a3390fb6d..0b9e337da4bd7e50f7ebb266c88ca2d9c7bf6c28 100644 (file)
--- 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 "]"