diff --git a/HaXml.cabal b/HaXml.cabal --- a/HaXml.cabal +++ b/HaXml.cabal @@ -1,5 +1,5 @@ name: HaXml -version: 1.19.5 +version: 1.19.6 license: LGPL license-file: COPYRIGHT author: Malcolm Wallace @@ -46,6 +46,8 @@ Text.XML.HaXml.Verbatim, Text.XML.HaXml.Wrappers, Text.XML.HaXml.XmlContent, + Text.XML.HaXml.XmlContent.Parser, + Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXml.Xtract.Combinators, Text.XML.HaXml.Xtract.Lex, Text.XML.HaXml.Xtract.Parse @@ -60,7 +62,7 @@ else build-depends: base < 2 || >= 3, bytestring extensions: CPP, ExistentialQuantification - cpp-options: -DVERSION=1.19.4 + cpp-options: -DVERSION=1.19.6 nhc98-options: -K10M Executable Canonicalise diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ SOFTWARE = HaXml -VERSION = 1.19.5 +VERSION = 1.19.6 #CPP = cpp -traditional CPP = cpphs --text --noline # useful e.g. on MacOS X DIRS = Text Text/XML Text/XML/HaXml Text/XML/HaXml/Html \ - Text/XML/HaXml/Xtract Text/XML/HaXml/DtdToHaskell + Text/XML/HaXml/Xtract Text/XML/HaXml/DtdToHaskell \ + Text/XML/HaXml/XmlContent SRCS = \ src/Text/XML/HaXml.hs src/Text/XML/HaXml/Combinators.hs \ @@ -17,7 +18,10 @@ src/Text/XML/HaXml/OneOfN.hs \ src/Text/XML/HaXml/ParseLazy.hs \ src/Text/XML/HaXml/ByteStringPP.hs \ - src/Text/XML/HaXml/TypeMapping.hs src/Text/XML/HaXml/XmlContent.hs \ + src/Text/XML/HaXml/TypeMapping.hs \ + src/Text/XML/HaXml/XmlContent.hs \ + src/Text/XML/HaXml/XmlContent/Parser.hs \ + src/Text/XML/HaXml/XmlContent/Haskell.hs \ src/Text/XML/HaXml/SAX.hs \ src/Text/XML/HaXml/ShowXmlLazy.hs \ src/Text/XML/HaXml/Util.hs \ 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.19.5" +VERSION="1.19.6" if [ -f obj/prefix ] then INSTALLDIR=`cat obj/prefix` diff --git a/docs/HaXml/Text-XML-HaXml-OneOfN.html b/docs/HaXml/Text-XML-HaXml-OneOfN.html --- a/docs/HaXml/Text-XML-HaXml-OneOfN.html +++ b/docs/HaXml/Text-XML-HaXml-OneOfN.html @@ -166,11 +166,11 @@ >((XmlContent a, a, XmlContent b) => b) => XmlContent (OneOf2((XmlContent a, a, XmlContent b, b, XmlContent c) => c) => XmlContent (OneOf3((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d) => d) => XmlContent (OneOf4((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e) => e) => XmlContent (OneOf5((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f) => f) => XmlContent (OneOf6((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g) => g) => XmlContent (OneOf7((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h) => h) => XmlContent (OneOf8((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i) => i) => XmlContent (OneOf9((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j) => j) => XmlContent (OneOf10((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k) => k) => XmlContent (OneOf11((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l) => l) => XmlContent (OneOf12((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m) => m) => XmlContent (OneOf13((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n) => n) => XmlContent (OneOf14((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o) => o) => XmlContent (OneOf15((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o, o, XmlContent p) => p) => XmlContent (OneOf16((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o, o, XmlContent p, p, XmlContent q) => q) => XmlContent (OneOf17((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o, o, XmlContent p, p, XmlContent q, q, XmlContent r) => r) => XmlContent (OneOf18((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o, o, XmlContent p, p, XmlContent q, q, XmlContent r, r, XmlContent s) => s) => XmlContent (OneOf19((XmlContent a, a, XmlContent b, b, XmlContent c, c, XmlContent d, d, XmlContent e, e, XmlContent f, f, XmlContent g, g, XmlContent h, h, XmlContent i, i, XmlContent j, j, XmlContent k, k, XmlContent l, l, XmlContent m, m, XmlContent n, n, XmlContent o, o, XmlContent p, p, XmlContent q, q, XmlContent r, r, XmlContent s, s, XmlContent t) => t) => XmlContent (OneOf20showXmlLazy :: :: XmlContent a => Bool -> a -> StringshowXmlLazy :: :: XmlContent a => Bool -> a -> StringHTypeable ANYContentHTypeable a => HTypeable ( (List1 a) + +Text.XML.HaXml.XmlContent.Haskell
HaXmlSource codeContentsIndex
Text.XML.HaXml.XmlContent.Haskell
Contents
Re-export everything from Text.XML.HaXml.XmlContent.Parser. +
Instances (only) for the XmlContent class, for datatypes that +
Whole-document conversion functions +
Description

The class XmlContent is a kind of replacement for Read and Show: + it provides conversions between a generic XML tree representation + and your own more specialised typeful Haskell data trees. +

If you are starting with a set of Haskell datatypes, use DrIFT to + derive instances of this class for you: + http://repetae.net/john/computer/haskell/DrIFT + and use the current module for instances of the standard Haskell + datatypes list, Maybe, and so on. +

If you are starting with an XML DTD, use HaXml's tool DtdToHaskell + to generate both the Haskell types and the corresponding instances, + but _do_not_ use the current module for instances: use + Text.XML.HaXml.XmlContent instead. +

Synopsis
module Text.XML.HaXml.XmlContent.Parser
toXml :: XmlContent a => Bool -> a -> Document ()
fromXml :: XmlContent a => Document Posn -> Either String a
readXml :: XmlContent a => String -> Either String a
showXml :: XmlContent a => Bool -> a -> String
fpsShowXml :: XmlContent a => Bool -> a -> ByteString
fReadXml :: XmlContent a => FilePath -> IO a
fWriteXml :: XmlContent a => FilePath -> a -> IO ()
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
hGetXml :: XmlContent a => Handle -> IO a
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
Re-export everything from Text.XML.HaXml.XmlContent.Parser. +
module Text.XML.HaXml.XmlContent.Parser
Instances (only) for the XmlContent class, for datatypes that +
Whole-document conversion functions +
toXml :: XmlContent a => Bool -> a -> Document ()Source
Convert a fully-typed XML document to a string (with or without DTD). +
fromXml :: XmlContent a => Document Posn -> Either String aSource
Read a Haskell value from an XML document, ignoring the DTD and + using the Haskell result type to determine how to parse it. +
readXml :: XmlContent a => String -> Either String aSource
Read a fully-typed XML document from a string. +
showXml :: XmlContent a => Bool -> a -> StringSource
Convert a fully-typed XML document to a string (without DTD). +
fpsShowXml :: XmlContent a => Bool -> a -> ByteStringSource
Convert a fully-typed XML document to a ByteString (without DTD). +
fReadXml :: XmlContent a => FilePath -> IO aSource
Read an XML document from a file and convert it to a fully-typed + Haskell value. +
fWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write a fully-typed Haskell value to the given file as an XML + document. +
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write any Haskell value to the given file as an XML document, + using the FastPackedString interface (output will not be prettified). +
hGetXml :: XmlContent a => Handle -> IO aSource
Read a fully-typed XML document from a file handle. +
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle. +
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle, using the + FastPackedString interface (output will not be prettified). +
Produced by Haddock version 0.8
diff --git a/docs/HaXml/Text-XML-HaXml-XmlContent-Parser.html b/docs/HaXml/Text-XML-HaXml-XmlContent-Parser.html new file mode 100644 --- /dev/null +++ b/docs/HaXml/Text-XML-HaXml-XmlContent-Parser.html @@ -0,0 +1,4341 @@ + + +Text.XML.HaXml.XmlContent.Parser
HaXmlSource codeContentsIndex
Text.XML.HaXml.XmlContent.Parser
Contents
Re-export the relevant set of generic XML document type definitions +
The enabling classes, that define parsing/unparsing between Haskell +
Auxiliaries for writing parsers in the XmlContent class +
Auxiliaries for generating in the XmlContent class +
Auxiliaries for the attribute-related classes +
Explicit representation of Haskell datatype information +
Types useful for some content models +
Description

The class XmlContent is a kind of replacement for Read and Show: + it provides conversions between a generic XML tree representation + and your own more specialised typeful Haskell data trees. +

If you are starting with a set of Haskell datatypes, use DrIFT to + derive instances of this class for you: + http://repetae.net/john/computer/haskell/DrIFT + If you are starting with an XML DTD, use HaXml's tool DtdToHaskell + to generate both the Haskell types and the corresponding instances. +

This unified class interface replaces two previous (somewhat similar) + classes: Haskell2Xml and Xml2Haskell. There was no real reason to have + separate classes depending on how you originally defined your datatypes. + However, some instances for basic types like lists will depend on which + direction you are using. See Text.XML.HaXml.XmlContent and + Text.XML.HaXml.XmlContent.Haskell. +

Synopsis
data Document i = Document Prolog (SymTab EntityDef) (Element i) [Misc]
data Element i = Elem Name [Attribute] [Content i]
data ElemTag = ElemTag Name [Attribute]
data Content i
= CElem (Element i) i
| CString Bool CharData i
| CRef Reference i
| CMisc Misc i
type Attribute = (Name, AttValue)
data AttValue = AttValue [Either String Reference]
data Prolog = Prolog (Maybe XMLDecl) [Misc] (Maybe DocTypeDecl) [Misc]
data Reference
= RefEntity EntityRef
| RefChar CharRef
class HTypeable a => XmlContent a where
parseContents :: XMLParser a
toContents :: a -> [Content ()]
xToChar :: a -> Char
xFromChar :: Char -> a
class XmlAttributes a where
fromAttrs :: [Attribute] -> a
toAttrs :: a -> [Attribute]
class XmlAttrType a where
fromAttrToTyp :: String -> Attribute -> Maybe a
toAttrFrTyp :: String -> a -> Maybe Attribute
type XMLParser a = Parser (Content Posn) a
content :: String -> XMLParser (Content Posn)
posnElement :: [String] -> XMLParser (Posn, Element Posn)
element :: [String] -> XMLParser (Element Posn)
interior :: Element Posn -> XMLParser a -> XMLParser a
inElement :: String -> XMLParser a -> XMLParser a
text :: XMLParser String
attributes :: XmlAttributes a => Element Posn -> XMLParser a
posnElementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Posn, Element Posn)
elementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Element Posn)
inElementWith :: (String -> String -> Bool) -> String -> XMLParser a -> XMLParser a
choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
mkElem :: XmlContent a => a -> [Content ()] -> Content ()
mkElemC :: String -> [Content ()] -> Content ()
mkAttr :: String -> String -> Attribute
toText :: String -> [Content ()]
toCData :: String -> [Content ()]
maybeToAttr :: (String -> a -> Maybe Attribute) -> String -> Maybe a -> Maybe Attribute
defaultToAttr :: (String -> a -> Maybe Attribute) -> String -> Defaultable a -> Maybe Attribute
definiteA :: (String -> Attribute -> Maybe a) -> String -> String -> [Attribute] -> a
defaultA :: (String -> Attribute -> Maybe a) -> a -> String -> [Attribute] -> Defaultable a
possibleA :: (String -> Attribute -> Maybe a) -> String -> [Attribute] -> Maybe a
fromAttrToStr :: String -> Attribute -> Maybe String
toAttrFrStr :: String -> String -> Maybe Attribute
data Defaultable a
= Default a
| NonDefault a
str2attr :: String -> AttValue
attr2str :: AttValue -> String
attval :: Read a => Element i -> a
module Text.XML.HaXml.TypeMapping
data List1 a = NonEmpty [a]
data ANYContent
= forall a . (XmlContent a, Show a) => ANYContent a
| UnConverted [Content Posn]
Re-export the relevant set of generic XML document type definitions +
data Document iSource
The symbol table stored in a document holds all its general entity + reference definitions. +
Constructors
Document Prolog (SymTab EntityDef) (Element i) [Misc]
show/hide Instances
Functor Document
??? i => Eq (Document i)
data Element iSource
Constructors
Elem Name [Attribute] [Content i]
show/hide Instances
Functor Element
??? i => Eq (Element i)
Verbatim (Element i)
data ElemTag Source
Constructors
ElemTag Name [Attribute]
show/hide Instances
data Content iSource
Constructors
CElem (Element i) i
CString Bool CharData ibool is whether whitespace is significant +
CRef Reference i
CMisc Misc i
show/hide Instances
Functor Content
(Eq i, ??? i) => Eq (Content i)
Verbatim (Content i)
type Attribute = (Name, AttValue)Source
data AttValue Source
Constructors
AttValue [Either String Reference]
show/hide Instances
data Prolog Source
Constructors
Prolog (Maybe XMLDecl) [Misc] (Maybe DocTypeDecl) [Misc]
show/hide Instances
data Reference Source
Constructors
RefEntity EntityRef
RefChar CharRef
show/hide Instances
The enabling classes, that define parsing/unparsing between Haskell +
class HTypeable a => XmlContent a whereSource
The XmlContent class promises that an XML Content element can be + converted to and from a Haskell value. +
Methods
parseContents :: XMLParser aSource
Convert from XML to Haskell +
toContents :: a -> [Content ()]Source
Convert from Haskell to XML +
xToChar :: a -> CharSource
Dummy functions (for most types): used only in the Char instance + for coercing lists of Char into String. +
xFromChar :: Char -> aSource
show/hide Instances
XmlContent ANYContent
XmlContent Bool
XmlContent Char
XmlContent Char
XmlContent Double
XmlContent Float
XmlContent Int
XmlContent Integer
XmlContent ()
(XmlContent a, XmlContent b) => XmlContent (a, b)
(XmlContent a, XmlContent b, XmlContent c) => XmlContent (a, b, c)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d) => XmlContent (a, b, c, d)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e) => XmlContent (a, b, c, d, e)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f) => XmlContent (a, b, c, d, e, f)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g) => XmlContent (a, b, c, d, e, f, g)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h) => XmlContent (a, b, c, d, e, f, g, h)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i) => XmlContent (a, b, c, d, e, f, g, h, i)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j) => XmlContent (a, b, c, d, e, f, g, h, i, j)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k) => XmlContent (a, b, c, d, e, f, g, h, i, j, k)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m, n)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
XmlContent a => XmlContent (List1 a)
XmlContent a => XmlContent (Maybe a)
XmlContent a => XmlContent (Maybe a)
XmlContent a => XmlContent [a]
XmlContent a => XmlContent [a]
(XmlContent a, XmlContent b) => XmlContent (Either a b)
(XmlContent a, XmlContent b) => XmlContent (OneOf2 a b)
(XmlContent a, XmlContent b, XmlContent c) => XmlContent (OneOf3 a b c)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d) => XmlContent (OneOf4 a b c d)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e) => XmlContent (OneOf5 a b c d e)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f) => XmlContent (OneOf6 a b c d e f)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g) => XmlContent (OneOf7 a b c d e f g)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h) => XmlContent (OneOf8 a b c d e f g h)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i) => XmlContent (OneOf9 a b c d e f g h i)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j) => XmlContent (OneOf10 a b c d e f g h i j)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k) => XmlContent (OneOf11 a b c d e f g h i j k)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l) => XmlContent (OneOf12 a b c d e f g h i j k l)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m) => XmlContent (OneOf13 a b c d e f g h i j k l m)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n) => XmlContent (OneOf14 a b c d e f g h i j k l m n)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o) => XmlContent (OneOf15 a b c d e f g h i j k l m n o)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p) => XmlContent (OneOf16 a b c d e f g h i j k l m n o p)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q) => XmlContent (OneOf17 a b c d e f g h i j k l m n o p q)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r) => XmlContent (OneOf18 a b c d e f g h i j k l m n o p q r)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r, XmlContent s) => XmlContent (OneOf19 a b c d e f g h i j k l m n o p q r s)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r, XmlContent s, XmlContent t) => XmlContent (OneOf20 a b c d e f g h i j k l m n o p q r s t)
class XmlAttributes a whereSource
The XmlAttributes class promises that a list of XML tag attributes + can be converted to and from a Haskell value. +
Methods
fromAttrs :: [Attribute] -> aSource
toAttrs :: a -> [Attribute]Source
class XmlAttrType a whereSource
The XmlAttrType class promises that an attribute taking an XML + enumerated type can be converted to and from a Haskell value. +
Methods
fromAttrToTyp :: String -> Attribute -> Maybe aSource
toAttrFrTyp :: String -> a -> Maybe AttributeSource
Auxiliaries for writing parsers in the XmlContent class +
type XMLParser a = Parser (Content Posn) aSource
We need a parsing monad for reading generic XML Content into specific + datatypes. This is a specialisation of the Text.ParserCombinators.Poly + ones, where the input token type is fixed as XML Content. +
content :: String -> XMLParser (Content Posn)Source
The most primitive combinator for XMLParser - get one content item. +
posnElement :: [String] -> XMLParser (Posn, Element Posn)Source
A specialisation of posnElementWith (==). +
element :: [String] -> XMLParser (Element Posn)Source
Get the next content element, checking that it has one of the required + tags. (Skips over comments and whitespace, rejects text and refs.) +
interior :: Element Posn -> XMLParser a -> XMLParser aSource
Run an XMLParser on the contents of the given element (i.e. not on the + current monadic content sequence), checking that the contents are + exhausted, before returning the calculated value within the current + parser context. +
inElement :: String -> XMLParser a -> XMLParser aSource
A combination of element + interior. +
text :: XMLParser StringSource
text is a counterpart to element, parsing text content if it + exists. Adjacent text and references are coalesced. +
attributes :: XmlAttributes a => Element Posn -> XMLParser aSource
Do some parsing of the attributes of the given element +
posnElementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Posn, Element Posn)Source
Get the next content element, checking that it has one of the required + tags, using the given matching function. + (Skips over comments and whitespace, rejects text and refs. + Also returns position of element.) +
elementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Element Posn)Source
Like element, only permits a more flexible match against the tagname. +
inElementWith :: (String -> String -> Bool) -> String -> XMLParser a -> XMLParser aSource
A combination of elementWith + interior. +
choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser bSource
'choice f p' means if parseContents succeeds, apply f to the result, + otherwise use the continuation parser. +
definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser aSource
not sure this is needed now. 'definite p' previously ensured that + an element was definitely present. Now I think the monad might take + care of that for us. +
Auxiliaries for generating in the XmlContent class +
mkElem :: XmlContent a => a -> [Content ()] -> Content ()Source
Generate an element with no attributes, named for its HType. +
mkElemC :: String -> [Content ()] -> Content ()Source
Generate an element with no attributes, named directly. +
mkAttr :: String -> String -> AttributeSource
Generate a single attribute. +
toText :: String -> [Content ()]Source
Turn a simple string into XML text. +
toCData :: String -> [Content ()]Source
Turn a string into an XML CDATA section. + (i.e. special characters like & are preserved without interpretation.) +
Auxiliaries for the attribute-related classes +
maybeToAttr :: (String -> a -> Maybe Attribute) -> String -> Maybe a -> Maybe AttributeSource
defaultToAttr :: (String -> a -> Maybe Attribute) -> String -> Defaultable a -> Maybe AttributeSource
definiteA :: (String -> Attribute -> Maybe a) -> String -> String -> [Attribute] -> aSource
defaultA :: (String -> Attribute -> Maybe a) -> a -> String -> [Attribute] -> Defaultable aSource
possibleA :: (String -> Attribute -> Maybe a) -> String -> [Attribute] -> Maybe aSource
fromAttrToStr :: String -> Attribute -> Maybe StringSource
toAttrFrStr :: String -> String -> Maybe AttributeSource
data Defaultable aSource
If an attribute is defaultable, then it either takes the default + value (which is omitted from the output), or a non-default value + (which obviously must be printed). +
Constructors
Default a
NonDefault a
show/hide Instances
Eq a => Eq (Defaultable a)
Show a => Show (Defaultable a)
str2attr :: String -> AttValueSource
attr2str :: AttValue -> StringSource
attval :: Read a => Element i -> aSource
Read a single attribute called value. +
Explicit representation of Haskell datatype information +
module Text.XML.HaXml.TypeMapping
Types useful for some content models +
data List1 aSource
The List1 type represents lists with at least one element. + It is required for DTD content models that use + as a modifier. +
Constructors
NonEmpty [a]
show/hide Instances
??? a => Eq (List1 a)
HTypeable a => HTypeable (List1 a)
??? a => Show (List1 a)
XmlContent a => XmlContent (List1 a)
data ANYContent Source

A type corresponding to XML's ANY contentspec. + It is either a list of unconverted xml Content + or some XmlContent-able value. +

Parsing functions (e.g. parseContents) will always produce UnConverted. + Note: The Show instance for UnConverted uses verbatim. +

Constructors
forall a . (XmlContent a, Show a) => ANYContent a
UnConverted [Content Posn]
show/hide Instances
Produced by Haddock version 0.8
diff --git a/docs/HaXml/Text-XML-HaXml-XmlContent.html b/docs/HaXml/Text-XML-HaXml-XmlContent.html --- a/docs/HaXml/Text-XML-HaXml-XmlContent.html +++ b/docs/HaXml/Text-XML-HaXml-XmlContent.html @@ -66,4723 +66,596 @@ >
Re-export the relevant set of generic XML document type definitions -
The enabling classes, that define parsing/unparsing between Haskell -
Auxiliaries for writing parsers in the XmlContent class -
Auxiliaries for generating in the XmlContent class -
Auxiliaries for the attribute-related classes -
Whole-document conversion functions -
Explicit representation of Haskell datatype information -
Types useful for some content models -
Description

The class XmlContent is a kind of replacement for Read and Show: - it provides conversions between a generic XML tree representation - and your own more specialised typeful Haskell data trees. -

If you are starting with a set of Haskell datatypes, use DrIFT to - derive instances of this class for you: - http://repetae.net/john/computer/haskell/DrIFT - If you are starting with an XML DTD, use HaXml's tool DtdToHaskell - to generate both the Haskell types and the corresponding instances. -

This unified class interface replaces two previous (somewhat similar) - classes: Haskell2Xml and Xml2Haskell. There was no real reason to have - separate classes depending on how you originally defined your datatypes. -

Synopsis
data Document i = Document Prolog (SymTab EntityDef) (Element i) [Misc]
data Element i = Elem Name [Attribute] [Content i]
data ElemTag = ElemTag Name [Attribute]
data Content i
= CElem (Element i) i
| CString Bool CharData i
| CRef Reference i
| CMisc Misc i
type Attribute = (Name, AttValue)
data AttValue = AttValue [Either String Reference]
data Prolog = Prolog (Maybe XMLDecl) [Misc] (Maybe DocTypeDecl) [Misc]
data Reference
= RefEntity EntityRef
| RefChar CharRef
class HTypeable a => XmlContent a where
parseContents :: XMLParser a
toContents :: a -> [Content ()]
xToChar :: a -> Char
xFromChar :: Char -> a
class XmlAttributes a where
fromAttrs :: [Attribute] -> a
toAttrs :: a -> [Attribute]
class XmlAttrType a where
fromAttrToTyp :: String -> Attribute -> Maybe a
toAttrFrTyp :: String -> a -> Maybe Attribute
type XMLParser a = Parser (Content Posn) a
content :: String -> XMLParser (Content Posn)
posnElement :: [String] -> XMLParser (Posn, Element Posn)
element :: [String] -> XMLParser (Element Posn)
interior :: Element Posn -> XMLParser a -> XMLParser a
inElement :: String -> XMLParser a -> XMLParser a
text :: XMLParser String
attributes :: XmlAttributes a => Element Posn -> XMLParser a
posnElementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Posn, Element Posn)
elementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Element Posn)
inElementWith :: (String -> String -> Bool) -> String -> XMLParser a -> XMLParser a
choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
mkElem :: XmlContent a => a -> [Content ()] -> Content ()
mkElemC :: String -> [Content ()] -> Content ()
mkAttr :: String -> String -> Attribute
toText :: String -> [Content ()]
toCData :: String -> [Content ()]
maybeToAttr :: (String -> a -> Maybe Attribute) -> String -> Maybe a -> Maybe Attribute
defaultToAttr :: (String -> a -> Maybe Attribute) -> String -> Defaultable a -> Maybe Attribute
definiteA :: (String -> Attribute -> Maybe a) -> String -> String -> [Attribute] -> a
defaultA :: (String -> Attribute -> Maybe a) -> a -> String -> [Attribute] -> Defaultable a
possibleA :: (String -> Attribute -> Maybe a) -> String -> [Attribute] -> Maybe a
fromAttrToStr :: String -> Attribute -> Maybe String
toAttrFrStr :: String -> String -> Maybe Attribute
data Defaultable a
= Default a
| NonDefault a
str2attr :: String -> AttValue
attr2str :: AttValue -> String
attval :: Read a => Element i -> a
toXml :: XmlContent a => Bool -> a -> Document ()
fromXml :: XmlContent a => Document Posn -> Either String a
readXml :: XmlContent a => String -> Either String a
showXml :: XmlContent a => Bool -> a -> String
fpsShowXml :: XmlContent a => Bool -> a -> ByteString
fReadXml :: XmlContent a => FilePath -> IO a
fWriteXml :: XmlContent a => FilePath -> a -> IO ()
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
hGetXml :: XmlContent a => Handle -> IO a
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
module Text.XML.HaXml.TypeMapping
data List1 a = NonEmpty [a]
data ANYContent
= forall a . (XmlContent a, Show a) => ANYContent a
| UnConverted [Content Posn]
Re-export the relevant set of generic XML document type definitions -
data Document iSource
The symbol table stored in a document holds all its general entity - reference definitions. -
Constructors
Document Prolog (SymTab EntityDef) (Element i) [Misc]
show/hide Instances
Functor Document
??? i => Eq (Document i)
data Element iSource
Constructors
Elem Name [Attribute] [Content i]
show/hide Instances
Functor Element
??? i => Eq (Element i)
Verbatim (Element i)
data ElemTag Source
Constructors
ElemTag Name [Attribute]
show/hide Instances
data Content iSource
Constructors
CElem (Element i) i
CString Bool CharData ibool is whether whitespace is significant -
CRef Reference i
CMisc Misc i
show/hide Instances
Functor Content
(Eq i, ??? i) => Eq (Content i)
Verbatim (Content i)
type Attribute = (Name, AttValue)Source
data AttValue Source
Constructors
AttValue [Either String Reference]
show/hide Instances
data Prolog Source
Constructors
Prolog (Maybe XMLDecl) [Misc] (Maybe DocTypeDecl) [Misc]
show/hide Instances
data Reference Source
Constructors
RefEntity EntityRef
RefChar CharRef
show/hide Instances
The enabling classes, that define parsing/unparsing between Haskell -
class HTypeable a => XmlContent a whereSource
The XmlContent class promises that an XML Content element can be - converted to and from a Haskell value. -
Methods
parseContents :: XMLParser aSource
Convert from XML to Haskell -
toContents :: a -> [Content ()]Source
Convert from Haskell to XML -
xToChar :: a -> CharSource
Dummy functions (for most types): used only in the Char instance - for coercing lists of Char into String. -
xFromChar :: Char -> aSource
show/hide Instances
XmlContent ANYContent
XmlContent Bool
XmlContent Char
XmlContent Double
XmlContent Float
XmlContent Int
XmlContent Integer
XmlContent ()
(XmlContent a, XmlContent b) => XmlContent (a, b)
(XmlContent a, XmlContent b, XmlContent c) => XmlContent (a, b, c)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d) => XmlContent (a, b, c, d)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e) => XmlContent (a, b, c, d, e)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f) => XmlContent (a, b, c, d, e, f)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g) => XmlContent (a, b, c, d, e, f, g)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h) => XmlContent (a, b, c, d, e, f, g, h)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i) => XmlContent (a, b, c, d, e, f, g, h, i)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j) => XmlContent (a, b, c, d, e, f, g, h, i, j)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k) => XmlContent (a, b, c, d, e, f, g, h, i, j, k)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m, n)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o) => XmlContent (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
XmlContent a => XmlContent (List1 a)
XmlContent a => XmlContent (Maybe a)
XmlContent a => XmlContent [a]
(XmlContent a, XmlContent b) => XmlContent (Either a b)
(XmlContent a, XmlContent b) => XmlContent (OneOf2 a b)
(XmlContent a, XmlContent b, XmlContent c) => XmlContent (OneOf3 a b c)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d) => XmlContent (OneOf4 a b c d)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e) => XmlContent (OneOf5 a b c d e)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f) => XmlContent (OneOf6 a b c d e f)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g) => XmlContent (OneOf7 a b c d e f g)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h) => XmlContent (OneOf8 a b c d e f g h)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i) => XmlContent (OneOf9 a b c d e f g h i)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j) => XmlContent (OneOf10 a b c d e f g h i j)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k) => XmlContent (OneOf11 a b c d e f g h i j k)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l) => XmlContent (OneOf12 a b c d e f g h i j k l)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m) => XmlContent (OneOf13 a b c d e f g h i j k l m)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n) => XmlContent (OneOf14 a b c d e f g h i j k l m n)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o) => XmlContent (OneOf15 a b c d e f g h i j k l m n o)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p) => XmlContent (OneOf16 a b c d e f g h i j k l m n o p)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q) => XmlContent (OneOf17 a b c d e f g h i j k l m n o p q)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r) => XmlContent (OneOf18 a b c d e f g h i j k l m n o p q r)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r, XmlContent s) => XmlContent (OneOf19 a b c d e f g h i j k l m n o p q r s)
(XmlContent a, XmlContent b, XmlContent c, XmlContent d, XmlContent e, XmlContent f, XmlContent g, XmlContent h, XmlContent i, XmlContent j, XmlContent k, XmlContent l, XmlContent m, XmlContent n, XmlContent o, XmlContent p, XmlContent q, XmlContent r, XmlContent s, XmlContent t) => XmlContent (OneOf20 a b c d e f g h i j k l m n o p q r s t)
class XmlAttributes a whereSource
The XmlAttributes class promises that a list of XML tag attributes - can be converted to and from a Haskell value. -
Methods
fromAttrs :: [Attribute] -> aSource
toAttrs :: a -> [Attribute]Source
class XmlAttrType a whereSource
The XmlAttrType class promises that an attribute taking an XML - enumerated type can be converted to and from a Haskell value. -
Methods
fromAttrToTyp :: String -> Attribute -> Maybe aSource
toAttrFrTyp :: String -> a -> Maybe AttributeSource
Auxiliaries for writing parsers in the XmlContent class -
type XMLParser a = Parser (Content Posn) aSource
We need a parsing monad for reading generic XML Content into specific - datatypes. This is a specialisation of the Text.ParserCombinators.Poly - ones, where the input token type is fixed as XML Content. -
content :: String -> XMLParser (Content Posn)Source
The most primitive combinator for XMLParser - get one content item. -
posnElement :: [String] -> XMLParser (Posn, Element Posn)Source
A specialisation of posnElementWith (==). -
element :: [String] -> XMLParser (Element Posn)Source
Get the next content element, checking that it has one of the required - tags. (Skips over comments and whitespace, rejects text and refs.) -
interior :: Element Posn -> XMLParser a -> XMLParser aSource
Run an XMLParser on the contents of the given element (i.e. not on the - current monadic content sequence), checking that the contents are - exhausted, before returning the calculated value within the current - parser context. -
inElement :: String -> XMLParser a -> XMLParser aSource
A combination of element + interior. -
text :: XMLParser StringSource
text is a counterpart to element, parsing text content if it - exists. Adjacent text and references are coalesced. -
attributes :: XmlAttributes a => Element Posn -> XMLParser aSource
Do some parsing of the attributes of the given element -
posnElementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Posn, Element Posn)Source
Get the next content element, checking that it has one of the required - tags, using the given matching function. - (Skips over comments and whitespace, rejects text and refs. - Also returns position of element.) -
elementWith :: (String -> String -> Bool) -> [String] -> XMLParser (Element Posn)Source
Like element, only permits a more flexible match against the tagname. -
inElementWith :: (String -> String -> Bool) -> String -> XMLParser a -> XMLParser aSource
A combination of elementWith + interior. -
choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser bSource
'choice f p' means if parseContents succeeds, apply f to the result, - otherwise use the continuation parser. -
definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser aSource
not sure this is needed now. 'definite p' previously ensured that - an element was definitely present. Now I think the monad might take - care of that for us. -Auxiliaries for generating in the XmlContent class -
mkElem :: XmlContent a => a -> [Content ()] -> Content ()Source
Generate an element with no attributes, named for its HType. -
mkElemC :: String -> [Content ()] -> Content ()Source
Generate an element with no attributes, named directly. -
mkAttr :: String -> String -> AttributeSource
Generate a single attribute. -
toText :: String -> [Content ()]Source
Turn a simple string into XML text. -
toCData :: String -> [Content ()]Source
Turn a string into an XML CDATA section. - (i.e. special characters like & are preserved without interpretation.) -Auxiliaries for the attribute-related classes -
maybeToAttr :: (String -> a -> Maybe Attribute) -> String -> Maybe a -> Maybe AttributeSource
defaultToAttr :: (String -> a -> Maybe Attribute) -> String -> Defaultable a -> Maybe AttributeSource
definiteA :: (String -> Attribute -> Maybe a) -> String -> String -> [Attribute] -> aSource
defaultA :: (String -> Attribute -> Maybe a) -> a -> String -> [Attribute] -> Defaultable aSource
possibleA :: (String -> Attribute -> Maybe a) -> String -> [Attribute] -> Maybe aSource
fromAttrToStr :: String -> Attribute -> Maybe StringSource
toAttrFrStr :: String -> String -> Maybe AttributeSource
data Defaultable aSource
If an attribute is defaultable, then it either takes the default - value (which is omitted from the output), or a non-default value - (which obviously must be printed). -
Constructors
Default a
NonDefault a
show/hide Instances
Eq a => Eq (Defaultable a)
Show a => Show (Defaultable a)
str2attr :: String -> AttValueSource
attr2str :: AttValue -> StringSource
attval :: Read a => Element i -> aSource
Read a single attribute called value. -Whole-document conversion functions -
toXml :: XmlContent a => Bool -> a -> Document ()Source
Convert a fully-typed XML document to a string (with or without DTD). -
fromXml :: XmlContent a => Document Posn -> Either String aSource
Read a Haskell value from an XML document, ignoring the DTD and - using the Haskell result type to determine how to parse it. -
readXml :: XmlContent a => String -> Either String aSource
Read a fully-typed XML document from a string. -
showXml :: XmlContent a => Bool -> a -> StringSource
Convert a fully-typed XML document to a string (without DTD). -
fpsShowXml :: XmlContent a => Bool -> a -> ByteStringSource
Convert a fully-typed XML document to a ByteString (without DTD). -
fReadXml :: XmlContent a => FilePath -> IO aSource
Read an XML document from a file and convert it to a fully-typed - Haskell value. -
fWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write a fully-typed Haskell value to the given file as an XML - document. -
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write any Haskell value to the given file as an XML document, - using the FastPackedString interface (output will not be prettified). -
hGetXml :: XmlContent a => Handle -> IO aSource
Read a fully-typed XML document from a file handle. -
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle. -
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle, using the - FastPackedString interface (output will not be prettified). -Explicit representation of Haskell datatype information -module Text.XML.HaXml.TypeMappingTypes useful for some content models -
data List1 aSource
The List1 type represents lists with at least one element. - It is required for DTD content models that use + as a modifier. -
Constructors
NonEmpty [a]
show/hide Instances
??? a => Eq (List1 a)
HTypeable a => HTypeable (List1 a)
??? a => Show (List1 a)
XmlContent a => XmlContent (List1 a)
data ANYContent Source

A type corresponding to XML's ANY contentspec. - It is either a list of unconverted xml Content - or some XmlContent-able value. -

Parsing functions (e.g. parseContents) will always produce UnConverted. - Note: The Show instance for UnConverted uses verbatim. -

Constructors
forall a . (XmlContent a, Show a) => ANYContent a
UnConverted [Content Posn]
show/hide Instances
Re-export everything from Text.XML.HaXml.XmlContent.Parser. +
Contains instances of the XmlContent classes, +
Whole-document conversion functions +
Description

The class XmlContent is a kind of replacement for Read and Show: + it provides conversions between a generic XML tree representation + and your own more specialised typeful Haskell data trees. +

If you are starting with an XML DTD, use HaXml's tool DtdToHaskell + to generate both the Haskell types and the corresponding instances. +

If you are starting with a set of Haskell datatypes, use DrIFT to + derive instances of this class for you: + http://repetae.net/john/computer/haskell/DrIFT + and _do_not_ use the current module, but rather + Text.XML.HaXml.XmlContent.Haskell, for the correct matching + instances for standard Haskell datatypes. +

Synopsis
module Text.XML.HaXml.XmlContent.Parser
toXml :: XmlContent a => Bool -> a -> Document ()
fromXml :: XmlContent a => Document Posn -> Either String a
readXml :: XmlContent a => String -> Either String a
showXml :: XmlContent a => Bool -> a -> String
fpsShowXml :: XmlContent a => Bool -> a -> ByteString
fReadXml :: XmlContent a => FilePath -> IO a
fWriteXml :: XmlContent a => FilePath -> a -> IO ()
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
hGetXml :: XmlContent a => Handle -> IO a
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
Re-export everything from Text.XML.HaXml.XmlContent.Parser. +module Text.XML.HaXml.XmlContent.ParserContains instances of the XmlContent classes, +Whole-document conversion functions +
toXml :: XmlContent a => Bool -> a -> Document ()Source
Convert a fully-typed XML document to a string (with or without DTD). +
fromXml :: XmlContent a => Document Posn -> Either String aSource
Read a Haskell value from an XML document, ignoring the DTD and + using the Haskell result type to determine how to parse it. +
readXml :: XmlContent a => String -> Either String aSource
Read a fully-typed XML document from a string. +
showXml :: XmlContent a => Bool -> a -> StringSource
Convert a fully-typed XML document to a string (without DTD). +
fpsShowXml :: XmlContent a => Bool -> a -> ByteStringSource
Convert a fully-typed XML document to a ByteString (without DTD). +
fReadXml :: XmlContent a => FilePath -> IO aSource
Read an XML document from a file and convert it to a fully-typed + Haskell value. +
fWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write a fully-typed Haskell value to the given file as an XML + document. +
fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()Source
Write any Haskell value to the given file as an XML document, + using the FastPackedString interface (output will not be prettified). +
hGetXml :: XmlContent a => Handle -> IO aSource
Read a fully-typed XML document from a file handle. +
hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle. +
fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()Source
Write a fully-typed XML document to a file handle, using the + FastPackedString interface (output will not be prettified). +1 (Type/Class)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell2 (Data Constructor)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlattr2strText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellattributesText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellattvalText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlcatMaybesText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellchoiceText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell6 (Function)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellDefaultText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell2 (Type/Class)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmldefaultAText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelldefaultToAttrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelldefiniteText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelldefiniteAText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXml6 (Function)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellelementWithText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellfReadXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellfWriteXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellfindfpsHPutXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellfpsShowXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellfpsWriteXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellfromAttrToStrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellfromAttrToTypText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellfromAttrsText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellfromXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlhGetXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellhNamehPutXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellinElementText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellinElementWithText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellinteriorText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell2 (Type/Class)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellmaybeToAttrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellmkAttrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell2 (Function)Text.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellmkElemCText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellNonDefaultText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellNonEmptyText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlparseContentsText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellposnElementText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellposnElementWithText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellpossibleAText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlText.XML.HaXml.Types, Text.XML.HaXml.XmlContent, Text.XML.HaXml, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskell, Text.XML.HaXmlreadXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellshowXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellshowXmlLazystr2attrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltextText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoAttrFrStrText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoAttrFrTypText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoAttrsText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoCDataText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoContentsText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellText.XML.HaXml.TypeMapping, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoTextText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskelltoXml1 (Function)Text.XML.HaXml.XmlContent2 (Function)Text.XML.HaXml.XmlContent.HaskellUnConvertedText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellXMLParserText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellXmlAttrTypeText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellXmlAttributesText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellXmlContentText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellxFromCharText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.HaskellxToCharText.XML.HaXml.XmlContentText.XML.HaXml.XmlContent.Parser, Text.XML.HaXml.XmlContent, Text.XML.HaXml.XmlContent.Haskellshow/hideText.XML.HaXml.XmlContent
Text.XML.HaXml.XmlContent.Haskell
Text.XML.HaXml.XmlContent.Parser
show/hideshow/hideXtract
src/Text/XML/HaXml/XmlContent.hs -
{-# LANGUAGE ExistentialQuantification #-}
-
--- | The class 'XmlContent' is a kind of replacement for Read and Show:
---   it provides conversions between a generic XML tree representation
---   and your own more specialised typeful Haskell data trees.
---
---   If you are starting with a set of Haskell datatypes, use DrIFT to
---   derive instances of this class for you:
---       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
---   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
---   to generate both the Haskell types and the corresponding instances.
---
---   This unified class interface replaces two previous (somewhat similar)
---   classes: Haskell2Xml and Xml2Haskell.  There was no real reason to have
---   separate classes depending on how you originally defined your datatypes.
-
---   The methods 'toContents' and 'parseContents' convert a value to and from
---   a generic internal representation of an XML document /without/ a DTD.
---   The functions 'toXml' and 'fromXml' convert a value to and from a generic
---   internal representation of an XML document /including/ a DTD.
---   The functions 'readXml' and 'showXml' convert to and from Strings.
---   The functions 'fReadXml' and 'fWriteXml' do the conversion to and from
---   the given filenames.
---   The functions 'hGetXml' and 'hPutXml' do the conversion to and from
---   the given file handles.
---   (See the type signatures.)
---
-
-module Text.XML.HaXml.XmlContent
-  ( -- * Re-export the relevant set of generic XML document type definitions
-    Document(..)
-  , Element(..)
-  , ElemTag(..)
-  , Content(..)
-  , Attribute()
-  , AttValue(..)
-  , Prolog(..)
-  , Reference(..)
-  -- * The enabling classes, that define parsing\/unparsing between Haskell
-  --   datatypes and a generic XML representation.
-  , XmlContent(..)
-  , XmlAttributes(..)
-  , XmlAttrType(..)
-  -- ** Auxiliaries for writing parsers in the XmlContent class
-  , module Text.ParserCombinators.Poly
-  , XMLParser
-  , content, posnElement, element, interior, inElement, text, attributes
-  , posnElementWith, elementWith, inElementWith
-  , choice, definite -- ???
-  -- ** Auxiliaries for generating in the XmlContent class
-  , mkElem, mkElemC, mkAttr
-  , toText, toCData
-  -- ** Auxiliaries for the attribute-related classes
-  , maybeToAttr, defaultToAttr
-  , definiteA, defaultA, possibleA, fromAttrToStr, toAttrFrStr
-  , Defaultable(..)
-  , str2attr, attr2str, attval
-  , catMaybes   -- re-exported from Maybe
-  -- * Whole-document conversion functions
-  , toXml, fromXml
-  , readXml, showXml, fpsShowXml
-  , fReadXml, fWriteXml, fpsWriteXml
-  , hGetXml,  hPutXml, fpsHPutXml
-  -- * Explicit representation of Haskell datatype information
-  --   (for conversion to a DTD)
-  , module Text.XML.HaXml.TypeMapping
-  -- * Types useful for some content models
-  , List1(..)
-  , ANYContent(..)
-  ) where
-
-import IO
-import Maybe (catMaybes)
-import Char  (chr, isSpace)
-import List  (isPrefixOf, isSuffixOf)
-
-import Text.PrettyPrint.HughesPJ (render)
-import qualified Text.XML.HaXml.Pretty as PP
-
-import Text.XML.HaXml.Types
-import Text.XML.HaXml.TypeMapping
-import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
-import Text.XML.HaXml.Pretty   (document)
-import Text.XML.HaXml.Parse    (xmlParse)
-import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
-import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
-import qualified Data.ByteString.Lazy.Char8 as FPS
-
-import Text.ParserCombinators.Poly
-
---  #define DEBUG
-
-#if defined(DEBUG)
-import Debug.Trace(trace)
-debug :: a -> String -> a
-v `debug` s = trace s v
-#else
-debug :: t -> t1 -> t
-v `debug` _ = v
-#endif
-
-
-------------------------------------------------------------------------
--- | Read a single attribute called "value".
-attval :: (Read a) => Element i -> a
-attval (Elem _ [("value",v@(AttValue _))] []) = read (show v)
-
--- | Generate a single attribute.
-mkAttr :: String -> String -> Attribute
-mkAttr n v = (n, AttValue [Left v])
-
--- | Generate an element with no attributes, named for its HType.
-mkElem :: XmlContent a => a -> [Content ()] -> Content ()
-mkElem x cs  = CElem (Elem (showHType (toHType x) "") [] cs) ()
-
--- | Generate an element with no attributes, named directly.
-mkElemC :: String -> [Content ()] -> Content ()
-mkElemC x cs = CElem (Elem x [] cs) ()
-
--- | Turn a simple string into XML text.
-toText :: String -> [Content ()]
-toText s = [CString False s ()]
-
--- | Turn a string into an XML CDATA section.
---   (i.e. special characters like '&' are preserved without interpretation.)
-toCData :: String -> [Content ()]
-toCData s = [CString True s ()]
-------------------------------------------------------------------------
-
-        -- probably want to write DTD separately from value, and have
-        -- easy ways to combine DTD + value into a document, or write
-        -- them to separate files.
-
--- | Read an XML document from a file and convert it to a fully-typed
---   Haskell value.
-fReadXml  :: XmlContent a => FilePath -> IO a
-fReadXml fp = do
-    f <- ( if fp=="-" then return stdin
-           else openFile fp ReadMode )
-    x <- hGetContents f
-    let (Document _ _ y _) = xmlParse fp x
-        y' = CElem y (posInNewCxt fp Nothing)
-    either fail return (fst (runParser parseContents [y']))
-
--- | Write a fully-typed Haskell value to the given file as an XML
---   document.
-fWriteXml :: XmlContent a => FilePath -> a -> IO ()
-fWriteXml fp x = do
-    f <- ( if fp=="-" then return stdout
-           else openFile fp WriteMode )
-    hPutXml f False x
-    hClose f
-
--- | Write any Haskell value to the given file as an XML document,
---   using the FastPackedString interface (output will not be prettified).
-fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
-fpsWriteXml fp x = do
-    f <- ( if fp=="-" then return stdout
-           else openFile fp WriteMode )
-    fpsHPutXml f False x
-    hClose f
-
--- | Read a fully-typed XML document from a string.
-readXml :: XmlContent a => String -> Either String a
-readXml s =
-    let (Document _ _ y _) = xmlParse "string input" s in
-    fst (runParser parseContents
-                   [CElem y (posInNewCxt "string input" Nothing)])
-
--- | Convert a fully-typed XML document to a string (without DTD).
-showXml :: XmlContent a => Bool -> a -> String
-showXml dtd x =
-    case toContents x of
-      [CElem _ _] -> (render . document . toXml dtd) x
-      _ -> ""
-
--- | Convert a fully-typed XML document to a ByteString (without DTD).
-fpsShowXml :: XmlContent a => Bool -> a -> FPS.ByteString
-fpsShowXml dtd x =
-    case toContents x of
-      [CElem _ _] -> (FPS.document . toXml dtd) x
-      _ -> FPS.empty
-
-
--- | Convert a fully-typed XML document to a string (with or without DTD).
-toXml :: XmlContent a => Bool -> a -> Document ()
-toXml dtd value =
-    let ht = toHType value in
-    Document (Prolog (Just (XMLDecl "1.0" Nothing Nothing))
-                     [] (if dtd then Just (toDTD ht) else Nothing) [])
-             emptyST
-             ( case (ht, toContents value) of
-                 (Tuple _, cs)       -> Elem (showHType ht "") [] cs
-                 (Defined _ _ _, cs) -> Elem (showHType ht "-XML") [] cs
-                 (_, [CElem e ()])   -> e )
-             []
-
--- | Read a Haskell value from an XML document, ignoring the DTD and
---   using the Haskell result type to determine how to parse it.
-fromXml :: XmlContent a => Document Posn -> Either String a
-fromXml (Document _ _ e@(Elem n _ cs) _)
-  | "tuple" `isPrefixOf` n = fst (runParser parseContents cs)
-  | "-XML"  `isSuffixOf` n = fst (runParser parseContents cs)
-  | otherwise = fst (runParser parseContents
-                               [CElem e (posInNewCxt "document" Nothing)])
-
-
--- | Read a fully-typed XML document from a file handle.
-hGetXml :: XmlContent a => Handle -> IO a
-hGetXml h = do
-    x <- hGetContents h
-    let (Document _ _ y _) = xmlParse "file handle" x
-    either fail return
-           (fst (runParser parseContents
-                           [CElem y (posInNewCxt "file handle" Nothing)]))
-
--- | Write a fully-typed XML document to a file handle.
-hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
-hPutXml h dtd x = do
-    (hPutStrLn h . render . document . toXml dtd) x
-
--- | Write a fully-typed XML document to a file handle, using the
---   FastPackedString interface (output will not be prettified).
-fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
-fpsHPutXml h dtd x = do
-    (FPS.hPut h . FPS.document . toXml dtd) x
-
-------------------------------------------------------------------------
-
--- | We need a parsing monad for reading generic XML Content into specific
---   datatypes.  This is a specialisation of the Text.ParserCombinators.Poly
---   ones, where the input token type is fixed as XML Content.
-type XMLParser a = Parser (Content Posn) a
-
-
-------------------------------------------------------------------------
--- Some useful parsing combinators
-------------------------------------------------------------------------
-
--- | The most primitive combinator for XMLParser - get one content item.
-content :: String -> XMLParser (Content Posn)
-content word = next `adjustErr` (++" when expecting "++word)
-
--- | Get the next content element, checking that it has one of the required
---   tags, using the given matching function.
---   (Skips over comments and whitespace, rejects text and refs.
---    Also returns position of element.)
-posnElementWith :: (String->String->Bool) -> [String]
-                   -> XMLParser (Posn, Element Posn)
-posnElementWith match tags = do
-    { c <- content (formatted tags)
-    ; case c of
-          CElem e@(Elem t _ _) pos
-              | any (match t) tags -> return (pos, e)
-              | otherwise          -> fail ("Found a <"++t++">, but expected "
-                                           ++formatted tags++"\nat "++show pos)
-          CString b s pos
-              | not b && all isSpace s -> posnElementWith match tags
-                                                        -- ignore blank space
-              | otherwise -> fail ("Found text content, but expected "
-                                  ++formatted tags++"\ntext is: "++s
-                                  ++"\nat "++show pos)
-          CRef r pos -> fail ("Found reference, but expected "
-                             ++formatted tags++"\nreference is: "++verbatim r
-                             ++"\nat "++show pos)
-          CMisc _ _ -> posnElementWith match tags  -- skip comments, PIs, etc.
-    }
-  where
-    formatted [t]  = "a <"++t++">"
-    formatted tgs = "one of"++ concatMap (\t->" <"++t++">") tgs
-
--- | A specialisation of @posnElementWith (==)@.
-posnElement :: [String] -> XMLParser (Posn, Element Posn)
-posnElement = posnElementWith (==)
-
--- | Get the next content element, checking that it has one of the required
---   tags.  (Skips over comments and whitespace, rejects text and refs.)
-element :: [String] -> XMLParser (Element Posn)
-element tags = fmap snd (posnElement tags)
-                                `debug` ("Element: "++unwords tags++"\n")
-
--- | Like element, only permits a more flexible match against the tagname.
-elementWith :: (String->String->Bool) -> [String] -> XMLParser (Element Posn)
-elementWith match tags = fmap snd (posnElementWith match tags)
-                                `debug` ("Element: "++unwords tags++"\n")
-
--- | Run an XMLParser on the contents of the given element (i.e. not on the
---   current monadic content sequence), checking that the contents are
---   exhausted, before returning the calculated value within the current
---   parser context.
-interior :: Element Posn -> XMLParser a -> XMLParser a
-interior (Elem e _ cs) p =
-    case runParser p cs of
-        (Left msg, _) -> fail msg
-        (Right x, []) -> return x
-        (Right x, ds@(d:_))
-            | all onlyMisc ds -> return x
-            | otherwise       -> fail ("Too many elements inside <"++e++"> at\n"
-                                      ++show (info d)++"\n"
-                                      ++"Found excess: "++verbatim d)
-  where onlyMisc (CMisc _ _) = True
-        onlyMisc (CString False s _) | all isSpace s = True
-        onlyMisc _ = False
-
--- | A combination of element + interior.
-inElement :: String -> XMLParser a -> XMLParser a
-inElement tag p = do { e <- element [tag]; commit (interior e p) }
-
--- | A combination of elementWith + interior.
-inElementWith :: (String->String->Bool) -> String -> XMLParser a -> XMLParser a
-inElementWith match tag p = do { e <- elementWith match [tag]
-                               ; commit (interior e p) }
-
--- | Do some parsing of the attributes of the given element
-attributes :: XmlAttributes a => Element Posn -> XMLParser a
-attributes (Elem _ as _) = return (fromAttrs as)
-
--- | 'text' is a counterpart to 'element', parsing text content if it
---   exists.  Adjacent text and references are coalesced.
-text :: XMLParser String
-text = text' []
-  where text' acc =
-          do { c <- content "plain text"
-             ; case c of
-                 CString _ s _        -> text' (s:acc)
-                 CRef (RefChar s) _   -> text' (("&#"++show s++";") :acc)
-                 CRef (RefEntity s) _ -> text' (('&':s++";"):acc)
-                 CMisc _ _            -> text' acc
-                 CElem _ _         -> do { reparse [c] -- put it back!
-                                         ; if null acc then fail "empty string"
-                                           else return (concat (reverse acc))
-                                         }
-             }
-          `onFail` ( if null acc then fail "empty string"
-                     else return (concat (reverse acc)) )
-
-
--- | 'choice f p' means if parseContents succeeds, apply f to the result,
---   otherwise use the continuation parser.
-choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
-choice cons (P other) =
-    P (\cs-> case runParser parseContents cs of
-                 (Left _, _)  -> other cs
-                 (Right x, cs') -> (Right (cons x), cs'))
-
---choice cons other = fmap cons parseContents `onFail` other
-
--- | not sure this is needed now.   'definite p' previously ensured that
---   an element was definitely present.  Now I think the monad might take
---   care of that for us.
-definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
-definite p inner tag = P (\cs-> case runParser p cs of
-                                   (Left _, cs') -> (Left (False,msg'), cs')
-                                   (Right x, cs')  -> (Right x,   cs'))
-  where msg' = "content error: expected "++inner++" inside <"++tag
-               ++"> element\n"
-
-------------------------------------------------------------------------
-
--- | The @XmlContent@ class promises that an XML Content element can be
---   converted to and from a Haskell value.
-class HTypeable a => XmlContent a where
-    -- | Convert from XML to Haskell
-    parseContents :: XMLParser a
-    -- | Convert from Haskell to XML
-    toContents    :: a -> [Content ()]
-
-    -- | Dummy functions (for most types): used /only/ in the Char instance
-    --   for coercing lists of Char into String.
-    xToChar       :: a -> Char
-    xFromChar     :: Char -> a
-    xToChar        = error "HaXml.XmlContent.xToChar used in error"
-    xFromChar      = error "HaXml.XmlContent.xFromChar used in error"
-
--- | The @XmlAttributes@ class promises that a list of XML tag attributes
---   can be converted to and from a Haskell value.
-class XmlAttributes a where
-    fromAttrs :: [Attribute] -> a
-    toAttrs   :: a -> [Attribute]
--- | The @XmlAttrType@ class promises that an attribute taking an XML
---   enumerated type can be converted to and from a Haskell value.
-class XmlAttrType a where
-    fromAttrToTyp :: String -> Attribute -> Maybe a
-    toAttrFrTyp   :: String -> a -> Maybe Attribute
-
-
-------------------------------------------------------------------------
--- Instances for all the standard basic datatypes.
--- These are for Haskell datatypes being derived to go to XML.
--- DtdToHaskell does not use these instances.
-------------------------------------------------------------------------
-
-instance XmlContent Bool where
-    toContents b   = [CElem (Elem "bool" [mkAttr "value" (show b)] []) ()]
-    parseContents = do { e <- element ["bool"] ; return (attval e) }
-
-instance XmlContent Int where
-    toContents i   = [CElem (Elem "int" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["int"] ; return (attval e) }
-
-instance XmlContent Integer where
-    toContents i   = [CElem (Elem "integer" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["integer"] ; return (attval e) }
-
-instance XmlContent Float where
-    toContents i   = [CElem (Elem "float" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["float"] ; return (attval e) }
-
-instance XmlContent Double where
-    toContents i   = [CElem (Elem "double" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["double"] ; return (attval e) }
-
-instance XmlContent Char where
-    -- NOT in a string
-    toContents c   = [CElem (Elem "char" [mkAttr "value" [c]] []) ()]
-    parseContents = do { (Elem _ [("value",(AttValue [Left [c]]))] [])
-                             <- element ["char"]
-                       ; return c
-                       }
-    -- Only defined for Char and no other types:
-    xToChar   = id
-    xFromChar = id
-
-instance XmlContent a => XmlContent [a] where
-    toContents xs  = case toHType x of
-                       (Prim "Char" _) ->
-                            [mkElem "string" [CString True (map xToChar xs) ()]]
-                       _ -> [mkElem xs (concatMap toContents xs)]
-                   where   (x:_) = xs
-    parseContents = P (\x ->
-        case x of
-            (CString _ s _:cs)
-                   -> (Right (map xFromChar s), cs)
-            (CElem (Elem "string" [] [CString _ s _]) _:cs)
-                   -> (Right (map xFromChar s), cs)
-            (CElem (Elem e [] xs) _:cs) | "list" `isPrefixOf` e
-                   -> scanElements xs
-                   where
-                  -- scanElements :: [Content] -> (Either String [a],[Content])
-                     scanElements [] = (Right [], cs)
-                     scanElements es =
-                        case runParser parseContents es of
-                            (Left msg, es') -> (Left (False,msg), es')
-                            (Right y, es') ->
-                                case scanElements es' of
-                                    (Left msg, ds) -> (Left msg, ds)
-                                    (Right ys, ds) -> (Right (y:ys), ds)
-            (CElem (Elem e _ _) pos: cs)
-                   -> (Left (False
-                            ,"Expected a <list-...>, but found a <"++e++"> at\n"
-                            ++ show pos), cs)
-            (CRef r pos: cs)
-                   -> (Left (False
-                            ,"Expected a <list-...>, but found a ref "
-                            ++verbatim r++" at\n"++ show pos), cs)
-            (_:cs) -> ((\ (P p)-> p) parseContents) cs  -- skip comments etc.
-            []     -> (Left (False
-                            ,"Ran out of input XML whilst secondary parsing")
-                      , [])
-        )
-
-instance XmlContent () where
-    toContents ()  = [CElem (Elem "unit" [] []) ()]
-    parseContents = do { element ["unit"]; return () }
-
-instance (XmlContent a, XmlContent b) => XmlContent (a,b) where
-    toContents (a,b) = toContents a ++ toContents b
-    parseContents    = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; return (a,b)
-        }
-
-instance (XmlContent a, XmlContent b, XmlContent c) => XmlContent (a,b,c) where
-    toContents (a,b,c) = toContents a ++ toContents b ++ toContents c
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; return (a,b,c)
-        }
-
-instance (XmlContent a, XmlContent b, XmlContent c, XmlContent d) =>
-         XmlContent (a,b,c,d) where
-    toContents (a,b,c,d) = toContents a ++ toContents b ++ toContents c
-                           ++ toContents d
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; return (a,b,c,d)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e ) =>
-         XmlContent (a,b,c,d,e) where
-    toContents (a,b,c,d,e) = toContents a ++ toContents b ++ toContents c
-                             ++ toContents d ++ toContents e
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; return (a,b,c,d,e)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f ) =>
-         XmlContent (a,b,c,d,e,f) where
-    toContents (a,b,c,d,e,f) = toContents a ++ toContents b ++ toContents c
-                               ++ toContents d ++ toContents e ++ toContents f
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; return (a,b,c,d,e,f)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g ) =>
-         XmlContent (a,b,c,d,e,f,g) where
-    toContents (a,b,c,d,e,f,g)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; return (a,b,c,d,e,f,g)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h ) =>
-         XmlContent (a,b,c,d,e,f,g,h) where
-    toContents (a,b,c,d,e,f,g,h)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; return (a,b,c,d,e,f,g,h)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i) where
-    toContents (a,b,c,d,e,f,g,h,i)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j) where
-    toContents (a,b,c,d,e,f,g,h,i,j)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m, XmlContent n ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m ++ toContents n
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; n <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m, XmlContent n, XmlContent o ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m ++ toContents n ++ toContents o
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; n <- parseContents
-        ; o <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
-        }
-
-instance (XmlContent a) => XmlContent (Maybe a) where
-    toContents m   = [mkElem m (maybe [] toContents m)]
-    parseContents = do
-        { e <- elementWith (flip isPrefixOf) ["maybe"]
-        ; case e of (Elem _ [] []) -> return Nothing
-                    (Elem _ [] _)  -> fmap Just (interior e parseContents)
-        }
-
-instance (XmlContent a, XmlContent b) => XmlContent (Either a b) where
-    toContents v@(Left aa) =
-        [mkElemC (showConstr 0 (toHType v)) (toContents aa)]
-    toContents v@(Right ab) =
-        [mkElemC (showConstr 1 (toHType v)) (toContents ab)]
-    parseContents =
-        (inElementWith (flip isPrefixOf) "Left"  $ fmap Left  parseContents)
-          `onFail`
-        (inElementWith (flip isPrefixOf) "Right" $ fmap Right parseContents)
-
---    do{ e@(Elem t [] _) <- element ["Left","Right"]
---      ; case t of
---          _ | "Left"  `isPrefixOf` t -> fmap Left  (interior e parseContents)
---            | "Right" `isPrefixOf` t -> fmap Right (interior e parseContents)
---      }
-
-
-------------------------------------------------------------------------
--- Useful auxiliaries for "fromAttributes"
-------------------------------------------------------------------------
-
--- | If an attribute is defaultable, then it either takes the default
---   value (which is omitted from the output), or a non-default value
---   (which obviously must be printed).
-data Defaultable a  = Default a    | NonDefault a    deriving (Eq,Show)
-
-searchMaybe :: (a -> Maybe b) -> [a] -> Maybe b
-searchMaybe _ [] = Nothing
-searchMaybe f (x:xs) =
-    let fx = f x in
-    case fx of
-      Nothing  -> searchMaybe f xs
-      (Just _) -> fx
-
-maybeToAttr :: (String->a->Maybe Attribute) -> String -> Maybe a
-               -> Maybe Attribute
-maybeToAttr _ _ Nothing  = Nothing
-maybeToAttr to n (Just v) = to n v
-
-defaultToAttr :: (String->a->Maybe Attribute) -> String -> Defaultable a
-                 -> Maybe Attribute
-defaultToAttr _ _ (Default _)  = Nothing
-defaultToAttr to n (NonDefault v) = to n v
-
-definiteA :: (String->Attribute->Maybe a) -> String -> String
-             -> [Attribute] -> a
-definiteA from tag at as =
-    case searchMaybe (from at) as of
-      Nothing  -> error ("missing attribute "++at++" in tag <"++tag++">")
-      (Just a) -> a
-
-defaultA :: (String->Attribute->Maybe a) -> a -> String
-            -> [Attribute] -> Defaultable a
-defaultA from def at as =
-    case searchMaybe (from at) as of
-      Nothing  -> Default def
-      (Just a) -> NonDefault a
-
-possibleA :: (String->Attribute->Maybe a) -> String -> [Attribute] -> Maybe a
-possibleA from at as = searchMaybe (from at) as
-
-fromAttrToStr :: String -> Attribute -> Maybe String
-fromAttrToStr n (n0,v)
-        | n == n0   = Just (attr2str v)
-        | otherwise = Nothing
-
-toAttrFrStr   :: String -> String -> Maybe Attribute
-toAttrFrStr n v = Just (n, str2attr v)
-
-str2attr :: String -> AttValue
-str2attr s =
-    let f t =
-          let (l,r) = span (\c-> not (elem c "\"&<>'")) t
-          in if null r then [Left l]
-             else Left l: Right (g (head r)): f (tail r)
-        g '"'  = RefEntity "quot"
-        g '&'  = RefEntity "amp"
-        g '<'  = RefEntity "lt"
-        g '>'  = RefEntity "gt"
-        g '\'' = RefEntity "apos"
-    in AttValue (f s)
-
-attr2str :: AttValue -> String          -- really needs symbol table
-attr2str (AttValue xs) =
-    let f (Left s) = s
-        f (Right (RefChar i))        = [chr i]
-        f (Right (RefEntity "quot")) = "\""
-        f (Right (RefEntity "amp"))  = "&"
-        f (Right (RefEntity "lt"))   = "<"
-        f (Right (RefEntity "gt"))   = ">"
-        f (Right (RefEntity "apos")) = "'"
-        f (Right _)                  = "*"  -- Ooops, ST needed here.
-    in concatMap f xs
-
-------------------------------------------------------------------------
---  New content-model types
-------------------------------------------------------------------------
-
-{-
-data OneOf2 a b
-data OneOf3 a b c
-data OneOf4 a b c d
-    ... etc are now defined (with instances) in module OneOfN.
--}
-
--- | A type corresponding to XML's ANY contentspec.
---   It is either a list of unconverted xml 'Content'
---   or some 'XmlContent'-able value.
---
--- Parsing functions (e.g. 'parseContents') will always produce 'UnConverted'.
--- Note: The Show instance for 'UnConverted' uses 'verbatim'.
-data ANYContent = forall a . (XmlContent a, Show a) => ANYContent a
-                | UnConverted [Content Posn]
-
-instance Show ANYContent where
-    show (UnConverted c) = "UnConverted " ++ (show $ map verbatim c)
-    show (ANYContent a)  = "ANYContent " ++ (show a)
-
-instance Eq ANYContent where
-    a == b = show a == show b
-
--- | The List1 type represents lists with at least one element.
---   It is required for DTD content models that use + as a modifier.
-data List1 a = NonEmpty [a]  deriving (Eq, Show)
-
-
-------------------------------------------------------------------------
---  Instances for new content-model types
-------------------------------------------------------------------------
-instance (HTypeable a) => HTypeable (List1 a) where
-    toHType m  = Defined "List1" [hx]
-                         [Constr "NonEmpty" [hx] [List hx] {-Nothing-}]
-               where (NonEmpty x) = m
-                     hx = toHType x
-instance (XmlContent a) => XmlContent (List1 a) where
-    toContents (NonEmpty xs) = concatMap toContents xs
-    parseContents = fmap NonEmpty $ many1 parseContents
-
-instance HTypeable ANYContent where
-    toHType _      = Prim "ANYContent" "ANY"
-instance XmlContent ANYContent where
-    toContents (ANYContent a)  = toContents a
-    toContents (UnConverted s) = map (fmap (const ())) s
-    parseContents = P (\cs -> (Right (UnConverted cs), []))
-
-------------------------------------------------------------------------
---
-------------------------------------------------------------------------
+
-- | The class 'XmlContent' is a kind of replacement for Read and Show:
+--   it provides conversions between a generic XML tree representation
+--   and your own more specialised typeful Haskell data trees.
+--
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances.
+--   
+--   If you are starting with a set of Haskell datatypes, use DrIFT to
+--   derive instances of this class for you:
+--       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
+--   and _do_not_ use the current module, but rather
+--   Text.XML.HaXml.XmlContent.Haskell, for the correct matching
+--   instances for standard Haskell datatypes.
+
+module Text.XML.HaXml.XmlContent
+  (
+  -- * Re-export everything from Text.XML.HaXml.XmlContent.Parser.
+    module Text.XML.HaXml.XmlContent.Parser
+  -- * Contains instances of the XmlContent classes,
+  --   for the basic Haskell datatypes list and Maybe,
+  --   intended for use with DtdToHaskell-generated datatypes.
+  --   See the alternative instances in Text.XML.HaXml.XmlContent.Haskell
+  --   if your datatypes originate in Haskell instead.
+--  , module Text.XML.HaXml.XmlContent
+
+  -- * Whole-document conversion functions
+  , toXml, fromXml
+  , readXml, showXml, fpsShowXml
+  , fReadXml, fWriteXml, fpsWriteXml
+  , hGetXml,  hPutXml, fpsHPutXml
+  ) where
+
+import IO
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
+
+import Text.PrettyPrint.HughesPJ (render)
+import Text.ParserCombinators.Poly
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.TypeMapping
+import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
+import Text.XML.HaXml.Pretty   (document)
+import Text.XML.HaXml.Parse    (xmlParse)
+import Text.XML.HaXml.XmlContent.Parser
+
+
+------------------------------------------------------------------------
+
+        -- probably want to write DTD separately from value, and have
+        -- easy ways to combine DTD + value into a document, or write
+        -- them to separate files.
+
+-- | Read an XML document from a file and convert it to a fully-typed
+--   Haskell value.
+fReadXml  :: XmlContent a => FilePath -> IO a
+fReadXml fp = do
+    f <- ( if fp=="-" then return stdin
+           else openFile fp ReadMode )
+    x <- hGetContents f
+    let (Document _ _ y _) = xmlParse fp x
+        y' = CElem y (posInNewCxt fp Nothing)
+    either fail return (fst (runParser parseContents [y']))
+
+-- | Write a fully-typed Haskell value to the given file as an XML
+--   document.
+fWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    hPutXml f False x
+    hClose f
+
+-- | Write any Haskell value to the given file as an XML document,
+--   using the FastPackedString interface (output will not be prettified).
+fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fpsWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    fpsHPutXml f False x
+    hClose f
+
+-- | Read a fully-typed XML document from a string.
+readXml :: XmlContent a => String -> Either String a
+readXml s =
+    let (Document _ _ y _) = xmlParse "string input" s in
+    fst (runParser parseContents
+                   [CElem y (posInNewCxt "string input" Nothing)])
+
+-- | Convert a fully-typed XML document to a string (without DTD).
+showXml :: XmlContent a => Bool -> a -> String
+showXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (render . document . toXml dtd) x
+      _ -> ""
+
+-- | Convert a fully-typed XML document to a ByteString (without DTD).
+fpsShowXml :: XmlContent a => Bool -> a -> FPS.ByteString
+fpsShowXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (FPS.document . toXml dtd) x
+      _ -> FPS.empty
+
+
+-- | Convert a fully-typed XML document to a string (with or without DTD).
+toXml :: XmlContent a => Bool -> a -> Document ()
+toXml dtd value =
+    let ht = toHType value in
+    Document (Prolog (Just (XMLDecl "1.0" Nothing Nothing))
+                     [] (if dtd then Just (toDTD ht) else Nothing) [])
+             emptyST
+             ( case toContents value of
+                 []             -> Elem "empty" [] []
+                 [CElem e ()]   -> e
+                 (CElem e ():_) -> error "too many XML elements in document" )
+             []
+
+-- | Read a Haskell value from an XML document, ignoring the DTD and
+--   using the Haskell result type to determine how to parse it.
+fromXml :: XmlContent a => Document Posn -> Either String a
+fromXml (Document _ _ e@(Elem n _ cs) _) =
+  fst (runParser parseContents [CElem e (posInNewCxt "document" Nothing)])
+
+
+-- | Read a fully-typed XML document from a file handle.
+hGetXml :: XmlContent a => Handle -> IO a
+hGetXml h = do
+    x <- hGetContents h
+    let (Document _ _ y _) = xmlParse "file handle" x
+    either fail return
+           (fst (runParser parseContents
+                           [CElem y (posInNewCxt "file handle" Nothing)]))
+
+-- | Write a fully-typed XML document to a file handle.
+hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+hPutXml h dtd x = do
+    (hPutStrLn h . render . document . toXml dtd) x
+
+-- | Write a fully-typed XML document to a file handle, using the
+--   FastPackedString interface (output will not be prettified).
+fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+fpsHPutXml h dtd x = do
+    (FPS.hPut h . FPS.document . toXml dtd) x
+
+
+------------------------------------------------------------------------
+-- Instances for all the standard basic datatypes.
+-- DtdToHaskell uses only a small number of standard datatypes.
+------------------------------------------------------------------------
+
+instance XmlContent Char where
+    -- NOT in a string
+    toContents c  = error "Text.XML.HaXml.XmlContent.toContents used on a Haskell Char"
+    parseContents = fail "Text.XML.HaXml.XmlContent.parseContents used on a Haskell Char "
+    -- Only defined for Char and no other types:
+    xToChar   = id
+    xFromChar = id
+
+instance XmlContent a => XmlContent [a] where
+    toContents xs  = case toHType x of
+                       (Prim "Char" _) ->
+                            [CString True (map xToChar xs) ()]
+                       _ -> concatMap toContents xs
+                   where   (x:_) = xs
+    parseContents = let (Right (x:_),_) = runParser p [] -- for type of x only
+                        p = case toHType x of
+                              (Prim "Char" _) -> fmap (map xFromChar) $ text
+                              _ -> many parseContents
+                    in p
+        -- comments, PIs, etc, are skipped in the individual element parser.
+
+instance (XmlContent a) => XmlContent (Maybe a) where
+    toContents m  = maybe [] toContents m
+    parseContents = optional parseContents
+
+------------------------------------------------------------------------
 

 
 
diff --git a/docs/HaXml/src/Text/XML/HaXml/XmlContent/Haskell.html b/docs/HaXml/src/Text/XML/HaXml/XmlContent/Haskell.html
new file mode 100644
--- /dev/null
+++ b/docs/HaXml/src/Text/XML/HaXml/XmlContent/Haskell.html
@@ -0,0 +1,262 @@
+
+
+
+
+src/Text/XML/HaXml/XmlContent/Haskell.hs
+
+
+
-- | The class 'XmlContent' is a kind of replacement for Read and Show:
+--   it provides conversions between a generic XML tree representation
+--   and your own more specialised typeful Haskell data trees.
+--
+--   If you are starting with a set of Haskell datatypes, use DrIFT to
+--   derive instances of this class for you:
+--       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
+--   and use the current module for instances of the standard Haskell
+--   datatypes list, Maybe, and so on.
+--
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances,
+--   but _do_not_ use the current module for instances: use
+--   Text.XML.HaXml.XmlContent instead.
+
+module Text.XML.HaXml.XmlContent.Haskell
+  (
+  -- * Re-export everything from Text.XML.HaXml.XmlContent.Parser.
+    module Text.XML.HaXml.XmlContent.Parser
+  -- * Instances (only) for the XmlContent class, for datatypes that
+  --   originated in Haskell, rather than from a DTD definition.
+--  , module Text.XML.HaXml.XmlContent.Haskell
+
+  -- * Whole-document conversion functions
+  , toXml, fromXml
+  , readXml, showXml, fpsShowXml
+  , fReadXml, fWriteXml, fpsWriteXml
+  , hGetXml,  hPutXml, fpsHPutXml
+
+  ) where
+
+import IO
+import List (isPrefixOf, isSuffixOf)
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
+
+import Text.PrettyPrint.HughesPJ (render)
+import Text.ParserCombinators.Poly
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.TypeMapping
+import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
+import Text.XML.HaXml.Pretty   (document)
+import Text.XML.HaXml.Parse    (xmlParse)
+import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
+import Text.XML.HaXml.XmlContent.Parser
+
+
+        -- probably want to write DTD separately from value, and have
+        -- easy ways to combine DTD + value into a document, or write
+        -- them to separate files.
+
+-- | Read an XML document from a file and convert it to a fully-typed
+--   Haskell value.
+fReadXml  :: XmlContent a => FilePath -> IO a
+fReadXml fp = do
+    f <- ( if fp=="-" then return stdin
+           else openFile fp ReadMode )
+    x <- hGetContents f
+    let (Document _ _ y _) = xmlParse fp x
+        y' = CElem y (posInNewCxt fp Nothing)
+    either fail return (fst (runParser parseContents [y']))
+
+-- | Write a fully-typed Haskell value to the given file as an XML
+--   document.
+fWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    hPutXml f False x
+    hClose f
+
+-- | Write any Haskell value to the given file as an XML document,
+--   using the FastPackedString interface (output will not be prettified).
+fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fpsWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    fpsHPutXml f False x
+    hClose f
+
+-- | Read a fully-typed XML document from a string.
+readXml :: XmlContent a => String -> Either String a
+readXml s =
+    let (Document _ _ y _) = xmlParse "string input" s in
+    fst (runParser parseContents
+                   [CElem y (posInNewCxt "string input" Nothing)])
+
+-- | Convert a fully-typed XML document to a string (without DTD).
+showXml :: XmlContent a => Bool -> a -> String
+showXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (render . document . toXml dtd) x
+      _ -> ""
+
+-- | Convert a fully-typed XML document to a ByteString (without DTD).
+fpsShowXml :: XmlContent a => Bool -> a -> FPS.ByteString
+fpsShowXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (FPS.document . toXml dtd) x
+      _ -> FPS.empty
+
+
+-- | Convert a fully-typed XML document to a string (with or without DTD).
+toXml :: XmlContent a => Bool -> a -> Document ()
+toXml dtd value =
+    let ht = toHType value in
+    Document (Prolog (Just (XMLDecl "1.0" Nothing Nothing))
+                     [] (if dtd then Just (toDTD ht) else Nothing) [])
+             emptyST
+             ( case (ht, toContents value) of
+                 (Tuple _, cs)       -> Elem (showHType ht "") [] cs
+                 (Defined _ _ _, cs) -> Elem (showHType ht "-XML") [] cs
+                 (_, [CElem e ()])   -> e )
+             []
+
+-- | Read a Haskell value from an XML document, ignoring the DTD and
+--   using the Haskell result type to determine how to parse it.
+fromXml :: XmlContent a => Document Posn -> Either String a
+fromXml (Document _ _ e@(Elem n _ cs) _)
+  | "tuple" `isPrefixOf` n = fst (runParser parseContents cs)
+  | "-XML"  `isSuffixOf` n = fst (runParser parseContents cs)
+  | otherwise = fst (runParser parseContents
+                               [CElem e (posInNewCxt "document" Nothing)])
+
+
+-- | Read a fully-typed XML document from a file handle.
+hGetXml :: XmlContent a => Handle -> IO a
+hGetXml h = do
+    x <- hGetContents h
+    let (Document _ _ y _) = xmlParse "file handle" x
+    either fail return
+           (fst (runParser parseContents
+                           [CElem y (posInNewCxt "file handle" Nothing)]))
+
+-- | Write a fully-typed XML document to a file handle.
+hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+hPutXml h dtd x = do
+    (hPutStrLn h . render . document . toXml dtd) x
+
+-- | Write a fully-typed XML document to a file handle, using the
+--   FastPackedString interface (output will not be prettified).
+fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+fpsHPutXml h dtd x = do
+    (FPS.hPut h . FPS.document . toXml dtd) x
+
+
+------------------------------------------------------------------------
+-- Instances for all the standard basic datatypes.
+-- These are for Haskell datatypes being derived to go to XML.
+-- DtdToHaskell does not use these instances.
+------------------------------------------------------------------------
+
+instance XmlContent Bool where
+    toContents b   = [CElem (Elem "bool" [mkAttr "value" (show b)] []) ()]
+    parseContents = do { e <- element ["bool"] ; return (attval e) }
+
+instance XmlContent Int where
+    toContents i   = [CElem (Elem "int" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["int"] ; return (attval e) }
+
+instance XmlContent Integer where
+    toContents i   = [CElem (Elem "integer" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["integer"] ; return (attval e) }
+
+instance XmlContent Float where
+    toContents i   = [CElem (Elem "float" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["float"] ; return (attval e) }
+
+instance XmlContent Double where
+    toContents i   = [CElem (Elem "double" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["double"] ; return (attval e) }
+
+instance XmlContent Char where
+    -- NOT in a string
+    toContents c   = [CElem (Elem "char" [mkAttr "value" [c]] []) ()]
+    parseContents = do { (Elem _ [("value",(AttValue [Left [c]]))] [])
+                             <- element ["char"]
+                       ; return c
+                       }
+    -- Only defined for Char and no other types:
+    xToChar   = id
+    xFromChar = id
+
+instance XmlContent a => XmlContent [a] where
+    toContents xs  = case toHType x of
+                       (Prim "Char" _) ->
+                            [mkElem "string" [CString True (map xToChar xs) ()]]
+                       _ -> [mkElem xs (concatMap toContents xs)]
+                   where   (x:_) = xs
+    parseContents = P (\x ->
+        case x of
+            (CString _ s _:cs)
+                   -> (Right (map xFromChar s), cs)
+            (CElem (Elem "string" [] [CString _ s _]) _:cs)
+                   -> (Right (map xFromChar s), cs)
+            (CElem (Elem e [] xs) _:cs) | "list" `isPrefixOf` e
+                   -> scanElements xs
+                   where
+                  -- scanElements :: [Content] -> (Either String [a],[Content])
+                     scanElements [] = (Right [], cs)
+                     scanElements es =
+                        case runParser parseContents es of
+                            (Left msg, es') -> (Left (False,msg), es')
+                            (Right y, es') ->
+                                case scanElements es' of
+                                    (Left msg, ds) -> (Left msg, ds)
+                                    (Right ys, ds) -> (Right (y:ys), ds)
+            (CElem (Elem e _ _) pos: cs)
+                   -> (Left (False
+                            ,"Expected a <list-...>, but found a <"++e++"> at\n"
+                            ++ show pos), cs)
+            (CRef r pos: cs)
+                   -> (Left (False
+                            ,"Expected a <list-...>, but found a ref "
+                            ++verbatim r++" at\n"++ show pos), cs)
+            (_:cs) -> ((\ (P p)-> p) parseContents) cs  -- skip comments etc.
+            []     -> (Left (False
+                            ,"Ran out of input XML whilst secondary parsing")
+                      , [])
+        )
+
+instance XmlContent () where
+    toContents ()  = [CElem (Elem "unit" [] []) ()]
+    parseContents = do { element ["unit"]; return () }
+
+
+instance (XmlContent a) => XmlContent (Maybe a) where
+    toContents m   = [mkElem m (maybe [] toContents m)]
+    parseContents = do
+        { e <- elementWith (flip isPrefixOf) ["maybe"]
+        ; case e of (Elem _ [] []) -> return Nothing
+                    (Elem _ [] _)  -> fmap Just (interior e parseContents)
+        }
+
+instance (XmlContent a, XmlContent b) => XmlContent (Either a b) where
+    toContents v@(Left aa) =
+        [mkElemC (showConstr 0 (toHType v)) (toContents aa)]
+    toContents v@(Right ab) =
+        [mkElemC (showConstr 1 (toHType v)) (toContents ab)]
+    parseContents =
+        (inElementWith (flip isPrefixOf) "Left"  $ fmap Left  parseContents)
+          `onFail`
+        (inElementWith (flip isPrefixOf) "Right" $ fmap Right parseContents)
+
+--    do{ e@(Elem t [] _) <- element ["Left","Right"]
+--      ; case t of
+--          _ | "Left"  `isPrefixOf` t -> fmap Left  (interior e parseContents)
+--            | "Right" `isPrefixOf` t -> fmap Right (interior e parseContents)
+--      }
+
+------------------------------------------------------------------------
+

+
+
diff --git a/docs/HaXml/src/Text/XML/HaXml/XmlContent/Parser.html b/docs/HaXml/src/Text/XML/HaXml/XmlContent/Parser.html
new file mode 100644
--- /dev/null
+++ b/docs/HaXml/src/Text/XML/HaXml/XmlContent/Parser.html
@@ -0,0 +1,700 @@
+
+
+
+
+src/Text/XML/HaXml/XmlContent/Parser.hs
+
+
+
{-# LANGUAGE ExistentialQuantification #-}
+
+-- | The class 'XmlContent' is a kind of replacement for Read and Show:
+--   it provides conversions between a generic XML tree representation
+--   and your own more specialised typeful Haskell data trees.
+--
+--   If you are starting with a set of Haskell datatypes, use DrIFT to
+--   derive instances of this class for you:
+--       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances.
+--
+--   This unified class interface replaces two previous (somewhat similar)
+--   classes: Haskell2Xml and Xml2Haskell.  There was no real reason to have
+--   separate classes depending on how you originally defined your datatypes.
+--   However, some instances for basic types like lists will depend on which 
+--   direction you are using.  See Text.XML.HaXml.XmlContent and
+--   Text.XML.HaXml.XmlContent.Haskell.
+
+--   The methods 'toContents' and 'parseContents' convert a value to and from
+--   a generic internal representation of an XML document /without/ a DTD.
+--   The functions 'toXml' and 'fromXml' convert a value to and from a generic
+--   internal representation of an XML document /including/ a DTD.
+--   The functions 'readXml' and 'showXml' convert to and from Strings.
+--   The functions 'fReadXml' and 'fWriteXml' do the conversion to and from
+--   the given filenames.
+--   The functions 'hGetXml' and 'hPutXml' do the conversion to and from
+--   the given file handles.
+--   (See the type signatures.)
+--
+
+module Text.XML.HaXml.XmlContent.Parser
+  ( -- * Re-export the relevant set of generic XML document type definitions
+    Document(..)
+  , Element(..)
+  , ElemTag(..)
+  , Content(..)
+  , Attribute()
+  , AttValue(..)
+  , Prolog(..)
+  , Reference(..)
+  -- * The enabling classes, that define parsing\/unparsing between Haskell
+  --   datatypes and a generic XML representation.
+  , XmlContent(..)
+  , XmlAttributes(..)
+  , XmlAttrType(..)
+  -- ** Auxiliaries for writing parsers in the XmlContent class
+  , module Text.ParserCombinators.Poly
+  , XMLParser
+  , content, posnElement, element, interior, inElement, text, attributes
+  , posnElementWith, elementWith, inElementWith
+  , choice, definite -- ???
+  -- ** Auxiliaries for generating in the XmlContent class
+  , mkElem, mkElemC, mkAttr
+  , toText, toCData
+  -- ** Auxiliaries for the attribute-related classes
+  , maybeToAttr, defaultToAttr
+  , definiteA, defaultA, possibleA, fromAttrToStr, toAttrFrStr
+  , Defaultable(..)
+  , str2attr, attr2str, attval
+  , catMaybes   -- re-exported from Maybe
+  -- * Explicit representation of Haskell datatype information
+  --   (for conversion to a DTD)
+  , module Text.XML.HaXml.TypeMapping
+  -- * Types useful for some content models
+  , List1(..)
+  , ANYContent(..)
+  ) where
+
+--import IO
+import Maybe (catMaybes)
+import Char  (chr, isSpace)
+import List  (isPrefixOf, isSuffixOf)
+
+import Text.PrettyPrint.HughesPJ (render)
+import qualified Text.XML.HaXml.Pretty as PP
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.TypeMapping
+import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
+import Text.XML.HaXml.Pretty   (document)
+import Text.XML.HaXml.Parse    (xmlParse)
+import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
+
+import Text.ParserCombinators.Poly
+
+--  #define DEBUG
+
+#if defined(DEBUG)
+import Debug.Trace(trace)
+debug :: a -> String -> a
+v `debug` s = trace s v
+#else
+debug :: t -> t1 -> t
+v `debug` _ = v
+#endif
+
+
+------------------------------------------------------------------------
+-- | Read a single attribute called "value".
+attval :: (Read a) => Element i -> a
+attval (Elem _ [("value",v@(AttValue _))] []) = read (show v)
+
+-- | Generate a single attribute.
+mkAttr :: String -> String -> Attribute
+mkAttr n v = (n, AttValue [Left v])
+
+-- | Generate an element with no attributes, named for its HType.
+mkElem :: XmlContent a => a -> [Content ()] -> Content ()
+mkElem x cs  = CElem (Elem (showHType (toHType x) "") [] cs) ()
+
+-- | Generate an element with no attributes, named directly.
+mkElemC :: String -> [Content ()] -> Content ()
+mkElemC x cs = CElem (Elem x [] cs) ()
+
+-- | Turn a simple string into XML text.
+toText :: String -> [Content ()]
+toText s = [CString False s ()]
+
+-- | Turn a string into an XML CDATA section.
+--   (i.e. special characters like '&' are preserved without interpretation.)
+toCData :: String -> [Content ()]
+toCData s = [CString True s ()]
+
+
+------------------------------------------------------------------------
+
+-- | We need a parsing monad for reading generic XML Content into specific
+--   datatypes.  This is a specialisation of the Text.ParserCombinators.Poly
+--   ones, where the input token type is fixed as XML Content.
+type XMLParser a = Parser (Content Posn) a
+
+
+------------------------------------------------------------------------
+-- Some useful parsing combinators
+------------------------------------------------------------------------
+
+-- | The most primitive combinator for XMLParser - get one content item.
+content :: String -> XMLParser (Content Posn)
+content word = next `adjustErr` (++" when expecting "++word)
+
+-- | Get the next content element, checking that it has one of the required
+--   tags, using the given matching function.
+--   (Skips over comments and whitespace, rejects text and refs.
+--    Also returns position of element.)
+posnElementWith :: (String->String->Bool) -> [String]
+                   -> XMLParser (Posn, Element Posn)
+posnElementWith match tags = do
+    { c <- content (formatted tags)
+    ; case c of
+          CElem e@(Elem t _ _) pos
+              | any (match t) tags -> return (pos, e)
+              | otherwise          -> fail ("Found a <"++t++">, but expected "
+                                           ++formatted tags++"\nat "++show pos)
+          CString b s pos
+              | not b && all isSpace s -> posnElementWith match tags
+                                                        -- ignore blank space
+              | otherwise -> fail ("Found text content, but expected "
+                                  ++formatted tags++"\ntext is: "++s
+                                  ++"\nat "++show pos)
+          CRef r pos -> fail ("Found reference, but expected "
+                             ++formatted tags++"\nreference is: "++verbatim r
+                             ++"\nat "++show pos)
+          CMisc _ _ -> posnElementWith match tags  -- skip comments, PIs, etc.
+    }
+  where
+    formatted [t]  = "a <"++t++">"
+    formatted tgs = "one of"++ concatMap (\t->" <"++t++">") tgs
+
+-- | A specialisation of @posnElementWith (==)@.
+posnElement :: [String] -> XMLParser (Posn, Element Posn)
+posnElement = posnElementWith (==)
+
+-- | Get the next content element, checking that it has one of the required
+--   tags.  (Skips over comments and whitespace, rejects text and refs.)
+element :: [String] -> XMLParser (Element Posn)
+element tags = fmap snd (posnElement tags)
+                                `debug` ("Element: "++unwords tags++"\n")
+
+-- | Like element, only permits a more flexible match against the tagname.
+elementWith :: (String->String->Bool) -> [String] -> XMLParser (Element Posn)
+elementWith match tags = fmap snd (posnElementWith match tags)
+                                `debug` ("Element: "++unwords tags++"\n")
+
+-- | Run an XMLParser on the contents of the given element (i.e. not on the
+--   current monadic content sequence), checking that the contents are
+--   exhausted, before returning the calculated value within the current
+--   parser context.
+interior :: Element Posn -> XMLParser a -> XMLParser a
+interior (Elem e _ cs) p =
+    case runParser p cs of
+        (Left msg, _) -> fail msg
+        (Right x, []) -> return x
+        (Right x, ds@(d:_))
+            | all onlyMisc ds -> return x
+            | otherwise       -> fail ("Too many elements inside <"++e++"> at\n"
+                                      ++show (info d)++"\n"
+                                      ++"Found excess: "++verbatim d)
+  where onlyMisc (CMisc _ _) = True
+        onlyMisc (CString False s _) | all isSpace s = True
+        onlyMisc _ = False
+
+-- | A combination of element + interior.
+inElement :: String -> XMLParser a -> XMLParser a
+inElement tag p = do { e <- element [tag]; commit (interior e p) }
+
+-- | A combination of elementWith + interior.
+inElementWith :: (String->String->Bool) -> String -> XMLParser a -> XMLParser a
+inElementWith match tag p = do { e <- elementWith match [tag]
+                               ; commit (interior e p) }
+
+-- | Do some parsing of the attributes of the given element
+attributes :: XmlAttributes a => Element Posn -> XMLParser a
+attributes (Elem _ as _) = return (fromAttrs as)
+
+-- | 'text' is a counterpart to 'element', parsing text content if it
+--   exists.  Adjacent text and references are coalesced.
+text :: XMLParser String
+text = text' []
+  where text' acc =
+          do { c <- content "plain text"
+             ; case c of
+                 CString _ s _        -> text' (s:acc)
+                 CRef (RefChar s) _   -> text' (("&#"++show s++";") :acc)
+                 CRef (RefEntity s) _ -> text' (('&':s++";"):acc)
+                 CMisc _ _            -> text' acc
+                 CElem _ _         -> do { reparse [c] -- put it back!
+                                         ; if null acc then fail "empty string"
+                                           else return (concat (reverse acc))
+                                         }
+             }
+          `onFail` ( if null acc then fail "empty string"
+                     else return (concat (reverse acc)) )
+
+
+-- | 'choice f p' means if parseContents succeeds, apply f to the result,
+--   otherwise use the continuation parser.
+choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
+choice cons (P other) =
+    P (\cs-> case runParser parseContents cs of
+                 (Left _, _)  -> other cs
+                 (Right x, cs') -> (Right (cons x), cs'))
+
+--choice cons other = fmap cons parseContents `onFail` other
+
+-- | not sure this is needed now.   'definite p' previously ensured that
+--   an element was definitely present.  Now I think the monad might take
+--   care of that for us.
+definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
+definite p inner tag = P (\cs-> case runParser p cs of
+                                   (Left _, cs') -> (Left (False,msg'), cs')
+                                   (Right x, cs')  -> (Right x,   cs'))
+  where msg' = "content error: expected "++inner++" inside <"++tag
+               ++"> element\n"
+
+------------------------------------------------------------------------
+
+-- | The @XmlContent@ class promises that an XML Content element can be
+--   converted to and from a Haskell value.
+class HTypeable a => XmlContent a where
+    -- | Convert from XML to Haskell
+    parseContents :: XMLParser a
+    -- | Convert from Haskell to XML
+    toContents    :: a -> [Content ()]
+
+    -- | Dummy functions (for most types): used /only/ in the Char instance
+    --   for coercing lists of Char into String.
+    xToChar       :: a -> Char
+    xFromChar     :: Char -> a
+    xToChar        = error "HaXml.XmlContent.xToChar used in error"
+    xFromChar      = error "HaXml.XmlContent.xFromChar used in error"
+
+-- | The @XmlAttributes@ class promises that a list of XML tag attributes
+--   can be converted to and from a Haskell value.
+class XmlAttributes a where
+    fromAttrs :: [Attribute] -> a
+    toAttrs   :: a -> [Attribute]
+-- | The @XmlAttrType@ class promises that an attribute taking an XML
+--   enumerated type can be converted to and from a Haskell value.
+class XmlAttrType a where
+    fromAttrToTyp :: String -> Attribute -> Maybe a
+    toAttrFrTyp   :: String -> a -> Maybe Attribute
+
+
+------------------------------------------------------------------------
+-- Instances for some of the standard basic datatypes.
+-- Both DtdToHaskell and Haskell2Xml share these instances.
+------------------------------------------------------------------------
+
+instance (XmlContent a, XmlContent b) => XmlContent (a,b) where
+    toContents (a,b) = toContents a ++ toContents b
+    parseContents    = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; return (a,b)
+        }
+
+instance (XmlContent a, XmlContent b, XmlContent c) => XmlContent (a,b,c) where
+    toContents (a,b,c) = toContents a ++ toContents b ++ toContents c
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; return (a,b,c)
+        }
+
+instance (XmlContent a, XmlContent b, XmlContent c, XmlContent d) =>
+         XmlContent (a,b,c,d) where
+    toContents (a,b,c,d) = toContents a ++ toContents b ++ toContents c
+                           ++ toContents d
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; return (a,b,c,d)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e ) =>
+         XmlContent (a,b,c,d,e) where
+    toContents (a,b,c,d,e) = toContents a ++ toContents b ++ toContents c
+                             ++ toContents d ++ toContents e
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; return (a,b,c,d,e)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f ) =>
+         XmlContent (a,b,c,d,e,f) where
+    toContents (a,b,c,d,e,f) = toContents a ++ toContents b ++ toContents c
+                               ++ toContents d ++ toContents e ++ toContents f
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; return (a,b,c,d,e,f)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g ) =>
+         XmlContent (a,b,c,d,e,f,g) where
+    toContents (a,b,c,d,e,f,g)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; return (a,b,c,d,e,f,g)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h ) =>
+         XmlContent (a,b,c,d,e,f,g,h) where
+    toContents (a,b,c,d,e,f,g,h)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; return (a,b,c,d,e,f,g,h)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i) where
+    toContents (a,b,c,d,e,f,g,h,i)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j) where
+    toContents (a,b,c,d,e,f,g,h,i,j)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m, XmlContent n ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m ++ toContents n
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; n <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m, XmlContent n, XmlContent o ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m ++ toContents n ++ toContents o
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; n <- parseContents
+        ; o <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
+        }
+
+
+------------------------------------------------------------------------
+-- Useful auxiliaries for "fromAttributes"
+------------------------------------------------------------------------
+
+-- | If an attribute is defaultable, then it either takes the default
+--   value (which is omitted from the output), or a non-default value
+--   (which obviously must be printed).
+data Defaultable a  = Default a    | NonDefault a    deriving (Eq,Show)
+
+searchMaybe :: (a -> Maybe b) -> [a] -> Maybe b
+searchMaybe _ [] = Nothing
+searchMaybe f (x:xs) =
+    let fx = f x in
+    case fx of
+      Nothing  -> searchMaybe f xs
+      (Just _) -> fx
+
+maybeToAttr :: (String->a->Maybe Attribute) -> String -> Maybe a
+               -> Maybe Attribute
+maybeToAttr _ _ Nothing  = Nothing
+maybeToAttr to n (Just v) = to n v
+
+defaultToAttr :: (String->a->Maybe Attribute) -> String -> Defaultable a
+                 -> Maybe Attribute
+defaultToAttr _ _ (Default _)  = Nothing
+defaultToAttr to n (NonDefault v) = to n v
+
+definiteA :: (String->Attribute->Maybe a) -> String -> String
+             -> [Attribute] -> a
+definiteA from tag at as =
+    case searchMaybe (from at) as of
+      Nothing  -> error ("missing attribute "++at++" in tag <"++tag++">")
+      (Just a) -> a
+
+defaultA :: (String->Attribute->Maybe a) -> a -> String
+            -> [Attribute] -> Defaultable a
+defaultA from def at as =
+    case searchMaybe (from at) as of
+      Nothing  -> Default def
+      (Just a) -> NonDefault a
+
+possibleA :: (String->Attribute->Maybe a) -> String -> [Attribute] -> Maybe a
+possibleA from at as = searchMaybe (from at) as
+
+fromAttrToStr :: String -> Attribute -> Maybe String
+fromAttrToStr n (n0,v)
+        | n == n0   = Just (attr2str v)
+        | otherwise = Nothing
+
+toAttrFrStr   :: String -> String -> Maybe Attribute
+toAttrFrStr n v = Just (n, str2attr v)
+
+str2attr :: String -> AttValue
+str2attr s =
+    let f t =
+          let (l,r) = span (\c-> not (elem c "\"&<>'")) t
+          in if null r then [Left l]
+             else Left l: Right (g (head r)): f (tail r)
+        g '"'  = RefEntity "quot"
+        g '&'  = RefEntity "amp"
+        g '<'  = RefEntity "lt"
+        g '>'  = RefEntity "gt"
+        g '\'' = RefEntity "apos"
+    in AttValue (f s)
+
+attr2str :: AttValue -> String          -- really needs symbol table
+attr2str (AttValue xs) =
+    let f (Left s) = s
+        f (Right (RefChar i))        = [chr i]
+        f (Right (RefEntity "quot")) = "\""
+        f (Right (RefEntity "amp"))  = "&"
+        f (Right (RefEntity "lt"))   = "<"
+        f (Right (RefEntity "gt"))   = ">"
+        f (Right (RefEntity "apos")) = "'"
+        f (Right _)                  = "*"  -- Ooops, ST needed here.
+    in concatMap f xs
+
+------------------------------------------------------------------------
+--  New content-model types
+------------------------------------------------------------------------
+
+{-
+data OneOf2 a b
+data OneOf3 a b c
+data OneOf4 a b c d
+    ... etc are now defined (with instances) in module OneOfN.
+-}
+
+-- | A type corresponding to XML's ANY contentspec.
+--   It is either a list of unconverted xml 'Content'
+--   or some 'XmlContent'-able value.
+--
+-- Parsing functions (e.g. 'parseContents') will always produce 'UnConverted'.
+-- Note: The Show instance for 'UnConverted' uses 'verbatim'.
+data ANYContent = forall a . (XmlContent a, Show a) => ANYContent a
+                | UnConverted [Content Posn]
+
+instance Show ANYContent where
+    show (UnConverted c) = "UnConverted " ++ (show $ map verbatim c)
+    show (ANYContent a)  = "ANYContent " ++ (show a)
+
+instance Eq ANYContent where
+    a == b = show a == show b
+
+-- | The List1 type represents lists with at least one element.
+--   It is required for DTD content models that use + as a modifier.
+data List1 a = NonEmpty [a]  deriving (Eq, Show)
+
+
+------------------------------------------------------------------------
+--  Instances for new content-model types
+------------------------------------------------------------------------
+instance (HTypeable a) => HTypeable (List1 a) where
+    toHType m  = Defined "List1" [hx]
+                         [Constr "NonEmpty" [hx] [List hx] {-Nothing-}]
+               where (NonEmpty x) = m
+                     hx = toHType x
+instance (XmlContent a) => XmlContent (List1 a) where
+    toContents (NonEmpty xs) = concatMap toContents xs
+    parseContents = fmap NonEmpty $ many1 parseContents
+
+instance HTypeable ANYContent where
+    toHType _      = Prim "ANYContent" "ANY"
+instance XmlContent ANYContent where
+    toContents (ANYContent a)  = toContents a
+    toContents (UnConverted s) = map (fmap (const ())) s
+    parseContents = P (\cs -> (Right (UnConverted cs), []))
+
+------------------------------------------------------------------------
+--
+------------------------------------------------------------------------
+

+
+
diff --git a/docs/changelog.html b/docs/changelog.html
--- a/docs/changelog.html
+++ b/docs/changelog.html
@@ -27,6 +27,8 @@
      It also fixes a couple of bugs in DtdToHaskell, when dealing with
      larger datatypes (more than 26 components) and duplicate ATTLIST
      specifications.
+
  •  Version 1.19.6 fixes some tag-name bugs when converting datatypes
+     generated by DtdToHaskell back into an XML file value.
 
 
 
    Changes in 1.18
    
diff --git a/docs/index.html b/docs/index.html
--- a/docs/index.html
+++ b/docs/index.html
@@ -132,11 +132,11 @@
 
    Downloads
    
 
    
 Development versions:
    
-HaXml-1.19.5, release date 2009.02.02
    
+HaXml-1.19.6, release date 2009.02.04
    
 From Hackage
    
 By HTTP:
-.tar.gz,
-.zip.
+.tar.gz,
+.zip.
 
    
 By FTP: 
 
@@ -203,6 +203,8 @@
 
    Recent news
    
 
 
    
+Version 1.19.6 has some bugfixes to XmlContent, to ensure that types
+created via DtdToHaskell get converted back to XML correctly.
    
 Version 1.19.5 has some bugfixes to DtdToHaskell, to cope with especially
 large datatypes.
    
 Version 1.19.4 has some minor bugfixes to increase compatibility with the
diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 SOFTWARE = HaXml
-VERSION = 1.19.5
+VERSION = 1.19.6
 
 LIBSRCS = \
 	Text/XML/HaXml.hs Text/XML/HaXml/Combinators.hs Text/XML/HaXml/Lex.hs \
@@ -10,7 +10,10 @@
 	Text/XML/HaXml/OneOfN.hs \
 	Text/XML/HaXml/ParseLazy.hs \
 	Text/XML/HaXml/ByteStringPP.hs \
-	Text/XML/HaXml/TypeMapping.hs  Text/XML/HaXml/XmlContent.hs \
+	Text/XML/HaXml/TypeMapping.hs \
+	Text/XML/HaXml/XmlContent.hs \
+	Text/XML/HaXml/XmlContent/Parser.hs \
+	Text/XML/HaXml/XmlContent/Haskell.hs \
 	Text/XML/HaXml/Verbatim.hs Text/XML/HaXml/Escape.hs \
 	Text/XML/HaXml/SAX.hs \
 	Text/XML/HaXml/ShowXmlLazy.hs \
diff --git a/src/Text/XML/HaXml/XmlContent.hs b/src/Text/XML/HaXml/XmlContent.hs
--- a/src/Text/XML/HaXml/XmlContent.hs
+++ b/src/Text/XML/HaXml/XmlContent.hs
@@ -1,132 +1,52 @@
-{-# LANGUAGE ExistentialQuantification #-}
-
 -- | The class 'XmlContent' is a kind of replacement for Read and Show:
 --   it provides conversions between a generic XML tree representation
 --   and your own more specialised typeful Haskell data trees.
 --
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances.
+--   
 --   If you are starting with a set of Haskell datatypes, use DrIFT to
 --   derive instances of this class for you:
 --       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
---   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
---   to generate both the Haskell types and the corresponding instances.
---
---   This unified class interface replaces two previous (somewhat similar)
---   classes: Haskell2Xml and Xml2Haskell.  There was no real reason to have
---   separate classes depending on how you originally defined your datatypes.
-
---   The methods 'toContents' and 'parseContents' convert a value to and from
---   a generic internal representation of an XML document /without/ a DTD.
---   The functions 'toXml' and 'fromXml' convert a value to and from a generic
---   internal representation of an XML document /including/ a DTD.
---   The functions 'readXml' and 'showXml' convert to and from Strings.
---   The functions 'fReadXml' and 'fWriteXml' do the conversion to and from
---   the given filenames.
---   The functions 'hGetXml' and 'hPutXml' do the conversion to and from
---   the given file handles.
---   (See the type signatures.)
---
+--   and _do_not_ use the current module, but rather
+--   Text.XML.HaXml.XmlContent.Haskell, for the correct matching
+--   instances for standard Haskell datatypes.
 
 module Text.XML.HaXml.XmlContent
-  ( -- * Re-export the relevant set of generic XML document type definitions
-    Document(..)
-  , Element(..)
-  , ElemTag(..)
-  , Content(..)
-  , Attribute()
-  , AttValue(..)
-  , Prolog(..)
-  , Reference(..)
-  -- * The enabling classes, that define parsing\/unparsing between Haskell
-  --   datatypes and a generic XML representation.
-  , XmlContent(..)
-  , XmlAttributes(..)
-  , XmlAttrType(..)
-  -- ** Auxiliaries for writing parsers in the XmlContent class
-  , module Text.ParserCombinators.Poly
-  , XMLParser
-  , content, posnElement, element, interior, inElement, text, attributes
-  , posnElementWith, elementWith, inElementWith
-  , choice, definite -- ???
-  -- ** Auxiliaries for generating in the XmlContent class
-  , mkElem, mkElemC, mkAttr
-  , toText, toCData
-  -- ** Auxiliaries for the attribute-related classes
-  , maybeToAttr, defaultToAttr
-  , definiteA, defaultA, possibleA, fromAttrToStr, toAttrFrStr
-  , Defaultable(..)
-  , str2attr, attr2str, attval
-  , catMaybes   -- re-exported from Maybe
+  (
+  -- * Re-export everything from Text.XML.HaXml.XmlContent.Parser.
+    module Text.XML.HaXml.XmlContent.Parser
+  -- * Contains instances of the XmlContent classes,
+  --   for the basic Haskell datatypes list and Maybe,
+  --   intended for use with DtdToHaskell-generated datatypes.
+  --   See the alternative instances in Text.XML.HaXml.XmlContent.Haskell
+  --   if your datatypes originate in Haskell instead.
+--  , module Text.XML.HaXml.XmlContent
+
   -- * Whole-document conversion functions
   , toXml, fromXml
   , readXml, showXml, fpsShowXml
   , fReadXml, fWriteXml, fpsWriteXml
   , hGetXml,  hPutXml, fpsHPutXml
-  -- * Explicit representation of Haskell datatype information
-  --   (for conversion to a DTD)
-  , module Text.XML.HaXml.TypeMapping
-  -- * Types useful for some content models
-  , List1(..)
-  , ANYContent(..)
   ) where
 
 import IO
-import Maybe (catMaybes)
-import Char  (chr, isSpace)
-import List  (isPrefixOf, isSuffixOf)
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
 
 import Text.PrettyPrint.HughesPJ (render)
-import qualified Text.XML.HaXml.Pretty as PP
+import Text.ParserCombinators.Poly
 
 import Text.XML.HaXml.Types
 import Text.XML.HaXml.TypeMapping
 import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
 import Text.XML.HaXml.Pretty   (document)
 import Text.XML.HaXml.Parse    (xmlParse)
-import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
-import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
-import qualified Data.ByteString.Lazy.Char8 as FPS
-
-import Text.ParserCombinators.Poly
-
---  #define DEBUG
-
-#if defined(DEBUG)
-import Debug.Trace(trace)
-debug :: a -> String -> a
-v `debug` s = trace s v
-#else
-debug :: t -> t1 -> t
-v `debug` _ = v
-#endif
+import Text.XML.HaXml.XmlContent.Parser
 
 
 ------------------------------------------------------------------------
--- | Read a single attribute called "value".
-attval :: (Read a) => Element i -> a
-attval (Elem _ [("value",v@(AttValue _))] []) = read (show v)
 
--- | Generate a single attribute.
-mkAttr :: String -> String -> Attribute
-mkAttr n v = (n, AttValue [Left v])
-
--- | Generate an element with no attributes, named for its HType.
-mkElem :: XmlContent a => a -> [Content ()] -> Content ()
-mkElem x cs  = CElem (Elem (showHType (toHType x) "") [] cs) ()
-
--- | Generate an element with no attributes, named directly.
-mkElemC :: String -> [Content ()] -> Content ()
-mkElemC x cs = CElem (Elem x [] cs) ()
-
--- | Turn a simple string into XML text.
-toText :: String -> [Content ()]
-toText s = [CString False s ()]
-
--- | Turn a string into an XML CDATA section.
---   (i.e. special characters like '&' are preserved without interpretation.)
-toCData :: String -> [Content ()]
-toCData s = [CString True s ()]
-------------------------------------------------------------------------
-
         -- probably want to write DTD separately from value, and have
         -- easy ways to combine DTD + value into a document, or write
         -- them to separate files.
@@ -189,20 +109,17 @@
     Document (Prolog (Just (XMLDecl "1.0" Nothing Nothing))
                      [] (if dtd then Just (toDTD ht) else Nothing) [])
              emptyST
-             ( case (ht, toContents value) of
-                 (Tuple _, cs)       -> Elem (showHType ht "") [] cs
-                 (Defined _ _ _, cs) -> Elem (showHType ht "-XML") [] cs
-                 (_, [CElem e ()])   -> e )
+             ( case toContents value of
+                 []             -> Elem "empty" [] []
+                 [CElem e ()]   -> e
+                 (CElem e ():_) -> error "too many XML elements in document" )
              []
 
 -- | Read a Haskell value from an XML document, ignoring the DTD and
 --   using the Haskell result type to determine how to parse it.
 fromXml :: XmlContent a => Document Posn -> Either String a
-fromXml (Document _ _ e@(Elem n _ cs) _)
-  | "tuple" `isPrefixOf` n = fst (runParser parseContents cs)
-  | "-XML"  `isSuffixOf` n = fst (runParser parseContents cs)
-  | otherwise = fst (runParser parseContents
-                               [CElem e (posInNewCxt "document" Nothing)])
+fromXml (Document _ _ e@(Elem n _ cs) _) =
+  fst (runParser parseContents [CElem e (posInNewCxt "document" Nothing)])
 
 
 -- | Read a fully-typed XML document from a file handle.
@@ -225,198 +142,16 @@
 fpsHPutXml h dtd x = do
     (FPS.hPut h . FPS.document . toXml dtd) x
 
-------------------------------------------------------------------------
 
--- | We need a parsing monad for reading generic XML Content into specific
---   datatypes.  This is a specialisation of the Text.ParserCombinators.Poly
---   ones, where the input token type is fixed as XML Content.
-type XMLParser a = Parser (Content Posn) a
-
-
 ------------------------------------------------------------------------
--- Some useful parsing combinators
-------------------------------------------------------------------------
-
--- | The most primitive combinator for XMLParser - get one content item.
-content :: String -> XMLParser (Content Posn)
-content word = next `adjustErr` (++" when expecting "++word)
-
--- | Get the next content element, checking that it has one of the required
---   tags, using the given matching function.
---   (Skips over comments and whitespace, rejects text and refs.
---    Also returns position of element.)
-posnElementWith :: (String->String->Bool) -> [String]
-                   -> XMLParser (Posn, Element Posn)
-posnElementWith match tags = do
-    { c <- content (formatted tags)
-    ; case c of
-          CElem e@(Elem t _ _) pos
-              | any (match t) tags -> return (pos, e)
-              | otherwise          -> fail ("Found a <"++t++">, but expected "
-                                           ++formatted tags++"\nat "++show pos)
-          CString b s pos
-              | not b && all isSpace s -> posnElementWith match tags
-                                                        -- ignore blank space
-              | otherwise -> fail ("Found text content, but expected "
-                                  ++formatted tags++"\ntext is: "++s
-                                  ++"\nat "++show pos)
-          CRef r pos -> fail ("Found reference, but expected "
-                             ++formatted tags++"\nreference is: "++verbatim r
-                             ++"\nat "++show pos)
-          CMisc _ _ -> posnElementWith match tags  -- skip comments, PIs, etc.
-    }
-  where
-    formatted [t]  = "a <"++t++">"
-    formatted tgs = "one of"++ concatMap (\t->" <"++t++">") tgs
-
--- | A specialisation of @posnElementWith (==)@.
-posnElement :: [String] -> XMLParser (Posn, Element Posn)
-posnElement = posnElementWith (==)
-
--- | Get the next content element, checking that it has one of the required
---   tags.  (Skips over comments and whitespace, rejects text and refs.)
-element :: [String] -> XMLParser (Element Posn)
-element tags = fmap snd (posnElement tags)
-                                `debug` ("Element: "++unwords tags++"\n")
-
--- | Like element, only permits a more flexible match against the tagname.
-elementWith :: (String->String->Bool) -> [String] -> XMLParser (Element Posn)
-elementWith match tags = fmap snd (posnElementWith match tags)
-                                `debug` ("Element: "++unwords tags++"\n")
-
--- | Run an XMLParser on the contents of the given element (i.e. not on the
---   current monadic content sequence), checking that the contents are
---   exhausted, before returning the calculated value within the current
---   parser context.
-interior :: Element Posn -> XMLParser a -> XMLParser a
-interior (Elem e _ cs) p =
-    case runParser p cs of
-        (Left msg, _) -> fail msg
-        (Right x, []) -> return x
-        (Right x, ds@(d:_))
-            | all onlyMisc ds -> return x
-            | otherwise       -> fail ("Too many elements inside <"++e++"> at\n"
-                                      ++show (info d)++"\n"
-                                      ++"Found excess: "++verbatim d)
-  where onlyMisc (CMisc _ _) = True
-        onlyMisc (CString False s _) | all isSpace s = True
-        onlyMisc _ = False
-
--- | A combination of element + interior.
-inElement :: String -> XMLParser a -> XMLParser a
-inElement tag p = do { e <- element [tag]; commit (interior e p) }
-
--- | A combination of elementWith + interior.
-inElementWith :: (String->String->Bool) -> String -> XMLParser a -> XMLParser a
-inElementWith match tag p = do { e <- elementWith match [tag]
-                               ; commit (interior e p) }
-
--- | Do some parsing of the attributes of the given element
-attributes :: XmlAttributes a => Element Posn -> XMLParser a
-attributes (Elem _ as _) = return (fromAttrs as)
-
--- | 'text' is a counterpart to 'element', parsing text content if it
---   exists.  Adjacent text and references are coalesced.
-text :: XMLParser String
-text = text' []
-  where text' acc =
-          do { c <- content "plain text"
-             ; case c of
-                 CString _ s _        -> text' (s:acc)
-                 CRef (RefChar s) _   -> text' (("&#"++show s++";") :acc)
-                 CRef (RefEntity s) _ -> text' (('&':s++";"):acc)
-                 CMisc _ _            -> text' acc
-                 CElem _ _         -> do { reparse [c] -- put it back!
-                                         ; if null acc then fail "empty string"
-                                           else return (concat (reverse acc))
-                                         }
-             }
-          `onFail` ( if null acc then fail "empty string"
-                     else return (concat (reverse acc)) )
-
-
--- | 'choice f p' means if parseContents succeeds, apply f to the result,
---   otherwise use the continuation parser.
-choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
-choice cons (P other) =
-    P (\cs-> case runParser parseContents cs of
-                 (Left _, _)  -> other cs
-                 (Right x, cs') -> (Right (cons x), cs'))
-
---choice cons other = fmap cons parseContents `onFail` other
-
--- | not sure this is needed now.   'definite p' previously ensured that
---   an element was definitely present.  Now I think the monad might take
---   care of that for us.
-definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
-definite p inner tag = P (\cs-> case runParser p cs of
-                                   (Left _, cs') -> (Left (False,msg'), cs')
-                                   (Right x, cs')  -> (Right x,   cs'))
-  where msg' = "content error: expected "++inner++" inside <"++tag
-               ++"> element\n"
-
-------------------------------------------------------------------------
-
--- | The @XmlContent@ class promises that an XML Content element can be
---   converted to and from a Haskell value.
-class HTypeable a => XmlContent a where
-    -- | Convert from XML to Haskell
-    parseContents :: XMLParser a
-    -- | Convert from Haskell to XML
-    toContents    :: a -> [Content ()]
-
-    -- | Dummy functions (for most types): used /only/ in the Char instance
-    --   for coercing lists of Char into String.
-    xToChar       :: a -> Char
-    xFromChar     :: Char -> a
-    xToChar        = error "HaXml.XmlContent.xToChar used in error"
-    xFromChar      = error "HaXml.XmlContent.xFromChar used in error"
-
--- | The @XmlAttributes@ class promises that a list of XML tag attributes
---   can be converted to and from a Haskell value.
-class XmlAttributes a where
-    fromAttrs :: [Attribute] -> a
-    toAttrs   :: a -> [Attribute]
--- | The @XmlAttrType@ class promises that an attribute taking an XML
---   enumerated type can be converted to and from a Haskell value.
-class XmlAttrType a where
-    fromAttrToTyp :: String -> Attribute -> Maybe a
-    toAttrFrTyp   :: String -> a -> Maybe Attribute
-
-
-------------------------------------------------------------------------
 -- Instances for all the standard basic datatypes.
--- These are for Haskell datatypes being derived to go to XML.
--- DtdToHaskell does not use these instances.
+-- DtdToHaskell uses only a small number of standard datatypes.
 ------------------------------------------------------------------------
 
-instance XmlContent Bool where
-    toContents b   = [CElem (Elem "bool" [mkAttr "value" (show b)] []) ()]
-    parseContents = do { e <- element ["bool"] ; return (attval e) }
-
-instance XmlContent Int where
-    toContents i   = [CElem (Elem "int" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["int"] ; return (attval e) }
-
-instance XmlContent Integer where
-    toContents i   = [CElem (Elem "integer" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["integer"] ; return (attval e) }
-
-instance XmlContent Float where
-    toContents i   = [CElem (Elem "float" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["float"] ; return (attval e) }
-
-instance XmlContent Double where
-    toContents i   = [CElem (Elem "double" [mkAttr "value" (show i)] []) ()]
-    parseContents = do { e <- element ["double"] ; return (attval e) }
-
 instance XmlContent Char where
     -- NOT in a string
-    toContents c   = [CElem (Elem "char" [mkAttr "value" [c]] []) ()]
-    parseContents = do { (Elem _ [("value",(AttValue [Left [c]]))] [])
-                             <- element ["char"]
-                       ; return c
-                       }
+    toContents c  = error "Text.XML.HaXml.XmlContent.toContents used on a Haskell Char"
+    parseContents = fail "Text.XML.HaXml.XmlContent.parseContents used on a Haskell Char "
     -- Only defined for Char and no other types:
     xToChar   = id
     xFromChar = id
@@ -424,465 +159,18 @@
 instance XmlContent a => XmlContent [a] where
     toContents xs  = case toHType x of
                        (Prim "Char" _) ->
-                            [mkElem "string" [CString True (map xToChar xs) ()]]
-                       _ -> [mkElem xs (concatMap toContents xs)]
+                            [CString True (map xToChar xs) ()]
+                       _ -> concatMap toContents xs
                    where   (x:_) = xs
-    parseContents = P (\x ->
-        case x of
-            (CString _ s _:cs)
-                   -> (Right (map xFromChar s), cs)
-            (CElem (Elem "string" [] [CString _ s _]) _:cs)
-                   -> (Right (map xFromChar s), cs)
-            (CElem (Elem e [] xs) _:cs) | "list" `isPrefixOf` e
-                   -> scanElements xs
-                   where
-                  -- scanElements :: [Content] -> (Either String [a],[Content])
-                     scanElements [] = (Right [], cs)
-                     scanElements es =
-                        case runParser parseContents es of
-                            (Left msg, es') -> (Left (False,msg), es')
-                            (Right y, es') ->
-                                case scanElements es' of
-                                    (Left msg, ds) -> (Left msg, ds)
-                                    (Right ys, ds) -> (Right (y:ys), ds)
-            (CElem (Elem e _ _) pos: cs)
-                   -> (Left (False
-                            ,"Expected a , but found a <"++e++"> at\n"
-                            ++ show pos), cs)
-            (CRef r pos: cs)
-                   -> (Left (False
-                            ,"Expected a , but found a ref "
-                            ++verbatim r++" at\n"++ show pos), cs)
-            (_:cs) -> ((\ (P p)-> p) parseContents) cs  -- skip comments etc.
-            []     -> (Left (False
-                            ,"Ran out of input XML whilst secondary parsing")
-                      , [])
-        )
-
-instance XmlContent () where
-    toContents ()  = [CElem (Elem "unit" [] []) ()]
-    parseContents = do { element ["unit"]; return () }
-
-instance (XmlContent a, XmlContent b) => XmlContent (a,b) where
-    toContents (a,b) = toContents a ++ toContents b
-    parseContents    = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; return (a,b)
-        }
-
-instance (XmlContent a, XmlContent b, XmlContent c) => XmlContent (a,b,c) where
-    toContents (a,b,c) = toContents a ++ toContents b ++ toContents c
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; return (a,b,c)
-        }
-
-instance (XmlContent a, XmlContent b, XmlContent c, XmlContent d) =>
-         XmlContent (a,b,c,d) where
-    toContents (a,b,c,d) = toContents a ++ toContents b ++ toContents c
-                           ++ toContents d
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; return (a,b,c,d)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e ) =>
-         XmlContent (a,b,c,d,e) where
-    toContents (a,b,c,d,e) = toContents a ++ toContents b ++ toContents c
-                             ++ toContents d ++ toContents e
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; return (a,b,c,d,e)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f ) =>
-         XmlContent (a,b,c,d,e,f) where
-    toContents (a,b,c,d,e,f) = toContents a ++ toContents b ++ toContents c
-                               ++ toContents d ++ toContents e ++ toContents f
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; return (a,b,c,d,e,f)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g ) =>
-         XmlContent (a,b,c,d,e,f,g) where
-    toContents (a,b,c,d,e,f,g)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; return (a,b,c,d,e,f,g)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h ) =>
-         XmlContent (a,b,c,d,e,f,g,h) where
-    toContents (a,b,c,d,e,f,g,h)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; return (a,b,c,d,e,f,g,h)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i) where
-    toContents (a,b,c,d,e,f,g,h,i)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j) where
-    toContents (a,b,c,d,e,f,g,h,i,j)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m, XmlContent n ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m ++ toContents n
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; n <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
-        }
-
-instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
-         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
-         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
-         , XmlContent m, XmlContent n, XmlContent o ) =>
-         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where
-    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
-        = toContents a ++ toContents b ++ toContents c ++ toContents d
-          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
-          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
-          ++ toContents m ++ toContents n ++ toContents o
-    parseContents = do
-        { a <- parseContents
-        ; b <- parseContents
-        ; c <- parseContents
-        ; d <- parseContents
-        ; e <- parseContents
-        ; f <- parseContents
-        ; g <- parseContents
-        ; h <- parseContents
-        ; i <- parseContents
-        ; j <- parseContents
-        ; k <- parseContents
-        ; l <- parseContents
-        ; m <- parseContents
-        ; n <- parseContents
-        ; o <- parseContents
-        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
-        }
+    parseContents = let (Right (x:_),_) = runParser p [] -- for type of x only
+                        p = case toHType x of
+                              (Prim "Char" _) -> fmap (map xFromChar) $ text
+                              _ -> many parseContents
+                    in p
+        -- comments, PIs, etc, are skipped in the individual element parser.
 
 instance (XmlContent a) => XmlContent (Maybe a) where
-    toContents m   = [mkElem m (maybe [] toContents m)]
-    parseContents = do
-        { e <- elementWith (flip isPrefixOf) ["maybe"]
-        ; case e of (Elem _ [] []) -> return Nothing
-                    (Elem _ [] _)  -> fmap Just (interior e parseContents)
-        }
-
-instance (XmlContent a, XmlContent b) => XmlContent (Either a b) where
-    toContents v@(Left aa) =
-        [mkElemC (showConstr 0 (toHType v)) (toContents aa)]
-    toContents v@(Right ab) =
-        [mkElemC (showConstr 1 (toHType v)) (toContents ab)]
-    parseContents =
-        (inElementWith (flip isPrefixOf) "Left"  $ fmap Left  parseContents)
-          `onFail`
-        (inElementWith (flip isPrefixOf) "Right" $ fmap Right parseContents)
-
---    do{ e@(Elem t [] _) <- element ["Left","Right"]
---      ; case t of
---          _ | "Left"  `isPrefixOf` t -> fmap Left  (interior e parseContents)
---            | "Right" `isPrefixOf` t -> fmap Right (interior e parseContents)
---      }
-
-
-------------------------------------------------------------------------
--- Useful auxiliaries for "fromAttributes"
-------------------------------------------------------------------------
-
--- | If an attribute is defaultable, then it either takes the default
---   value (which is omitted from the output), or a non-default value
---   (which obviously must be printed).
-data Defaultable a  = Default a    | NonDefault a    deriving (Eq,Show)
-
-searchMaybe :: (a -> Maybe b) -> [a] -> Maybe b
-searchMaybe _ [] = Nothing
-searchMaybe f (x:xs) =
-    let fx = f x in
-    case fx of
-      Nothing  -> searchMaybe f xs
-      (Just _) -> fx
-
-maybeToAttr :: (String->a->Maybe Attribute) -> String -> Maybe a
-               -> Maybe Attribute
-maybeToAttr _ _ Nothing  = Nothing
-maybeToAttr to n (Just v) = to n v
-
-defaultToAttr :: (String->a->Maybe Attribute) -> String -> Defaultable a
-                 -> Maybe Attribute
-defaultToAttr _ _ (Default _)  = Nothing
-defaultToAttr to n (NonDefault v) = to n v
-
-definiteA :: (String->Attribute->Maybe a) -> String -> String
-             -> [Attribute] -> a
-definiteA from tag at as =
-    case searchMaybe (from at) as of
-      Nothing  -> error ("missing attribute "++at++" in tag <"++tag++">")
-      (Just a) -> a
-
-defaultA :: (String->Attribute->Maybe a) -> a -> String
-            -> [Attribute] -> Defaultable a
-defaultA from def at as =
-    case searchMaybe (from at) as of
-      Nothing  -> Default def
-      (Just a) -> NonDefault a
-
-possibleA :: (String->Attribute->Maybe a) -> String -> [Attribute] -> Maybe a
-possibleA from at as = searchMaybe (from at) as
-
-fromAttrToStr :: String -> Attribute -> Maybe String
-fromAttrToStr n (n0,v)
-        | n == n0   = Just (attr2str v)
-        | otherwise = Nothing
-
-toAttrFrStr   :: String -> String -> Maybe Attribute
-toAttrFrStr n v = Just (n, str2attr v)
-
-str2attr :: String -> AttValue
-str2attr s =
-    let f t =
-          let (l,r) = span (\c-> not (elem c "\"&<>'")) t
-          in if null r then [Left l]
-             else Left l: Right (g (head r)): f (tail r)
-        g '"'  = RefEntity "quot"
-        g '&'  = RefEntity "amp"
-        g '<'  = RefEntity "lt"
-        g '>'  = RefEntity "gt"
-        g '\'' = RefEntity "apos"
-    in AttValue (f s)
-
-attr2str :: AttValue -> String          -- really needs symbol table
-attr2str (AttValue xs) =
-    let f (Left s) = s
-        f (Right (RefChar i))        = [chr i]
-        f (Right (RefEntity "quot")) = "\""
-        f (Right (RefEntity "amp"))  = "&"
-        f (Right (RefEntity "lt"))   = "<"
-        f (Right (RefEntity "gt"))   = ">"
-        f (Right (RefEntity "apos")) = "'"
-        f (Right _)                  = "*"  -- Ooops, ST needed here.
-    in concatMap f xs
-
-------------------------------------------------------------------------
---  New content-model types
-------------------------------------------------------------------------
-
-{-
-data OneOf2 a b
-data OneOf3 a b c
-data OneOf4 a b c d
-    ... etc are now defined (with instances) in module OneOfN.
--}
-
--- | A type corresponding to XML's ANY contentspec.
---   It is either a list of unconverted xml 'Content'
---   or some 'XmlContent'-able value.
---
--- Parsing functions (e.g. 'parseContents') will always produce 'UnConverted'.
--- Note: The Show instance for 'UnConverted' uses 'verbatim'.
-data ANYContent = forall a . (XmlContent a, Show a) => ANYContent a
-                | UnConverted [Content Posn]
-
-instance Show ANYContent where
-    show (UnConverted c) = "UnConverted " ++ (show $ map verbatim c)
-    show (ANYContent a)  = "ANYContent " ++ (show a)
-
-instance Eq ANYContent where
-    a == b = show a == show b
-
--- | The List1 type represents lists with at least one element.
---   It is required for DTD content models that use + as a modifier.
-data List1 a = NonEmpty [a]  deriving (Eq, Show)
-
-
-------------------------------------------------------------------------
---  Instances for new content-model types
-------------------------------------------------------------------------
-instance (HTypeable a) => HTypeable (List1 a) where
-    toHType m  = Defined "List1" [hx]
-                         [Constr "NonEmpty" [hx] [List hx] {-Nothing-}]
-               where (NonEmpty x) = m
-                     hx = toHType x
-instance (XmlContent a) => XmlContent (List1 a) where
-    toContents (NonEmpty xs) = concatMap toContents xs
-    parseContents = fmap NonEmpty $ many1 parseContents
-
-instance HTypeable ANYContent where
-    toHType _      = Prim "ANYContent" "ANY"
-instance XmlContent ANYContent where
-    toContents (ANYContent a)  = toContents a
-    toContents (UnConverted s) = map (fmap (const ())) s
-    parseContents = P (\cs -> (Right (UnConverted cs), []))
+    toContents m  = maybe [] toContents m
+    parseContents = optional parseContents
 
-------------------------------------------------------------------------
---
 ------------------------------------------------------------------------
diff --git a/src/Text/XML/HaXml/XmlContent/Haskell.hs b/src/Text/XML/HaXml/XmlContent/Haskell.hs
new file mode 100644
--- /dev/null
+++ b/src/Text/XML/HaXml/XmlContent/Haskell.hs
@@ -0,0 +1,252 @@
+-- | The class 'XmlContent' is a kind of replacement for Read and Show:
+--   it provides conversions between a generic XML tree representation
+--   and your own more specialised typeful Haskell data trees.
+--
+--   If you are starting with a set of Haskell datatypes, use DrIFT to
+--   derive instances of this class for you:
+--       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
+--   and use the current module for instances of the standard Haskell
+--   datatypes list, Maybe, and so on.
+--
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances,
+--   but _do_not_ use the current module for instances: use
+--   Text.XML.HaXml.XmlContent instead.
+
+module Text.XML.HaXml.XmlContent.Haskell
+  (
+  -- * Re-export everything from Text.XML.HaXml.XmlContent.Parser.
+    module Text.XML.HaXml.XmlContent.Parser
+  -- * Instances (only) for the XmlContent class, for datatypes that
+  --   originated in Haskell, rather than from a DTD definition.
+--  , module Text.XML.HaXml.XmlContent.Haskell
+
+  -- * Whole-document conversion functions
+  , toXml, fromXml
+  , readXml, showXml, fpsShowXml
+  , fReadXml, fWriteXml, fpsWriteXml
+  , hGetXml,  hPutXml, fpsHPutXml
+
+  ) where
+
+import IO
+import List (isPrefixOf, isSuffixOf)
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
+
+import Text.PrettyPrint.HughesPJ (render)
+import Text.ParserCombinators.Poly
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.TypeMapping
+import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
+import Text.XML.HaXml.Pretty   (document)
+import Text.XML.HaXml.Parse    (xmlParse)
+import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
+import Text.XML.HaXml.XmlContent.Parser
+
+
+        -- probably want to write DTD separately from value, and have
+        -- easy ways to combine DTD + value into a document, or write
+        -- them to separate files.
+
+-- | Read an XML document from a file and convert it to a fully-typed
+--   Haskell value.
+fReadXml  :: XmlContent a => FilePath -> IO a
+fReadXml fp = do
+    f <- ( if fp=="-" then return stdin
+           else openFile fp ReadMode )
+    x <- hGetContents f
+    let (Document _ _ y _) = xmlParse fp x
+        y' = CElem y (posInNewCxt fp Nothing)
+    either fail return (fst (runParser parseContents [y']))
+
+-- | Write a fully-typed Haskell value to the given file as an XML
+--   document.
+fWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    hPutXml f False x
+    hClose f
+
+-- | Write any Haskell value to the given file as an XML document,
+--   using the FastPackedString interface (output will not be prettified).
+fpsWriteXml :: XmlContent a => FilePath -> a -> IO ()
+fpsWriteXml fp x = do
+    f <- ( if fp=="-" then return stdout
+           else openFile fp WriteMode )
+    fpsHPutXml f False x
+    hClose f
+
+-- | Read a fully-typed XML document from a string.
+readXml :: XmlContent a => String -> Either String a
+readXml s =
+    let (Document _ _ y _) = xmlParse "string input" s in
+    fst (runParser parseContents
+                   [CElem y (posInNewCxt "string input" Nothing)])
+
+-- | Convert a fully-typed XML document to a string (without DTD).
+showXml :: XmlContent a => Bool -> a -> String
+showXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (render . document . toXml dtd) x
+      _ -> ""
+
+-- | Convert a fully-typed XML document to a ByteString (without DTD).
+fpsShowXml :: XmlContent a => Bool -> a -> FPS.ByteString
+fpsShowXml dtd x =
+    case toContents x of
+      [CElem _ _] -> (FPS.document . toXml dtd) x
+      _ -> FPS.empty
+
+
+-- | Convert a fully-typed XML document to a string (with or without DTD).
+toXml :: XmlContent a => Bool -> a -> Document ()
+toXml dtd value =
+    let ht = toHType value in
+    Document (Prolog (Just (XMLDecl "1.0" Nothing Nothing))
+                     [] (if dtd then Just (toDTD ht) else Nothing) [])
+             emptyST
+             ( case (ht, toContents value) of
+                 (Tuple _, cs)       -> Elem (showHType ht "") [] cs
+                 (Defined _ _ _, cs) -> Elem (showHType ht "-XML") [] cs
+                 (_, [CElem e ()])   -> e )
+             []
+
+-- | Read a Haskell value from an XML document, ignoring the DTD and
+--   using the Haskell result type to determine how to parse it.
+fromXml :: XmlContent a => Document Posn -> Either String a
+fromXml (Document _ _ e@(Elem n _ cs) _)
+  | "tuple" `isPrefixOf` n = fst (runParser parseContents cs)
+  | "-XML"  `isSuffixOf` n = fst (runParser parseContents cs)
+  | otherwise = fst (runParser parseContents
+                               [CElem e (posInNewCxt "document" Nothing)])
+
+
+-- | Read a fully-typed XML document from a file handle.
+hGetXml :: XmlContent a => Handle -> IO a
+hGetXml h = do
+    x <- hGetContents h
+    let (Document _ _ y _) = xmlParse "file handle" x
+    either fail return
+           (fst (runParser parseContents
+                           [CElem y (posInNewCxt "file handle" Nothing)]))
+
+-- | Write a fully-typed XML document to a file handle.
+hPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+hPutXml h dtd x = do
+    (hPutStrLn h . render . document . toXml dtd) x
+
+-- | Write a fully-typed XML document to a file handle, using the
+--   FastPackedString interface (output will not be prettified).
+fpsHPutXml :: XmlContent a => Handle -> Bool -> a -> IO ()
+fpsHPutXml h dtd x = do
+    (FPS.hPut h . FPS.document . toXml dtd) x
+
+
+------------------------------------------------------------------------
+-- Instances for all the standard basic datatypes.
+-- These are for Haskell datatypes being derived to go to XML.
+-- DtdToHaskell does not use these instances.
+------------------------------------------------------------------------
+
+instance XmlContent Bool where
+    toContents b   = [CElem (Elem "bool" [mkAttr "value" (show b)] []) ()]
+    parseContents = do { e <- element ["bool"] ; return (attval e) }
+
+instance XmlContent Int where
+    toContents i   = [CElem (Elem "int" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["int"] ; return (attval e) }
+
+instance XmlContent Integer where
+    toContents i   = [CElem (Elem "integer" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["integer"] ; return (attval e) }
+
+instance XmlContent Float where
+    toContents i   = [CElem (Elem "float" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["float"] ; return (attval e) }
+
+instance XmlContent Double where
+    toContents i   = [CElem (Elem "double" [mkAttr "value" (show i)] []) ()]
+    parseContents = do { e <- element ["double"] ; return (attval e) }
+
+instance XmlContent Char where
+    -- NOT in a string
+    toContents c   = [CElem (Elem "char" [mkAttr "value" [c]] []) ()]
+    parseContents = do { (Elem _ [("value",(AttValue [Left [c]]))] [])
+                             <- element ["char"]
+                       ; return c
+                       }
+    -- Only defined for Char and no other types:
+    xToChar   = id
+    xFromChar = id
+
+instance XmlContent a => XmlContent [a] where
+    toContents xs  = case toHType x of
+                       (Prim "Char" _) ->
+                            [mkElem "string" [CString True (map xToChar xs) ()]]
+                       _ -> [mkElem xs (concatMap toContents xs)]
+                   where   (x:_) = xs
+    parseContents = P (\x ->
+        case x of
+            (CString _ s _:cs)
+                   -> (Right (map xFromChar s), cs)
+            (CElem (Elem "string" [] [CString _ s _]) _:cs)
+                   -> (Right (map xFromChar s), cs)
+            (CElem (Elem e [] xs) _:cs) | "list" `isPrefixOf` e
+                   -> scanElements xs
+                   where
+                  -- scanElements :: [Content] -> (Either String [a],[Content])
+                     scanElements [] = (Right [], cs)
+                     scanElements es =
+                        case runParser parseContents es of
+                            (Left msg, es') -> (Left (False,msg), es')
+                            (Right y, es') ->
+                                case scanElements es' of
+                                    (Left msg, ds) -> (Left msg, ds)
+                                    (Right ys, ds) -> (Right (y:ys), ds)
+            (CElem (Elem e _ _) pos: cs)
+                   -> (Left (False
+                            ,"Expected a , but found a <"++e++"> at\n"
+                            ++ show pos), cs)
+            (CRef r pos: cs)
+                   -> (Left (False
+                            ,"Expected a , but found a ref "
+                            ++verbatim r++" at\n"++ show pos), cs)
+            (_:cs) -> ((\ (P p)-> p) parseContents) cs  -- skip comments etc.
+            []     -> (Left (False
+                            ,"Ran out of input XML whilst secondary parsing")
+                      , [])
+        )
+
+instance XmlContent () where
+    toContents ()  = [CElem (Elem "unit" [] []) ()]
+    parseContents = do { element ["unit"]; return () }
+
+
+instance (XmlContent a) => XmlContent (Maybe a) where
+    toContents m   = [mkElem m (maybe [] toContents m)]
+    parseContents = do
+        { e <- elementWith (flip isPrefixOf) ["maybe"]
+        ; case e of (Elem _ [] []) -> return Nothing
+                    (Elem _ [] _)  -> fmap Just (interior e parseContents)
+        }
+
+instance (XmlContent a, XmlContent b) => XmlContent (Either a b) where
+    toContents v@(Left aa) =
+        [mkElemC (showConstr 0 (toHType v)) (toContents aa)]
+    toContents v@(Right ab) =
+        [mkElemC (showConstr 1 (toHType v)) (toContents ab)]
+    parseContents =
+        (inElementWith (flip isPrefixOf) "Left"  $ fmap Left  parseContents)
+          `onFail`
+        (inElementWith (flip isPrefixOf) "Right" $ fmap Right parseContents)
+
+--    do{ e@(Elem t [] _) <- element ["Left","Right"]
+--      ; case t of
+--          _ | "Left"  `isPrefixOf` t -> fmap Left  (interior e parseContents)
+--            | "Right" `isPrefixOf` t -> fmap Right (interior e parseContents)
+--      }
+
+------------------------------------------------------------------------
diff --git a/src/Text/XML/HaXml/XmlContent/Parser.hs b/src/Text/XML/HaXml/XmlContent/Parser.hs
new file mode 100644
--- /dev/null
+++ b/src/Text/XML/HaXml/XmlContent/Parser.hs
@@ -0,0 +1,690 @@
+{-# LANGUAGE ExistentialQuantification #-}
+
+-- | The class 'XmlContent' is a kind of replacement for Read and Show:
+--   it provides conversions between a generic XML tree representation
+--   and your own more specialised typeful Haskell data trees.
+--
+--   If you are starting with a set of Haskell datatypes, use DrIFT to
+--   derive instances of this class for you:
+--       http:\/\/repetae.net\/john\/computer\/haskell\/DrIFT
+--   If you are starting with an XML DTD, use HaXml's tool DtdToHaskell
+--   to generate both the Haskell types and the corresponding instances.
+--
+--   This unified class interface replaces two previous (somewhat similar)
+--   classes: Haskell2Xml and Xml2Haskell.  There was no real reason to have
+--   separate classes depending on how you originally defined your datatypes.
+--   However, some instances for basic types like lists will depend on which 
+--   direction you are using.  See Text.XML.HaXml.XmlContent and
+--   Text.XML.HaXml.XmlContent.Haskell.
+
+--   The methods 'toContents' and 'parseContents' convert a value to and from
+--   a generic internal representation of an XML document /without/ a DTD.
+--   The functions 'toXml' and 'fromXml' convert a value to and from a generic
+--   internal representation of an XML document /including/ a DTD.
+--   The functions 'readXml' and 'showXml' convert to and from Strings.
+--   The functions 'fReadXml' and 'fWriteXml' do the conversion to and from
+--   the given filenames.
+--   The functions 'hGetXml' and 'hPutXml' do the conversion to and from
+--   the given file handles.
+--   (See the type signatures.)
+--
+
+module Text.XML.HaXml.XmlContent.Parser
+  ( -- * Re-export the relevant set of generic XML document type definitions
+    Document(..)
+  , Element(..)
+  , ElemTag(..)
+  , Content(..)
+  , Attribute()
+  , AttValue(..)
+  , Prolog(..)
+  , Reference(..)
+  -- * The enabling classes, that define parsing\/unparsing between Haskell
+  --   datatypes and a generic XML representation.
+  , XmlContent(..)
+  , XmlAttributes(..)
+  , XmlAttrType(..)
+  -- ** Auxiliaries for writing parsers in the XmlContent class
+  , module Text.ParserCombinators.Poly
+  , XMLParser
+  , content, posnElement, element, interior, inElement, text, attributes
+  , posnElementWith, elementWith, inElementWith
+  , choice, definite -- ???
+  -- ** Auxiliaries for generating in the XmlContent class
+  , mkElem, mkElemC, mkAttr
+  , toText, toCData
+  -- ** Auxiliaries for the attribute-related classes
+  , maybeToAttr, defaultToAttr
+  , definiteA, defaultA, possibleA, fromAttrToStr, toAttrFrStr
+  , Defaultable(..)
+  , str2attr, attr2str, attval
+  , catMaybes   -- re-exported from Maybe
+  -- * Explicit representation of Haskell datatype information
+  --   (for conversion to a DTD)
+  , module Text.XML.HaXml.TypeMapping
+  -- * Types useful for some content models
+  , List1(..)
+  , ANYContent(..)
+  ) where
+
+--import IO
+import Maybe (catMaybes)
+import Char  (chr, isSpace)
+import List  (isPrefixOf, isSuffixOf)
+
+import Text.PrettyPrint.HughesPJ (render)
+import qualified Text.XML.HaXml.Pretty as PP
+
+import Text.XML.HaXml.Types
+import Text.XML.HaXml.TypeMapping
+import Text.XML.HaXml.Posn     (Posn, posInNewCxt)
+import Text.XML.HaXml.Pretty   (document)
+import Text.XML.HaXml.Parse    (xmlParse)
+import Text.XML.HaXml.Verbatim (Verbatim(verbatim))
+import qualified Text.XML.HaXml.ByteStringPP as FPS (document)
+import qualified Data.ByteString.Lazy.Char8 as FPS
+
+import Text.ParserCombinators.Poly
+
+--  #define DEBUG
+
+#if defined(DEBUG)
+import Debug.Trace(trace)
+debug :: a -> String -> a
+v `debug` s = trace s v
+#else
+debug :: t -> t1 -> t
+v `debug` _ = v
+#endif
+
+
+------------------------------------------------------------------------
+-- | Read a single attribute called "value".
+attval :: (Read a) => Element i -> a
+attval (Elem _ [("value",v@(AttValue _))] []) = read (show v)
+
+-- | Generate a single attribute.
+mkAttr :: String -> String -> Attribute
+mkAttr n v = (n, AttValue [Left v])
+
+-- | Generate an element with no attributes, named for its HType.
+mkElem :: XmlContent a => a -> [Content ()] -> Content ()
+mkElem x cs  = CElem (Elem (showHType (toHType x) "") [] cs) ()
+
+-- | Generate an element with no attributes, named directly.
+mkElemC :: String -> [Content ()] -> Content ()
+mkElemC x cs = CElem (Elem x [] cs) ()
+
+-- | Turn a simple string into XML text.
+toText :: String -> [Content ()]
+toText s = [CString False s ()]
+
+-- | Turn a string into an XML CDATA section.
+--   (i.e. special characters like '&' are preserved without interpretation.)
+toCData :: String -> [Content ()]
+toCData s = [CString True s ()]
+
+
+------------------------------------------------------------------------
+
+-- | We need a parsing monad for reading generic XML Content into specific
+--   datatypes.  This is a specialisation of the Text.ParserCombinators.Poly
+--   ones, where the input token type is fixed as XML Content.
+type XMLParser a = Parser (Content Posn) a
+
+
+------------------------------------------------------------------------
+-- Some useful parsing combinators
+------------------------------------------------------------------------
+
+-- | The most primitive combinator for XMLParser - get one content item.
+content :: String -> XMLParser (Content Posn)
+content word = next `adjustErr` (++" when expecting "++word)
+
+-- | Get the next content element, checking that it has one of the required
+--   tags, using the given matching function.
+--   (Skips over comments and whitespace, rejects text and refs.
+--    Also returns position of element.)
+posnElementWith :: (String->String->Bool) -> [String]
+                   -> XMLParser (Posn, Element Posn)
+posnElementWith match tags = do
+    { c <- content (formatted tags)
+    ; case c of
+          CElem e@(Elem t _ _) pos
+              | any (match t) tags -> return (pos, e)
+              | otherwise          -> fail ("Found a <"++t++">, but expected "
+                                           ++formatted tags++"\nat "++show pos)
+          CString b s pos
+              | not b && all isSpace s -> posnElementWith match tags
+                                                        -- ignore blank space
+              | otherwise -> fail ("Found text content, but expected "
+                                  ++formatted tags++"\ntext is: "++s
+                                  ++"\nat "++show pos)
+          CRef r pos -> fail ("Found reference, but expected "
+                             ++formatted tags++"\nreference is: "++verbatim r
+                             ++"\nat "++show pos)
+          CMisc _ _ -> posnElementWith match tags  -- skip comments, PIs, etc.
+    }
+  where
+    formatted [t]  = "a <"++t++">"
+    formatted tgs = "one of"++ concatMap (\t->" <"++t++">") tgs
+
+-- | A specialisation of @posnElementWith (==)@.
+posnElement :: [String] -> XMLParser (Posn, Element Posn)
+posnElement = posnElementWith (==)
+
+-- | Get the next content element, checking that it has one of the required
+--   tags.  (Skips over comments and whitespace, rejects text and refs.)
+element :: [String] -> XMLParser (Element Posn)
+element tags = fmap snd (posnElement tags)
+                                `debug` ("Element: "++unwords tags++"\n")
+
+-- | Like element, only permits a more flexible match against the tagname.
+elementWith :: (String->String->Bool) -> [String] -> XMLParser (Element Posn)
+elementWith match tags = fmap snd (posnElementWith match tags)
+                                `debug` ("Element: "++unwords tags++"\n")
+
+-- | Run an XMLParser on the contents of the given element (i.e. not on the
+--   current monadic content sequence), checking that the contents are
+--   exhausted, before returning the calculated value within the current
+--   parser context.
+interior :: Element Posn -> XMLParser a -> XMLParser a
+interior (Elem e _ cs) p =
+    case runParser p cs of
+        (Left msg, _) -> fail msg
+        (Right x, []) -> return x
+        (Right x, ds@(d:_))
+            | all onlyMisc ds -> return x
+            | otherwise       -> fail ("Too many elements inside <"++e++"> at\n"
+                                      ++show (info d)++"\n"
+                                      ++"Found excess: "++verbatim d)
+  where onlyMisc (CMisc _ _) = True
+        onlyMisc (CString False s _) | all isSpace s = True
+        onlyMisc _ = False
+
+-- | A combination of element + interior.
+inElement :: String -> XMLParser a -> XMLParser a
+inElement tag p = do { e <- element [tag]; commit (interior e p) }
+
+-- | A combination of elementWith + interior.
+inElementWith :: (String->String->Bool) -> String -> XMLParser a -> XMLParser a
+inElementWith match tag p = do { e <- elementWith match [tag]
+                               ; commit (interior e p) }
+
+-- | Do some parsing of the attributes of the given element
+attributes :: XmlAttributes a => Element Posn -> XMLParser a
+attributes (Elem _ as _) = return (fromAttrs as)
+
+-- | 'text' is a counterpart to 'element', parsing text content if it
+--   exists.  Adjacent text and references are coalesced.
+text :: XMLParser String
+text = text' []
+  where text' acc =
+          do { c <- content "plain text"
+             ; case c of
+                 CString _ s _        -> text' (s:acc)
+                 CRef (RefChar s) _   -> text' (("&#"++show s++";") :acc)
+                 CRef (RefEntity s) _ -> text' (('&':s++";"):acc)
+                 CMisc _ _            -> text' acc
+                 CElem _ _         -> do { reparse [c] -- put it back!
+                                         ; if null acc then fail "empty string"
+                                           else return (concat (reverse acc))
+                                         }
+             }
+          `onFail` ( if null acc then fail "empty string"
+                     else return (concat (reverse acc)) )
+
+
+-- | 'choice f p' means if parseContents succeeds, apply f to the result,
+--   otherwise use the continuation parser.
+choice :: XmlContent a => (a -> b) -> XMLParser b -> XMLParser b
+choice cons (P other) =
+    P (\cs-> case runParser parseContents cs of
+                 (Left _, _)  -> other cs
+                 (Right x, cs') -> (Right (cons x), cs'))
+
+--choice cons other = fmap cons parseContents `onFail` other
+
+-- | not sure this is needed now.   'definite p' previously ensured that
+--   an element was definitely present.  Now I think the monad might take
+--   care of that for us.
+definite :: XmlContent a => XMLParser a -> String -> String -> XMLParser a
+definite p inner tag = P (\cs-> case runParser p cs of
+                                   (Left _, cs') -> (Left (False,msg'), cs')
+                                   (Right x, cs')  -> (Right x,   cs'))
+  where msg' = "content error: expected "++inner++" inside <"++tag
+               ++"> element\n"
+
+------------------------------------------------------------------------
+
+-- | The @XmlContent@ class promises that an XML Content element can be
+--   converted to and from a Haskell value.
+class HTypeable a => XmlContent a where
+    -- | Convert from XML to Haskell
+    parseContents :: XMLParser a
+    -- | Convert from Haskell to XML
+    toContents    :: a -> [Content ()]
+
+    -- | Dummy functions (for most types): used /only/ in the Char instance
+    --   for coercing lists of Char into String.
+    xToChar       :: a -> Char
+    xFromChar     :: Char -> a
+    xToChar        = error "HaXml.XmlContent.xToChar used in error"
+    xFromChar      = error "HaXml.XmlContent.xFromChar used in error"
+
+-- | The @XmlAttributes@ class promises that a list of XML tag attributes
+--   can be converted to and from a Haskell value.
+class XmlAttributes a where
+    fromAttrs :: [Attribute] -> a
+    toAttrs   :: a -> [Attribute]
+-- | The @XmlAttrType@ class promises that an attribute taking an XML
+--   enumerated type can be converted to and from a Haskell value.
+class XmlAttrType a where
+    fromAttrToTyp :: String -> Attribute -> Maybe a
+    toAttrFrTyp   :: String -> a -> Maybe Attribute
+
+
+------------------------------------------------------------------------
+-- Instances for some of the standard basic datatypes.
+-- Both DtdToHaskell and Haskell2Xml share these instances.
+------------------------------------------------------------------------
+
+instance (XmlContent a, XmlContent b) => XmlContent (a,b) where
+    toContents (a,b) = toContents a ++ toContents b
+    parseContents    = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; return (a,b)
+        }
+
+instance (XmlContent a, XmlContent b, XmlContent c) => XmlContent (a,b,c) where
+    toContents (a,b,c) = toContents a ++ toContents b ++ toContents c
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; return (a,b,c)
+        }
+
+instance (XmlContent a, XmlContent b, XmlContent c, XmlContent d) =>
+         XmlContent (a,b,c,d) where
+    toContents (a,b,c,d) = toContents a ++ toContents b ++ toContents c
+                           ++ toContents d
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; return (a,b,c,d)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e ) =>
+         XmlContent (a,b,c,d,e) where
+    toContents (a,b,c,d,e) = toContents a ++ toContents b ++ toContents c
+                             ++ toContents d ++ toContents e
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; return (a,b,c,d,e)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f ) =>
+         XmlContent (a,b,c,d,e,f) where
+    toContents (a,b,c,d,e,f) = toContents a ++ toContents b ++ toContents c
+                               ++ toContents d ++ toContents e ++ toContents f
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; return (a,b,c,d,e,f)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g ) =>
+         XmlContent (a,b,c,d,e,f,g) where
+    toContents (a,b,c,d,e,f,g)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; return (a,b,c,d,e,f,g)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h ) =>
+         XmlContent (a,b,c,d,e,f,g,h) where
+    toContents (a,b,c,d,e,f,g,h)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; return (a,b,c,d,e,f,g,h)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i) where
+    toContents (a,b,c,d,e,f,g,h,i)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j) where
+    toContents (a,b,c,d,e,f,g,h,i,j)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m, XmlContent n ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m ++ toContents n
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; n <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n)
+        }
+
+instance ( XmlContent a, XmlContent b, XmlContent c, XmlContent d
+         , XmlContent e, XmlContent f, XmlContent g, XmlContent h
+         , XmlContent i, XmlContent j, XmlContent k, XmlContent l
+         , XmlContent m, XmlContent n, XmlContent o ) =>
+         XmlContent (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) where
+    toContents (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
+        = toContents a ++ toContents b ++ toContents c ++ toContents d
+          ++ toContents e ++ toContents f ++ toContents g ++ toContents h
+          ++ toContents i ++ toContents j ++ toContents k ++ toContents l
+          ++ toContents m ++ toContents n ++ toContents o
+    parseContents = do
+        { a <- parseContents
+        ; b <- parseContents
+        ; c <- parseContents
+        ; d <- parseContents
+        ; e <- parseContents
+        ; f <- parseContents
+        ; g <- parseContents
+        ; h <- parseContents
+        ; i <- parseContents
+        ; j <- parseContents
+        ; k <- parseContents
+        ; l <- parseContents
+        ; m <- parseContents
+        ; n <- parseContents
+        ; o <- parseContents
+        ; return (a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
+        }
+
+
+------------------------------------------------------------------------
+-- Useful auxiliaries for "fromAttributes"
+------------------------------------------------------------------------
+
+-- | If an attribute is defaultable, then it either takes the default
+--   value (which is omitted from the output), or a non-default value
+--   (which obviously must be printed).
+data Defaultable a  = Default a    | NonDefault a    deriving (Eq,Show)
+
+searchMaybe :: (a -> Maybe b) -> [a] -> Maybe b
+searchMaybe _ [] = Nothing
+searchMaybe f (x:xs) =
+    let fx = f x in
+    case fx of
+      Nothing  -> searchMaybe f xs
+      (Just _) -> fx
+
+maybeToAttr :: (String->a->Maybe Attribute) -> String -> Maybe a
+               -> Maybe Attribute
+maybeToAttr _ _ Nothing  = Nothing
+maybeToAttr to n (Just v) = to n v
+
+defaultToAttr :: (String->a->Maybe Attribute) -> String -> Defaultable a
+                 -> Maybe Attribute
+defaultToAttr _ _ (Default _)  = Nothing
+defaultToAttr to n (NonDefault v) = to n v
+
+definiteA :: (String->Attribute->Maybe a) -> String -> String
+             -> [Attribute] -> a
+definiteA from tag at as =
+    case searchMaybe (from at) as of
+      Nothing  -> error ("missing attribute "++at++" in tag <"++tag++">")
+      (Just a) -> a
+
+defaultA :: (String->Attribute->Maybe a) -> a -> String
+            -> [Attribute] -> Defaultable a
+defaultA from def at as =
+    case searchMaybe (from at) as of
+      Nothing  -> Default def
+      (Just a) -> NonDefault a
+
+possibleA :: (String->Attribute->Maybe a) -> String -> [Attribute] -> Maybe a
+possibleA from at as = searchMaybe (from at) as
+
+fromAttrToStr :: String -> Attribute -> Maybe String
+fromAttrToStr n (n0,v)
+        | n == n0   = Just (attr2str v)
+        | otherwise = Nothing
+
+toAttrFrStr   :: String -> String -> Maybe Attribute
+toAttrFrStr n v = Just (n, str2attr v)
+
+str2attr :: String -> AttValue
+str2attr s =
+    let f t =
+          let (l,r) = span (\c-> not (elem c "\"&<>'")) t
+          in if null r then [Left l]
+             else Left l: Right (g (head r)): f (tail r)
+        g '"'  = RefEntity "quot"
+        g '&'  = RefEntity "amp"
+        g '<'  = RefEntity "lt"
+        g '>'  = RefEntity "gt"
+        g '\'' = RefEntity "apos"
+    in AttValue (f s)
+
+attr2str :: AttValue -> String          -- really needs symbol table
+attr2str (AttValue xs) =
+    let f (Left s) = s
+        f (Right (RefChar i))        = [chr i]
+        f (Right (RefEntity "quot")) = "\""
+        f (Right (RefEntity "amp"))  = "&"
+        f (Right (RefEntity "lt"))   = "<"
+        f (Right (RefEntity "gt"))   = ">"
+        f (Right (RefEntity "apos")) = "'"
+        f (Right _)                  = "*"  -- Ooops, ST needed here.
+    in concatMap f xs
+
+------------------------------------------------------------------------
+--  New content-model types
+------------------------------------------------------------------------
+
+{-
+data OneOf2 a b
+data OneOf3 a b c
+data OneOf4 a b c d
+    ... etc are now defined (with instances) in module OneOfN.
+-}
+
+-- | A type corresponding to XML's ANY contentspec.
+--   It is either a list of unconverted xml 'Content'
+--   or some 'XmlContent'-able value.
+--
+-- Parsing functions (e.g. 'parseContents') will always produce 'UnConverted'.
+-- Note: The Show instance for 'UnConverted' uses 'verbatim'.
+data ANYContent = forall a . (XmlContent a, Show a) => ANYContent a
+                | UnConverted [Content Posn]
+
+instance Show ANYContent where
+    show (UnConverted c) = "UnConverted " ++ (show $ map verbatim c)
+    show (ANYContent a)  = "ANYContent " ++ (show a)
+
+instance Eq ANYContent where
+    a == b = show a == show b
+
+-- | The List1 type represents lists with at least one element.
+--   It is required for DTD content models that use + as a modifier.
+data List1 a = NonEmpty [a]  deriving (Eq, Show)
+
+
+------------------------------------------------------------------------
+--  Instances for new content-model types
+------------------------------------------------------------------------
+instance (HTypeable a) => HTypeable (List1 a) where
+    toHType m  = Defined "List1" [hx]
+                         [Constr "NonEmpty" [hx] [List hx] {-Nothing-}]
+               where (NonEmpty x) = m
+                     hx = toHType x
+instance (XmlContent a) => XmlContent (List1 a) where
+    toContents (NonEmpty xs) = concatMap toContents xs
+    parseContents = fmap NonEmpty $ many1 parseContents
+
+instance HTypeable ANYContent where
+    toHType _      = Prim "ANYContent" "ANY"
+instance XmlContent ANYContent where
+    toContents (ANYContent a)  = toContents a
+    toContents (UnConverted s) = map (fmap (const ())) s
+    parseContents = P (\cs -> (Right (UnConverted cs), []))
+
+------------------------------------------------------------------------
+--
+------------------------------------------------------------------------