aboutsummaryrefslogtreecommitdiff
path: root/src/Main.hs
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2012-04-01 21:26:13 +0200
committerDavid Waern <david.waern@gmail.com>2012-04-01 21:26:13 +0200
commit7569db9bae4e70416b960d54d145312e0b8747a2 (patch)
tree2bb27dfe0e40b2e09e5bbe9126b881bd27620419 /src/Main.hs
parent7e3eb8d3aa0d5ff2caa62bde637d8c577b72f92d (diff)
parent29861370dd56f59557c3bcecd53fba0f88a89792 (diff)
Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Main.hs b/src/Main.hs
index c0b7df4b..4f0784eb 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -190,6 +190,11 @@ renderStep flags pkgs interfaces = do
render :: [Flag] -> [Interface] -> [InstalledInterface] -> SrcMap -> IO ()
render flags ifaces installedIfaces srcMap = do
+ opt_qualification <-
+ case qualification flags of
+ Left msg -> throwE msg
+ Right q -> return q
+
let
title = fromMaybe "" (optTitle flags)
unicode = Flag_UseUnicode `elem` flags
@@ -199,7 +204,6 @@ render flags ifaces installedIfaces srcMap = do
opt_index_url = optIndexUrl flags
odir = outputDir flags
opt_latex_style = optLaTeXStyle flags
- opt_qualification = qualification flags
visibleIfaces = [ i | i <- ifaces, OptHide `notElem` ifaceOptions i ]
@@ -229,7 +233,8 @@ render flags ifaces installedIfaces srcMap = do
when (Flag_GenContents `elem` flags) $ do
ppHtmlContents odir title pkgStr
themes opt_index_url sourceUrls' opt_wiki_urls
- allVisibleIfaces True prologue pretty opt_qualification
+ allVisibleIfaces True prologue pretty
+ (makeContentsQual opt_qualification)
copyHtmlBits odir libDir themes
when (Flag_Html `elem` flags) $ do