diff --git a/HaXml.cabal b/HaXml.cabal --- a/HaXml.cabal +++ b/HaXml.cabal @@ -1,5 +1,5 @@ name: HaXml -version: 1.20.1 +version: 1.20.2 license: LGPL license-file: COPYRIGHT author: Malcolm Wallace @@ -62,47 +62,54 @@ else build-depends: base < 2 || >= 3, bytestring extensions: CPP, ExistentialQuantification - cpp-options: -DVERSION=1.20.1 + cpp-options: -DMYVERSION="1.20.2" nhc98-options: -K10M Executable Canonicalise GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: Canonicalise.hs Executable CanonicaliseLazy GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: CanonicaliseLazy.hs Executable Xtract GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: Xtract.hs Executable XtractLazy GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: XtractLazy.hs Executable Validate GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: Validate.hs Executable MkOneOf GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: MkOneOf.hs Executable DtdToHaskell GHC-Options: -Wall Extensions: CPP Hs-Source-Dirs: src/tools, src + cpp-options: -DMYVERSION="1.20.2" Main-Is: DtdToHaskell.hs diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SOFTWARE = HaXml -VERSION = 1.20.1 +VERSION = 1.20.2 #CPP = cpp -traditional CPP = cpphs --text --noline # useful e.g. on MacOS X @@ -90,7 +90,7 @@ do mkdir -p docs/HaXml/src/$$dir; \ done for file in $(SRCS); \ - do $(CPP) -D__NHC__=120 $$file >$$file.uncpp.hs; \ + do $(CPP) -D__NHC__=120 -DMYVERSION="\"$(VERSION)\"" $$file >$$file.uncpp.hs; \ HsColour -anchor -html $$file >docs/HaXml/`dirname $$file`/`basename $$file .hs`.html; \ done haddock --html --title=HaXml --odir=docs/HaXml \ diff --git a/configure b/configure --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # configure -- prepare to compile/install the HaXml package # author: Malcolm.Wallace@cs.york.ac.uk, August 2002 -VERSION="1.20.1" +VERSION="1.20.2" if [ -f obj/prefix ] then INSTALLDIR=`cat obj/prefix` diff --git a/docs/HaXml/src/Text/XML/HaXml.html b/docs/HaXml/src/Text/XML/HaXml.html --- a/docs/HaXml/src/Text/XML/HaXml.html +++ b/docs/HaXml/src/Text/XML/HaXml.html @@ -1,40 +1,41 @@ -
#define dummy	-- just to ensure cpp gets called on this file
--- | This is just a convenient way of bunching the XML combinators
---   together with some other things you are likely to want at the
---   same time.
-module Text.XML.HaXml
-  ( module Text.XML.HaXml.Types
-  , module Text.XML.HaXml.Combinators
-  , module Text.XML.HaXml.Parse
-  , module Text.XML.HaXml.Pretty
-  , module Text.XML.HaXml.Html.Generate
-  , module Text.XML.HaXml.Html.Parse
-  , module Text.XML.HaXml.Validate
-  , module Text.XML.HaXml.Wrappers
-  , module Text.XML.HaXml.Verbatim
-  , module Text.XML.HaXml.Escape
-  , render
-  , version
-  ) where
-
-import Text.XML.HaXml.Types
-import Text.XML.HaXml.Combinators
-import Text.XML.HaXml.Parse       (xmlParse,dtdParse)
-import Text.XML.HaXml.Pretty      (element)
-import Text.XML.HaXml.Html.Generate
-import Text.XML.HaXml.Html.Parse  (htmlParse)
-import Text.XML.HaXml.Validate    (validate)
-import Text.XML.HaXml.Wrappers    (fix2Args,processXmlWith)
-import Text.XML.HaXml.Verbatim
-import Text.XML.HaXml.Escape
-
-import Text.PrettyPrint.HughesPJ  (render)
-
--- | The version of the library.
-version :: String
-version  = "VERSION"
-		-- expect cpp to fill in value
+
{-# LANGUAGE CPP #-}
+#define dummy	-- just to ensure cpp gets called on this file
+-- | This is just a convenient way of bunching the XML combinators
+--   together with some other things you are likely to want at the
+--   same time.
+module Text.XML.HaXml
+  ( module Text.XML.HaXml.Types
+  , module Text.XML.HaXml.Combinators
+  , module Text.XML.HaXml.Parse
+  , module Text.XML.HaXml.Pretty
+  , module Text.XML.HaXml.Html.Generate
+  , module Text.XML.HaXml.Html.Parse
+  , module Text.XML.HaXml.Validate
+  , module Text.XML.HaXml.Wrappers
+  , module Text.XML.HaXml.Verbatim
+  , module Text.XML.HaXml.Escape
+  , render
+  , version
+  ) where
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.Combinators
+import Text.XML.HaXml.Parse       (xmlParse,dtdParse)
+import Text.XML.HaXml.Pretty      (element)
+import Text.XML.HaXml.Html.Generate
+import Text.XML.HaXml.Html.Parse  (htmlParse)
+import Text.XML.HaXml.Validate    (validate)
+import Text.XML.HaXml.Wrappers    (fix2Args,processXmlWith)
+import Text.XML.HaXml.Verbatim
+import Text.XML.HaXml.Escape
+
+import Text.PrettyPrint.HughesPJ  (render)
+
+-- | The version of the library.
+version :: String
+version  = MYVERSION
+		-- expect cpp to fill in value
 

 
diff --git a/docs/HaXml/src/Text/XML/HaXml/Wrappers.html b/docs/HaXml/src/Text/XML/HaXml/Wrappers.html
--- a/docs/HaXml/src/Text/XML/HaXml/Wrappers.html
+++ b/docs/HaXml/src/Text/XML/HaXml/Wrappers.html
@@ -1,76 +1,85 @@
 
 
-
module Text.XML.HaXml.Wrappers
-  ( fix2Args
-  , processXmlWith
-  , onContent
-  ) where
-
--- imports required for processXmlWith and fix2Args
-import Prelude hiding (filter)
-import System
-import IO
-import List (isSuffixOf)
-
-import Text.XML.HaXml.Types       (Document(..),Content(..))
-import Text.XML.HaXml.Combinators (CFilter)
-import Text.XML.HaXml.Posn        (Posn,posInNewCxt)
-import Text.XML.HaXml.Parse       (xmlParse)
-import Text.XML.HaXml.Html.Parse  (htmlParse)
-import Text.XML.HaXml.Pretty as PP(document)
-import Text.PrettyPrint.HughesPJ  (render)
-
-
--- | This useful auxiliary checks the commandline arguments for two
---   filenames, the input and output file respectively.  If either
---   is missing, it is replaced by '-', which can be interpreted by the
---   caller as stdin and\/or stdout.
-fix2Args :: IO (String,String)
-fix2Args = do
-  args <- getArgs
-  case length args of
-    0 -> return ("-",     "-")
-    1 -> return (args!!0, "-")
-    2 -> return (args!!0, args!!1)
-    _ -> do prog <- getProgName
-            putStrLn ("Usage: "++prog++" [infile] [outfile]")
-            exitFailure
-
-
--- | The wrapper @processXmlWith@ returns an IO () computation
---   that collects the filenames (or stdin\/stdout) to use when
---   reading\/writing XML documents.  Its CFilter argument
---   is applied to transform the XML document from the input and
---   write it to the output.  No DTD is attached to the output.
---
---   If the input filename ends with .html or .htm, it is parsed using
---   the error-correcting HTML parser rather than the strict XML parser.
-processXmlWith :: CFilter Posn -> IO ()
-processXmlWith f = do
-  (inf,outf) <- fix2Args
-  input      <- if inf=="-" then getContents else readFile inf
-  o          <- if outf=="-" then return stdout else openFile outf WriteMode
-  parse      <- if ".html" `isSuffixOf` inf || ".htm" `isSuffixOf` inf
-                then return (htmlParse inf)
-                else return (xmlParse inf)
-  ( hPutStrLn o . render . PP.document . onContent inf f . parse ) input
-  hFlush o
-
-  where
-    onContent :: FilePath -> (CFilter Posn) -> Document Posn -> Document Posn
-    onContent file filter (Document p s e m) =
-        case filter (CElem e (posInNewCxt file Nothing)) of
-            [CElem e' _] -> Document p s e' m
-            []           -> error "produced no output"
-            _            -> error "produced more than one output"
-
--- | The wrapper @onContent@ simply applies a given content filter to a
---   document.  Ambiguous or empty results raise an error exception.
-onContent :: CFilter i -> Document i -> Document i
-onContent filter (Document p s e m) =
-    case filter (CElem e undefined) of
-      [CElem e' _] -> Document p s e' m
-      []           -> error "onContent: produced no output"
-      _            -> error "onContent: produced more than one output"
+
{-# LANGUAGE CPP #-}
+#define dummy		-- just to ensure that cpp gets called on this file
+module Text.XML.HaXml.Wrappers
+  ( fix2Args
+  , processXmlWith
+  , onContent
+  ) where
+
+-- imports required for processXmlWith and fix2Args
+import Prelude hiding (filter)
+import System
+import IO
+import List (isSuffixOf)
+import Control.Monad (when)
+
+import Text.XML.HaXml.Types       (Document(..),Content(..))
+import Text.XML.HaXml.Combinators (CFilter)
+import Text.XML.HaXml.Posn        (Posn,posInNewCxt)
+import Text.XML.HaXml.Parse       (xmlParse)
+import Text.XML.HaXml.Html.Parse  (htmlParse)
+import Text.XML.HaXml.Pretty as PP(document)
+import Text.PrettyPrint.HughesPJ  (render)
+
+
+-- | This useful auxiliary checks the commandline arguments for two
+--   filenames, the input and output file respectively.  If either
+--   is missing, it is replaced by '-', which can be interpreted by the
+--   caller as stdin and\/or stdout.
+fix2Args :: IO (String,String)
+fix2Args = do
+  args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++MYVERSION
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+  case length args of
+    0 -> return ("-",     "-")
+    1 -> return (args!!0, "-")
+    2 -> return (args!!0, args!!1)
+    _ -> do prog <- getProgName
+            putStrLn ("Usage: "++prog++" [infile] [outfile]")
+            exitFailure
+
+
+-- | The wrapper @processXmlWith@ returns an IO () computation
+--   that collects the filenames (or stdin\/stdout) to use when
+--   reading\/writing XML documents.  Its CFilter argument
+--   is applied to transform the XML document from the input and
+--   write it to the output.  No DTD is attached to the output.
+--
+--   If the input filename ends with .html or .htm, it is parsed using
+--   the error-correcting HTML parser rather than the strict XML parser.
+processXmlWith :: CFilter Posn -> IO ()
+processXmlWith f = do
+  (inf,outf) <- fix2Args
+  input      <- if inf=="-" then getContents else readFile inf
+  o          <- if outf=="-" then return stdout else openFile outf WriteMode
+  parse      <- if ".html" `isSuffixOf` inf || ".htm" `isSuffixOf` inf
+                then return (htmlParse inf)
+                else return (xmlParse inf)
+  ( hPutStrLn o . render . PP.document . onContent inf f . parse ) input
+  hFlush o
+
+  where
+    onContent :: FilePath -> (CFilter Posn) -> Document Posn -> Document Posn
+    onContent file filter (Document p s e m) =
+        case filter (CElem e (posInNewCxt file Nothing)) of
+            [CElem e' _] -> Document p s e' m
+            []           -> error "produced no output"
+            _            -> error "produced more than one output"
+
+-- | The wrapper @onContent@ simply applies a given content filter to a
+--   document.  Ambiguous or empty results raise an error exception.
+onContent :: CFilter i -> Document i -> Document i
+onContent filter (Document p s e m) =
+    case filter (CElem e undefined) of
+      [CElem e' _] -> Document p s e' m
+      []           -> error "onContent: produced no output"
+      _            -> error "onContent: produced more than one output"
 

 
diff --git a/docs/changelog.html b/docs/changelog.html
--- a/docs/changelog.html
+++ b/docs/changelog.html
@@ -13,12 +13,6 @@
 
 

 
-
Changes in 1.20.1

-

-
    
-
  •  Fixes a stack-overflow in code generated by DtdToHaskell.
-

-
 
Changes in 1.20

 

 
    
@@ -26,6 +20,8 @@
 
  •  Fixes a runtime-crash bug in Xtract.
 
  •  Fiddles with the pretty-printing to make it more correct on mixed
      text and references (e.g. character escapes).
+
  •  1.20.1 fixes a stack-overflow in code generated by DtdToHaskell.
+
  •  1.20.2 adds a --version and --help argument to all executables.
 

 
 
Changes in 1.19

diff --git a/docs/index.html b/docs/index.html
--- a/docs/index.html
+++ b/docs/index.html
@@ -131,11 +131,11 @@
 
Downloads

 

 Latest version:

-HaXml-1.20.1, release date 2010.01.13

+HaXml-1.20.2, release date 2010.01.14

 From Hackage

 By HTTP:
-.tar.gz,
-.zip.
+.tar.gz,
+.zip.
 

 By FTP: 
 
@@ -158,10 +158,14 @@
 Then, for more recent compilers,
 use the standard Cabal method of installation:
 
-    cabal install HaXml-1.20.1
+    cabal install HaXml
 

 or
 
+    cabal install HaXml-1.20.2
+

+or
+
     runhaskell Setup.hs configure [--prefix=...] [--buildwith=...]
     runhaskell Setup.hs build
     runhaskell Setup.hs install
@@ -192,6 +196,7 @@
 
Recent news

 
 

+Version 1.20.2 adds --version and --help arguments to all executables.

 Version 1.20.1 fixes a small bug in DtdToHaskell.

 Version 1.20 is the new stable version.

 
diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 SOFTWARE = HaXml
-VERSION = 1.20.1
+VERSION = 1.20.2
 
 LIBSRCS = \
 	Text/XML/HaXml.hs Text/XML/HaXml/Combinators.hs Text/XML/HaXml/Lex.hs \
diff --git a/src/Text/XML/HaXml.hs b/src/Text/XML/HaXml.hs
--- a/src/Text/XML/HaXml.hs
+++ b/src/Text/XML/HaXml.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 #define dummy	-- just to ensure cpp gets called on this file
 -- | This is just a convenient way of bunching the XML combinators
 --   together with some other things you are likely to want at the
@@ -32,5 +33,5 @@
 
 -- | The version of the library.
 version :: String
-version  = "VERSION"
+version  = MYVERSION
 		-- expect cpp to fill in value
diff --git a/src/Text/XML/HaXml/Wrappers.hs b/src/Text/XML/HaXml/Wrappers.hs
--- a/src/Text/XML/HaXml/Wrappers.hs
+++ b/src/Text/XML/HaXml/Wrappers.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+#define dummy		-- just to ensure that cpp gets called on this file
 module Text.XML.HaXml.Wrappers
   ( fix2Args
   , processXmlWith
@@ -9,6 +11,7 @@
 import System
 import IO
 import List (isSuffixOf)
+import Control.Monad (when)
 
 import Text.XML.HaXml.Types       (Document(..),Content(..))
 import Text.XML.HaXml.Combinators (CFilter)
@@ -26,6 +29,12 @@
 fix2Args :: IO (String,String)
 fix2Args = do
   args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++MYVERSION
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
   case length args of
     0 -> return ("-",     "-")
     1 -> return (args!!0, "-")
diff --git a/src/tools/DtdToHaskell.hs b/src/tools/DtdToHaskell.hs
--- a/src/tools/DtdToHaskell.hs
+++ b/src/tools/DtdToHaskell.hs
@@ -9,8 +9,10 @@
 import System
 import IO
 import List (nub,takeWhile,dropWhile)
+import Control.Monad
 
 --import Text.XML.HaXml.Wrappers   (fix2Args)
+import Text.XML.HaXml            (version)
 import Text.XML.HaXml.Types      (DocTypeDecl(..))
 import Text.XML.HaXml.Parse      (dtdParse)
 import Text.XML.HaXml.DtdToHaskell.TypeDef  (TypeDef,ppTypeDef,mangle)
@@ -22,6 +24,12 @@
 fix2Args :: IO (String,String)
 fix2Args = do
   args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
   case length args of
     0 -> return ("-",     "-")
     1 -> return (args!!0, "-")
diff --git a/src/tools/MkOneOf.hs b/src/tools/MkOneOf.hs
--- a/src/tools/MkOneOf.hs
+++ b/src/tools/MkOneOf.hs
@@ -1,13 +1,21 @@
 module Main where
 
 import Prelude hiding (max)
-import System (getArgs)
+import System (getArgs,exitWith,ExitCode(..))
 import Char   (isDigit)
 import IO     (hFlush,stdout)
+import Control.Monad  (when)
+import Text.XML.HaXml (version)
 
 main  :: IO ()
 main = do
     args <- getArgs
+    when ("--version" `elem` args) $ do
+        putStrLn $ "part of HaXml-"++version
+        exitWith ExitSuccess
+    when ("--help" `elem` args) $ do
+        putStrLn $ "See http://haskell.org/HaXml"
+        exitWith ExitSuccess
     case length args of
       1 -> do n <- saferead (head args)
               putStrLn ("module Text.XML.HaXml."++constructor 1 n++" where\n")
diff --git a/src/tools/Xtract.hs b/src/tools/Xtract.hs
--- a/src/tools/Xtract.hs
+++ b/src/tools/Xtract.hs
@@ -6,7 +6,9 @@
 import IO
 import Char         (toLower)
 import List         (isSuffixOf)
+import Control.Monad(when)
 
+import Text.XML.HaXml               (version)
 import Text.XML.HaXml.Types
 import Text.XML.HaXml.Posn          (posInNewCxt)
 import Text.XML.HaXml.Parse         (xmlParse)
@@ -22,13 +24,18 @@
 escape = xmlEscapeContent stdXmlEscaper
 
 main :: IO ()
-main =
-  getArgs >>= \args->
-  if length args < 1 then
-    putStrLn "Usage: Xtract [-n]  [xmlfile ...]" >>
-    exitWith (ExitFailure 1)
-  else
-    let (pattern,files,esc) =
+main = do
+  args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+  when (length args < 1) $ do
+      putStrLn "Usage: Xtract [-n]  [xmlfile ...]"
+      exitWith (ExitFailure 1)
+  let (pattern,files,esc) =
           case args of ("-n":pat:files) -> (pat,files, (:[]))
                        (pat:"-n":files) -> (pat,files, (:[]))
                        (pat:files)      -> (pat,files, escape.(:[]))
@@ -38,11 +45,10 @@
 --                           return ((if isHTML x
 --                                    then htmlParse x else xmlParse x) c))
 --                  files
-    in
 --  findcontents >>= \cs->
 --  ( hPutStrLn stdout . render . vcat
 --  . map (vcat . map content . selection . docContent)) cs
-    mapM_ (\x-> do c <- (if x=="-" then getContents else readFile x)
+  mapM_ (\x->   do c <- (if x=="-" then getContents else readFile x)
                    ( if isHTML x then
                           hPutStrLn stdout . render . htmlprint
                           . xtract (map toLower) pattern
diff --git a/src/tools/XtractLazy.hs b/src/tools/XtractLazy.hs
--- a/src/tools/XtractLazy.hs
+++ b/src/tools/XtractLazy.hs
@@ -6,7 +6,9 @@
 import IO
 import Char         (toLower)
 import List         (isSuffixOf)
+import Control.Monad(when)
 
+import Text.XML.HaXml               (version)
 import Text.XML.HaXml.Types
 import Text.XML.HaXml.Posn          (posInNewCxt,Posn)
 import Text.XML.HaXml.ParseLazy     (xmlParse)
@@ -21,13 +23,20 @@
 escape = xmlEscapeContent stdXmlEscaper
 
 main :: IO ()
-main =
-  getArgs >>= \args->
-  if length args < 1 then
-    putStrLn "Usage: Xtract [-n]  [xmlfile ...]" >>
-    exitWith (ExitFailure 1)
-  else
-    let (pattern,files,esc) =
+main = do
+  args <- getArgs
+  when ("--version" `elem` args) $ do
+      putStrLn $ "part of HaXml-"++version
+      exitWith ExitSuccess
+  when ("--help" `elem` args) $ do
+      putStrLn $ "See http://haskell.org/HaXml"
+      exitWith ExitSuccess
+
+  when (length args < 1) $ do
+      putStrLn "Usage: Xtract [-n]  [xmlfile ...]"
+      exitWith (ExitFailure 1)
+
+  let (pattern,files,esc) =
           case args of ("-n":pat:files) -> (pat,files, (:[]))
                        (pat:"-n":files) -> (pat,files, (:[]))
                        (pat:files)      -> (pat,files, escape.(:[]))
@@ -37,11 +46,10 @@
 --                           return ((if isHTML x
 --                                    then htmlParse x else xmlParse x) c))
 --                  files
-    in
 --  findcontents >>= \cs->
 --  ( hPutStrLn stdout . render . vcat
 --  . map (vcat . map content . selection . getElem)) cs
-    mapM_ (\x-> do c <- (if x=="-" then getContents else readFile x)
+  mapM_ (\x->   do c <- (if x=="-" then getContents else readFile x)
                    ( if isHTML x then
                           hPutStrLn stdout . render . htmlprint
                           . xtract (map toLower) pattern