[Fencommits] fenserve: merge

[Benja Fallenstein]

Sun May 20 22:20:46 EEST 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * merge
diff -rN -u old-fenserve/fendata/Main.hs new-fenserve/fendata/Main.hs
--- old-fenserve/fendata/Main.hs	2007-05-20 22:20:56.000000000 +0300
+++ new-fenserve/fendata/Main.hs	2007-05-20 22:20:56.000000000 +0300
@@ -49,7 +49,7 @@
 
 funParts (Fun _ ps _) = ps
 funParts (FieldFun _ name) = ["the "++name++" of ", ""]
-funParts (CatFun cat) = [cat]
+funParts (CatFun cat) = ["the " ++ cat ++ "s in the system"]
 funParts (AddItemFun cat fs) = ["Add a new "++cat++" with "] ++
                                [" as the "++f++", and " | f <- init fs] ++
                                [" as the "++last fs++"."]
@@ -94,8 +94,8 @@
     f (t:ts) (x:xs) (y:ys) n = 
         editLink cx exp ty x ++ maybe (editLink (cx' n) (Var 0) t $ surround $ "<b style='color: maroon'>[" ++ typeQuestion t ++ "]</b>") (\exp' -> renderExp' exp' (cx' n) t) y ++ f ts xs ys (n+1)
 renderExp exp@(Var i) cx ty = editLink cx exp ty (renderVar i)
-renderExp (Forall i exp body) cx _ = "For each " ++ renderExp' exp (\e -> cx $ Forall i e body) (expType exp)
-                             ++ " " ++ renderVar i ++ ":\n"
+renderExp (Forall i exp body) cx _ = "For each of " ++ renderExp' exp (\e -> cx $ Forall i e body) (expType exp)
+                             ++ " (call it '" ++ renderVar i ++ "'):\n"
                              ++ "<blockquote>\n" ++ renderExp body (\e -> cx $ Forall i exp e) string
                              ++ "</blockquote>"
 renderExp (Str s) cx _ = "<small>" ++ quoteP s ++ "</small>"