X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Main.hs;h=20ead4304b1beaf8b41fc1ad0f7cc6099c53b855;hb=66579a5b5cf49483f40de590f9b3b0527ba5621c;hp=2dafbccda09d522a9cea358208d07371d59049fe;hpb=85eacfb829b94b0e1d7a6ca77f39546f6285fb4c;p=yawbih.git

diff --git a/Main.hs b/Main.hs
index 2dafbcc..20ead43 100644
--- a/Main.hs
+++ b/Main.hs
@@ -56,6 +56,16 @@ showPage db key = do
 				p $ tt $ text $ "Last edited: "++date
 		footer db key
 
+showLatex db key = do
+	s <- io $ getCurrent db key 
+	standardQuery key $ do
+		case s of
+			Nothing -> text "No text added for this keyword"
+			Just (full, date) -> do
+				parseLatex full	
+				p $ tt $ text $ "Last edited: "++date
+		footer db key
+
 parseText full = case parse wikiParser "" full of
 	Right n -> toWash n	
 	Left e -> do
@@ -63,15 +73,26 @@ parseText full = case parse wikiParser "" full of
 		text (show e)
 		p $ text full
 
+parseLatex full = case parse wikiParser "" full of
+	Right n -> pre $ text $ toLatex n	
+	Left e -> do
+		text "PARSE ERROR: "
+		text (show e)
+
 footer db key = do
 	hr empty
-	table $ tr $ do
+	table $ do
+	tr $ do
+		td $ text "Keyword: " 
+		searchKey <- td $  textInputField empty
+		td $ defaultSubmit (F1 searchKey) (\(F1 sk) -> showPage db (value sk)) (attr "value" "Go")
+	tr $ do
 		td $ submitLink0 (showPage db "itproj3") (text "Back to main page")
 		when (e key) $ td $ submitLink0 (editPage db key) (text "Edit this keyword")
 		when (e key) $ td $ submitLink0 (listRevs db key) (text "List old versions")
+		when (e key) $ td $ submitLink0 (showLatex db key) (text "Output latex")
 		td $ submitLink0 (listKeywords db) (text "List all keywords")
-		td $ text "Keyword: " 
-		td $ activate (showPage db) textInputField empty
+		--td $ activate (showPage db) textInputField empty
 
 e "" = False
 e _ = True
@@ -128,17 +149,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
@@ -159,6 +171,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