diff options
| author | David Waern <david.waern@gmail.com> | 2007-11-10 17:19:48 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2007-11-10 17:19:48 +0000 |
| commit | 3cd9016f5263741a38b904d1dad474abff8c2f3e (patch) | |
| tree | 975158657f34fd549d96bd18e2fecb9d8af8dc2e /src/Haddock | |
| parent | 08b75f838779c59083e4f693ed2b002d5ac2c49f (diff) | |
FIX: contents and index should include external package modules when --gen-contents/--gen-index
Diffstat (limited to 'src/Haddock')
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 4 | ||||
| -rw-r--r-- | src/Haddock/Types.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index acd3dd93..a3c8470f 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -75,14 +75,14 @@ ppHtml doctitle maybe_package ifaces odir prologue maybe_html_help_format when (not (isJust maybe_contents_url)) $ ppHtmlContents odir doctitle maybe_package maybe_html_help_format maybe_index_url maybe_source_url maybe_wiki_url - (map toInstalledInterface visible_ifaces) + (map toInstalledIface visible_ifaces) False -- we don't want to display the packages in a single-package contents prologue when (not (isJust maybe_index_url)) $ ppHtmlIndex odir doctitle maybe_package maybe_html_help_format maybe_contents_url maybe_source_url maybe_wiki_url - (map toInstalledInterface visible_ifaces) + (map toInstalledIface visible_ifaces) when (not (isJust maybe_contents_url && isJust maybe_index_url)) $ ppHtmlHelpFiles doctitle maybe_package ifaces odir maybe_html_help_format [] diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs index e1fd5b4a..e46ddf9e 100644 --- a/src/Haddock/Types.hs +++ b/src/Haddock/Types.hs @@ -170,8 +170,8 @@ data InstalledInterface = InstalledInterface { -- | Convert an 'Interface' to an 'InstalledInterface' -toInstalledInterface :: Interface -> InstalledInterface -toInstalledInterface interface = InstalledInterface { +toInstalledIface :: Interface -> InstalledInterface +toInstalledIface interface = InstalledInterface { instMod = ifaceMod interface, instInfo = ifaceInfo interface, instDocMap = ifaceRnDocMap interface, |