[haddock @ 2002-07-15 09:54:16 by simonmar]

merge rev. 1.35

1 files changed, 12 insertions, 17 deletions

diff --git a/src/Main.hs b/src/Main.hs
index dcaf1fcc..2d2433a1 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -55,20 +55,19 @@ main = do
 usage = usageInfo "usage: haddock [OPTION] file...\n" options
 
 data Flag
-  = Flag_CSS String
-  | Flag_Debug
+  = Flag_Verbose
   | Flag_DocBook
-  | Flag_DumpInterface FilePath
-  | Flag_Heading String
+  | Flag_Debug
   | Flag_Html
+  | Flag_Heading String
+  | Flag_Prologue FilePath
+  | Flag_SourceURL String
+  | Flag_CSS String
   | Flag_Lib String
-  | Flag_MSHtmlHelp
-  | Flag_NoImplicitPrelude
   | Flag_OutputDir FilePath
-  | Flag_Prologue FilePath
   | Flag_ReadInterface FilePath
-  | Flag_SourceURL String
-  | Flag_Verbose
+  | Flag_DumpInterface FilePath
+  | Flag_NoImplicitPrelude
   deriving (Eq)
 
 options =
@@ -91,14 +90,12 @@ options =
 	"be verbose",
     Option ['i'] ["read-interface"] (ReqArg Flag_ReadInterface "FILE")
 	"read an interface from FILE",
-    Option []  ["css"]         (ReqArg Flag_CSS "FILE") 
-	"The CSS file to use for HTML output",
     Option []  ["dump-interface"]   (ReqArg Flag_DumpInterface "FILE")
         "dump an interface for these modules in FILE",
+    Option []  ["css"]         (ReqArg Flag_CSS "FILE") 
+	"The CSS file to use for HTML output",
     Option []  ["lib"]         (ReqArg Flag_Lib "DIR") 
-	"Location of Haddock's auxiliary files",
-    Option []  ["ms-help"]    (NoArg Flag_MSHtmlHelp)
-	"Produce Microsoft HTML Help files (with -h)",
+	"Directory containing Haddock's auxiliary files",
     Option []  ["no-implicit-prelude"] (NoArg Flag_NoImplicitPrelude)
  	"Do not assume Prelude is imported"
   ]
@@ -181,7 +178,7 @@ run flags files = do
 
   when (Flag_Html `elem` flags) $
     ppHtml title source_url these_mod_ifaces odir css_file 
-	libdir inst_maps prologue (Flag_MSHtmlHelp `elem` flags)
+	libdir inst_maps prologue
 
   -- dump an interface if requested
   case dump_iface of
@@ -324,8 +321,6 @@ mkInterface no_implicit_prelude mod_map filename
 		   buildImportEnv mod_map mod exported_visible_names 
 			implicit_imps
 
-  -- trace (show (fmToList orig_env)) $ do
-  -- trace (show (fmToList import_env)) $ do
   let
      final_decls = orig_decls