From 9393846ff6b439bd8f360f1239e79fe684f734ee Mon Sep 17 00:00:00 2001 From: Mark Lentczner Date: Sat, 24 Jul 2010 16:55:22 +0000 Subject: excisting last vestiges of the --xhtml flag --- src/Haddock/Options.hs | 2 +- src/Main.hs | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Haddock/Options.hs b/src/Haddock/Options.hs index f8bec718..b855f545 100644 --- a/src/Haddock/Options.hs +++ b/src/Haddock/Options.hs @@ -92,7 +92,7 @@ options backwardsCompat = "write the resulting interface to FILE", -- Option ['S'] ["docbook"] (NoArg Flag_DocBook) -- "output in DocBook XML", - Option ['h'] ["html", "xhtml"] (NoArg Flag_Html) + Option ['h'] ["html"] (NoArg Flag_Html) "output in HTML (XHTML 1.0)", Option [] ["latex"] (NoArg Flag_LaTeX) "use experimental LaTeX rendering", Option [] ["latex-style"] (ReqArg Flag_LaTeXStyle "FILE") "provide your own LaTeX style in FILE", diff --git a/src/Main.hs b/src/Main.hs index b21f5a8b..159cb48d 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -151,7 +151,7 @@ main = handleTopExceptions $ do Nothing -> return () else do - when (any (`elem` [Flag_Html, Flag_Xhtml, Flag_Hoogle, Flag_LaTeX]) flags) $ + when (any (`elem` [Flag_Html, Flag_Hoogle, Flag_LaTeX]) flags) $ throwE "No input file(s)." -- Get packages supplied with --read-interface. @@ -343,10 +343,6 @@ shortcutFlags flags = do && Flag_Html `elem` flags) $ throwE "-h cannot be used with --gen-index or --gen-contents" - when ((Flag_GenIndex `elem` flags || Flag_GenContents `elem` flags) - && Flag_Xhtml `elem` flags) $ - throwE "--xhtml cannot be used with --gen-index or --gen-contents" - when ((Flag_GenIndex `elem` flags || Flag_GenContents `elem` flags) && Flag_Hoogle `elem` flags) $ throwE "--hoogle cannot be used with --gen-index or --gen-contents" -- cgit v1.2.3