diff options
| -rw-r--r-- | src/HaddockDevHelp.hs | 5 | ||||
| -rw-r--r-- | src/HaddockHH2.hs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/HaddockDevHelp.hs b/src/HaddockDevHelp.hs index 23f3bfc6..fcb26099 100644 --- a/src/HaddockDevHelp.hs +++ b/src/HaddockDevHelp.hs @@ -20,7 +20,8 @@ import HaddockTypes ppDevHelpFile :: FilePath -> String -> Maybe String -> [(Module,Interface)] -> IO () ppDevHelpFile odir doctitle maybe_package ifaces = do let devHelpFile = package++".devhelp" - tree = mkModuleTree [(mod,iface_package iface) | (mod,iface) <- ifaces] + tree = mkModuleTree [ (mod, iface_package iface, toDescription iface) + | (mod, iface) <- ifaces ] doc = text "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>" $$ (text "<book xmlns=\"http://www.devhelp.net/book\" title=\""<>text doctitle<> @@ -42,7 +43,7 @@ ppDevHelpFile odir doctitle maybe_package ifaces = do ppModuleTree _ [] = error "HaddockHH.ppHHContents.fn: no module trees given" ppNode :: [String] -> ModuleTree -> Doc - ppNode ss (Node s leaf _pkg ts) = + ppNode ss (Node s leaf _pkg _short ts) = case ts of [] -> text "<sub"<+>ppAttribs<>text "/>" ts -> diff --git a/src/HaddockHH2.hs b/src/HaddockHH2.hs index 3cee48e3..2555e523 100644 --- a/src/HaddockHH2.hs +++ b/src/HaddockHH2.hs @@ -40,9 +40,9 @@ ppHH2Contents odir doctitle maybe_package tree = do ppModuleTree _ [] = error "HaddockHH2.ppHH2Contents.ppModuleTree: no module trees given" ppNode :: [String] -> ModuleTree -> Doc - ppNode ss (Node s leaf _pkg []) = + ppNode ss (Node s leaf _pkg _short []) = text "<HelpTOCNode" <+> ppAttributes leaf (s:ss) <> text "/>" - ppNode ss (Node s leaf _pkg ts) = + ppNode ss (Node s leaf _pkg _short ts) = text "<HelpTOCNode" <+> ppAttributes leaf (s:ss) <> text ">" $$ nest 4 (ppModuleTree (s:ss) ts) $+$ text "</HelpTOCNode>" |