some simplifications

diff --git a/Main.hs b/Main.hs
index 2aa225ead5154a711fbbc957f3036ad552c0abda..8dec3829a18d5fe82717ccc98ded344292763635 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -128,20 +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 ((Mono d):xs) = do
-       tt (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
@@ -162,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

diff --git a/Wiki.hs b/Wiki.hs
index 3d1eed2b309b09e5cc5385ddc3c8852be47e7a1d..94f4a5f433000c2a86cbd8eb19cc7ca1f8dffb8d 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -2,7 +2,8 @@ module Wiki (
        Backend (getCurrent,getList,get,setCurrent,update,listKeys)
        ,PGB
        ,createPGB
-       ,Markup (Text, Paragraph, Link, Bold, Emph, Mono, Heading, Url, Underline, Strike, Pre,List)
+       ,Markup (Text, Paragraph, Font, Link, Heading, Url, Pre,List)
+       ,FontOp (Bold, Emph, Mono, Underline, Strike)
        ,Document
        ,wikiParser
        ,htmlOutput
@@ -35,16 +36,14 @@ class Backend a where
 data Markup = Text String
        | Paragraph 
        | Link String String
-       | Bold [Markup]
-       | Emph [Markup]
-       | Mono [Markup]
+       | Font FontOp [Markup]
        | Heading Int [Markup]
        | Url String
-       | Underline [Markup]
-       | Strike [Markup]
        | Pre [Markup]
        | List Bool [[Markup]]
 
+data FontOp = Bold | Emph | Mono | Underline | Strike
+
 type Document = [Markup]
 
 wikiParser :: Parser Document  
@@ -103,14 +102,15 @@ pPre = string "<pre>" >> do
        return (Pre s)
 
 pBold,pEmph,pUnderline,pStrike :: Parser Markup        
-pBold = pS "**" (\s -> Bold s)
-pEmph = pS "//" (\s -> Emph s)
-pUnderline = pS "__" (\s -> Underline s)
-pStrike = pS "--" (\s -> Strike s)
-pMono = pS "||" (\s -> Mono s)
-pS s f = string s >> do
+pBold = pFont "**" Bold
+pEmph = pFont "//" Emph
+pUnderline = pFont "__" Underline
+pStrike = pFont "--" Strike
+pMono = pFont "||" Mono
+
+pFont s o = string s >> do
        s <- pStopAt s
-       return (f s)
+       return (Font o s)
 
 pOtherChar :: Parser Markup    
 pOtherChar = do
@@ -242,11 +242,7 @@ toHtml [] = []
 toHtml ((Paragraph):xs) = "<p>\n"++toHtml xs
 toHtml ((Text s):xs) = s++toHtml xs
 toHtml ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++toHtml xs
-toHtml ((Bold d):xs) = "<b>"++toHtml d++"</b>"++toHtml xs
-toHtml ((Emph d):xs) = "<em>"++toHtml d++"</em>"++toHtml xs
-toHtml ((Mono d):xs) = "<tt>"++toHtml d++"</tt>"++toHtml xs
-toHtml ((Underline d):xs) = "<u>"++toHtml d++"</u>"++toHtml xs
-toHtml ((Strike d):xs) = "<strike>"++toHtml d++"</strike>"++toHtml xs
+toHtml ((Font o d):xs) = "<"++fontOp o++">"++toHtml d++"</"++fontOp o++">"++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>"++toHtml s++"</pre>"++toHtml xs
@@ -255,6 +251,12 @@ toHtml ((List o l):xs) = "<"++listType o++">\n"++(unlines $ map (\s -> "<li>"++t
 listType True = "ol"
 listType False = "ul"
 
+fontOp Bold = "b"
+fontOp Emph = "em"
+fontOp Mono = "tt"
+fontOp Underline = "u"
+fontOp Strike = "strike"
+
 htmlOutput s = case parse wikiParser "" s of
                                        Right n -> putStr (toHtml n)
                                        Left e -> print e