more robust link parsing

[yawbih.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 324241616b6b4c462ceceddd58b41fb525af98e1..b1b4f5736db06aa1a13c2935873ccda28360d129 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -118,11 +118,17 @@ ex ((Bold d):xs) = do
 ex ((Emph d):xs) = do
        em (ex d)
        ex xs
+ex ((Underline d):xs) = do
+       u (ex d)
+       ex xs
+ex ((Strike d):xs) = do
+       strike (ex d)
+       ex xs
 ex ((Heading n d):xs) = do
        heading n $ ex d
        ex xs
 ex ((Url l):xs) = do
-       hlink (URL {unURL = ("wiki?"++l)}) (text l)
+       hlink (URL {unURL = (l)}) (text l)
        ex xs
 
 heading 1 = h1
@@ -133,17 +139,19 @@ heading 5 = h5
 heading 6 = h6
 
 ex2 [] = []
-ex2 ((Paragraph):xs) = "<p>"++ex2 xs
+ex2 ((Paragraph):xs) = "<p>\n"++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
-ex2 ((Heading n d):xs) = "<h"++show n++">"++ex2 d++"</h"++show n++">"++ex2 xs
+ex2 ((Underline d):xs) = "<u>"++ex2 d++"</u>"++ex2 xs
+ex2 ((Strike d):xs) = "<strike>"++ex2 d++"</strike>"++ex2 xs
+ex2 ((Heading n d):xs) = "\n<h"++show n++">"++ex2 d++"</h"++show n++">\n"++ex2 xs
 ex2 ((Url l):xs) = "<link: "++l++">"++ex2 xs
 
 
 test s = case parse wikiParser "" s of
                                        Right n -> do 
-                                               print (ex2 n)
+                                               putStr (ex2 n)
                                        Left e -> do
                                                print e