projects
/
wix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add \Box
[wix.git]
/
src
/
Html.lhs
diff --git
a/src/Html.lhs
b/src/Html.lhs
index
1989e64
..
a3ff54f
100644
(file)
--- a/
src/Html.lhs
+++ b/
src/Html.lhs
@@
-183,8
+183,9
@@
instance ToHtml Paragraph where
toHtml (P t) = stag "p" $ toHtml t
toHtml (P t) = stag "p" $ toHtml t
-link ref body = "<a href='"++ref++"'>"++icon++body++"</a>"
+link ref body = "<a href='"++(urlify ref)++"'>"++icon++body++"</a>"
where
where
+ urlify = toHtml
icon = if ".pdf" `isSuffixOf` ref then "<img "++img++" src='"++pdfIconBase64++"'> "
else if "mailto:" `isPrefixOf` ref then "<img "++img++" src='"++emailIconBase64++"'> "
else ""
icon = if ".pdf" `isSuffixOf` ref then "<img "++img++" src='"++pdfIconBase64++"'> "
else if "mailto:" `isPrefixOf` ref then "<img "++img++" src='"++emailIconBase64++"'> "
else ""
@@
-274,7
+275,7
@@
instance ToHtml Text where
toHtml (GlyphText TradeMark) = "™"
toHtml (GlyphText ServiceMark) = "™"
toHtml (GlyphText Emdash) = "—"
toHtml (GlyphText TradeMark) = "™"
toHtml (GlyphText ServiceMark) = "™"
toHtml (GlyphText Emdash) = "—"
- toHtml (GlyphText Ellipsis) = "…"
+ toHtml (GlyphText Ellipsis) = "…" -- &cdots;?
toHtml (GlyphText Cent) = "½"
toHtml (GlyphText Daggar) = "†"
toHtml (GlyphText DoubleDaggar) = "‡"
toHtml (GlyphText Cent) = "½"
toHtml (GlyphText Daggar) = "†"
toHtml (GlyphText DoubleDaggar) = "‡"
@@
-313,7
+314,7
@@
htmlEscapeChar '\'' = "'"
htmlEscapeChar '\"' = """
htmlEscapeChar c = [c]
htmlEscapeChar '\"' = """
htmlEscapeChar c = [c]
-pre x = "\n<div class=pre>"++ (pre' x) ++ "\n</div>\n"
+pre x = "\n<div class=pre style='white-space:nowrap'>"++ (pre' x) ++ "\n</div>\n"
where
pre' (' ':b) = " "++(pre' b)
pre' ('\n':b) = "<br/>\n"++(pre' b)
where
pre' (' ':b) = " "++(pre' b)
pre' ('\n':b) = "<br/>\n"++(pre' b)