some simplifications

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 194fffd0c721d0342f9ac31dcd6ee67a717f9d47..8dec3829a18d5fe82717ccc98ded344292763635 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -128,17 +128,8 @@ toWash ((Text s):xs) = do
 toWash ((Link l d):xs) = do
        hlink (URL {unURL = ("wiki?"++l)}) (text d)
        toWash xs
-toWash ((Bold d):xs) = do
-       b (toWash d)
-       toWash xs
-toWash ((Emph d):xs) = do
-       em (toWash d)
-       toWash xs
-toWash ((Underline d):xs) = do
-       u (toWash d)
-       toWash xs
-toWash ((Strike d):xs) = do
-       strike (toWash d)
+toWash ((Font o d):xs) = do
+       fontOp o (toWash d)
        toWash xs
 toWash ((Heading n d):xs) = do
        heading n $ toWash d
@@ -147,7 +138,7 @@ toWash ((Url l):xs) = do
        hlink (URL {unURL = (l)}) (text $ stripMailto l)
        toWash xs
 toWash ((Pre s):xs) = do
-       pre $ text s
+       pre $ toWash s
        toWash xs
 toWash ((List o l):xs) = do
        listType o $ mapM (\s -> li $ toWash s) l
@@ -159,6 +150,12 @@ listType False = ul
 stripMailto ('m':'a':'i':'l':'t':'o':':':xs) = xs
 stripMailto xs = xs
 
+fontOp Bold = b
+fontOp Emph = em
+fontOp Mono = tt
+fontOp Underline = u
+fontOp Strike = strike
+
 heading 1 = h1
 heading 2 = h2
 heading 3 = h3