aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMark Lentczner <markl@glyphic.com>2010-07-24 16:55:22 +0000
committerMark Lentczner <markl@glyphic.com>2010-07-24 16:55:22 +0000
commit9393846ff6b439bd8f360f1239e79fe684f734ee (patch)
treefd043fa61222114131f99c98177c84da40b0a5d8 /src
parent03836297a59c665f72176f3efecd448bac5e8423 (diff)
excisting last vestiges of the --xhtml flag
Diffstat (limited to 'src')
-rw-r--r--src/Haddock/Options.hs2
-rw-r--r--src/Main.hs6
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.
@@ -344,10 +344,6 @@ shortcutFlags flags = do
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"