update handling of %-escapes in urls

[wix.git] / src / Html.lhs

diff --git a/src/Html.lhs b/src/Html.lhs
index 6fb939a..96e9e6a 100644 (file)
--- a/src/Html.lhs
+++ b/src/Html.lhs
@@ -1,4 +1,8 @@
 \begin{code}
+-- Copyright 2008 the Contributors, as shown in the revision logs.
+-- Licensed under the Apache Public Source License 2.0 ("the License").
+-- You may not use this file except in compliance with the License.
+
 module Html
 where
 import Edu_Berkeley_Sbp_Haskell_SBP
@@ -43,18 +47,18 @@ style =
   " a:hover { text-decoration: none; border-bottom:1px solid; }\n"++
   " table.footer { border-top: silver solid 1px; }\n"++
   " span.signature { color: #bbb;  }\n"++
-  " .signature a:link { color: #bbb;  }\n"++
-  " .signature a:visited { color: #bbb;  }\n"++
+  " .signature a:link { color: #aaf;  }\n"++
+  " .signature a:visited { color: #faa;  }\n"++
   " .signature a:hover { color: blue; border-bottom: 1px solid blue;  }\n"++
   " span.highlight { background: yellow; color: black; padding: 3px }\n"++
   " div.pre {\n"++
   "     text-align: left;\n"++
   "     font-family: monospace;\n"++
-  "     border-style: solid;\n"++
+  "     border-style: none;\n"++
   "     border-width: 2px 2px 2px 2px;\n"++
   "     border-color: #6666aa;\n"++
   "     color: #FFFFFF;\n"++
-  "     background-color: #000000;\n"++
+  "     background-color: #333333;\n"++
   "     margin-right: 25px;\n"++
   "     margin-left: 25px;\n"++
   "     padding: 10px;\n"++
@@ -195,6 +199,7 @@ instance ToHtml Text where
  toHtml (Quotes x)                = "“"++(toHtml x)++"”"
  toHtml (Verbatim x)              = pre x
  toHtml (Link t ref)              = link (show ref) (toHtml t)
+ toHtml (Command "comment" y)     = ""
  toHtml (Command "url" y)         = "<tt>"++(link (toHtml y) (toHtml y))++"</tt>"
  toHtml (Command "WiX" y)         = "W<span style='vertical-align:-20%'>I</span>X"
  toHtml (Command "TeX" y)         = "T<span style='vertical-align:-20%'>E</span>X"
@@ -246,7 +251,13 @@ instance ToHtml Text where
  toHtml (Command "br" _)          = "\n<br/>\n"
  toHtml (Command "cent" _)        = "&#189;"
  toHtml (Command "euro" _)        = "&#8364;"
- toHtml (Command "ordinal" x)      = (toHtml x)++"<sup>"++"th"++"</sup>"
+
+ -- gross hack
+ toHtml (Command "ordinal" x) | (last (toHtml x) == '1') = (toHtml x)++"<sup>"++"st"++"</sup>"
+                              | (last (toHtml x) == '2') = (toHtml x)++"<sup>"++"nd"++"</sup>"
+                              | (last (toHtml x) == '3') = (toHtml x)++"<sup>"++"rd"++"</sup>"
+                              | otherwise                = (toHtml x)++"<sup>"++"th"++"</sup>"
+       
  -- FIXME: use "unicode vulgar fractions" here
  toHtml (Command "fraction" [n,d]) = "<sup>"++(toHtml n)++"</sup>"++"/"++"<sub>"++(toHtml d)++"</sub>"
  toHtml (Command "rfc" x)         = "<tt><a href=http://tools.ietf.org/html/rfc"++(toHtml x)++">RFC"++(toHtml x)++"</a></tt>"