summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolmWallace <>2014-03-18 15:37:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2014-03-18 15:37:00 (GMT)
commit48f79c821e99d586da96084c555b59ac0467fff2 (patch)
tree8db32a0ea1916d96329d88d29e21cae01224b898
parent7153cd25741d547aca13208e7d36acf71434ba11 (diff)
version 1.24.11.24.1
-rw-r--r--[-rwxr-xr-x]COPYRIGHT0
-rw-r--r--[-rwxr-xr-x]HaXml.cabal20
-rw-r--r--[-rwxr-xr-x]LICENCE-GPL0
-rw-r--r--[-rwxr-xr-x]LICENCE-LGPL0
-rw-r--r--[-rwxr-xr-x]Setup.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml.hs2
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/ByteStringPP.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Combinators.hs87
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/DtdToHaskell/Convert.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/DtdToHaskell/Instance.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/DtdToHaskell/TypeDef.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Escape.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Html/Generate.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Html/Parse.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Html/ParseLazy.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Html/Pretty.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Lex.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Namespaces.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/OneOfN.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Parse.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/ParseLazy.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Posn.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Pretty.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/SAX.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/Environment.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/HaskellTypeModel.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/NameConversion.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/Parse.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/PrettyHaskell.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/PrettyHsBoot.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/PrimitiveTypes.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/Schema.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/TypeConversion.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Schema/XSDTypeModel.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/ShowXmlLazy.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/TypeMapping.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Types.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Util.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Validate.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Verbatim.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Wrappers.hs4
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/XmlContent.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/XmlContent/Haskell.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/XmlContent/Parser.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Xtract/Combinators.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Xtract/Lex.hs0
-rw-r--r--[-rwxr-xr-x]src/Text/XML/HaXml/Xtract/Parse.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/Canonicalise.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/CanonicaliseLazy.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/DtdToHaskell.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/FpMLToHaskell.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/MkOneOf.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/Validate.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/XsdToHaskell.hs0
-rw-r--r--[-rwxr-xr-x]src/tools/Xtract.hs0
55 files changed, 98 insertions, 15 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d4fd72..3d4fd72 100755..100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
diff --git a/HaXml.cabal b/HaXml.cabal
index 4b46428..1b25c6e 100755..100644
--- a/HaXml.cabal
+++ b/HaXml.cabal
@@ -1,5 +1,5 @@
name: HaXml
-version: 1.24
+version: 1.24.1
license: LGPL
license-file: COPYRIGHT
author: Malcolm Wallace <Malcolm.Wallace@me.com>
@@ -76,63 +76,63 @@ library
else
build-depends: base < 2 || >= 3, bytestring
extensions: CPP, ExistentialQuantification
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
nhc98-options: -K10M
Executable Canonicalise
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: Canonicalise.hs
Executable CanonicaliseLazy
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: CanonicaliseLazy.hs
Executable Xtract
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: Xtract.hs
Executable Validate
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: Validate.hs
Executable MkOneOf
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: MkOneOf.hs
Executable DtdToHaskell
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: DtdToHaskell.hs
Executable XsdToHaskell
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: XsdToHaskell.hs
Executable FpMLToHaskell
GHC-Options: -Wall
Extensions: CPP
Hs-Source-Dirs: src/tools, src
- cpp-options: -DMAJOR=1 -DMINOR=24
+ cpp-options: -DVERSION="\"1.24.1\""
Main-Is: FpMLToHaskell.hs
build-depends: directory
diff --git a/LICENCE-GPL b/LICENCE-GPL
index 7c35400..7c35400 100755..100644
--- a/LICENCE-GPL
+++ b/LICENCE-GPL
diff --git a/LICENCE-LGPL b/LICENCE-LGPL
index 2ae47b5..2ae47b5 100755..100644
--- a/LICENCE-LGPL
+++ b/LICENCE-LGPL
diff --git a/Setup.hs b/Setup.hs
index 9a994af..9a994af 100755..100644
--- a/Setup.hs
+++ b/Setup.hs
diff --git a/src/Text/XML/HaXml.hs b/src/Text/XML/HaXml.hs
index fd80a32..d106240 100755..100644
--- a/src/Text/XML/HaXml.hs
+++ b/src/Text/XML/HaXml.hs
@@ -33,5 +33,5 @@ import Text.PrettyPrint.HughesPJ (render)
-- | The version of the library.
version :: String
-version = show MAJOR.MINOR
+version = VERSION
-- expect cpp to fill in value
diff --git a/src/Text/XML/HaXml/ByteStringPP.hs b/src/Text/XML/HaXml/ByteStringPP.hs
index c782575..c782575 100755..100644
--- a/src/Text/XML/HaXml/ByteStringPP.hs
+++ b/src/Text/XML/HaXml/ByteStringPP.hs
diff --git a/src/Text/XML/HaXml/Combinators.hs b/src/Text/XML/HaXml/Combinators.hs
index 3178e8e..f4b80f8 100755..100644
--- a/src/Text/XML/HaXml/Combinators.hs
+++ b/src/Text/XML/HaXml/Combinators.hs
@@ -32,9 +32,10 @@ module Text.XML.HaXml.Combinators
-- $recursive
, deep, deepest, multi
-- ** Interior editing.
- , when, guards, chip, inplace, foldXml
+ , when, guards, chip, inplace, recursivelyInPlace, foldXml
-- ** Constructive filters.
- , mkElem, mkElemAttr, literal, cdata, replaceTag, replaceAttrs
+ -- $constructive
+ , mkElem, mkElemAttr, literal, cdata, replaceTag, replaceAttrs, addAttribute
-- * C-like conditionals.
-- $cond
@@ -278,6 +279,13 @@ inplace :: CFilter i -> CFilter i
inplace f c@(CElem (Elem name as _) i) = [ CElem (Elem name as (f c)) i ]
inplace _f c = [c]
+-- | Recursively process an element in place. That is, the filter is
+-- applied to the element itself, then recursively to the results of the
+-- filter, all the way to the bottom, then the original element rebuilt
+-- around the final results.
+recursivelyInPlace :: CFilter i -> CFilter i
+recursivelyInPlace f = inplace (recursivelyInPlace f `o` f)
+
-- | Recursive application of filters: a fold-like operator. Defined
-- as @f `o` chip (foldXml f)@.
@@ -288,6 +296,10 @@ foldXml f = f `o` chip (foldXml f)
-- CONSTRUCTIVE CONTENT FILTERS
+--
+-- $constructive
+-- The constructive filters are primitive filters for building new elements,
+-- or editing existing elements.
-- | Build an element with the given tag name - its content is the results
-- of the given list of filters.
@@ -321,9 +333,80 @@ replaceAttrs as (CElem (Elem n _ cs) i) = [CElem (Elem n as' cs) i]
where as' = map (\(n,v)-> (N n, AttValue [Left v])) as
replaceAttrs _ _ = []
+-- | Add the desired attribute name and value to the topmost element,
+-- without changing the element in any other way.
+addAttribute :: String -> String -> CFilter a
+addAttribute name val (CElem (Elem n as cs) i) =
+ [CElem (Elem n (a:as) cs) i]
+ where a = (N name, AttValue [Left val])
+addAttribute _ _ _ = []
+
-- LABELLING
+-- $labelling
+-- LabelFilters are a way of annotating the results of a filter operation
+-- with some arbitrary values drawn from the tree values. Typically, the
+-- annotations are then consumed by a label-processing filter (of
+-- type @a -> CFilter@). This is useful way of passing information between
+-- sections of the tree as you process it. An example may help to explain.
+--
+-- Let's say we want to add an attribute to every node of the tree,
+-- containing a textual representation of its path from the root,
+-- e.g. "/foo/bar/quux". Where there are multiple identically-tagged elements
+-- under the same parent node of the original tree, we expect them to have
+-- a distinguishing attribute called "name".
+--
+-- Step one. Given the path prefix to this node, how do we add the "xpath"
+-- attribute?
+--
+-- > annotateOne :: String -> CFilter a
+-- > annotateOne prefix =
+-- > (f `oo` ((tagged `x` attributed "name") (attr "name")))
+-- > |>|
+-- > (g `oo` (tagged keep))
+-- > where
+-- > f (tag,att) = addAttribute "xpath" (prefix++"/"++tag++"["++att++"]")
+-- > g tag = addAttribute "xpath" (prefix++"/"++tag)@
+--
+-- First, the @attr "name"@ filter distinguishes whether this node contains
+-- the attribute, hence choosing whether the left or right branch of the
+-- @|>|@ is taken. If the attribute is /not/ present, then the LabelFilter
+-- @tagged keep@ selects the current node, and annotates it with the
+-- tagname of the element. The @oo@ applies the label-consuming function @g@
+-- to the result, and this injects the "xpath" attribute by suffixing
+-- the tagname to the known path prefix.
+--
+-- If the "name" attribute /is/ present, then there are /two/ labelling filters
+-- applied to the current node, annotating it with the pair of its tag
+-- and the value of the attribute "name". The label-consuming function @f@ is
+-- applied to the pair with @oo@, to inject the "xpath" attribute with a more
+-- complex representation of its path.
+--
+-- Step two. Recursively apply the annotation throughout the tree.
+--
+-- > labelAllPaths :: CFilter a
+-- > labelAllPaths = allPaths `o` initialise
+-- > where
+-- > initialise = annotateOne "/"
+-- >
+-- > allPaths :: CFilter a
+-- > allPaths = inplace ( allPaths
+-- > `o`
+-- > (\prefix-> annotateOne prefix `o` children)
+-- > `oo`
+-- > (attributed "xpath" keep)
+-- > )
+--
+-- In order to apply @annotateOne@ to any node, we need to know the path
+-- prefix thus far into the tree. So, we read the "xpath" attribute from
+-- the current node (assumed to have already been processed) as a
+-- LabelFilter, then consume the label by passing it to @annotateOne@ on
+-- the children of the current node. Using @inplace@ rebuilds the processed
+-- children into the current node, after recursively dealing with their
+-- children.
+
+
-- | A LabelFilter is like a CFilter except that it pairs up a polymorphic
-- value (label) with each of its results.
diff --git a/src/Text/XML/HaXml/DtdToHaskell/Convert.hs b/src/Text/XML/HaXml/DtdToHaskell/Convert.hs
index 9c97c36..9c97c36 100755..100644
--- a/src/Text/XML/HaXml/DtdToHaskell/Convert.hs
+++ b/src/Text/XML/HaXml/DtdToHaskell/Convert.hs
diff --git a/src/Text/XML/HaXml/DtdToHaskell/Instance.hs b/src/Text/XML/HaXml/DtdToHaskell/Instance.hs
index 0d7f9e8..0d7f9e8 100755..100644
--- a/src/Text/XML/HaXml/DtdToHaskell/Instance.hs
+++ b/src/Text/XML/HaXml/DtdToHaskell/Instance.hs
diff --git a/src/Text/XML/HaXml/DtdToHaskell/TypeDef.hs b/src/Text/XML/HaXml/DtdToHaskell/TypeDef.hs
index 6fa3da3..6fa3da3 100755..100644
--- a/src/Text/XML/HaXml/DtdToHaskell/TypeDef.hs
+++ b/src/Text/XML/HaXml/DtdToHaskell/TypeDef.hs
diff --git a/src/Text/XML/HaXml/Escape.hs b/src/Text/XML/HaXml/Escape.hs
index 99a5ba3..99a5ba3 100755..100644
--- a/src/Text/XML/HaXml/Escape.hs
+++ b/src/Text/XML/HaXml/Escape.hs
diff --git a/src/Text/XML/HaXml/Html/Generate.hs b/src/Text/XML/HaXml/Html/Generate.hs
index 7d5ebaf..7d5ebaf 100755..100644
--- a/src/Text/XML/HaXml/Html/Generate.hs
+++ b/src/Text/XML/HaXml/Html/Generate.hs
diff --git a/src/Text/XML/HaXml/Html/Parse.hs b/src/Text/XML/HaXml/Html/Parse.hs
index a7f0bbf..a7f0bbf 100755..100644
--- a/src/Text/XML/HaXml/Html/Parse.hs
+++ b/src/Text/XML/HaXml/Html/Parse.hs
diff --git a/src/Text/XML/HaXml/Html/ParseLazy.hs b/src/Text/XML/HaXml/Html/ParseLazy.hs
index 927a750..927a750 100755..100644
--- a/src/Text/XML/HaXml/Html/ParseLazy.hs
+++ b/src/Text/XML/HaXml/Html/ParseLazy.hs
diff --git a/src/Text/XML/HaXml/Html/Pretty.hs b/src/Text/XML/HaXml/Html/Pretty.hs
index f918f28..f918f28 100755..100644
--- a/src/Text/XML/HaXml/Html/Pretty.hs
+++ b/src/Text/XML/HaXml/Html/Pretty.hs
diff --git a/src/Text/XML/HaXml/Lex.hs b/src/Text/XML/HaXml/Lex.hs
index 3796920..3796920 100755..100644
--- a/src/Text/XML/HaXml/Lex.hs
+++ b/src/Text/XML/HaXml/Lex.hs
diff --git a/src/Text/XML/HaXml/Namespaces.hs b/src/Text/XML/HaXml/Namespaces.hs
index dc1ba1a..dc1ba1a 100755..100644
--- a/src/Text/XML/HaXml/Namespaces.hs
+++ b/src/Text/XML/HaXml/Namespaces.hs
diff --git a/src/Text/XML/HaXml/OneOfN.hs b/src/Text/XML/HaXml/OneOfN.hs
index 462a007..462a007 100755..100644
--- a/src/Text/XML/HaXml/OneOfN.hs
+++ b/src/Text/XML/HaXml/OneOfN.hs
diff --git a/src/Text/XML/HaXml/Parse.hs b/src/Text/XML/HaXml/Parse.hs
index 502e0e7..502e0e7 100755..100644
--- a/src/Text/XML/HaXml/Parse.hs
+++ b/src/Text/XML/HaXml/Parse.hs
diff --git a/src/Text/XML/HaXml/ParseLazy.hs b/src/Text/XML/HaXml/ParseLazy.hs
index 621bf03..621bf03 100755..100644
--- a/src/Text/XML/HaXml/ParseLazy.hs
+++ b/src/Text/XML/HaXml/ParseLazy.hs
diff --git a/src/Text/XML/HaXml/Posn.hs b/src/Text/XML/HaXml/Posn.hs
index a9f1d8f..a9f1d8f 100755..100644
--- a/src/Text/XML/HaXml/Posn.hs
+++ b/src/Text/XML/HaXml/Posn.hs
diff --git a/src/Text/XML/HaXml/Pretty.hs b/src/Text/XML/HaXml/Pretty.hs
index 409a359..409a359 100755..100644
--- a/src/Text/XML/HaXml/Pretty.hs
+++ b/src/Text/XML/HaXml/Pretty.hs
diff --git a/src/Text/XML/HaXml/SAX.hs b/src/Text/XML/HaXml/SAX.hs
index f8819df..f8819df 100755..100644
--- a/src/Text/XML/HaXml/SAX.hs
+++ b/src/Text/XML/HaXml/SAX.hs
diff --git a/src/Text/XML/HaXml/Schema/Environment.hs b/src/Text/XML/HaXml/Schema/Environment.hs
index 9d0653d..9d0653d 100755..100644
--- a/src/Text/XML/HaXml/Schema/Environment.hs
+++ b/src/Text/XML/HaXml/Schema/Environment.hs
diff --git a/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs b/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs
index 05b5f3b..05b5f3b 100755..100644
--- a/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs
+++ b/src/Text/XML/HaXml/Schema/HaskellTypeModel.hs
diff --git a/src/Text/XML/HaXml/Schema/NameConversion.hs b/src/Text/XML/HaXml/Schema/NameConversion.hs
index 39950ea..39950ea 100755..100644
--- a/src/Text/XML/HaXml/Schema/NameConversion.hs
+++ b/src/Text/XML/HaXml/Schema/NameConversion.hs
diff --git a/src/Text/XML/HaXml/Schema/Parse.hs b/src/Text/XML/HaXml/Schema/Parse.hs
index d3acfc2..d3acfc2 100755..100644
--- a/src/Text/XML/HaXml/Schema/Parse.hs
+++ b/src/Text/XML/HaXml/Schema/Parse.hs
diff --git a/src/Text/XML/HaXml/Schema/PrettyHaskell.hs b/src/Text/XML/HaXml/Schema/PrettyHaskell.hs
index 11996e8..11996e8 100755..100644
--- a/src/Text/XML/HaXml/Schema/PrettyHaskell.hs
+++ b/src/Text/XML/HaXml/Schema/PrettyHaskell.hs
diff --git a/src/Text/XML/HaXml/Schema/PrettyHsBoot.hs b/src/Text/XML/HaXml/Schema/PrettyHsBoot.hs
index 0808c9c..0808c9c 100755..100644
--- a/src/Text/XML/HaXml/Schema/PrettyHsBoot.hs
+++ b/src/Text/XML/HaXml/Schema/PrettyHsBoot.hs
diff --git a/src/Text/XML/HaXml/Schema/PrimitiveTypes.hs b/src/Text/XML/HaXml/Schema/PrimitiveTypes.hs
index 1bbab38..1bbab38 100755..100644
--- a/src/Text/XML/HaXml/Schema/PrimitiveTypes.hs
+++ b/src/Text/XML/HaXml/Schema/PrimitiveTypes.hs
diff --git a/src/Text/XML/HaXml/Schema/Schema.hs b/src/Text/XML/HaXml/Schema/Schema.hs
index 3c5831e..3c5831e 100755..100644
--- a/src/Text/XML/HaXml/Schema/Schema.hs
+++ b/src/Text/XML/HaXml/Schema/Schema.hs
diff --git a/src/Text/XML/HaXml/Schema/TypeConversion.hs b/src/Text/XML/HaXml/Schema/TypeConversion.hs
index 62d2efd..62d2efd 100755..100644
--- a/src/Text/XML/HaXml/Schema/TypeConversion.hs
+++ b/src/Text/XML/HaXml/Schema/TypeConversion.hs
diff --git a/src/Text/XML/HaXml/Schema/XSDTypeModel.hs b/src/Text/XML/HaXml/Schema/XSDTypeModel.hs
index 578dc7a..578dc7a 100755..100644
--- a/src/Text/XML/HaXml/Schema/XSDTypeModel.hs
+++ b/src/Text/XML/HaXml/Schema/XSDTypeModel.hs
diff --git a/src/Text/XML/HaXml/ShowXmlLazy.hs b/src/Text/XML/HaXml/ShowXmlLazy.hs
index f8898fe..f8898fe 100755..100644
--- a/src/Text/XML/HaXml/ShowXmlLazy.hs
+++ b/src/Text/XML/HaXml/ShowXmlLazy.hs
diff --git a/src/Text/XML/HaXml/TypeMapping.hs b/src/Text/XML/HaXml/TypeMapping.hs
index 18d8763..18d8763 100755..100644
--- a/src/Text/XML/HaXml/TypeMapping.hs
+++ b/src/Text/XML/HaXml/TypeMapping.hs
diff --git a/src/Text/XML/HaXml/Types.hs b/src/Text/XML/HaXml/Types.hs
index ab0d82e..ab0d82e 100755..100644
--- a/src/Text/XML/HaXml/Types.hs
+++ b/src/Text/XML/HaXml/Types.hs
diff --git a/src/Text/XML/HaXml/Util.hs b/src/Text/XML/HaXml/Util.hs
index f11cf18..f11cf18 100755..100644
--- a/src/Text/XML/HaXml/Util.hs
+++ b/src/Text/XML/HaXml/Util.hs
diff --git a/src/Text/XML/HaXml/Validate.hs b/src/Text/XML/HaXml/Validate.hs
index cbbfb7b..cbbfb7b 100755..100644
--- a/src/Text/XML/HaXml/Validate.hs
+++ b/src/Text/XML/HaXml/Validate.hs
diff --git a/src/Text/XML/HaXml/Verbatim.hs b/src/Text/XML/HaXml/Verbatim.hs
index dbf41c5..dbf41c5 100755..100644
--- a/src/Text/XML/HaXml/Verbatim.hs
+++ b/src/Text/XML/HaXml/Verbatim.hs
diff --git a/src/Text/XML/HaXml/Wrappers.hs b/src/Text/XML/HaXml/Wrappers.hs
index ead7b71..7340b78 100755..100644
--- a/src/Text/XML/HaXml/Wrappers.hs
+++ b/src/Text/XML/HaXml/Wrappers.hs
@@ -31,10 +31,10 @@ fix2Args :: IO (String,String)
fix2Args = do
args <- getArgs
when ("--version" `elem` args) $ do
- putStrLn $ "part of HaXml-"++show MAJOR.MINOR
+ putStrLn $ "part of HaXml-"++ VERSION
exitWith ExitSuccess
when ("--help" `elem` args) $ do
- putStrLn $ "See http://haskell.org/HaXml"
+ putStrLn $ "See http://projects.haskell.org/HaXml"
exitWith ExitSuccess
case length args of
0 -> return ("-", "-")
diff --git a/src/Text/XML/HaXml/XmlContent.hs b/src/Text/XML/HaXml/XmlContent.hs
index 06dc8d6..06dc8d6 100755..100644
--- a/src/Text/XML/HaXml/XmlContent.hs
+++ b/src/Text/XML/HaXml/XmlContent.hs
diff --git a/src/Text/XML/HaXml/XmlContent/Haskell.hs b/src/Text/XML/HaXml/XmlContent/Haskell.hs
index 3b27097..3b27097 100755..100644
--- a/src/Text/XML/HaXml/XmlContent/Haskell.hs
+++ b/src/Text/XML/HaXml/XmlContent/Haskell.hs
diff --git a/src/Text/XML/HaXml/XmlContent/Parser.hs b/src/Text/XML/HaXml/XmlContent/Parser.hs
index a6c18ca..a6c18ca 100755..100644
--- a/src/Text/XML/HaXml/XmlContent/Parser.hs
+++ b/src/Text/XML/HaXml/XmlContent/Parser.hs
diff --git a/src/Text/XML/HaXml/Xtract/Combinators.hs b/src/Text/XML/HaXml/Xtract/Combinators.hs
index 14f7e6d..14f7e6d 100755..100644
--- a/src/Text/XML/HaXml/Xtract/Combinators.hs
+++ b/src/Text/XML/HaXml/Xtract/Combinators.hs
diff --git a/src/Text/XML/HaXml/Xtract/Lex.hs b/src/Text/XML/HaXml/Xtract/Lex.hs
index 327675f..327675f 100755..100644
--- a/src/Text/XML/HaXml/Xtract/Lex.hs
+++ b/src/Text/XML/HaXml/Xtract/Lex.hs
diff --git a/src/Text/XML/HaXml/Xtract/Parse.hs b/src/Text/XML/HaXml/Xtract/Parse.hs
index 5e559d2..5e559d2 100755..100644
--- a/src/Text/XML/HaXml/Xtract/Parse.hs
+++ b/src/Text/XML/HaXml/Xtract/Parse.hs
diff --git a/src/tools/Canonicalise.hs b/src/tools/Canonicalise.hs
index 3d7196a..3d7196a 100755..100644
--- a/src/tools/Canonicalise.hs
+++ b/src/tools/Canonicalise.hs
diff --git a/src/tools/CanonicaliseLazy.hs b/src/tools/CanonicaliseLazy.hs
index 5039055..5039055 100755..100644
--- a/src/tools/CanonicaliseLazy.hs
+++ b/src/tools/CanonicaliseLazy.hs
diff --git a/src/tools/DtdToHaskell.hs b/src/tools/DtdToHaskell.hs
index 6104be7..6104be7 100755..100644
--- a/src/tools/DtdToHaskell.hs
+++ b/src/tools/DtdToHaskell.hs
diff --git a/src/tools/FpMLToHaskell.hs b/src/tools/FpMLToHaskell.hs
index e1fd4b7..e1fd4b7 100755..100644
--- a/src/tools/FpMLToHaskell.hs
+++ b/src/tools/FpMLToHaskell.hs
diff --git a/src/tools/MkOneOf.hs b/src/tools/MkOneOf.hs
index d994227..d994227 100755..100644
--- a/src/tools/MkOneOf.hs
+++ b/src/tools/MkOneOf.hs
diff --git a/src/tools/Validate.hs b/src/tools/Validate.hs
index f684274..f684274 100755..100644
--- a/src/tools/Validate.hs
+++ b/src/tools/Validate.hs
diff --git a/src/tools/XsdToHaskell.hs b/src/tools/XsdToHaskell.hs
index b174ffb..b174ffb 100755..100644
--- a/src/tools/XsdToHaskell.hs
+++ b/src/tools/XsdToHaskell.hs
diff --git a/src/tools/Xtract.hs b/src/tools/Xtract.hs
index 57a6add..57a6add 100755..100644
--- a/src/tools/Xtract.hs
+++ b/src/tools/Xtract.hs