diff options
| author | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
| commit | c3811c56988ecae6c3d3b2c4c202474de012e9ed (patch) | |
| tree | c7d897e98c3523d056d38745b794c681b30a38f6 /src/Haddock/Backends/Xhtml/DocMarkup.hs | |
| parent | 83a2a6ab67b25eec42c50b99b0b594313b8abe44 (diff) | |
| parent | 0730c1b4088fd5d2c36671b0adf3c9e11222e233 (diff) | |
Merge branch 'dev' of https://github.com/sol/haddock into ghc-7.6
Conflicts:
src/Haddock/InterfaceFile.hs
Diffstat (limited to 'src/Haddock/Backends/Xhtml/DocMarkup.hs')
| -rw-r--r-- | src/Haddock/Backends/Xhtml/DocMarkup.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Haddock/Backends/Xhtml/DocMarkup.hs b/src/Haddock/Backends/Xhtml/DocMarkup.hs index 052116ee..e75cfaba 100644 --- a/src/Haddock/Backends/Xhtml/DocMarkup.hs +++ b/src/Haddock/Backends/Xhtml/DocMarkup.hs @@ -25,6 +25,7 @@ import Haddock.Types import Haddock.Utils import Text.XHtml hiding ( name, title, p, quote ) +import Data.Maybe (fromMaybe) import GHC @@ -46,7 +47,7 @@ parHtmlMarkup qual ppId = Markup { markupOrderedList = ordList, markupDefList = defList, markupCodeBlock = pre, - markupURL = \url -> anchor ! [href url] << url, + markupHyperlink = \(Hyperlink url mLabel) -> anchor ! [href url] << fromMaybe url mLabel, markupAName = \aname -> namedAnchor aname << "", markupPic = \path -> image ! [src path], markupExample = examplesToHtml |