aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Lentczner <markl@glyphic.com>2010-04-12 05:07:53 +0000
committerMark Lentczner <markl@glyphic.com>2010-04-12 05:07:53 +0000
commit62f2d121a7217b78ae1c20a32519550b0ebc88c8 (patch)
tree7fa87960a88dfa5cccaaa26ce52a3c3a655be5e2
parent6554de2b6751212fdc14e5d814d9f61dfe9eadb5 (diff)
merge in markupExample changes
-rw-r--r--src/Haddock/Backends/Xhtml/DocMarkup.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Haddock/Backends/Xhtml/DocMarkup.hs b/src/Haddock/Backends/Xhtml/DocMarkup.hs
index 5103f569..3e925ce0 100644
--- a/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/src/Haddock/Backends/Xhtml/DocMarkup.hs
@@ -41,8 +41,10 @@ parHtmlMarkup ppId isTyCon = Markup {
markupOrderedList = ordList,
markupDefList = defList,
markupCodeBlock = pre,
- markupURL = \url -> anchor ! [href url] << toHtml url,
- markupAName = \aname -> namedAnchor aname << toHtml ""
+ markupURL = \url -> anchor ! [href url] << url,
+ markupAName = \aname -> namedAnchor aname << "",
+ markupPic = \path -> image ! [src path],
+ markupExample = examplesToHtml
}
where
-- If an id can refer to multiple things, we give precedence to type