From 011b63cb2034476017dde1d4ad5a6aea43b94066 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 2 Jun 1999 17:44:04 +0000 Subject: [PATCH] Release of libxml-1.1, Daniel. --- ChangeLog | 7 + Makefile.am | 75 +- README | 7 + SAX.c | 77 +- SAXresult/dav1 | 100 +++ SAXresult/dav10 | 13 + SAXresult/dav11 | 77 ++ SAXresult/dav12 | 6 + SAXresult/dav13 | 55 ++ SAXresult/dav15 | 93 +++ SAXresult/dav16 | 22 + SAXresult/dav17 | 99 +++ SAXresult/dav18 | 22 + SAXresult/dav19 | 79 ++ SAXresult/dav2 | 104 +++ SAXresult/dav3 | 77 ++ SAXresult/dav4 | 70 ++ SAXresult/dav5 | 67 ++ SAXresult/dav6 | 83 ++ SAXresult/dav7 | 68 ++ SAXresult/dav8 | 59 ++ SAXresult/dav9 | 77 ++ SAXresult/dia1 | 365 +++++++++ SAXresult/dia2 | 365 +++++++++ SAXresult/dtd1 | 10 + SAXresult/dtd10 | 21 + SAXresult/dtd11 | 8 + SAXresult/dtd2 | 8 + SAXresult/dtd3 | 8 + SAXresult/dtd4 | 7 + SAXresult/dtd5 | 19 + SAXresult/dtd6 | 19 + SAXresult/dtd7 | 15 + SAXresult/dtd8 | 17 + SAXresult/dtd9 | 17 + SAXresult/ent1 | 21 + SAXresult/ent2 | 33 + SAXresult/ent3 | 11 + SAXresult/ent4 | 21 + SAXresult/ent5 | 15 + SAXresult/p3p | 75 ++ SAXresult/rdf1 | 223 ++++++ SAXresult/rdf2 | 193 +++++ SAXresult/svg1 | 627 ++++++++++++++++ SAXresult/svg2 | 226 ++++++ SAXresult/xml1 | 16 + SAXresult/xml2 | 21 + configure.in | 2 +- doc/html/gnome-xml-entities.html | 167 +--- doc/html/gnome-xml-parser.html | 776 ++++++++++++------- doc/html/gnome-xml-parserinternals.html | 725 ++++++++++++++---- doc/html/gnome-xml-tree.html | 283 ++++--- doc/html/gnome-xml-valid.html | 71 +- doc/html/index.sgml | 11 +- encoding.c | 4 +- encoding.h | 4 +- entities.c | 119 +-- entities.h | 3 +- error.c | 4 +- include/libxml/encoding.h | 4 +- include/libxml/entities.h | 3 +- include/libxml/parser.h | 5 + include/libxml/parserInternals.h | 31 +- include/libxml/tree.h | 1 + libxml.spec.in | 5 + parser.c | 961 +++++++++++++++++------- parser.h | 5 + parserInternals.h | 31 +- result/SVG/4rects.xml | 10 + result/SVG/a-valid.xml | 9 + result/SVG/a-wf.xml | 8 + result/SVG/bike-errors.xml | 0 result/SVG/bike.xml | 37 + result/SVG/circle.xml | 9 + result/SVG/defs.xml | 12 + result/SVG/desc.xml | 13 + result/SVG/ellipse.xml | 9 + result/SVG/flower2.xml | 43 ++ result/SVG/gradient.xml | 15 + result/SVG/group01.xml | 14 + result/SVG/group02.xml | 12 + result/SVG/group03.xml | 11 + result/SVG/image-valid.xml | 9 + result/SVG/image-wf.xml | 8 + result/SVG/lin-gradient.xml | 15 + result/SVG/marker.xml | 19 + result/SVG/mask.xml | 12 + result/SVG/mathswitch.xml | 14 + result/SVG/parentns.xml | 6 + result/SVG/path01.xml | 4 + result/SVG/path02.xml | 9 + result/SVG/patternfill.xml | 8 + result/SVG/polyline.xml | 8 + result/SVG/private.xml | 15 + result/SVG/rad-gradient.xml | 16 + result/SVG/rectangle.xml | 9 + result/SVG/richdesc.xml | 11 + result/SVG/script.xml | 12 + result/SVG/structure01.xml | 6 + result/SVG/style.xml | 10 + result/SVG/switch.xml | 9 + result/SVG/symbol-use.xml | 14 + result/SVG/template.xml | 8 + result/SVG/text01.xml | 11 + result/SVG/text02.xml | 25 + result/SVG/text03.xml | 7 + result/SVG/toap01.xml | 10 + result/SVG/toap02.xml | 27 + result/SVG/transform.xml | 12 + result/SVG/trivial.xml | 2 + result/SVG/twin-gradients.xml | 18 + result/SVG/v-template.xml | 6 + result/SVG/viewport-nest.xml | 8 + result/SVG/viewport-transform.xml | 18 + result/SVG/viewport.xml | 6 + result/SVG/wf-template.xml | 4 + result/dia1 | 99 +++ result/dia2 | 99 +++ result/dtd10 | 13 + result/dtd11 | 6 + result/dtd2 | 5 + result/dtd3 | 5 + result/dtd4 | 5 + result/dtd5 | 10 + result/dtd6 | 11 + result/dtd7 | 10 + result/dtd8 | 12 + result/dtd9 | 12 + result/ent2 | 4 +- result/p3p | 22 + result/svg1 | 161 ++++ result/svg2 | 54 ++ result/xml1 | 7 + result/xml2 | 8 + test/SVG/4rects.xml | 11 + test/SVG/a-valid.xml | 10 + test/SVG/a-wf.xml | 9 + test/SVG/bike.xml | 41 + test/SVG/circle.xml | 11 + test/SVG/defs.xml | 14 + test/SVG/desc.xml | 14 + test/SVG/ellipse.xml | 10 + test/SVG/flower2.xml | 44 ++ test/SVG/gradient.xml | 16 + test/SVG/group01.xml | 15 + test/SVG/group02.xml | 13 + test/SVG/group03.xml | 13 + test/SVG/image-valid.xml | 11 + test/SVG/image-wf.xml | 11 + test/SVG/lin-gradient.xml | 16 + test/SVG/marker.xml | 28 + test/SVG/mask.xml | 13 + test/SVG/mathswitch.xml | 32 + test/SVG/parentns.xml | 12 + test/SVG/path01.xml | 5 + test/SVG/path02.xml | 10 + test/SVG/patternfill.xml | 12 + test/SVG/polyline.xml | 9 + test/SVG/private.xml | 19 + test/SVG/rad-gradient.xml | 17 + test/SVG/rectangle.xml | 10 + test/SVG/richdesc.xml | 12 + test/SVG/script.xml | 13 + test/SVG/structure01.xml | 10 + test/SVG/style.xml | 11 + test/SVG/switch.xml | 21 + test/SVG/symbol-use.xml | 28 + test/SVG/template.xml | 9 + test/SVG/text01.xml | 12 + test/SVG/text02.xml | 17 + test/SVG/text03.xml | 8 + test/SVG/toap01.xml | 10 + test/SVG/toap02.xml | 33 + test/SVG/transform.xml | 26 + test/SVG/trivial.xml | 6 + test/SVG/twin-gradients.xml | 19 + test/SVG/v-template.xml | 9 + test/SVG/viewport-nest.xml | 13 + test/SVG/viewport-transform.xml | 46 ++ test/SVG/viewport.xml | 11 + test/SVG/wf-template.xml | 7 + test/dav1 | 43 +- test/dav10 | 5 +- test/dav11 | 33 +- test/dav12 | 5 +- test/dav13 | 23 +- test/dav15 | 40 +- test/dav16 | 9 +- test/dav17 | 43 +- test/dav18 | 9 +- test/dav19 | 35 +- test/dav2 | 48 +- test/dav3 | 36 +- test/dav4 | 30 +- test/dav5 | 28 +- test/dav6 | 37 +- test/dav7 | 31 +- test/dav8 | 27 +- test/dav9 | 35 +- test/dia1 | 99 +++ test/dia2 | 99 +++ test/dtd10 | 8 + test/dtd11 | 5 + test/dtd2 | 4 + test/dtd3 | 5 + test/dtd4 | 4 + test/dtd5 | 6 + test/dtd6 | 6 + test/dtd7 | 6 + test/dtd8 | 8 + test/dtd9 | 8 + test/ent2 | 2 +- test/p3p | 8 +- test/rdf1 | 8 +- test/svg1 | 163 ++++ test/svg2 | 58 ++ test/xml1 | 7 + test/xml2 | 8 + testSAX.c | 11 + tester.c | 5 + tree.c | 90 ++- tree.h | 1 + valid.c | 27 +- 223 files changed, 8520 insertions(+), 1424 deletions(-) create mode 100644 SAXresult/dav1 create mode 100644 SAXresult/dav10 create mode 100644 SAXresult/dav11 create mode 100644 SAXresult/dav12 create mode 100644 SAXresult/dav13 create mode 100644 SAXresult/dav15 create mode 100644 SAXresult/dav16 create mode 100644 SAXresult/dav17 create mode 100644 SAXresult/dav18 create mode 100644 SAXresult/dav19 create mode 100644 SAXresult/dav2 create mode 100644 SAXresult/dav3 create mode 100644 SAXresult/dav4 create mode 100644 SAXresult/dav5 create mode 100644 SAXresult/dav6 create mode 100644 SAXresult/dav7 create mode 100644 SAXresult/dav8 create mode 100644 SAXresult/dav9 create mode 100644 SAXresult/dia1 create mode 100644 SAXresult/dia2 create mode 100644 SAXresult/dtd1 create mode 100644 SAXresult/dtd10 create mode 100644 SAXresult/dtd11 create mode 100644 SAXresult/dtd2 create mode 100644 SAXresult/dtd3 create mode 100644 SAXresult/dtd4 create mode 100644 SAXresult/dtd5 create mode 100644 SAXresult/dtd6 create mode 100644 SAXresult/dtd7 create mode 100644 SAXresult/dtd8 create mode 100644 SAXresult/dtd9 create mode 100644 SAXresult/ent1 create mode 100644 SAXresult/ent2 create mode 100644 SAXresult/ent3 create mode 100644 SAXresult/ent4 create mode 100644 SAXresult/ent5 create mode 100644 SAXresult/p3p create mode 100644 SAXresult/rdf1 create mode 100644 SAXresult/rdf2 create mode 100644 SAXresult/svg1 create mode 100644 SAXresult/svg2 create mode 100644 SAXresult/xml1 create mode 100644 SAXresult/xml2 create mode 100644 result/SVG/4rects.xml create mode 100644 result/SVG/a-valid.xml create mode 100644 result/SVG/a-wf.xml create mode 100644 result/SVG/bike-errors.xml create mode 100644 result/SVG/bike.xml create mode 100644 result/SVG/circle.xml create mode 100644 result/SVG/defs.xml create mode 100644 result/SVG/desc.xml create mode 100644 result/SVG/ellipse.xml create mode 100644 result/SVG/flower2.xml create mode 100644 result/SVG/gradient.xml create mode 100644 result/SVG/group01.xml create mode 100644 result/SVG/group02.xml create mode 100644 result/SVG/group03.xml create mode 100644 result/SVG/image-valid.xml create mode 100644 result/SVG/image-wf.xml create mode 100644 result/SVG/lin-gradient.xml create mode 100644 result/SVG/marker.xml create mode 100644 result/SVG/mask.xml create mode 100644 result/SVG/mathswitch.xml create mode 100644 result/SVG/parentns.xml create mode 100644 result/SVG/path01.xml create mode 100644 result/SVG/path02.xml create mode 100644 result/SVG/patternfill.xml create mode 100644 result/SVG/polyline.xml create mode 100644 result/SVG/private.xml create mode 100644 result/SVG/rad-gradient.xml create mode 100644 result/SVG/rectangle.xml create mode 100644 result/SVG/richdesc.xml create mode 100644 result/SVG/script.xml create mode 100644 result/SVG/structure01.xml create mode 100644 result/SVG/style.xml create mode 100644 result/SVG/switch.xml create mode 100644 result/SVG/symbol-use.xml create mode 100644 result/SVG/template.xml create mode 100644 result/SVG/text01.xml create mode 100644 result/SVG/text02.xml create mode 100644 result/SVG/text03.xml create mode 100644 result/SVG/toap01.xml create mode 100644 result/SVG/toap02.xml create mode 100644 result/SVG/transform.xml create mode 100644 result/SVG/trivial.xml create mode 100644 result/SVG/twin-gradients.xml create mode 100644 result/SVG/v-template.xml create mode 100644 result/SVG/viewport-nest.xml create mode 100644 result/SVG/viewport-transform.xml create mode 100644 result/SVG/viewport.xml create mode 100644 result/SVG/wf-template.xml create mode 100644 result/dia1 create mode 100644 result/dia2 create mode 100644 result/dtd10 create mode 100644 result/dtd11 create mode 100644 result/dtd2 create mode 100644 result/dtd3 create mode 100644 result/dtd4 create mode 100644 result/dtd5 create mode 100644 result/dtd6 create mode 100644 result/dtd7 create mode 100644 result/dtd8 create mode 100644 result/dtd9 create mode 100644 result/svg1 create mode 100644 result/svg2 create mode 100644 result/xml1 create mode 100644 result/xml2 create mode 100755 test/SVG/4rects.xml create mode 100755 test/SVG/a-valid.xml create mode 100755 test/SVG/a-wf.xml create mode 100755 test/SVG/bike.xml create mode 100755 test/SVG/circle.xml create mode 100755 test/SVG/defs.xml create mode 100755 test/SVG/desc.xml create mode 100755 test/SVG/ellipse.xml create mode 100755 test/SVG/flower2.xml create mode 100755 test/SVG/gradient.xml create mode 100755 test/SVG/group01.xml create mode 100755 test/SVG/group02.xml create mode 100755 test/SVG/group03.xml create mode 100755 test/SVG/image-valid.xml create mode 100755 test/SVG/image-wf.xml create mode 100755 test/SVG/lin-gradient.xml create mode 100755 test/SVG/marker.xml create mode 100755 test/SVG/mask.xml create mode 100755 test/SVG/mathswitch.xml create mode 100755 test/SVG/parentns.xml create mode 100755 test/SVG/path01.xml create mode 100755 test/SVG/path02.xml create mode 100755 test/SVG/patternfill.xml create mode 100755 test/SVG/polyline.xml create mode 100755 test/SVG/private.xml create mode 100755 test/SVG/rad-gradient.xml create mode 100755 test/SVG/rectangle.xml create mode 100755 test/SVG/richdesc.xml create mode 100755 test/SVG/script.xml create mode 100755 test/SVG/structure01.xml create mode 100755 test/SVG/style.xml create mode 100755 test/SVG/switch.xml create mode 100755 test/SVG/symbol-use.xml create mode 100755 test/SVG/template.xml create mode 100755 test/SVG/text01.xml create mode 100755 test/SVG/text02.xml create mode 100755 test/SVG/text03.xml create mode 100755 test/SVG/toap01.xml create mode 100755 test/SVG/toap02.xml create mode 100755 test/SVG/transform.xml create mode 100755 test/SVG/trivial.xml create mode 100755 test/SVG/twin-gradients.xml create mode 100755 test/SVG/v-template.xml create mode 100755 test/SVG/viewport-nest.xml create mode 100755 test/SVG/viewport-transform.xml create mode 100755 test/SVG/viewport.xml create mode 100755 test/SVG/wf-template.xml create mode 100644 test/dia1 create mode 100644 test/dia2 create mode 100644 test/dtd10 create mode 100644 test/dtd11 create mode 100644 test/dtd2 create mode 100644 test/dtd3 create mode 100644 test/dtd4 create mode 100644 test/dtd5 create mode 100644 test/dtd6 create mode 100644 test/dtd7 create mode 100644 test/dtd8 create mode 100644 test/dtd9 create mode 100644 test/svg1 create mode 100644 test/svg2 create mode 100644 test/xml1 create mode 100644 test/xml2 diff --git a/ChangeLog b/ChangeLog index 2331fd77..e35c9e6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 2 19:40:58 CEST 1999 Daniel Veillard + + * Release of libxml-1.1, nearly everything has been touched for + this. + * Added more regression tests + * Updated the documentation + Sat May 29 13:34:42 CEST 1999 Daniel Veillard * tree.[ch]: unified the XML_NO_CORBA defines. diff --git a/Makefile.am b/Makefile.am index beae84e5..75e75342 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = doc INCLUDES = -I@srcdir@ @CORBA_CFLAGS@ -noinst_PROGRAMS=tester +noinst_PROGRAMS=tester testSAX bin_SCRIPTS=xml-config @@ -39,29 +39,82 @@ tester_LDFLAGS = tester_DEPENDENCIES = $(DEPS) tester_LDADD= $(LDADDS) +testSAX_SOURCES=testSAX.c +testSAX_LDFLAGS = +testSAX_DEPENDENCIES = $(DEPS) +testSAX_LDADD= $(LDADDS) + check-local: tests +testall : tests SVGtests SAXtests + tests : tester - @(for i in $(srcdir)/test/* ; do \ + @(DIR=`pwd`; cd $(srcdir) ; \ + for i in test/* ; do \ if [ ! -d $$i ] ; then \ - j=`echo $$i | sed -e 's,^.*/,,'`; \ - if [ ! -f $(srcdir)/result/$$j ] ; then \ - echo New test file $$j ; \ - ./tester $$i > $(srcdir)/result/$$j ; \ + if [ ! -f result/`basename $$i` ] ; then \ + echo New test file `basename $$i` ; \ + $$DIR/tester $$i > result/`basename $$i` ; \ else \ - echo Testing $$j ; \ - ./tester $$i > result.$$j ; \ - diff $(srcdir)/result/$$j result.$$j ; \ - rm result.$$j ; \ + echo Testing `basename $$i` ; \ + $$DIR/tester $$i > result.`basename $$i` ; \ + diff result/`basename $$i` result.`basename $$i` ; \ + $$DIR/tester result.`basename $$i` > result2.`basename $$i` ; \ + diff result.`basename $$i` result2.`basename $$i` ; \ + rm result.`basename $$i` result2.`basename $$i` ; \ fi ; fi ; done) +SVGtests : tester + @(DIR=`pwd`; cd $(srcdir) ; \ + for i in test/SVG/* ; do \ + if [ ! -d $$i ] ; then \ + if [ ! -f result/SVG/`basename $$i` ] ; then \ + echo New test file `basename $$i` ; \ + $$DIR/tester $$i > result/SVG/`basename $$i` ; \ + else \ + echo Testing `basename $$i` ; \ + $$DIR/tester $$i > result.`basename $$i` ; \ + diff result/SVG/`basename $$i` result.`basename $$i` ; \ + $$DIR/tester result.`basename $$i` > result2.`basename $$i` ; \ + diff result.`basename $$i` result2.`basename $$i` ; \ + rm result.`basename $$i` result2.`basename $$i` ; \ + fi ; fi ; done) + +SAXtests : testSAX + @(DIR=`pwd`; cd $(srcdir) ; \ + for i in test/* ; do \ + if [ ! -d $$i ] ; then \ + if [ ! -f SAXresult/`basename $$i` ] ; then \ + echo New test file `basename $$i` ; \ + $$DIR/testSAX $$i > SAXresult/`basename $$i` ; \ + else \ + echo Testing `basename $$i` ; \ + $$DIR/testSAX $$i > result.`basename $$i` ; \ + diff SAXresult/`basename $$i` result.`basename $$i` ; \ + rm result.`basename $$i` ; \ + fi ; fi ; done) + +#tests : tester +# @(for i in $(srcdir)/test/* ; do \ +# if [ ! -d $$i ] ; then \ +# j=`echo $$i | sed -e 's,^.*/,,'`; \ +# if [ ! -f $(srcdir)/result/$$j ] ; then \ +# echo New test file $$j ; \ +# ./tester $$i > $(srcdir)/result/$$j ; \ +# else \ +# echo Testing $$j ; \ +# ./tester $$i > result.$$j ; \ +# diff $(srcdir)/result/$$j result.$$j ; \ +# rm result.$$j ; \ +# fi ; fi ; done) + ## Put `exec' in the name because this should be installed by ## `install-exec', not `install-data'. confexecdir=$(libdir) confexec_DATA = xmlConf.sh -EXTRA_DIST = xmlConf.sh.in libxml.spec.in test result +EXTRA_DIST = xmlConf.sh.in libxml.spec.in test result SAXresult dist-hook: cp libxml.spec $(distdir) diff --git a/README b/README index 39c315c0..48aa4032 100644 --- a/README +++ b/README @@ -10,5 +10,12 @@ A mailing-list has been set-up, to subscribe: The list archive is at: http://rufus.w3.org/veillard/XML/messages/ +NOTE: I use a second CVS server for experimental version of the XML code, + this mean that if you commit without a Changelog or without sending + the patch to me or the list, it may well get lost. I usually check + before copying over the Gnome directory, but it may happen. + + People interested in the bleeding edge or what I'm up to can check + at http://dev.w3.org/cgi-bin/cvsweb/XML/ Daniel.Veillard@w3.org diff --git a/SAX.c b/SAX.c index 596f6682..bd0caf59 100644 --- a/SAX.c +++ b/SAX.c @@ -19,7 +19,7 @@ /** * getPublicId: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Return the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN" * @@ -34,9 +34,9 @@ getPublicId(void *ctx) /** * getSystemId: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * - * Return the system ID, basically URI or filename e.g. + * Return the system ID, basically URL or filename e.g. * http://www.sgmlsource.com/dtds/memo.dtd * * Returns a CHAR * @@ -50,7 +50,7 @@ getSystemId(void *ctx) /** * getLineNumber: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Return the line number of the current parsing point. * @@ -65,7 +65,7 @@ getLineNumber(void *ctx) /** * getColumnNumber: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Return the column number of the current parsing point. * @@ -88,7 +88,7 @@ xmlSAXLocator xmlDefaultSAXLocator = { /** * isStandalone: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Is this document tagged standalone ? * @@ -103,7 +103,7 @@ isStandalone(void *ctx) /** * hasInternalSubset: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Does this document has an internal subset * @@ -118,7 +118,7 @@ hasInternalSubset(void *ctx) /** * hasExternalSubset: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Does this document has an external subset * @@ -133,7 +133,7 @@ hasExternalSubset(void *ctx) /** * hasInternalSubset: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Does this document has an internal subset */ @@ -141,17 +141,21 @@ void internalSubset(void *ctx, const CHAR *name, const CHAR *ExternalID, const CHAR *SystemID) { + xmlDtdPtr externalSubset; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; #ifdef DEBUG_SAX fprintf(stderr, "SAX.internalSubset(%s, %s, %s)\n", name, ExternalID, SystemID); #endif xmlCreateIntSubset(ctxt->myDoc, name, ExternalID, SystemID); + if ((ExternalID != NULL) || (SystemID != NULL)) { + externalSubset = xmlParseDTD(ExternalID, SystemID); + } } /** * resolveEntity: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @publicId: The public ID of the entity * @systemId: The system ID of the entity * @@ -166,7 +170,7 @@ internalSubset(void *ctx, const CHAR *name, xmlParserInputPtr resolveEntity(void *ctx, const CHAR *publicId, const CHAR *systemId) { - /* xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; */ + xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; #ifdef DEBUG_SAX fprintf(stderr, "SAX.resolveEntity(%s, %s)\n", publicId, systemId); @@ -175,17 +179,20 @@ resolveEntity(void *ctx, const CHAR *publicId, const CHAR *systemId) /* * TODO : not 100% sure that the appropriate handling in that case. */ + if (systemId != NULL) { + return(xmlNewInputFromFile(ctxt, systemId)); + } return(NULL); } /** * getEntity: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The entity name * * Get an entity by name * - * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour. + * Returns the xmlEntityPtr if found. */ xmlEntityPtr getEntity(void *ctx, const CHAR *name) @@ -204,7 +211,7 @@ getEntity(void *ctx, const CHAR *name) /** * entityDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: the entity name * @type: the entity type * @publicId: The public ID of the entity @@ -228,7 +235,7 @@ entityDecl(void *ctx, const CHAR *name, int type, /** * attributeDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: the attribute name * @type: the attribute type * @publicId: The public ID of the attribute @@ -254,7 +261,7 @@ attributeDecl(void *ctx, const CHAR *elem, const CHAR *name, /** * elementDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: the element name * @type: the element type * @publicId: The public ID of the element @@ -278,7 +285,7 @@ elementDecl(void *ctx, const CHAR *name, int type, /** * notationDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The name of the notation * @publicId: The public ID of the entity * @systemId: The system ID of the entity @@ -299,7 +306,7 @@ notationDecl(void *ctx, const CHAR *name, /** * unparsedEntityDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The name of the entity * @publicId: The public ID of the entity * @systemId: The system ID of the entity @@ -322,7 +329,7 @@ unparsedEntityDecl(void *ctx, const CHAR *name, /** * setDocumentLocator: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @loc: A SAX Locator * * Receive the document locator at startup, actually xmlDefaultSAXLocator @@ -339,7 +346,7 @@ setDocumentLocator(void *ctx, xmlSAXLocatorPtr loc) /** * startDocument: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * called when the document start being processed. */ @@ -364,7 +371,7 @@ startDocument(void *ctx) /** * endDocument: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * called when the document end has been detected. */ @@ -379,7 +386,7 @@ endDocument(void *ctx) /** * attribute: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The attribute name * @value: The attribute value * @@ -429,7 +436,7 @@ attribute(void *ctx, const CHAR *fullname, const CHAR *value) } ret = xmlNewProp(ctxt->node, name, NULL); - if (ret != NULL) + if ((ret != NULL) && (ctxt->replaceEntities == 0)) ret->val = xmlStringGetNodeList(ctxt->myDoc, value); if (name != NULL) free(name); @@ -439,7 +446,7 @@ attribute(void *ctx, const CHAR *fullname, const CHAR *value) /** * startElement: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The element name * @atts: An array of name/value attributes pairs, NULL terminated * @@ -529,7 +536,7 @@ startElement(void *ctx, const CHAR *fullname, const CHAR **atts) /** * endElement: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The element name * * called when the end of an element has been detected. @@ -564,7 +571,7 @@ endElement(void *ctx, const CHAR *name) /** * reference: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: The entity name * * called when an entity reference is detected. @@ -584,7 +591,7 @@ reference(void *ctx, const CHAR *name) /** * characters: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @ch: a CHAR string * @len: the number of CHAR * @@ -621,7 +628,7 @@ characters(void *ctx, const CHAR *ch, int len) /** * ignorableWhitespace: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @ch: a CHAR string * @len: the number of CHAR * @@ -639,7 +646,7 @@ ignorableWhitespace(void *ctx, const CHAR *ch, int len) /** * processingInstruction: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @target: the target name * @data: the PI data's * @len: the number of CHAR @@ -658,7 +665,7 @@ processingInstruction(void *ctx, const CHAR *target, /** * globalNamespace: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @href: the namespace associated URN * @prefix: the namespace prefix * @@ -676,7 +683,7 @@ globalNamespace(void *ctx, const CHAR *href, const CHAR *prefix) /** * setNamespace: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @name: the namespace prefix * * Set the current element namespace. @@ -704,7 +711,7 @@ setNamespace(void *ctx, const CHAR *name) /** * getNamespace: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * * Get the current element namespace. */ @@ -723,7 +730,7 @@ getNamespace(void *ctx) /** * checkNamespace: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @namespace: the namespace to check against * * Check that the current element namespace is the same as the @@ -771,7 +778,7 @@ checkNamespace(void *ctx, CHAR *namespace) /** * namespaceDecl: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @href: the namespace associated URN * @prefix: the namespace prefix * @@ -792,7 +799,7 @@ namespaceDecl(void *ctx, const CHAR *href, const CHAR *prefix) /** * comment: - * @ctxt: An XML parser context + * @ctx: the user data (XML parser context) * @value: the comment content * * A comment has been parsed. diff --git a/SAXresult/dav1 b/SAXresult/dav1 new file mode 100644 index 00000000..0d6b77df --- /dev/null +++ b/SAXresult/dav1 @@ -0,0 +1,100 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/', xmlns:R='http://www.foo.bar/boxschema') +SAX.characters( + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + , 5) +SAX.startElement(D:prop) +SAX.characters( + + Box type A, 9) +SAX.startElement(R:BoxType) +SAX.characters(Box type A + <, 10) +SAX.endElement(R:BoxType) +SAX.characters( + + + J.J. Dinglehe, 9) +SAX.startElement(R:Name) +SAX.characters(J.J. Dingleheimerschmidt + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + + + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 403 Fo, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 403 Forbidden T, 5) +SAX.startElement(D:responsedescription) +SAX.characters( The user does not have access, 64) +SAX.endElement(D:responsedescription) +SAX.characters( + + The, 3) +SAX.startElement(D:responsedescription) +SAX.characters( There has been an access viol, 44) +SAX.endElement(D:responsedescription) +SAX.characters( + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav10 b/SAXresult/dav10 new file mode 100644 index 00000000..e8a0e1e9 --- /dev/null +++ b/SAXresult/dav10 @@ -0,0 +1,13 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:owner, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + http://www.ics.uci., 3) +SAX.startElement(D:href) +SAX.characters(http://www.ics.uci.edu/~ejw/co, 40) +SAX.endElement(D:href) +SAX.characters( + +, 1) +SAX.endElement(D:owner) +SAX.endDocument() diff --git a/SAXresult/dav11 b/SAXresult/dav11 new file mode 100644 index 00000000..e7a6c666 --- /dev/null +++ b/SAXresult/dav11 @@ -0,0 +1,77 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:prop, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + write + exclusive<, 7) +SAX.startElement(D:lockscope) +SAX.characters(exclusive + , 9) +SAX.endElement(D:lockscope) +SAX.characters( + + + + http://www, 9) +SAX.startElement(D:href) +SAX.characters( + http://www.ics.uci.edu/~ejw, 46) +SAX.endElement(D:href) +SAX.characters( + + Second-60480, 7) +SAX.startElement(D:timeout) +SAX.characters(Second-604800 + , 13) +SAX.endElement(D:timeout) +SAX.characters( + + <, 7) +SAX.startElement(D:locktoken) +SAX.characters( + + opaquelo, 9) +SAX.startElement(D:href) +SAX.characters( + opaquelocktoken:xyz122393, 59) +SAX.endElement(D:href) +SAX.characters( + + + + +, 1) +SAX.endElement(D:prop) +SAX.endDocument() diff --git a/SAXresult/dav12 b/SAXresult/dav12 new file mode 100644 index 00000000..67b9f647 --- /dev/null +++ b/SAXresult/dav12 @@ -0,0 +1,6 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:href, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters(http://www.ics.uci.edu/~ejw/co, 40) +SAX.endElement(D:href) +SAX.endDocument() diff --git a/SAXresult/dav13 b/SAXresult/dav13 new file mode 100644 index 00000000..e7f104d9 --- /dev/null +++ b/SAXresult/dav13 @@ -0,0 +1,55 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + http://webda, 5) +SAX.startElement(D:href) +SAX.characters( + http://webdav.sb.aol.com/, 66) +SAX.endElement(D:href) +SAX.characters( + + http://webda, 5) +SAX.startElement(D:href) +SAX.characters( + http://webdav.sb.aol.com/, 54) +SAX.endElement(D:href) +SAX.characters( + HTTP/1.1 202 Ac, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 202 Accepted + + ht, 3) +SAX.startElement(D:response) +SAX.characters( + http://foo.bar/bl, 5) +SAX.startElement(D:href) +SAX.characters(http://foo.bar/blah + , 19) +SAX.endElement(D:href) +SAX.characters( + HTTP/1.1 403 Fo, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 403 Forbidden + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav15 b/SAXresult/dav15 new file mode 100644 index 00000000..b3c545f1 --- /dev/null +++ b/SAXresult/dav15 @@ -0,0 +1,93 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:prop, xmlns:D='http://www.ietf.org/standards/dav/', xmlns:F='http://www.foocorp.com/Project/') +SAX.characters( + + + , 3) +SAX.startElement(D:Source) +SAX.characters( + + Source + http://foo.bar/p, 7) +SAX.startElement(D:src) +SAX.characters(http://foo.bar/program, 22) +SAX.endElement(D:src) +SAX.characters( + http://foo.bar/s, 7) +SAX.startElement(D:dst) +SAX.characters(http://foo.bar/src/main.c + + , 5) +SAX.endElement(D:link) +SAX.characters( + + Library + http://foo.bar/p, 7) +SAX.startElement(D:src) +SAX.characters(http://foo.bar/program, 22) +SAX.endElement(D:src) +SAX.characters( + http://foo.bar/s, 7) +SAX.startElement(D:dst) +SAX.characters(http://foo.bar/src/main.lib + + , 5) +SAX.endElement(D:link) +SAX.characters( + + Makefile + <, 8) +SAX.endElement(F:projfiles) +SAX.characters( + http://foo.bar/p, 7) +SAX.startElement(D:src) +SAX.characters(http://foo.bar/program, 22) +SAX.endElement(D:src) +SAX.characters( + http://foo.bar/s, 7) +SAX.startElement(D:dst) +SAX.characters(http://foo.bar/src/makefile + +<, 5) +SAX.endElement(D:link) +SAX.characters( + + +, 3) +SAX.endElement(D:Source) +SAX.characters( + +, 1) +SAX.endElement(D:prop) +SAX.endDocument() diff --git a/SAXresult/dav16 b/SAXresult/dav16 new file mode 100644 index 00000000..0c26b96d --- /dev/null +++ b/SAXresult/dav16 @@ -0,0 +1,22 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:propfind, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + + +, 3) +SAX.endElement(D:prop) +SAX.characters( + +, 1) +SAX.endElement(D:propfind) +SAX.endDocument() diff --git a/SAXresult/dav17 b/SAXresult/dav17 new file mode 100644 index 00000000..6cbf8823 --- /dev/null +++ b/SAXresult/dav17 @@ -0,0 +1,99 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + + , 7) +SAX.startElement(D:lockdiscovery) +SAX.characters( + + , 9) +SAX.startElement(D:activelock) +SAX.characters( + write + <, 5) +SAX.endElement(D:locktype) +SAX.characters( + exclus, 11) +SAX.startElement(D:lockscope) +SAX.characters(exclusive + , 9) +SAX.endElement(D:lockscope) +SAX.characters( + + , 11) +SAX.startElement(D:addlocks) +SAX.characters( + http://fo, 13) +SAX.startElement(D:href) +SAX.characters(http://foo.com/doc/ + , 19) +SAX.endElement(D:href) +SAX.characters( + + , 11) +SAX.endElement(D:addlocks) +SAX.characters( + Jane Smith, 11) +SAX.startElement(D:owner) +SAX.characters(Jane Smith + , 10) +SAX.endElement(D:owner) +SAX.characters( + Infinite, 11) +SAX.startElement(D:timeout) +SAX.characters(Infinite + , 8) +SAX.endElement(D:timeout) +SAX.characters( + + , 11) +SAX.startElement(D:locktoken) +SAX.characters( + iamuri:un, 13) +SAX.startElement(D:href) +SAX.characters(iamuri:unique!!!!! + , 18) +SAX.endElement(D:href) +SAX.characters( + + , 11) +SAX.endElement(D:locktoken) +SAX.characters( + + , 9) +SAX.endElement(D:activelock) +SAX.characters( + + , 7) +SAX.endElement(D:lockdiscovery) +SAX.characters( + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav18 b/SAXresult/dav18 new file mode 100644 index 00000000..6412a300 --- /dev/null +++ b/SAXresult/dav18 @@ -0,0 +1,22 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:propfind, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + + +, 3) +SAX.endElement(D:prop) +SAX.characters( + +, 1) +SAX.endElement(D:propfind) +SAX.endDocument() diff --git a/SAXresult/dav19 b/SAXresult/dav19 new file mode 100644 index 00000000..d19bb10b --- /dev/null +++ b/SAXresult/dav19 @@ -0,0 +1,79 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + + , 7) +SAX.startElement(D:supportedlock) +SAX.characters( + + , 9) +SAX.startElement(D:LockEntry) +SAX.characters( + Write + <, 5) +SAX.endElement(D:locktype) +SAX.characters( + Exclus, 11) +SAX.startElement(D:lockscope) +SAX.characters(Exclusive + , 9) +SAX.endElement(D:lockscope) +SAX.characters( + + , 9) +SAX.endElement(D:LockEntry) +SAX.characters( + + , 9) +SAX.startElement(D:LockEntry) +SAX.characters( + Write + <, 5) +SAX.endElement(D:locktype) +SAX.characters( + Shared, 11) +SAX.startElement(D:lockscope) +SAX.characters(Shared + <, 6) +SAX.endElement(D:lockscope) +SAX.characters( + + , 9) +SAX.endElement(D:LockEntry) +SAX.characters( + + , 7) +SAX.endElement(D:supportedlock) +SAX.characters( + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav2 b/SAXresult/dav2 new file mode 100644 index 00000000..28a069bd --- /dev/null +++ b/SAXresult/dav2 @@ -0,0 +1,104 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(S:multistatus, xmlns:S='http://www.ietf.org/standards/dav/', xmlns:R='http://www.foo.bar/boxschema/') +SAX.characters( + + ht, 3) +SAX.startElement(S:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(S:href) +SAX.characters(http://www.foo.bar/container/<, 29) +SAX.endElement(S:href) +SAX.characters( + + , 5) +SAX.startElement(S:prop) +SAX.characters( + + Box type A, 9) +SAX.startElement(R:BoxType) +SAX.characters(Box type A + <, 10) +SAX.endElement(R:BoxType) +SAX.characters( + + + Hadrian + + + H, 5) +SAX.endElement(S:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(S:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(S:status) +SAX.characters( + + + ht, 3) +SAX.startElement(S:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(S:href) +SAX.characters(http://www.foo.bar/container/i, 39) +SAX.endElement(S:href) +SAX.characters( + + , 5) +SAX.startElement(S:prop) +SAX.characters( + + Box type B, 9) +SAX.startElement(R:BoxType) +SAX.characters(Box type B + <, 10) +SAX.endElement(R:BoxType) +SAX.characters( + + + H, 5) +SAX.endElement(S:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(S:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(S:status) +SAX.characters( + + +, 1) +SAX.endElement(S:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav3 b/SAXresult/dav3 new file mode 100644 index 00000000..6c600b9e --- /dev/null +++ b/SAXresult/dav3 @@ -0,0 +1,77 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/', xmlns:R='http://www.foo.bar/boxschema/') +SAX.characters( + + ht, 3) +SAX.startElement(D:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(D:href) +SAX.characters(http://www.foo.bar/container/<, 29) +SAX.endElement(D:href) +SAX.characters( + + + + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + + ht, 3) +SAX.startElement(D:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(D:href) +SAX.characters(http://www.foo.bar/container/i, 39) +SAX.endElement(D:href) +SAX.characters( + + + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav4 b/SAXresult/dav4 new file mode 100644 index 00000000..3f4196aa --- /dev/null +++ b/SAXresult/dav4 @@ -0,0 +1,70 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:propertyupdate, xmlns:D='http://www.ietf.org/standards/dav/', xmlns:Z='http://www.w3.com/standards/z39.50/') +SAX.characters( + + + , 3) +SAX.startElement(D:set) +SAX.characters( + + + Jim Whitehe, 9) +SAX.startElement(Z:Author) +SAX.characters(Jim Whitehead + , 13) +SAX.endElement(Z:Author) +SAX.characters( + Roy Fieldin, 9) +SAX.startElement(Z:Author) +SAX.characters(Roy Fielding + , 12) +SAX.endElement(Z:Author) +SAX.characters( + + + + + + <, 3) +SAX.endElement(D:set) +SAX.characters( + + + , 3) +SAX.startElement(D:remove) +SAX.characters( + + + , 7) +SAX.startElement(Z:Copyright-Owner) +SAX.endElement((null)) +SAX.characters( + + +<, 5) +SAX.endElement(D:prop) +SAX.characters( + + +, 1) +SAX.endElement(D:propertyupdate) +SAX.endDocument() diff --git a/SAXresult/dav5 b/SAXresult/dav5 new file mode 100644 index 00000000..e8693b2d --- /dev/null +++ b/SAXresult/dav5 @@ -0,0 +1,67 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/', xmlns:Z='http://www.w3.com/standards/z39.50/') +SAX.characters( + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 420 Me, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 420 Method Failure + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + + , 7) +SAX.startElement(Z:Copyright-Owner) +SAX.endElement((null)) +SAX.characters( + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP/1.1 409 Co, 5) +SAX.startElement(D:status) +SAX.characters(HTTP/1.1 409 Conflict + Cop, 3) +SAX.startElement(D:responsedescription) +SAX.characters( Copyright Owner can not be de, 47) +SAX.endElement(D:responsedescription) +SAX.characters( + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav6 b/SAXresult/dav6 new file mode 100644 index 00000000..33e20eb9 --- /dev/null +++ b/SAXresult/dav6 @@ -0,0 +1,83 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(D:multistatus, xmlns:D='http://www.ietf.org/standards/dav/') +SAX.characters( + + ht, 3) +SAX.startElement(D:response) +SAX.characters( + http://www.micros, 5) +SAX.startElement(D:href) +SAX.characters(http://www.microsoft.com/user/, 55) +SAX.endElement(D:href) +SAX.characters( + + + , 7) +SAX.startElement(D:resourcetype) +SAX.characters( + + , 9) +SAX.startElement(D:collection) +SAX.endElement((null)) +SAX.characters( + + <, 7) +SAX.endElement(D:resourcetype) +SAX.characters( + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + + + , 3) +SAX.startElement(D:response) +SAX.characters( + + http://www, 5) +SAX.startElement(D:href) +SAX.characters( + http://www.microsoft.co, 66) +SAX.endElement(D:href) +SAX.characters( + + + <, 7) +SAX.startElement(D:resourcetype) +SAX.endElement((null)) +SAX.characters( + + H, 5) +SAX.endElement(D:prop) +SAX.characters( + HTTP 1.1 200 OK, 5) +SAX.startElement(D:status) +SAX.characters(HTTP 1.1 200 OK + <, 15) +SAX.endElement(D:status) +SAX.characters( + + +, 1) +SAX.endElement(D:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav7 b/SAXresult/dav7 new file mode 100644 index 00000000..c251d93e --- /dev/null +++ b/SAXresult/dav7 @@ -0,0 +1,68 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(d:multistatus, xmlns:d='http://www.ietf.org/standards/dav/') +SAX.characters( + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/r, 38) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/r, 38) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 200 OK, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 200 OK + <, 15) +SAX.endElement(d:status) +SAX.characters( + + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/<, 29) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 420 Me, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 420 Method Failure + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/r, 38) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 412 Pr, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 412 Precondition Fail, 32) +SAX.endElement(d:status) +SAX.characters( + + +, 1) +SAX.endElement(d:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav8 b/SAXresult/dav8 new file mode 100644 index 00000000..225c8d62 --- /dev/null +++ b/SAXresult/dav8 @@ -0,0 +1,59 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(d:multistatus, xmlns:d='http://www.ietf.org/standards/dav/') +SAX.characters( + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 43) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 43) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 34) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 39) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 201 Cr, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 201 Created + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 37) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 412 Pr, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 412 Precondition Fail, 32) +SAX.endElement(d:status) +SAX.characters( + + +, 1) +SAX.endElement(d:multistatus) +SAX.endDocument() diff --git a/SAXresult/dav9 b/SAXresult/dav9 new file mode 100644 index 00000000..65421a8c --- /dev/null +++ b/SAXresult/dav9 @@ -0,0 +1,77 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(d:multistatus, xmlns:d='http://www.ietf.org/standards/dav/') +SAX.characters( + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/r, 38) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/r, 38) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/<, 29) +SAX.endElement(d:href) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/C, 34) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 201 Cr, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 201 Created + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/container/C, 31) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 420 Me, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 420 Method Failure + + ht, 3) +SAX.startElement(d:response) +SAX.characters( + http://www.foo.ba, 5) +SAX.startElement(d:href) +SAX.characters(http://www.foo.bar/othercontai, 36) +SAX.endElement(d:href) +SAX.characters( + HTTP/1.1 409 Co, 5) +SAX.startElement(d:status) +SAX.characters(HTTP/1.1 409 Conflict + +, 1) +SAX.endElement(d:multistatus) +SAX.endDocument() diff --git a/SAXresult/dia1 b/SAXresult/dia1 new file mode 100644 index 00000000..c61703f3 --- /dev/null +++ b/SAXresult/dia1 @@ -0,0 +1,365 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(dia:diagram, xmlns:dia='http://www.lysator.liu.se/~alla/dia/') +SAX.characters( + + + + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + , 9) +SAX.startElement(dia:real, val='0.1') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.startElement(dia:connections) +SAX.characters( + + , 7) +SAX.endElement(dia:connections) +SAX.characters( + + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.endElement(dia:composite) +SAX.characters( + + + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:real, val='2') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + , 9) +SAX.startElement(dia:real, val='0.1') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + + +, 3) +SAX.endElement(dia:layer) +SAX.characters( + +, 1) +SAX.endElement(dia:diagram) +SAX.endDocument() diff --git a/SAXresult/dia2 b/SAXresult/dia2 new file mode 100644 index 00000000..c61703f3 --- /dev/null +++ b/SAXresult/dia2 @@ -0,0 +1,365 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(dia:diagram, xmlns:dia='http://www.lysator.liu.se/~alla/dia/') +SAX.characters( + + + + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + , 9) +SAX.startElement(dia:real, val='0.1') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.startElement(dia:connections) +SAX.characters( + + , 7) +SAX.endElement(dia:connections) +SAX.characters( + + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 11) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.endElement(dia:composite) +SAX.characters( + + + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:real, val='2') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + , 9) +SAX.startElement(dia:real, val='0.1') +SAX.endElement((null)) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 7) +SAX.endElement(dia:attribute) +SAX.characters( + + , 9) +SAX.startElement(dia:enum, val='0') +SAX.endElement((null)) +SAX.characters( + + + +, 3) +SAX.endElement(dia:layer) +SAX.characters( + +, 1) +SAX.endElement(dia:diagram) +SAX.endDocument() diff --git a/SAXresult/dtd1 b/SAXresult/dtd1 new file mode 100644 index 00000000..db7183fd --- /dev/null +++ b/SAXresult/dtd1 @@ -0,0 +1,10 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(MEMO, -//SGMLSOURCE//DTD MEMO//EN, http://www.sgmlsource.com/dtds/memo.dtd) +SAX.resolveEntity(-//SGMLSOURCE//DTD MEMO//EN, http://www.sgmlsource.com/dtds/memo.dtd) +SAX.startElement(MEMO) +SAX.characters( + +, 1) +SAX.endElement(MEMO) +SAX.endDocument() diff --git a/SAXresult/dtd10 b/SAXresult/dtd10 new file mode 100644 index 00000000..c9673563 --- /dev/null +++ b/SAXresult/dtd10 @@ -0,0 +1,21 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(a, 3, ...) +SAX.elementDecl(b, 3, ...) +SAX.elementDecl(c, 3, ...) +SAX.elementDecl(d, 3, ...) +SAX.startElement(doc) +SAX.startElement(b) +SAX.characters(This is a valid , 4) +SAX.endElement(b) +SAX.startElement(c) +SAX.characters( is a valid document +, 15) +SAX.endElement(d) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd11 b/SAXresult/dtd11 new file mode 100644 index 00000000..37a69d02 --- /dev/null +++ b/SAXresult/dtd11 @@ -0,0 +1,8 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 3, ...) +SAX.attributeDecl(doc, val, 1, 3, (null), ...) +SAX.startElement(doc, val='v1') +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd2 b/SAXresult/dtd2 new file mode 100644 index 00000000..22039349 --- /dev/null +++ b/SAXresult/dtd2 @@ -0,0 +1,8 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 3, ...) +SAX.startElement(doc) +SAX.characters(This is a valid document ! is a valid doc, 4) +SAX.endElement(a) +SAX.characters( is a valid document document +, 5) +SAX.endElement(b) +SAX.characters( document +, 9) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd6 b/SAXresult/dtd6 new file mode 100644 index 00000000..8a34085b --- /dev/null +++ b/SAXresult/dtd6 @@ -0,0 +1,19 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(a, 3, ...) +SAX.elementDecl(b, 3, ...) +SAX.startElement(doc) +SAX.startElement(a) +SAX.characters(This is a valid , 4) +SAX.endElement(a) +SAX.startElement(b) +SAX.characters( is a valid document +, 9) +SAX.endElement(a) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd7 b/SAXresult/dtd7 new file mode 100644 index 00000000..210258a2 --- /dev/null +++ b/SAXresult/dtd7 @@ -0,0 +1,15 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(a, 3, ...) +SAX.elementDecl(b, 3, ...) +SAX.startElement(doc) +SAX.startElement(a) +SAX.characters(This is a valid documen, 4) +SAX.endElement(a) +SAX.startElement(b) +SAX.characters( is a valid document, 20) +SAX.endElement(b) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd8 b/SAXresult/dtd8 new file mode 100644 index 00000000..b508a85e --- /dev/null +++ b/SAXresult/dtd8 @@ -0,0 +1,17 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(a, 3, ...) +SAX.elementDecl(b, 3, ...) +SAX.elementDecl(c, 3, ...) +SAX.elementDecl(d, 3, ...) +SAX.startElement(doc) +SAX.startElement(b) +SAX.characters(This is a valid documen, 4) +SAX.endElement(b) +SAX.startElement(c) +SAX.characters( is a valid document, 20) +SAX.endElement(c) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/dtd9 b/SAXresult/dtd9 new file mode 100644 index 00000000..c56ec5c4 --- /dev/null +++ b/SAXresult/dtd9 @@ -0,0 +1,17 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(doc, (null), (null)) +SAX.elementDecl(doc, 4, ...) +SAX.elementDecl(a, 3, ...) +SAX.elementDecl(b, 3, ...) +SAX.elementDecl(c, 3, ...) +SAX.elementDecl(d, 3, ...) +SAX.startElement(doc) +SAX.startElement(b) +SAX.characters(This is a valid documen, 4) +SAX.endElement(b) +SAX.startElement(d) +SAX.characters( is a valid document, 20) +SAX.endElement(d) +SAX.endElement(doc) +SAX.endDocument() diff --git a/SAXresult/ent1 b/SAXresult/ent1 new file mode 100644 index 00000000..fd4ba41b --- /dev/null +++ b/SAXresult/ent1 @@ -0,0 +1,21 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(EXAMPLE, (null), example.dtd) +SAX.resolveEntity((null), example.dtd) +SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) +SAX.getEntity(xml) +SAX.startElement(EXAMPLE) +SAX.characters( + &xml; + +, 5) +SAX.getEntity(xml) +SAX.isStandalone() +SAX.hasInternalSubset() +SAX.hasExternalSubset() +SAX.error: Entity 'xml' not defined +SAX.characters( + +, 1) +SAX.endElement(EXAMPLE) +SAX.endDocument() diff --git a/SAXresult/ent2 b/SAXresult/ent2 new file mode 100644 index 00000000..7a3e3c60 --- /dev/null +++ b/SAXresult/ent2 @@ -0,0 +1,33 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(EXAMPLE, (null), example.dtd) +SAX.resolveEntity((null), example.dtd) +SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) +SAX.getEntity(xml) +SAX.entityDecl(title, 2, -//MY-TITLE//FR, title.xml, (null)) +SAX.entityDecl(image, 3, (null), img.gif, GIF) +SAX.startElement(EXAMPLE) +SAX.characters( + &title; + This text is abou, 3) +SAX.getEntity(title) +SAX.isStandalone() +SAX.hasInternalSubset() +SAX.hasExternalSubset() +SAX.error: Entity 'title' not defined +SAX.characters( + This text is about XML, the, 31) +SAX.getEntity(xml) +SAX.isStandalone() +SAX.hasInternalSubset() +SAX.hasExternalSubset() +SAX.error: Entity 'xml' not defined +SAX.characters( and this is an embedded + +, 1) +SAX.endElement(EXAMPLE) +SAX.endDocument() diff --git a/SAXresult/ent3 b/SAXresult/ent3 new file mode 100644 index 00000000..09af2c0c --- /dev/null +++ b/SAXresult/ent3 @@ -0,0 +1,11 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(EXAMPLE, (null), example.dtd) +SAX.resolveEntity((null), example.dtd) +SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) +SAX.getEntity(xml) +SAX.startElement(EXAMPLE, prop1='a&b', prop2='&xml;') +SAX.characters( + Test of entities in attribu, 35) +SAX.endElement(EXAMPLE) +SAX.endDocument() diff --git a/SAXresult/ent4 b/SAXresult/ent4 new file mode 100644 index 00000000..ca195d19 --- /dev/null +++ b/SAXresult/ent4 @@ -0,0 +1,21 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(EXAMPLE, (null), example.dtd) +SAX.resolveEntity((null), example.dtd) +SAX.entityDecl(xml, 1, (null), (null), Extensible Markup Language) +SAX.getEntity(xml) +SAX.startElement(EXAMPLE) +SAX.characters( + Test of &amp; behaviour, 11) +SAX.getEntity(amp) +SAX.characters(&, 1) +SAX.characters(amp; behaviour a&b . + + +, 4) +SAX.endElement(EXAMPLE) +SAX.endDocument() diff --git a/SAXresult/ent5 b/SAXresult/ent5 new file mode 100644 index 00000000..6695697d --- /dev/null +++ b/SAXresult/ent5 @@ -0,0 +1,15 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(EXAMPLE) +SAX.characters( + This is an inverted excla, 42) +SAX.characters(¡, 1) +SAX.characters( + This is a space + +, 2) +SAX.endElement(EXAMPLE) +SAX.endDocument() diff --git a/SAXresult/p3p b/SAXresult/p3p new file mode 100644 index 00000000..87c56098 --- /dev/null +++ b/SAXresult/p3p @@ -0,0 +1,75 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(RDF:RDF, xmlsn:p3p='http//www.w3.org/TR/1998/WD-P3P10-syntax#proposal.DTD', xmlns:RDF='http://www.w3.org/TR/WD-rdf-syntax#') +SAX.characters( +, 6) +SAX.startElement(REF, name='Name.First') +SAX.endElement((null)) +SAX.characters( + + , 6) +SAX.startElement(REF, name='Gender') +SAX.endElement((null)) +SAX.characters( + + + + + + + + + + rpm +, 5) +SAX.startElement(RPM:Name) +SAX.characters(rpm + 2.5 + 2 + , 1) +SAX.endElement(RPM:Release) +SAX.characters( + i386, 5) +SAX.startElement(RPM:Arch) +SAX.characters(i386 + Li, 4) +SAX.endElement(RPM:Arch) +SAX.characters( + Linux + , 5) +SAX.startElement(RPM:Os) +SAX.characters(Linux + Manhatt, 5) +SAX.startElement(RPM:Distribution) +SAX.characters(Manhattan +, 10) +SAX.endElement(RPM:Distribution) +SAX.characters( + Red Hat Softw, 5) +SAX.startElement(RPM:Vendor) +SAX.characters(Red Hat Software +, 16) +SAX.endElement(RPM:Vendor) +SAX.characters( + Red Hat Sof, 5) +SAX.startElement(RPM:Packager) +SAX.characters(Red Hat Software <bugs@redh, 17) +SAX.getEntity(lt) +SAX.characters(<, 1) +SAX.characters(bugs@redhat.com>, 1) +SAX.endElement(RPM:Packager) +SAX.characters( + Utilities/Syst, 5) +SAX.startElement(RPM:Group) +SAX.characters(Utilities/System + , 16) +SAX.endElement(RPM:Group) +SAX.characters( + Red Hat Pack, 5) +SAX.startElement(RPM:Summary) +SAX.characters(Red Hat Package ManagerRPM is a, 5) +SAX.startElement(RPM:Description) +SAX.characters(RPM is a powerful package mana, 248) +SAX.endElement(RPM:Description) +SAX.characters( + GPL + * Sun May , 5) +SAX.startElement(RPM:Changelog) +SAX.characters(* Sun May 10 1998 Prospector S, 36) +SAX.getEntity(lt) +SAX.characters(<, 1) +SAX.characters(bugs@redhat.com> + - transl, 15) +SAX.getEntity(gt) +SAX.characters(>, 1) +SAX.characters( + - translations modified for, 42) +SAX.endElement(RPM:Changelog) +SAX.characters( + rpm-2.5-2.sr, 5) +SAX.startElement(RPM:Sources) +SAX.characters(rpm-2.5-2.src.rpmftp://ftp, 5) +SAX.startElement(RPM:SourcesFtp) +SAX.characters(ftp://ftp.redhat.com/pub/redha, 48) +SAX.endElement(RPM:SourcesFtp) +SAX.characters( + Sun May 10, 5) +SAX.startElement(RPM:BuildDate) +SAX.characters(Sun May 10 14:52:32 1998894826352 + 850599 + porky.redh, 5) +SAX.startElement(RPM:BuildHost) +SAX.characters(porky.redhat.com + + rpm + + + + + /bin/sh, 9) +SAX.startElement(RPM:Resource) +SAX.characters(/bin/sh + , 7) +SAX.endElement(RPM:Resource) +SAX.characters( + ld-linu, 9) +SAX.startElement(RPM:Resource) +SAX.characters(ld-linux.so.2 + , 13) +SAX.endElement(RPM:Resource) +SAX.characters( + libc.so, 9) +SAX.startElement(RPM:Resource) +SAX.characters(libc.so.6 + , 9) +SAX.endElement(RPM:Resource) +SAX.characters( + libdb.s, 9) +SAX.startElement(RPM:Resource) +SAX.characters(libdb.so.2 + , 10) +SAX.endElement(RPM:Resource) +SAX.characters( + libz.so, 9) +SAX.startElement(RPM:Resource) +SAX.characters(libz.so.1 + , 9) +SAX.endElement(RPM:Resource) +SAX.characters( + /bin/ba, 9) +SAX.startElement(RPM:Resource) +SAX.characters(/bin/bash + , 9) +SAX.endElement(RPM:Resource) +SAX.characters( + /bin/sh, 9) +SAX.startElement(RPM:Resource) +SAX.characters(/bin/sh + <, 7) +SAX.endElement(RPM:Resource) +SAX.characters( + + + /bin/rpm +/usr/, 5) +SAX.startElement(RPM:Files) +SAX.characters(/bin/rpm +/usr/bin/find-provide, 885) +SAX.endElement(RPM:Files) +SAX.characters( + + +, 1) +SAX.endElement(RDF:RDF) +SAX.endDocument() diff --git a/SAXresult/rdf2 b/SAXresult/rdf2 new file mode 100644 index 00000000..bd7dbb28 --- /dev/null +++ b/SAXresult/rdf2 @@ -0,0 +1,193 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(RDF:RDF, xmlns:RDF='http://www.w3.org/TR/WD-rdf-syntax#', xmlns:RPM='http://www.rpm.org/') +SAX.characters( + + , 8) +SAX.endElement(RPM:Resource) +SAX.characters( + , 15) +SAX.endElement(RPM:Resource) +SAX.characters( + + , 12) +SAX.endElement(RPM:Resource) +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #f2cc99') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #e5b27f') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #eb8080') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #f2cc99') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #9c826b') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #ffcc7f') +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #9c826b') +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #845433') +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #9c826b') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #000000') +SAX.characters( + , 2) +SAX.startElement(g, style='fill: #ffe5b2') +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #000000') +SAX.characters( + , 5) +SAX.startElement(path, d=' M 29 28 ') +SAX.endElement((null)) +SAX.characters( + , 5) +SAX.startElement(path, d=' L 19 74 ') +SAX.endElement((null)) +SAX.characters( + + + +, 2) +SAX.startElement(g, style='fill: #0000ff') +SAX.characters( + +, 2) +SAX.startElement(g, style='fill: #ff0000') +SAX.characters( + + + + + + Java Font, 5) +SAX.startElement(g) +SAX.characters( + Java Font definit, 6) +SAX.startElement(desc) +SAX.characters( Java Font definition:Dialog 0, 30) +SAX.endElement(desc) +SAX.characters( + + + J, 5) +SAX.endElement(g) +SAX.characters( + + Java Font , 4) +SAX.startElement(g) +SAX.characters( + Java Font definit, 6) +SAX.startElement(desc) +SAX.characters( Java Font definition:Helvetic, 35) +SAX.endElement(desc) +SAX.characters( + + + + + + +, 2) +SAX.startElement(g, style='fill: #800040') +SAX.characters( + + +, 2) +SAX.startElement(g, style='fill: #ffffff') +SAX.characters( + + Java Font, 5) +SAX.startElement(g) +SAX.characters( + Java Font definit, 6) +SAX.startElement(desc) +SAX.characters( Java Font definition:Dialog 7, 32) +SAX.endElement(desc) +SAX.characters( + + + J, 5) +SAX.endElement(g) +SAX.characters( + + Java Font , 4) +SAX.startElement(g) +SAX.characters( + Java Font definit, 6) +SAX.startElement(desc) +SAX.characters( Java Font definition:Dialog 7, 32) +SAX.endElement(desc) +SAX.characters( + + + +, 5) +SAX.endElement(g) +SAX.characters( + + +, 1) +SAX.endElement(g) +SAX.endElement(svg) +SAX.endDocument() diff --git a/SAXresult/xml1 b/SAXresult/xml1 new file mode 100644 index 00000000..e509449c --- /dev/null +++ b/SAXresult/xml1 @@ -0,0 +1,16 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(test, (null), (null)) +SAX.getEntity(amp) +SAX.entityDecl(example, 1, (null), (null),

An ampersand (&) may be escaped + numerically (&#38;) or with a general entity + (&).

) +SAX.getEntity(example) +SAX.startElement(test) +SAX.getEntity(example) +SAX.isStandalone() +SAX.hasInternalSubset() +SAX.hasExternalSubset() +SAX.error: Entity 'example' not defined +SAX.endElement(test) +SAX.endDocument() diff --git a/SAXresult/xml2 b/SAXresult/xml2 new file mode 100644 index 00000000..7d75185c --- /dev/null +++ b/SAXresult/xml2 @@ -0,0 +1,21 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.internalSubset(test, (null), (null)) +SAX.elementDecl(test, 3, ...) +SAX.entityDecl(xx, 4, (null), (null), %zz;) +SAX.getEntity(xx) +SAX.entityDecl(zz, 4, (null), (null), ) +SAX.getEntity(zz) +SAX.getEntity(xx) +SAX.warning: xmlParsePEReference: %xx; not found +SAX.startElement(test) +SAX.characters(This sample shows a &tricky; m, 20) +SAX.getEntity(tricky) +SAX.isStandalone() +SAX.hasInternalSubset() +SAX.hasExternalSubset() +SAX.error: Entity 'tricky' not defined +SAX.characters( method. +, 8) +SAX.endElement(test) +SAX.endDocument() diff --git a/configure.in b/configure.in index f76d329a..59e2d58d 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.2) AC_INIT(entities.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libxml, 1.0.0) +AM_INIT_AUTOMAKE(libxml, 1.1.0) AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html index c3987094..5f326a16 100644 --- a/doc/html/gnome-xml-entities.html +++ b/doc/html/gnome-xml-entities.html @@ -65,7 +65,7 @@ WIDTH="100%">

Name

Synopsis

xmlEntitiesTablePtr table); -xmlParserInputPtr xmlNewEntityInputStream (xmlParserCtxtPtr ctxt, - xmlEntityPtr entity); table);

Description

Details

TODO !!!! Once moved to UTF-8 internal encoding, the encoding of non-ascii get erroneous.

TODO This routine is not reentrant and this will be changed, the interface -should not be modified though.

xmlNewEntityInputStream()

xmlParserInputPtr xmlNewEntityInputStream   (xmlParserCtxtPtr ctxt,
-                                             xmlEntityPtr entity);

Create a new input stream based on a memory buffer.

ctxt : an XML parser context
entity : an Entity pointer
Returns :the new input stream

(*resolveEntitySAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*internalSubsetSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR (*getEntitySAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*entityDeclSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*notationDeclSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*attributeDeclSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*elementDeclSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*unparsedEntityDeclSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*setDocumentLocatorSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, xmlSAXLocatorPtr*startDocumentSAXFunc) (xmlParserCtxtPtr ctxt); +>) (void *ctx); void (*endDocumentSAXFunc) (xmlParserCtxtPtr ctxt); +>) (void *ctx); void (*startElementSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*endElementSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*attributeSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*referenceSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*charactersSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*ignorableWhitespaceSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*processingInstructionSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*commentSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const CHAR*warningSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const char *msg, ...); void (*errorSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const char *msg, ...); void (*fatalErrorSAXFunc) (xmlParserCtxtPtr ctxt, +>) (void *ctx, const char *msg, ...); int (*isStandaloneSAXFunc) (xmlParserCtxtPtr ctxt); +>) (void *ctx); int (*hasInternalSubsetSAXFunc) (xmlParserCtxtPtr ctxt); +>) (void *ctx); int (*hasExternalSubsetSAXFunc) (xmlParserCtxtPtr ctxt); +>) (void *ctx); typedef xmlSAXHandlerPtrxmlParseFile (const char *filename); +int xmlSubstituteEntitiesDefault (int val); xmlDocPtr sax, const char *filename, int recovery); +xmlDtdPtr xmlParseDTD (const CHAR *ExternalID, + const CHAR *SystemID); +xmlDtdPtr xmlSAXParseDTD (xmlSAXHandlerPtr sax, + const CHAR *ExternalID, + const CHAR *SystemID); void xmlInitParserCtxt

Description

Details

xmlParserInputPtr (*resolveEntitySAXFunc) (xmlParserCtxtPtr ctxt, +> (*resolveEntitySAXFunc) (void *ctx, const CHARctxtctx :

void        (*internalSubsetSAXFunc)        (xmlParserCtxtPtr ctxt,
+>void        (*internalSubsetSAXFunc)        (void *ctx,
                                              const CHARctxtctx :
xmlEntityPtr (*getEntitySAXFunc)            (xmlParserCtxtPtr ctxt,
+> (*getEntitySAXFunc)            (void *ctx,
                                              const CHARctxtctx :
void        (*entityDeclSAXFunc)            (xmlParserCtxtPtr ctxt,
+>void        (*entityDeclSAXFunc)            (void *ctx,
                                              const CHARctxtctx :
void        (*notationDeclSAXFunc)          (xmlParserCtxtPtr ctxt,
+>void        (*notationDeclSAXFunc)          (void *ctx,
                                              const CHARctxtctx :
void        (*attributeDeclSAXFunc)         (xmlParserCtxtPtr ctxt,
+>void        (*attributeDeclSAXFunc)         (void *ctx,
                                              const CHARctxtctx :
void        (*elementDeclSAXFunc)           (xmlParserCtxtPtr ctxt,
+>void        (*elementDeclSAXFunc)           (void *ctx,
                                              const CHARctxtctx :
void        (*unparsedEntityDeclSAXFunc)    (xmlParserCtxtPtr ctxt,
+>void        (*unparsedEntityDeclSAXFunc)    (void *ctx,
                                              const CHARctxtctx :
void        (*setDocumentLocatorSAXFunc)    (xmlParserCtxtPtr ctxt,
+>void        (*setDocumentLocatorSAXFunc)    (void *ctx,
                                              xmlSAXLocatorPtrctxtctx :
void        (*startDocumentSAXFunc)         (xmlParserCtxtPtr ctxt);
void        (*startDocumentSAXFunc)         (void *ctx);
ctxtctx :
void        (*endDocumentSAXFunc)           (xmlParserCtxtPtr ctxt);
void        (*endDocumentSAXFunc)           (void *ctx);
ctxtctx :
void        (*startElementSAXFunc)          (xmlParserCtxtPtr ctxt,
+>void        (*startElementSAXFunc)          (void *ctx,
                                              const CHARctxtctx :
void        (*endElementSAXFunc)            (xmlParserCtxtPtr ctxt,
+>void        (*endElementSAXFunc)            (void *ctx,
                                              const CHARctxtctx :
void        (*attributeSAXFunc)             (xmlParserCtxtPtr ctxt,
+>void        (*attributeSAXFunc)             (void *ctx,
                                              const CHARctxtctx :
void        (*referenceSAXFunc)             (xmlParserCtxtPtr ctxt,
+>void        (*referenceSAXFunc)             (void *ctx,
                                              const CHARctxtctx :
void        (*charactersSAXFunc)            (xmlParserCtxtPtr ctxt,
+>void        (*charactersSAXFunc)            (void *ctx,
                                              const CHARctxtctx :
void        (*ignorableWhitespaceSAXFunc)   (xmlParserCtxtPtr ctxt,
+>void        (*ignorableWhitespaceSAXFunc)   (void *ctx,
                                              const CHARctxtctx :
void        (*processingInstructionSAXFunc) (xmlParserCtxtPtr ctxt,
+>void        (*processingInstructionSAXFunc) (void *ctx,
                                              const CHARctxtctx :
void        (*commentSAXFunc)               (xmlParserCtxtPtr ctxt,
+>void        (*commentSAXFunc)               (void *ctx,
                                              const CHARctxtctx :
void        (*warningSAXFunc)               (xmlParserCtxtPtr ctxt,
+>void        (*warningSAXFunc)               (void *ctx,
                                              const char *msg,
                                              ...);
ctxtctx :
void        (*errorSAXFunc)                 (xmlParserCtxtPtr ctxt,
+>void        (*errorSAXFunc)                 (void *ctx,
                                              const char *msg,
                                              ...);
ctxtctx :
void        (*fatalErrorSAXFunc)            (xmlParserCtxtPtr ctxt,
+>void        (*fatalErrorSAXFunc)            (void *ctx,
                                              const char *msg,
                                              ...);
ctxtctx :
int         (*isStandaloneSAXFunc)          (xmlParserCtxtPtr ctxt);
int         (*isStandaloneSAXFunc)          (void *ctx);
ctxtctx :
int         (*hasInternalSubsetSAXFunc)     (xmlParserCtxtPtr ctxt);
int         (*hasInternalSubsetSAXFunc)     (void *ctx);
ctxtctx :
int         (*hasExternalSubsetSAXFunc)     (xmlParserCtxtPtr ctxt);
int         (*hasExternalSubsetSAXFunc)     (void *ctx);
ctxtctx :
xmlSubstituteEntitiesDefault()
int         xmlSubstituteEntitiesDefault    (int val);
Set and return the previous value for default entity support.
+Initially the parser always keep entity references instead of substituting
+entity values in the output. This function has to be used to change the
+default parser behaviour
+SAX::subtituteEntities() has to be used for changing that on a file by
+file basis.
val :  int 0 or 1 
Returns :the last value for 0 for no substitution, 1 for substitution.
TODO : plug some encoding conversion routines here. !!!
xmlParseDTD()
xmlDtdPtr   xmlParseDTD                     (const CHAR *ExternalID,
+                                             const CHAR *SystemID);
Load and parse an external subset.
ExternalID :  a NAME* containing the External ID of the DTD
SystemID :  a NAME* containing the URL to the DTD
Returns :the resulting xmlDtdPtr or NULL in case of error.
xmlSAXParseDTD()
xmlDtdPtr   xmlSAXParseDTD                  (xmlSAXHandlerPtr sax,
+                                             const CHAR *ExternalID,
+                                             const CHAR *SystemID);
Load and parse an external subset.
sax :  the SAX handler block
ExternalID :  a NAME* containing the External ID of the DTD
SystemID :  a NAME* containing the URL to the DTD
Returns :the resulting xmlDtdPtr or NULL in case of error.
 ctxt);
+#define     XML_SUBSTITUTE_NONE
+#define     XML_SUBSTITUTE_REF
+#define     XML_SUBSTITUTE_PEREF
+#define     XML_SUBSTITUTE_BOTH
+CHAR*       xmlDecodeEntities               (xmlParserCtxtPtr ctxt,
+                                             int len,
+                                             int what,
+                                             CHAR end,
+                                             CHAR end2,
+                                             CHAR end3);
Description
Details
Create a new input stream based on a memory buffer.
Create a new input stream based on an xmlEntityPtr
   an XML parser context   an Entity pointer the new input stream
xmlNewInputFromFile()
xmlParserInputPtr xmlNewInputFromFile       (xmlParserCtxtPtr ctxt,
+                                             const char *filename);
Create a new input stream based on a file.
ctxt :  an XML parser context
filename :  the filename to use as entity
Returns :the new input stream or NULL in case of error
 ctxt,
+                                             CHAR **orig);
orig :  if non-NULL store a copy of the original entity valueReturnsthe EntityValue parsed or NULLthe EntityValue parsed with reference substitued or NULL
parse a value for an attribute
parse a value for an attribute
+Note: the parser won't do substitution of entities here, this
+will be handled later in xmlStringGetNodeList, unless it was
+asked for ctxt->replaceEntities != 0 
[10] AttValue ::= '"' ([^<&"] | Reference)* '"' |
 "'" ([^<&'] | Reference)* "'"
CHAR*       xmlParseCharRef                 (int         xmlParseCharRef                 (xmlParserCtxtPtr ctxt);
the value parsedthe value parsed (as an int)
CHAR*       xmlParseEntityRef               (xmlEntityPtr xmlParseEntityRef              (xmlParserCtxtPtr ctxt);
the entity ref string or NULL if directly as input stream.the xmlEntityPtr if found, or NULL otherwise.
CHAR*       xmlParseReference               (void        xmlParseReference               (xmlParserCtxtPtr ctxt);
parse Reference declarations
parse and handle entity references in content, depending on the SAX
+interface, this may end-up in a call to character() if this is a
+CharRef, a predefined entity, if there is no reference() callback.
+or if the parser was asked to switch to that mode.
[67] Reference ::= EntityRef | CharRef
  an XML parser contextReturns :the entity string or NULL if handled directly by pushing
-the entity value as the input.
CHAR*       xmlParsePEReference             (void        xmlParsePEReference             (xmlParserCtxtPtr ctxt);
parse PEReference declarations
parse PEReference declarations
+The entity content is handled directly by pushing it's content as
+a new input stream.
[69] PEReference ::= '%' Name ';'
  an XML parser contextReturns :the entity content or NULL if handled directly.
XML_SUBSTITUTE_NONE
#define XML_SUBSTITUTE_NONE	0
XML_SUBSTITUTE_REF
#define XML_SUBSTITUTE_REF	1
XML_SUBSTITUTE_PEREF
#define XML_SUBSTITUTE_PEREF	2
XML_SUBSTITUTE_BOTH
#define XML_SUBSTITUTE_BOTH 	3
xmlDecodeEntities()
CHAR*       xmlDecodeEntities               (xmlParserCtxtPtr ctxt,
+                                             int len,
+                                             int what,
+                                             CHAR end,
+                                             CHAR end2,
+                                             CHAR end3);
[67] Reference ::= EntityRef | CharRef
[69] PEReference ::= '%' Name ';'
ctxt :  the parser context
len :  the len to decode (in bytes !), -1 for no size limit
what :  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF
end :  an end marker CHAR, 0 if none
end2 :  an end marker CHAR, 0 if none
end3 :  an end marker CHAR, 0 if none
Returns :A newly allocated string with the substitution done. The caller
+must deallocate it !
Name
Synopsis
 buf,
                                              const char *string);
 void        xmlBufferWriteQuotedString      (xmlBufferPtr buf,
+                                             const CHAR *string);
+void        xmlDocDumpMemory                (
Description
Details
  the XML buffer  the XML buffer output
xmlBufferWriteQuotedString()
void        xmlBufferWriteQuotedString      (xmlBufferPtr buf,
+                                             const CHAR *string);
routine which manage and grows an output buffer. This one writes
+a quoted or double quoted CHAR string, checking first if it holds
+quote or double-quotes internally
buf :  the XML buffer output
string :  the string to add
Name
Synopsis
Description
Details
This will dump the content of the notation table as an XML DTD definition
NOTE: TODO an extra parameter allowing a reentant implementation will
-be added.
   the XML buffer output
This will dump the content of the element table as an XML DTD definition
NOTE: TODO an extra parameter allowing a reentant implementation will
-be added.
   the XML buffer output
This will dump the content of the attribute table as an XML DTD definition
NOTE: TODO an extra parameter allowing a reentant implementation will
-be added.
   the XML buffer output
 
 
+
 
 
 
@@ -53,6 +54,8 @@
 
 
 
+
+
 
 
 
@@ -144,6 +147,7 @@
 
 
 
+
 
 
 
@@ -171,7 +175,6 @@
 
 
 
-
 
 
 
@@ -222,6 +225,7 @@
 
 
 
+
 
 
 
@@ -270,3 +274,8 @@
 
 
 
+
+
+
+
+
diff --git a/encoding.c b/encoding.c
index a7e984e0..a9a5fa76 100644
--- a/encoding.c
+++ b/encoding.c
@@ -216,7 +216,7 @@ UTF8ToUTF16(unsigned short* out, int outlen, unsigned char* in, int inlen)
  * Returns one of the XML_CHAR_ENCODING_... values.
  */
 xmlCharEncoding
-xmlDetectCharEncoding(unsigned char* in)
+xmlDetectCharEncoding(const unsigned char* in)
 {
     if ((in[0] == 0x00) && (in[1] == 0x00) &&
         (in[2] == 0x00) && (in[3] == 0x3C))
@@ -255,7 +255,7 @@ xmlDetectCharEncoding(unsigned char* in)
  * if not recognized.
  */
 xmlCharEncoding
-xmlParseCharEncoding(char* name)
+xmlParseCharEncoding(const char* name)
 {
     char upper[500];
     int i;
diff --git a/encoding.h b/encoding.h
index 217edbca..3c5cee04 100644
--- a/encoding.h
+++ b/encoding.h
@@ -51,8 +51,8 @@ typedef enum {
     XML_CHAR_ENCODING_EUC_JP=   21,/* EUC-JP */
 } xmlCharEncoding;
 
-extern xmlCharEncoding xmlDetectCharEncoding(unsigned char* in);
-extern xmlCharEncoding xmlParseCharEncoding(char* name);
+extern xmlCharEncoding xmlDetectCharEncoding(const unsigned char* in);
+extern xmlCharEncoding xmlParseCharEncoding(const char* name);
 
 #ifdef __cplusplus
 }
diff --git a/entities.c b/entities.c
index 88f2661f..c61f81db 100644
--- a/entities.c
+++ b/entities.c
@@ -30,23 +30,18 @@ struct xmlPredefinedEntityValue xmlPredefinedEntityValues[] = {
 xmlEntitiesTablePtr xmlPredefinedEntities = NULL;
 
 /*
- * A buffer used for converting entities to their equivalent and back.
- *
- * TODO: remove this, this helps performances but forbid reentrancy in a 
- *       stupid way.
+ * Macro used to grow the current buffer.
  */
-static int buffer_size = 0;
-static CHAR *buffer = NULL;
-
-void growBuffer(void) {
-    buffer_size *= 2;
-    buffer = (CHAR *) realloc(buffer, buffer_size * sizeof(CHAR));
-    if (buffer == NULL) {
-	perror("realloc failed");
-	exit(1);
-    }
+#define growBuffer() {							\
+    buffer_size *= 2;							\
+    buffer = (CHAR *) realloc(buffer, buffer_size * sizeof(CHAR));	\
+    if (buffer == NULL) {						\
+	perror("realloc failed");					\
+	exit(1);							\
+    }									\
 }
 
+
 /*
  * xmlFreeEntity : clean-up an entity record.
  */
@@ -61,6 +56,8 @@ void xmlFreeEntity(xmlEntityPtr entity) {
         free((char *) entity->SystemID);
     if (entity->content != NULL)
         free((char *) entity->content);
+    if (entity->orig != NULL)
+        free((char *) entity->orig);
     memset(entity, -1, sizeof(xmlEntity));
 }
 
@@ -116,6 +113,7 @@ xmlAddEntity(xmlEntitiesTablePtr table, const CHAR *name, int type,
 	cur->content = xmlStrdup(content);
     else
         cur->content = NULL;
+    cur->orig = NULL;
     table->nb_entities++;
 }
 
@@ -314,26 +312,28 @@ xmlGetDocEntity(xmlDocPtr doc, const CHAR *name) {
  * TODO !!!! Once moved to UTF-8 internal encoding, the encoding of non-ascii
  *           get erroneous.
  *
- * TODO This routine is not reentrant and this will be changed, the interface
- *      should not be modified though.
- * 
  * Returns A newly allocated string with the substitution done.
  */
 CHAR *
 xmlEncodeEntities(xmlDocPtr doc, const CHAR *input) {
     const CHAR *cur = input;
-    CHAR *out = buffer;
+    CHAR *buffer = NULL;
+    CHAR *out = NULL;
+    int buffer_size = 0;
 
     if (input == NULL) return(NULL);
+
+    /*
+     * allocate an translation buffer.
+     */
+    buffer_size = 1000;
+    buffer = (CHAR *) malloc(buffer_size * sizeof(CHAR));
     if (buffer == NULL) {
-        buffer_size = 1000;
-        buffer = (CHAR *) malloc(buffer_size * sizeof(CHAR));
-	if (buffer == NULL) {
-	    perror("malloc failed");
-            exit(1);
-	}
-	out = buffer;
+	perror("malloc failed");
+	exit(1);
     }
+    out = buffer;
+
     while (*cur != '\0') {
         if (out - buffer > buffer_size - 100) {
 	    int index = out - buffer;
@@ -517,6 +517,10 @@ xmlCopyEntitiesTable(xmlEntitiesTablePtr table) {
 	    cur->content = xmlStrdup(ent->content);
 	else
 	    cur->content = NULL;
+	if (ent->orig != NULL)
+	    cur->orig = xmlStrdup(ent->orig);
+	else
+	    cur->orig = NULL;
     }
     return(ret);
 }
@@ -541,23 +545,24 @@ xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table) {
 	    case XML_INTERNAL_GENERAL_ENTITY:
 	        xmlBufferWriteChar(buf, "name);
-		xmlBufferWriteChar(buf, " \"");
-		xmlBufferWriteCHAR(buf, cur->content);
-		xmlBufferWriteChar(buf, "\">\n");
+		xmlBufferWriteChar(buf, " ");
+		if (cur->orig != NULL)
+		    xmlBufferWriteQuotedString(buf, cur->orig);
+		else
+		    xmlBufferWriteQuotedString(buf, cur->content);
+		xmlBufferWriteChar(buf, ">\n");
 	        break;
 	    case XML_EXTERNAL_GENERAL_PARSED_ENTITY:
 	        xmlBufferWriteChar(buf, "name);
 		if (cur->ExternalID != NULL) {
-		     xmlBufferWriteChar(buf, " PUBLIC \"");
-		     xmlBufferWriteCHAR(buf, cur->ExternalID);
-		     xmlBufferWriteChar(buf, "\" \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " PUBLIC ");
+		     xmlBufferWriteQuotedString(buf, cur->ExternalID);
+		     xmlBufferWriteChar(buf, " ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		} else {
-		     xmlBufferWriteChar(buf, " SYSTEM \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " SYSTEM ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		}
 		xmlBufferWriteChar(buf, ">\n");
 	        break;
@@ -565,42 +570,44 @@ xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table) {
 	        xmlBufferWriteChar(buf, "name);
 		if (cur->ExternalID != NULL) {
-		     xmlBufferWriteChar(buf, " PUBLIC \"");
-		     xmlBufferWriteCHAR(buf, cur->ExternalID);
-		     xmlBufferWriteChar(buf, "\" \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " PUBLIC ");
+		     xmlBufferWriteQuotedString(buf, cur->ExternalID);
+		     xmlBufferWriteChar(buf, " ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		} else {
-		     xmlBufferWriteChar(buf, " SYSTEM \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " SYSTEM ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		}
 		if (cur->content != NULL) { /* Should be true ! */
 		    xmlBufferWriteChar(buf, " NDATA ");
-		    xmlBufferWriteCHAR(buf, cur->content);
+		    if (cur->orig != NULL)
+			xmlBufferWriteCHAR(buf, cur->orig);
+		    else
+			xmlBufferWriteCHAR(buf, cur->content);
 		}
 		xmlBufferWriteChar(buf, ">\n");
 	        break;
 	    case XML_INTERNAL_PARAMETER_ENTITY:
 	        xmlBufferWriteChar(buf, "name);
-		xmlBufferWriteChar(buf, " \"");
-		xmlBufferWriteCHAR(buf, cur->content);
-		xmlBufferWriteChar(buf, "\">\n");
+		xmlBufferWriteChar(buf, " ");
+		if (cur->orig == NULL)
+		    xmlBufferWriteQuotedString(buf, cur->content);
+		else
+		    xmlBufferWriteQuotedString(buf, cur->orig);
+		xmlBufferWriteChar(buf, ">\n");
 	        break;
 	    case XML_EXTERNAL_PARAMETER_ENTITY:
 	        xmlBufferWriteChar(buf, "name);
 		if (cur->ExternalID != NULL) {
-		     xmlBufferWriteChar(buf, " PUBLIC \"");
-		     xmlBufferWriteCHAR(buf, cur->ExternalID);
-		     xmlBufferWriteChar(buf, "\" \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " PUBLIC ");
+		     xmlBufferWriteQuotedString(buf, cur->ExternalID);
+		     xmlBufferWriteChar(buf, " ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		} else {
-		     xmlBufferWriteChar(buf, " SYSTEM \"");
-		     xmlBufferWriteCHAR(buf, cur->SystemID);
-		     xmlBufferWriteChar(buf, "\"");
+		     xmlBufferWriteChar(buf, " SYSTEM ");
+		     xmlBufferWriteQuotedString(buf, cur->SystemID);
 		}
 		xmlBufferWriteChar(buf, ">\n");
 	        break;
diff --git a/entities.h b/entities.h
index 5d6506d9..b6535421 100644
--- a/entities.h
+++ b/entities.h
@@ -34,6 +34,7 @@ typedef struct xmlEntity {
     const CHAR    *ExternalID;	/* External identifier for PUBLIC Entity */
     const CHAR    *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
     CHAR *content;		/* The entity content or ndata if unparsed */
+    CHAR *orig;			/* The entity cont without ref substitution */
 } xmlEntity;
 typedef xmlEntity *xmlEntityPtr;
 
@@ -70,8 +71,6 @@ xmlEntitiesTablePtr xmlCreateEntitiesTable(void);
 xmlEntitiesTablePtr xmlCopyEntitiesTable(xmlEntitiesTablePtr table);
 void xmlFreeEntitiesTable(xmlEntitiesTablePtr table);
 void xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table);
-xmlParserInputPtr xmlNewEntityInputStream(xmlParserCtxtPtr ctxt,
-                                                 xmlEntityPtr entity);
 xmlEntitiesTablePtr xmlCopyEntitiesTable(xmlEntitiesTablePtr table);
 
 #ifdef __cplusplus
diff --git a/error.c b/error.c
index a9f0a0b3..6d1f57dd 100644
--- a/error.c
+++ b/error.c
@@ -12,7 +12,7 @@
 
 /**
  * xmlParserError:
- * @ctxt:  an XML parser context
+ * @ctx:  an XML parser context
  * @msg:  the message to display/transmit
  * @...:  extra parameters for the message display
  * 
@@ -66,7 +66,7 @@ xmlParserError(void *ctx, const char *msg, ...)
 
 /**
  * xmlParserWarning:
- * @ctxt:  an XML parser context
+ * @ctx:  an XML parser context
  * @msg:  the message to display/transmit
  * @...:  extra parameters for the message display
  * 
diff --git a/include/libxml/encoding.h b/include/libxml/encoding.h
index 217edbca..3c5cee04 100644
--- a/include/libxml/encoding.h
+++ b/include/libxml/encoding.h
@@ -51,8 +51,8 @@ typedef enum {
     XML_CHAR_ENCODING_EUC_JP=   21,/* EUC-JP */
 } xmlCharEncoding;
 
-extern xmlCharEncoding xmlDetectCharEncoding(unsigned char* in);
-extern xmlCharEncoding xmlParseCharEncoding(char* name);
+extern xmlCharEncoding xmlDetectCharEncoding(const unsigned char* in);
+extern xmlCharEncoding xmlParseCharEncoding(const char* name);
 
 #ifdef __cplusplus
 }
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index 5d6506d9..b6535421 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -34,6 +34,7 @@ typedef struct xmlEntity {
     const CHAR    *ExternalID;	/* External identifier for PUBLIC Entity */
     const CHAR    *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
     CHAR *content;		/* The entity content or ndata if unparsed */
+    CHAR *orig;			/* The entity cont without ref substitution */
 } xmlEntity;
 typedef xmlEntity *xmlEntityPtr;
 
@@ -70,8 +71,6 @@ xmlEntitiesTablePtr xmlCreateEntitiesTable(void);
 xmlEntitiesTablePtr xmlCopyEntitiesTable(xmlEntitiesTablePtr table);
 void xmlFreeEntitiesTable(xmlEntitiesTablePtr table);
 void xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table);
-xmlParserInputPtr xmlNewEntityInputStream(xmlParserCtxtPtr ctxt,
-                                                 xmlEntityPtr entity);
 xmlEntitiesTablePtr xmlCopyEntitiesTable(xmlEntitiesTablePtr table);
 
 #ifdef __cplusplus
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 20756076..aaab58c4 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -54,6 +54,7 @@ typedef struct _xmlParserCtxt {
     void            *userData;        /* the document being built */
     xmlDocPtr           myDoc;        /* the document being built */
     int            wellFormed;        /* is the document well formed */
+    int       replaceEntities;        /* shall we replace entities ? */
     const CHAR     *version;	      /* the XML version string */
     const CHAR     *encoding;         /* encoding, if any */
     int             standalone;       /* standalone document */
@@ -194,6 +195,7 @@ CHAR *xmlStrncat(CHAR *cur, const CHAR *add, int len);
 xmlDocPtr xmlParseDoc(CHAR *cur);
 xmlDocPtr xmlParseMemory(char *buffer, int size);
 xmlDocPtr xmlParseFile(const char *filename);
+int xmlSubstituteEntitiesDefault(int val);
 
 /*
  * Recovery mode 
@@ -211,6 +213,9 @@ xmlDocPtr xmlSAXParseMemory(xmlSAXHandlerPtr sax, char *buffer,
                                    int size, int recovery);
 xmlDocPtr xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename,
                                  int recovery);
+xmlDtdPtr xmlParseDTD(const CHAR *ExternalID, const CHAR *SystemID);
+xmlDtdPtr xmlSAXParseDTD(xmlSAXHandlerPtr sax, const CHAR *ExternalID,
+                         const CHAR *SystemID);
 void xmlInitParserCtxt(xmlParserCtxtPtr ctxt);
 void xmlClearParserCtxt(xmlParserCtxtPtr ctxt);
 void xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const CHAR* buffer,
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index 75e9e130..6a31c512 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -495,6 +495,13 @@ TODO !!!
 
 #define MOVETO_STARTTAG(p)						\
     while (IS_CHAR(*p) && (*(p) != '<')) (p)++
+
+/**
+ * entity substitution default behaviour.
+ */
+
+int xmlSubstituteEntitiesDefaultValue;
+
 /**
  * Parser context
  */
@@ -524,6 +531,8 @@ CHAR
 xmlPopInput(xmlParserCtxtPtr ctxt);
 void
 xmlFreeInputStream(xmlParserInputPtr input);
+xmlParserInputPtr
+xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename);
 
 /**
  * Namespaces.
@@ -549,7 +558,7 @@ xmlParseName(xmlParserCtxtPtr ctxt);
 CHAR *
 xmlParseNmtoken(xmlParserCtxtPtr ctxt);
 CHAR *
-xmlParseEntityValue(xmlParserCtxtPtr ctxt);
+xmlParseEntityValue(xmlParserCtxtPtr ctxt, CHAR **orig);
 CHAR *
 xmlParseAttValue(xmlParserCtxtPtr ctxt);
 CHAR *
@@ -593,13 +602,13 @@ int
 xmlParseElementDecl(xmlParserCtxtPtr ctxt);
 void
 xmlParseMarkupDecl(xmlParserCtxtPtr ctxt);
-CHAR *
+int
 xmlParseCharRef(xmlParserCtxtPtr ctxt);
-CHAR *
+xmlEntityPtr
 xmlParseEntityRef(xmlParserCtxtPtr ctxt);
-CHAR *
+void
 xmlParseReference(xmlParserCtxtPtr ctxt);
-CHAR *
+void
 xmlParsePEReference(xmlParserCtxtPtr ctxt);
 void
 xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt);
@@ -630,6 +639,18 @@ xmlParseXMLDecl(xmlParserCtxtPtr ctxt);
 void
 xmlParseMisc(xmlParserCtxtPtr ctxt);
 
+/*
+ * Entities substitution
+ */
+#define XML_SUBSTITUTE_NONE	0
+#define XML_SUBSTITUTE_REF	1
+#define XML_SUBSTITUTE_PEREF	2
+#define XML_SUBSTITUTE_BOTH 	3
+
+CHAR *
+xmlDecodeEntities(xmlParserCtxtPtr ctxt, int len, int what,
+                  CHAR end, CHAR  end2, CHAR end3);
+
 /*
  * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP
  */
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index ff6b55f7..5907e24f 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -362,6 +362,7 @@ CHAR *xmlNodeGetContent(xmlNodePtr cur);
  */
 void xmlBufferWriteCHAR(xmlBufferPtr buf, const CHAR *string);
 void xmlBufferWriteChar(xmlBufferPtr buf, const char *string);
+void xmlBufferWriteQuotedString(xmlBufferPtr buf, const CHAR *string);
 
 /*
  * Saving
diff --git a/libxml.spec.in b/libxml.spec.in
index 7b888a4c..919969fe 100644
--- a/libxml.spec.in
+++ b/libxml.spec.in
@@ -30,6 +30,11 @@ Libraries, include files, etc you can use to develop libxml applications.
 
 %changelog
 
+* Wed Jun  2 1999 Daniel Veillard 
+
+- Switched to version 1.1: SAX extensions, better entities support, lots of
+  bug fixes.
+
 * Sun Oct  4 1998 Daniel Veillard 
 
 - Added xml-config to the package
diff --git a/parser.c b/parser.c
index d934f824..8161ecdb 100644
--- a/parser.c
+++ b/parser.c
@@ -39,6 +39,9 @@
  * 		Parser stacks related functions and macros		*
  *									*
  ************************************************************************/
+
+int xmlSubstituteEntitiesDefaultValue = 0;
+
 /*
  * Generic function for accessing stacks in the Parser Context
  */
@@ -91,13 +94,14 @@ PUSH_AND_POP(xmlNodePtr, node)
  *   SKIP(n) Skip n CHAR, and must also be used only to skip ASCII defined
  *           strings within the parser.
  *
- * Clean macros, not dependent of an ASCII context.
+ * Clean macros, not dependent of an ASCII context, expect UTF-8 encoding
  *
  *   CURRENT Returns the current char value, with the full decoding of
  *           UTF-8 if we are using this mode. It returns an int.
  *   NEXT    Skip to the next character, this does the proper decoding
  *           in UTF-8 mode. It also pop-up unfinished entities on the fly.
  *           It returns the pointer to the current CHAR.
+ *   COPY(to) copy one char to *to, increment CUR_PTR and to accordingly
  */
 
 #define CUR (*ctxt->input->cur)
@@ -173,7 +177,7 @@ xmlFreeInputStream(xmlParserInputPtr input) {
  * @ctxt:  an XML parser context
  * @entity:  an Entity pointer
  *
- * Create a new input stream based on a memory buffer.
+ * Create a new input stream based on an xmlEntityPtr
  * Returns the new input stream
  */
 xmlParserInputPtr
@@ -210,16 +214,16 @@ xmlNewEntityInputStream(xmlParserCtxtPtr ctxt, xmlEntityPtr entity) {
 /**
  * xmlNewStringInputStream:
  * @ctxt:  an XML parser context
- * @entity:  an Entity pointer
+ * @entity:  an Entity memory buffer
  *
  * Create a new input stream based on a memory buffer.
  * Returns the new input stream
  */
 xmlParserInputPtr
-xmlNewStringInputStream(xmlParserCtxtPtr ctxt, CHAR *string) {
+xmlNewStringInputStream(xmlParserCtxtPtr ctxt, CHAR *entity) {
     xmlParserInputPtr input;
 
-    if (string == NULL) {
+    if (entity == NULL) {
         if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 	    ctxt->sax->error(ctxt->userData,
 	      "internal: xmlNewStringInputStream string = NULL\n");
@@ -232,14 +236,236 @@ xmlNewStringInputStream(xmlParserCtxtPtr ctxt, CHAR *string) {
 	return(NULL);
     }
     input->filename = NULL;
-    input->base = string;
-    input->cur = string;
+    input->base = entity;
+    input->cur = entity;
     input->line = 1;
     input->col = 1;
     input->free = NULL;
     return(input);
 }
 
+/**
+ * xmlNewInputFromFile:
+ * @ctxt:  an XML parser context
+ * @filename:  the filename to use as entity
+ *
+ * Create a new input stream based on a file.
+ *
+ * Returns the new input stream or NULL in case of error
+ */
+xmlParserInputPtr
+xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
+#ifdef HAVE_ZLIB_H
+    gzFile input;
+#else
+    int input;
+#endif
+    int res;
+    int len;
+    struct stat buf;
+    char *buffer;
+    xmlParserInputPtr inputStream;
+    /* xmlCharEncoding enc; */
+
+    res = stat(filename, &buf);
+    if (res < 0) return(NULL);
+
+#ifdef HAVE_ZLIB_H
+    len = (buf.st_size * 8) + 1000;
+retry_bigger:
+    buffer = malloc(len);
+#else
+    len = buf.st_size + 100;
+    buffer = malloc(len);
+#endif
+    if (buffer == NULL) {
+	perror("malloc");
+        return(NULL);
+    }
+
+    memset(buffer, 0, len);
+#ifdef HAVE_ZLIB_H
+    input = gzopen (filename, "r");
+    if (input == NULL) {
+        fprintf (stderr, "Cannot read file %s :\n", filename);
+	perror ("gzopen failed");
+	return(NULL);
+    }
+#else
+#ifdef WIN32
+    input = _open (filename, O_RDONLY | _O_BINARY);
+#else
+    input = open (filename, O_RDONLY);
+#endif
+    if (input < 0) {
+        fprintf (stderr, "Cannot read file %s :\n", filename);
+	perror ("open failed");
+	return(NULL);
+    }
+#endif
+#ifdef HAVE_ZLIB_H
+    res = gzread(input, buffer, len);
+#else
+    res = read(input, buffer, buf.st_size);
+#endif
+    if (res < 0) {
+        fprintf (stderr, "Cannot read file %s :\n", filename);
+#ifdef HAVE_ZLIB_H
+	perror ("gzread failed");
+#else
+	perror ("read failed");
+#endif
+	return(NULL);
+    }
+#ifdef HAVE_ZLIB_H
+    gzclose(input);
+    if (res >= len) {
+        free(buffer);
+	len *= 2;
+	goto retry_bigger;
+    }
+    buf.st_size = res;
+#else
+    close(input);
+#endif
+
+    buffer[buf.st_size] = '\0';
+
+    inputStream = (xmlParserInputPtr) malloc(sizeof(xmlParserInput));
+    if (inputStream == NULL) {
+        perror("malloc");
+	free(ctxt);
+	return(NULL);
+    }
+
+    inputStream->filename = strdup(filename);
+    inputStream->line = 1;
+    inputStream->col = 1;
+
+    /*
+     * plug some encoding conversion routines here. !!!
+    enc = xmlDetectCharEncoding(buffer);
+    xmlSwitchEncoding(ctxt, enc);
+     */
+
+    inputStream->base = buffer;
+    inputStream->cur = buffer;
+    inputStream->free = (xmlParserInputDeallocate) free;
+
+    return(inputStream);
+}
+
+/************************************************************************
+ *									*
+ *		Commodity functions to handle entities			*
+ *									*
+ ************************************************************************/
+
+/*
+ * Macro used to grow the current buffer.
+ */
+#define growBuffer(buffer) {						\
+    buffer##_size *= 2;							\
+    buffer = (CHAR *) realloc(buffer, buffer##_size * sizeof(CHAR));	\
+    if (buffer == NULL) {						\
+	perror("realloc failed");					\
+	exit(1);							\
+    }									\
+}
+
+
+/**
+ * xmlDecodeEntities:
+ * @ctxt:  the parser context
+ * @what:  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF
+ * @len:  the len to decode (in bytes !), -1 for no size limit
+ * @end:  an end marker CHAR, 0 if none
+ * @end2:  an end marker CHAR, 0 if none
+ * @end3:  an end marker CHAR, 0 if none
+ * 
+ * [67] Reference ::= EntityRef | CharRef
+ *
+ * [69] PEReference ::= '%' Name ';'
+ *
+ * Returns A newly allocated string with the substitution done. The caller
+ *      must deallocate it !
+ */
+CHAR *
+xmlDecodeEntities(xmlParserCtxtPtr ctxt, int len, int what,
+                  CHAR end, CHAR  end2, CHAR end3) {
+    CHAR *buffer = NULL;
+    int buffer_size = 0;
+    CHAR *out = NULL;
+
+    CHAR *cur = NULL;
+    xmlEntityPtr ent;
+    const CHAR *start = CUR_PTR;
+    unsigned int max = (unsigned int) len;
+
+    /*
+     * allocate a translation buffer.
+     */
+    buffer_size = 1000;
+    buffer = (CHAR *) malloc(buffer_size * sizeof(CHAR));
+    if (buffer == NULL) {
+	perror("xmlDecodeEntities: malloc failed");
+	return(NULL);
+    }
+    out = buffer;
+
+    /*
+     * Ok loop until we reach one of the ending char or a size limit.
+     */
+    while ((CUR_PTR - start < max) && (CUR != end) &&
+           (CUR != end2) && (CUR != end3)) {
+
+        if (CUR == '&' && (what & XML_SUBSTITUTE_REF)) {
+	    if (NXT(1) == '#') {
+		int val = xmlParseCharRef(ctxt);
+		/* TODO: invalid for UTF-8 variable encoding !!! */
+		*out++ = val;
+	    } else {
+		ent = xmlParseEntityRef(ctxt);
+		if (ent != NULL) {
+		    cur = ent->content;
+		    while (*cur != 0) {
+		        *out++ = *cur++;
+			if (out - buffer > buffer_size - 100) {
+			    int index = out - buffer;
+
+			    growBuffer(buffer);
+			    out = &buffer[index];
+			}
+		    }
+		}
+	    }
+	} else if (CUR == '%' && (what & XML_SUBSTITUTE_PEREF)) {
+	    /*
+	     * a PEReference induce to switch the entity flow,
+	     * we break here to flush the current set of chars
+	     * parsed if any. We will be called back later.
+	     */
+	    if (CUR_PTR != start) break;
+
+	    xmlParsePEReference(ctxt);
+
+	    /*
+	     * Pop-up of finished entities.
+	     */
+	    while ((CUR == 0) && (ctxt->inputNr > 1))
+		xmlPopInput(ctxt);
+
+            break;
+	} else {
+	    /*  TODO: invalid for UTF-8 , use COPY(out); */
+	    *out++ = CUR;
+	    NEXT;
+	}
+    }
+    *out++ = 0;
+    return(buffer);
+}
+
 
 /************************************************************************
  *									*
@@ -683,8 +909,8 @@ handle_as_char:
 /*
  * Forward definition for recusive behaviour.
  */
-CHAR *xmlParsePEReference(xmlParserCtxtPtr ctxt);
-CHAR *xmlParseReference(xmlParserCtxtPtr ctxt);
+void xmlParsePEReference(xmlParserCtxtPtr ctxt);
+void xmlParseReference(xmlParserCtxtPtr ctxt);
 
 /************************************************************************
  *									*
@@ -1066,92 +1292,64 @@ xmlParseNmtoken(xmlParserCtxtPtr ctxt) {
 /**
  * xmlParseEntityValue:
  * @ctxt:  an XML parser context
+ * @orig:  if non-NULL store a copy of the original entity value
  *
  * parse a value for ENTITY decl.
  *
  * [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' |
  *	               "'" ([^%&'] | PEReference | Reference)* "'"
  *
- * Returns the EntityValue parsed or NULL
+ * Returns the EntityValue parsed with reference substitued or NULL
  */
 
 CHAR *
-xmlParseEntityValue(xmlParserCtxtPtr ctxt) {
-    CHAR *ret = NULL, *cur;
-    const CHAR *q;
+xmlParseEntityValue(xmlParserCtxtPtr ctxt, CHAR **orig) {
+    CHAR *ret = NULL;
+    const CHAR *org = NULL;
+    const CHAR *tst = NULL;
+    const CHAR *temp = NULL;
 
     if (CUR == '"') {
         NEXT;
-
-	q = CUR_PTR;
-	while ((IS_CHAR(CUR)) && (CUR != '"')) {
-	    if (CUR == '%') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParsePEReference(ctxt);
-		ret = xmlStrcat(ret, cur);
-		q = CUR_PTR;
-	    } else if (CUR == '&') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParseReference(ctxt);
-		if (cur != NULL) {
-		    CHAR buf[2];
-		    buf[0] = '&';
-		    buf[1] = 0;
-		    ret = xmlStrncat(ret, buf, 1);
-		    ret = xmlStrcat(ret, cur);
-		    buf[0] = ';';
-		    buf[1] = 0;
-		    ret = xmlStrncat(ret, buf, 1);
-		}
-		q = CUR_PTR;
-	    } else 
-	        NEXT;
+	org = CUR_PTR;
+	while (CUR != '"') {
+	    tst = CUR_PTR;
+	    temp = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_BOTH, '"', 0, 0);
+	    if ((temp == NULL) && (tst == CUR_PTR)) break;
+	    ret = xmlStrcat(ret, temp);
+	    if (temp != NULL) free((char *)temp);
 	}
-	if (!IS_CHAR(CUR)) {
+        if (CUR != '"') {
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished EntityValue\n");
+		ctxt->sax->error(ctxt->userData, "EntityValue: \" expected\n");
 	    ctxt->wellFormed = 0;
 	} else {
-	    ret = xmlStrncat(ret, q, CUR_PTR - q);
+	    if (orig != NULL)
+	        *orig = xmlStrndup(org, CUR_PTR - org);
 	    NEXT;
-        }
+	}
     } else if (CUR == '\'') {
         NEXT;
-	q = CUR_PTR;
-	while ((IS_CHAR(CUR)) && (CUR != '\'')) {
-	    if (CUR == '%') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParsePEReference(ctxt);
-		ret = xmlStrcat(ret, cur);
-		q = CUR_PTR;
-	    } else if (CUR == '&') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParseReference(ctxt);
-		if (cur != NULL) {
-		    CHAR buf[2];
-		    buf[0] = '&';
-		    buf[1] = 0;
-		    ret = xmlStrncat(ret, buf, 1);
-		    ret = xmlStrcat(ret, cur);
-		    buf[0] = ';';
-		    buf[1] = 0;
-		    ret = xmlStrncat(ret, buf, 1);
-		}
-		q = CUR_PTR;
-	    } else 
-	        NEXT;
+	org = CUR_PTR;
+	while (CUR != '\'') {
+	    tst = CUR_PTR;
+	    temp = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_BOTH, '\'', 0, 0);
+	    if ((temp == NULL) && (tst == CUR_PTR)) break;
+	    ret = xmlStrcat(ret, temp);
+	    if (temp != NULL) free((char *)temp);
 	}
-	if (!IS_CHAR(CUR)) {
+        if (CUR != '\'') {
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished EntityValue\n");
+		ctxt->sax->error(ctxt->userData, "EntityValue: ' expected\n");
 	    ctxt->wellFormed = 0;
 	} else {
-	    ret = xmlStrncat(ret, q, CUR_PTR - q);
+	    if (orig != NULL)
+	        *orig = xmlStrndup(org, CUR_PTR - org);
 	    NEXT;
-        }
+	}
     } else {
 	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	    ctxt->sax->error(ctxt->userData, "xmlParseEntityValue \" or ' expected\n");
+	    ctxt->sax->error(ctxt->userData, "EntityValue: \" or ' expected\n");
 	ctxt->wellFormed = 0;
     }
     
@@ -1163,6 +1361,9 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt) {
  * @ctxt:  an XML parser context
  *
  * parse a value for an attribute
+ * Note: the parser won't do substitution of entities here, this
+ * will be handled later in xmlStringGetNodeList, unless it was
+ * asked for ctxt->replaceEntities != 0 
  *
  * [10] AttValue ::= '"' ([^<&"] | Reference)* '"' |
  *                   "'" ([^<&'] | Reference)* "'"
@@ -1172,104 +1373,44 @@ xmlParseEntityValue(xmlParserCtxtPtr ctxt) {
 
 CHAR *
 xmlParseAttValue(xmlParserCtxtPtr ctxt) {
-    CHAR *ret = NULL, *cur;
-    const CHAR *q;
+    CHAR *ret = NULL;
 
     if (CUR == '"') {
         NEXT;
-
-	q = CUR_PTR;
-	while ((IS_CHAR(CUR)) && (CUR != '"')) {
-	    if (CUR == '<') {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-		       "Unescaped '<' not allowed in attributes values\n");
-		ctxt->wellFormed = 0;
-	    }
-	    if (CUR == '&') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParseReference(ctxt);
-		if (cur != NULL) {
-		    /*
-		     * Special case for '&', we don't want to
-		     * resolve it here since it will break later
-		     * when searching entities in the string.
-		     */
-		    if ((cur[0] == '&') && (cur[1] == 0)) {
-		        CHAR buf[6] = { '&', 'a', 'm', 'p', ';', 0 };
-		        ret = xmlStrncat(ret, buf, 5);
-		    } else
-		        ret = xmlStrcat(ret, cur);
-		    free(cur);
-		}
-		q = CUR_PTR;
-	    } else 
-	        NEXT;
-	    /*
-	     * Pop out finished entity references.
-	     */
-	    while ((CUR == 0) && (ctxt->inputNr > 1)) {
-		if (CUR_PTR != q)
-		    ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        xmlPopInput(ctxt);
-		q = CUR_PTR;
-	    }
-	}
-	if (!IS_CHAR(CUR)) {
+	if (ctxt->replaceEntities != 0)
+	    ret = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_REF, '"', '<', 0);
+	else
+	    ret = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_NONE, '"', '<', 0);
+	if (CUR == '<') {
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished AttValue\n");
+		ctxt->sax->error(ctxt->userData,
+		   "Unescaped '<' not allowed in attributes values\n");
 	    ctxt->wellFormed = 0;
-	} else {
-	    ret = xmlStrncat(ret, q, CUR_PTR - q);
+	}
+        if (CUR != '"') {
+	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+		ctxt->sax->error(ctxt->userData, "AttValue: ' expected\n");
+	    ctxt->wellFormed = 0;
+	} else
 	    NEXT;
-        }
     } else if (CUR == '\'') {
         NEXT;
-	q = CUR_PTR;
-	while ((IS_CHAR(CUR)) && (CUR != '\'')) {
-	    if (CUR == '<') {
-		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-		    ctxt->sax->error(ctxt->userData,
-		       "Unescaped '<' not allowed in attributes values\n");
-		ctxt->wellFormed = 0;
-	    }
-	    if (CUR == '&') {
-	        ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        cur = xmlParseReference(ctxt);
-		if (cur != NULL) {
-		    /*
-		     * Special case for '&', we don't want to
-		     * resolve it here since it will break later
-		     * when searching entities in the string.
-		     */
-		    if ((cur[0] == '&') && (cur[1] == 0)) {
-		        CHAR buf[6] = { '&', 'a', 'm', 'p', ';', 0 };
-		        ret = xmlStrncat(ret, buf, 5);
-		    } else
-		        ret = xmlStrcat(ret, cur);
-		    free(cur);
-		}
-		q = CUR_PTR;
-	    } else 
-	        NEXT;
-	    /*
-	     * Pop out finished entity references.
-	     */
-	    while ((CUR == 0) && (ctxt->inputNr > 1)) {
-		if (CUR_PTR != q)
-		    ret = xmlStrncat(ret, q, CUR_PTR - q);
-	        xmlPopInput(ctxt);
-		q = CUR_PTR;
-	    }
-	}
-	if (!IS_CHAR(CUR)) {
+	if (ctxt->replaceEntities != 0)
+	    ret = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_REF, '\'', '<', 0);
+	else
+	    ret = xmlDecodeEntities(ctxt, -1, XML_SUBSTITUTE_NONE, '\'', '<', 0);
+	if (CUR == '<') {
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
-	        ctxt->sax->error(ctxt->userData, "Unfinished AttValue\n");
+		ctxt->sax->error(ctxt->userData,
+		   "Unescaped '<' not allowed in attributes values\n");
 	    ctxt->wellFormed = 0;
-	} else {
-	    ret = xmlStrncat(ret, q, CUR_PTR - q);
+	}
+        if (CUR != '\'') {
+	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+		ctxt->sax->error(ctxt->userData, "AttValue: ' expected\n");
+	    ctxt->wellFormed = 0;
+	} else
 	    NEXT;
-        }
     } else {
 	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 	    ctxt->sax->error(ctxt->userData, "AttValue: \" or ' expected\n");
@@ -1779,6 +1920,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
     CHAR *URI = NULL, *literal = NULL;
     CHAR *ndata = NULL;
     int isParameter = 0;
+    CHAR *orig = NULL;
     
     if ((CUR == '<') && (NXT(1) == '!') &&
         (NXT(2) == 'E') && (NXT(3) == 'N') &&
@@ -1823,7 +1965,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
 	 */
 	if (isParameter) {
 	    if ((CUR == '"') || (CUR == '\''))
-	        value = xmlParseEntityValue(ctxt);
+	        value = xmlParseEntityValue(ctxt, &orig);
 		if (value) {
 		    if ((ctxt->sax != NULL) && (ctxt->sax->entityDecl != NULL))
 			ctxt->sax->entityDecl(ctxt->userData, name,
@@ -1841,7 +1983,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
 	    }
 	} else {
 	    if ((CUR == '"') || (CUR == '\'')) {
-	        value = xmlParseEntityValue(ctxt);
+	        value = xmlParseEntityValue(ctxt, &orig);
 		if ((ctxt->sax != NULL) && (ctxt->sax->entityDecl != NULL))
 		    ctxt->sax->entityDecl(ctxt->userData, name,
 				XML_INTERNAL_GENERAL_ENTITY,
@@ -1887,6 +2029,19 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt) {
 	    ctxt->wellFormed = 0;
 	} else
 	    NEXT;
+	if (orig != NULL) {
+	    /*
+	     * TODO: somwhat unclean, extending the SAx API would be better !
+	     */
+	    xmlEntityPtr cur = NULL;
+
+	    if ((ctxt->sax != NULL) && (ctxt->sax->getEntity != NULL))
+	        cur = ctxt->sax->getEntity(ctxt, name);
+            if (cur != NULL)
+	        cur->orig = orig;
+	    else
+		free(orig);
+	}
 	if (name != NULL) free(name);
 	if (value != NULL) free(value);
 	if (URI != NULL) free(URI);
@@ -2681,7 +2836,8 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) {
 	} else {
 	    NEXT;
 	    if ((ctxt->sax != NULL) && (ctxt->sax->elementDecl != NULL))
-	        ctxt->sax->elementDecl(ctxt->userData, name, ret, content);
+	        ctxt->sax->elementDecl(ctxt->userData, name, ret,
+		                       content);
 	}
 	if (name != NULL) {
 	    free(name);
@@ -2711,6 +2867,161 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
     xmlParseComment(ctxt, 0);
 }
 
+/**
+ * xmlParseTextDecl:
+ * @ctxt:  an XML parser context
+ * 
+ * parse an XML declaration header for external entities
+ *
+ * [77] TextDecl ::= ''
+ *
+ * Returns the only valuable info for an external parsed entity, the encoding
+ */
+
+CHAR *
+xmlParseTextDecl(xmlParserCtxtPtr ctxt) {
+    CHAR *version;
+    CHAR *encoding = NULL;
+
+    /*
+     * We know that 'sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData, "Blank needed after 'wellFormed = 0;
+    }
+    SKIP_BLANKS;
+
+    /*
+     * We may have the VersionInfo here.
+     */
+    version = xmlParseVersionInfo(ctxt);
+    /* TODO: we should actually inherit from the referencing doc if absent
+    if (version == NULL)
+	version = xmlCharStrdup(XML_DEFAULT_VERSION);
+    ctxt->version = xmlStrdup(version);
+     */
+    if (version != NULL)
+	free(version);
+
+    /*
+     * We must have the encoding declaration
+     */
+    if (!IS_BLANK(CUR)) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData, "Blank needed here\n");
+	ctxt->wellFormed = 0;
+    }
+    encoding = xmlParseEncodingDecl(ctxt);
+
+    SKIP_BLANKS;
+    if ((CUR == '?') && (NXT(1) == '>')) {
+        SKIP(2);
+    } else if (CUR == '>') {
+        /* Deprecated old WD ... */
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData, "XML declaration must end-up with '?>'\n");
+	ctxt->wellFormed = 0;
+	NEXT;
+    } else {
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData, "parsing XML declaration: '?>' expected\n");
+	ctxt->wellFormed = 0;
+	MOVETO_ENDTAG(CUR_PTR);
+	NEXT;
+    }
+    return(encoding);
+}
+
+/*
+ * xmlParseConditionalSections
+ * @ctxt:  an XML parser context
+ *
+ * TODO : Conditionnal section are not yet supported !
+ *
+ * [61] conditionalSect ::= includeSect | ignoreSect 
+ * [62] includeSect ::= '' 
+ * [63] ignoreSect ::= ''
+ * [64] ignoreSectContents ::= Ignore ('' Ignore)*
+ * [65] Ignore ::= Char* - (Char* ('') Char*)
+ */
+
+void
+xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
+    if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL))
+	ctxt->sax->warning(ctxt->userData,
+                           "XML conditional section not supported\n");
+    /*
+     * Skip up to the end of the conditionnal section.
+     */
+    while ((CUR != 0) && ((CUR != ']') || (NXT(1) != ']') || (NXT(2) != '>')))
+	NEXT;
+    if (CUR == 0) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData,
+	        "XML conditional section not closed\n");
+	ctxt->wellFormed = 0;
+    }
+}
+
+/**
+ * xmlParseExternalSubset
+ * @ctxt:  an XML parser context
+ * 
+ * parse Markup declarations from an external subset
+ *
+ * [30] extSubset ::= textDecl? extSubsetDecl
+ *
+ * [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) *
+ *
+ * TODO There is a check [ VC: Proper Declaration/PE Nesting ]
+ */
+void
+xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const CHAR *ExternalID,
+                       const CHAR *SystemID) {
+    if ((CUR == '<') && (NXT(1) == '?') &&
+        (NXT(2) == 'x') && (NXT(3) == 'm') &&
+	(NXT(4) == 'l')) {
+	xmlParseTextDecl(ctxt);
+    }
+    if (ctxt->myDoc == NULL) {
+        ctxt->myDoc = xmlNewDoc("1.0");
+    }
+    if ((ctxt->myDoc != NULL) && (ctxt->myDoc->intSubset == NULL))
+        xmlCreateIntSubset(ctxt->myDoc, NULL, ExternalID, SystemID);
+
+    while (((CUR == '<') && (NXT(1) == '?')) ||
+           ((CUR == '<') && (NXT(1) == '!')) ||
+           IS_BLANK(CUR)) {
+        if ((CUR == '<') && (NXT(1) == '!') && (NXT(2) == '[')) {
+	    xmlParseConditionalSections(ctxt);
+	} else if (IS_BLANK(CUR)) {
+	    NEXT;
+	} else if (CUR == '%') {
+            xmlParsePEReference(ctxt);
+	} else
+	    xmlParseMarkupDecl(ctxt);
+
+	/*
+	 * Pop-up of finished entities.
+	 */
+	while ((CUR == 0) && (ctxt->inputNr > 1))
+	    xmlPopInput(ctxt);
+
+    }
+    
+    if (CUR != 0) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData,
+	        "Extra content at the end of the document\n");
+	ctxt->wellFormed = 0;
+    }
+
+}
+
 /**
  * xmlParseCharRef:
  * @ctxt:  an XML parser context
@@ -2720,12 +3031,11 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
  * [66] CharRef ::= '&#' [0-9]+ ';' |
  *                  '&#x' [0-9a-fA-F]+ ';'
  *
- * Returns the value parsed
+ * Returns the value parsed (as an int)
  */
-CHAR *
+int
 xmlParseCharRef(xmlParserCtxtPtr ctxt) {
     int val = 0;
-    CHAR buf[2];
 
     if ((CUR == '&') && (NXT(1) == '#') &&
         (NXT(2) == 'x')) {
@@ -2775,16 +3085,63 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
      * Check the value IS_CHAR ...
      */
     if (IS_CHAR(val)) {
-        buf[0] = (CHAR) val;
-	buf[1] = 0;
-	return(xmlStrndup(buf, 1));
+        return(val);
     } else {
 	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 	    ctxt->sax->error(ctxt->userData, "xmlParseCharRef: invalid CHAR value %d\n",
 	                     val);
 	ctxt->wellFormed = 0;
     }
-    return(NULL);
+    return(0);
+}
+
+/**
+ * xmlParseReference:
+ * @ctxt:  an XML parser context
+ * 
+ * parse and handle entity references in content, depending on the SAX
+ * interface, this may end-up in a call to character() if this is a
+ * CharRef, a predefined entity, if there is no reference() callback.
+ * or if the parser was asked to switch to that mode.
+ *
+ * [67] Reference ::= EntityRef | CharRef
+ */
+void
+xmlParseReference(xmlParserCtxtPtr ctxt) {
+    xmlEntityPtr ent;
+    CHAR *val;
+    if (CUR != '&') return;
+
+    if (NXT(1) == '#') {
+	CHAR out[2];
+	int val = xmlParseCharRef(ctxt);
+	/* TODO: invalid for UTF-8 variable encoding !!! */
+	out[0] = val;
+	out[1] = 0;
+	if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+	    ctxt->sax->characters(ctxt->userData, out, 1);
+    } else {
+	ent = xmlParseEntityRef(ctxt);
+	if (ent == NULL) return;
+	if ((ent->name != NULL) && 
+	    (ent->type != XML_INTERNAL_PREDEFINED_ENTITY) &&
+	    (ctxt->sax != NULL) && (ctxt->sax->reference != NULL) &&
+	    (ctxt->replaceEntities == 0)) {
+
+	    /*
+	     * Create a node.
+	     */
+	    ctxt->sax->reference(ctxt->userData, ent->name);
+	    return;
+	}
+	val = ent->content;
+	if (val == NULL) return;
+	/*
+	 * inline the entity.
+	 */
+	if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
+	    ctxt->sax->characters(ctxt->userData, val, xmlStrlen(val));
+    }
 }
 
 /**
@@ -2795,15 +3152,13 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
  *
  * [68] EntityRef ::= '&' Name ';'
  *
- * Returns the entity ref string or NULL if directly as input stream.
+ * Returns the xmlEntityPtr if found, or NULL otherwise.
  */
-CHAR *
+xmlEntityPtr
 xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
-    CHAR *ret = NULL;
     const CHAR *q;
     CHAR *name;
     xmlEntityPtr ent = NULL;
-    xmlParserInputPtr input = NULL;
 
     q = CUR_PTR;
     if (CUR == '&') {
@@ -2816,6 +3171,17 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 	} else {
 	    if (CUR == ';') {
 	        NEXT;
+		/*
+		 * Ask first SAX for entity resolution, otherwise try the
+		 * predefined set.
+		 */
+		if (ctxt->sax != NULL) {
+		    if (ctxt->sax->getEntity != NULL)
+			ent = ctxt->sax->getEntity(ctxt->userData, name);
+		    if (ent == NULL)
+		        ent = xmlGetPredefinedEntity(name);
+		}
+
 		/*
 		 * Well Formedness Constraint if:
 		 *   - standalone
@@ -2827,26 +3193,24 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 		 *
 		 * TODO: to be double checked !!! This is wrong !
 		 */
-		if (ctxt->sax != NULL) {
-		    if (ctxt->sax->getEntity != NULL)
-			ent = ctxt->sax->getEntity(ctxt->userData, name);
-
+		if (ent == NULL) {
+		    if (ctxt->sax != NULL) {
 		    if (((ctxt->sax->isStandalone != NULL) &&
-		         ctxt->sax->isStandalone(ctxt->userData) == 1) ||
+			 ctxt->sax->isStandalone(ctxt->userData) == 1) ||
 			(((ctxt->sax->hasInternalSubset == NULL) ||
 			  ctxt->sax->hasInternalSubset(ctxt->userData) == 0) &&
 			 ((ctxt->sax->hasExternalSubset == NULL) ||
 			  ctxt->sax->hasExternalSubset(ctxt->userData) == 0))) {
-			if (ent == NULL) {
-			    if ((ctxt->sax != NULL) &&
-			        (ctxt->sax->error != NULL))
-				ctxt->sax->error(ctxt->userData, 
-				     "Entity '%s' not defined\n", name);
-			    ctxt->wellFormed = 0;
-			}
+			if (ctxt->sax->error != NULL)
+			    ctxt->sax->error(ctxt->userData, 
+				 "Entity '%s' not defined\n", name);
+			ctxt->wellFormed = 0;
 		    }
-		} else
-		    ctxt->wellFormed = 0;
+		    } else {
+		        fprintf(stderr, "Entity '%s' not defined\n", name);
+			ctxt->wellFormed = 0;
+		    }
+		}
 
 		/*
 		 * Well Formedness Constraint :
@@ -2872,65 +3236,22 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 		}
 
 		/*
+		 * TODO: !!!
 		 * Well Formedness Constraint :
 		 *   The referenced entity must not lead to recursion !
 		 */
 		 
-		/*
-		 * We parsed the entity reference correctly, call SAX
-		 * interface for the proper behaviour:
-		 *   - get a new input stream
-		 *   - or keep the reference inline
-		 */
-		if ((ctxt->sax) && (ctxt->sax->resolveEntity != NULL))
-		    input = ctxt->sax->resolveEntity(ctxt->userData, NULL, name);
-		if (input != NULL)
-		    xmlPushInput(ctxt, input);
-		else {
-		    ret = xmlStrndup(q, CUR_PTR - q);
-		}
-	    } else {
-		char cst[2] = { '&', 0 };
 
+	    } else {
 		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 		    ctxt->sax->error(ctxt->userData,
 		                     "xmlParseEntityRef: expecting ';'\n");
 		ctxt->wellFormed = 0;
-		ret = xmlStrndup(cst, 1);
-		ret = xmlStrcat(ret, name);
 	    }
 	    free(name);
 	}
     }
-    return(ret);
-}
-
-/**
- * xmlParseReference:
- * @ctxt:  an XML parser context
- * 
- * parse Reference declarations
- *
- * [67] Reference ::= EntityRef | CharRef
- *
- * Returns the entity string or NULL if handled directly by pushing
- *      the entity value as the input.
- */
-CHAR *
-xmlParseReference(xmlParserCtxtPtr ctxt) {
-    if ((CUR == '&') && (NXT(1) == '#')) {
-        CHAR *val = xmlParseCharRef(ctxt);
-	xmlParserInputPtr in;
-
-	if (val != NULL) {
-	    in = xmlNewStringInputStream(ctxt, val);
-	    xmlPushInput(ctxt, in);
-	}
-	return(NULL);
-    } else if (CUR == '&') {
-        return(xmlParseEntityRef(ctxt));
-    }
-    return(NULL);
+    return(ent);
 }
 
 /**
@@ -2938,14 +3259,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
  * @ctxt:  an XML parser context
  *
  * parse PEReference declarations
+ * The entity content is handled directly by pushing it's content as
+ * a new input stream.
  *
  * [69] PEReference ::= '%' Name ';'
  *
- * Returns the entity content or NULL if handled directly.
  */
-CHAR *
+void
 xmlParsePEReference(xmlParserCtxtPtr ctxt) {
-    CHAR *ret = NULL;
     CHAR *name;
     xmlEntityPtr entity = NULL;
     xmlParserInputPtr input;
@@ -2961,7 +3282,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) {
 	    if (CUR == ';') {
 	        NEXT;
 		if ((ctxt->sax != NULL) && (ctxt->sax->getEntity != NULL))
-			entity = ctxt->sax->getEntity(ctxt->userData, name);
+		    entity = ctxt->sax->getEntity(ctxt->userData, name);
 		/* TODO !!!! Must check that it's of the proper type !!! */
 		if (entity == NULL) {
 		    if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL))
@@ -2972,19 +3293,14 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) {
 		    xmlPushInput(ctxt, input);
 		}
 	    } else {
-		char cst[2] = { '%', 0 };
-
 		if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 		    ctxt->sax->error(ctxt->userData,
 		                     "xmlParsePEReference: expecting ';'\n");
 		ctxt->wellFormed = 0;
-		ret = xmlStrndup(cst, 1);
-		ret = xmlStrcat(ret, name);
 	    }
 	    free(name);
 	}
     }
-    return(ret);
 }
 
 /**
@@ -3028,6 +3344,10 @@ xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt) {
     URI = xmlParseExternalID(ctxt, &ExternalID, 1);
     SKIP_BLANKS;
 
+    /*
+     * NOTE: the SAX callback may try to fetch the external subset
+     *       entity and fill it up !
+     */
     if ((ctxt->sax != NULL) && (ctxt->sax->internalSubset != NULL))
 	ctxt->sax->internalSubset(ctxt->userData, name, ExternalID, URI);
 
@@ -3055,6 +3375,13 @@ xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt) {
 		ctxt->wellFormed = 0;
 		break;
 	    }
+
+	    /*
+	     * Pop-up of finished entities.
+	     */
+	    while ((CUR == 0) && (ctxt->inputNr > 1))
+		xmlPopInput(ctxt);
+
 	}
 	if (CUR == ']') NEXT;
     }
@@ -3419,23 +3746,7 @@ xmlParseContent(xmlParserCtxtPtr ctxt) {
 	 *    parsing returns it's Name, create the node 
 	 */
 	else if (CUR == '&') {
-	    CHAR *val = xmlParseReference(ctxt);
-	    if (val != NULL) {
-	        if (val[0] != '&') {
-		    /*
-		     * inline predefined entity.
-		     */
-                    if ((ctxt->sax != NULL) && (ctxt->sax->characters != NULL))
-			ctxt->sax->characters(ctxt->userData, val, xmlStrlen(val));
-		} else {
-		    /*
-		     * user defined entity, create a node.
-		     */
-                    if ((ctxt->sax != NULL) && (ctxt->sax->reference != NULL))
-			ctxt->sax->reference(ctxt->userData, val);
-		}
-		free(val);
-	    }
+	    xmlParseReference(ctxt);
 	}
 
 	/*
@@ -3738,6 +4049,7 @@ xmlParseSDDecl(xmlParserCtxtPtr ctxt) {
 	(NXT(6) == 'l') && (NXT(7) == 'o') &&
 	(NXT(8) == 'n') && (NXT(9) == 'e')) {
 	SKIP(10);
+        SKIP_BLANKS;
 	if (CUR != '=') {
 	    if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
 	        ctxt->sax->error(ctxt->userData,
@@ -4117,6 +4429,109 @@ xmlParseDoc(CHAR *cur) {
     return(xmlSAXParseDoc(NULL, cur, 0));
 }
 
+/**
+ * xmlSAXParseDTD :
+ * @sax:  the SAX handler block
+ * @ExternalID:  a NAME* containing the External ID of the DTD
+ * @SystemID:  a NAME* containing the URL to the DTD
+ *
+ * Load and parse an external subset.
+ * 
+ * Returns the resulting xmlDtdPtr or NULL in case of error.
+ */
+
+xmlDtdPtr
+xmlSAXParseDTD(xmlSAXHandlerPtr sax, const CHAR *ExternalID,
+                          const CHAR *SystemID) {
+    xmlDtdPtr ret = NULL;
+    xmlParserCtxtPtr ctxt;
+    xmlParserInputPtr input;
+    xmlCharEncoding enc;
+
+    if ((ExternalID == NULL) && (SystemID == NULL)) return(NULL);
+
+    ctxt = (xmlParserCtxtPtr) malloc(sizeof(xmlParserCtxt));
+    if (ctxt == NULL) {
+        perror("malloc");
+	return(NULL);
+    }
+    xmlInitParserCtxt(ctxt);
+    input = (xmlParserInputPtr) malloc(sizeof(xmlParserInput));
+    if (input == NULL) {
+        perror("malloc");
+	free(ctxt);
+	return(NULL);
+    }
+
+    /*
+     * Set-up the SAX context
+     */
+    if (ctxt == NULL) return(NULL);
+    if (sax != NULL) { 
+        ctxt->sax = sax;
+        ctxt->userData = NULL;
+    }
+
+    /*
+     * Ask the Entity resolver to load the damn thing
+     */
+
+    if ((ctxt->sax != NULL) && (ctxt->sax->resolveEntity != NULL))
+	input = ctxt->sax->resolveEntity(ctxt->userData, ExternalID, SystemID);
+    if (input == NULL) {
+	xmlFreeParserCtxt(ctxt);
+	return(NULL);
+    }
+
+    /*
+     * plug some encoding conversion routines here. !!!
+     */
+    xmlPushInput(ctxt, input);
+    enc = xmlDetectCharEncoding(ctxt->input->cur);
+    xmlSwitchEncoding(ctxt, enc);
+
+    input->filename = xmlStrdup(SystemID);
+    input->line = 1;
+    input->col = 1;
+    input->base = ctxt->input->cur;
+    input->cur = ctxt->input->cur;
+    input->free = NULL;
+
+    /*
+     * let's parse that entity knowing it's an external subset.
+     */
+    xmlParseExternalSubset(ctxt, ExternalID, SystemID);
+
+    if (ctxt->myDoc != NULL) {
+	if (ctxt->wellFormed) {
+	    ret = ctxt->myDoc->intSubset;
+	    ctxt->myDoc->intSubset = NULL;
+	} else {
+	    ret = NULL;
+	}
+        xmlFreeDoc(ctxt->myDoc);
+        ctxt->myDoc = NULL;
+    }
+    xmlFreeParserCtxt(ctxt);
+    
+    return(ret);
+}
+
+/**
+ * xmlParseDTD :
+ * @ExternalID:  a NAME* containing the External ID of the DTD
+ * @SystemID:  a NAME* containing the URL to the DTD
+ *
+ * Load and parse an external subset.
+ * 
+ * Returns the resulting xmlDtdPtr or NULL in case of error.
+ */
+
+xmlDtdPtr
+xmlParseDTD(const CHAR *ExternalID, const CHAR *SystemID) {
+    return(xmlSAXParseDTD(NULL, ExternalID, SystemID));
+}
+
 /**
  * xmlRecoverDoc :
  * @cur:  a pointer to an array of CHAR
@@ -4268,7 +4683,8 @@ retry_bigger:
  * Returns the resulting document tree
  */
 
-xmlDocPtr xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename,
+xmlDocPtr
+xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename,
                           int recovery) {
     xmlDocPtr ret;
     xmlParserCtxtPtr ctxt;
@@ -4303,7 +4719,8 @@ xmlDocPtr xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename,
  * Returns the resulting document tree
  */
 
-xmlDocPtr xmlParseFile(const char *filename) {
+xmlDocPtr
+xmlParseFile(const char *filename) {
     return(xmlSAXParseFile(NULL, filename, 0));
 }
 
@@ -4318,10 +4735,33 @@ xmlDocPtr xmlParseFile(const char *filename) {
  * Returns the resulting document tree
  */
 
-xmlDocPtr xmlRecoverFile(const char *filename) {
+xmlDocPtr
+xmlRecoverFile(const char *filename) {
     return(xmlSAXParseFile(NULL, filename, 1));
 }
 
+/**
+ * xmlSubstituteEntitiesDefault :
+ * @val:  int 0 or 1 
+ *
+ * Set and return the previous value for default entity support.
+ * Initially the parser always keep entity references instead of substituting
+ * entity values in the output. This function has to be used to change the
+ * default parser behaviour
+ * SAX::subtituteEntities() has to be used for changing that on a file by
+ * file basis.
+ *
+ * Returns the last value for 0 for no substitution, 1 for substitution.
+ */
+
+int
+xmlSubstituteEntitiesDefault(int val) {
+    int old = xmlSubstituteEntitiesDefaultValue;
+
+    xmlSubstituteEntitiesDefaultValue = val;
+    return(old);
+}
+
 /**
  * xmlCreateMemoryParserCtxt :
  * @buffer:  an pointer to a char array
@@ -4469,6 +4909,7 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
     ctxt->userData = ctxt;
     ctxt->myDoc = NULL;
     ctxt->wellFormed = 1;
+    ctxt->replaceEntities = xmlSubstituteEntitiesDefaultValue;
     ctxt->record_info = 0;
     xmlInitNodeInfoSeq(&ctxt->node_seq);
 }
@@ -4698,3 +5139,5 @@ xmlParserAddNodeInfo(xmlParserCtxtPtr ctxt,
     ctxt->node_seq.length++;
   }   
 }
+
+
diff --git a/parser.h b/parser.h
index 20756076..aaab58c4 100644
--- a/parser.h
+++ b/parser.h
@@ -54,6 +54,7 @@ typedef struct _xmlParserCtxt {
     void            *userData;        /* the document being built */
     xmlDocPtr           myDoc;        /* the document being built */
     int            wellFormed;        /* is the document well formed */
+    int       replaceEntities;        /* shall we replace entities ? */
     const CHAR     *version;	      /* the XML version string */
     const CHAR     *encoding;         /* encoding, if any */
     int             standalone;       /* standalone document */
@@ -194,6 +195,7 @@ CHAR *xmlStrncat(CHAR *cur, const CHAR *add, int len);
 xmlDocPtr xmlParseDoc(CHAR *cur);
 xmlDocPtr xmlParseMemory(char *buffer, int size);
 xmlDocPtr xmlParseFile(const char *filename);
+int xmlSubstituteEntitiesDefault(int val);
 
 /*
  * Recovery mode 
@@ -211,6 +213,9 @@ xmlDocPtr xmlSAXParseMemory(xmlSAXHandlerPtr sax, char *buffer,
                                    int size, int recovery);
 xmlDocPtr xmlSAXParseFile(xmlSAXHandlerPtr sax, const char *filename,
                                  int recovery);
+xmlDtdPtr xmlParseDTD(const CHAR *ExternalID, const CHAR *SystemID);
+xmlDtdPtr xmlSAXParseDTD(xmlSAXHandlerPtr sax, const CHAR *ExternalID,
+                         const CHAR *SystemID);
 void xmlInitParserCtxt(xmlParserCtxtPtr ctxt);
 void xmlClearParserCtxt(xmlParserCtxtPtr ctxt);
 void xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const CHAR* buffer,
diff --git a/parserInternals.h b/parserInternals.h
index 75e9e130..6a31c512 100644
--- a/parserInternals.h
+++ b/parserInternals.h
@@ -495,6 +495,13 @@ TODO !!!
 
 #define MOVETO_STARTTAG(p)						\
     while (IS_CHAR(*p) && (*(p) != '<')) (p)++
+
+/**
+ * entity substitution default behaviour.
+ */
+
+int xmlSubstituteEntitiesDefaultValue;
+
 /**
  * Parser context
  */
@@ -524,6 +531,8 @@ CHAR
 xmlPopInput(xmlParserCtxtPtr ctxt);
 void
 xmlFreeInputStream(xmlParserInputPtr input);
+xmlParserInputPtr
+xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename);
 
 /**
  * Namespaces.
@@ -549,7 +558,7 @@ xmlParseName(xmlParserCtxtPtr ctxt);
 CHAR *
 xmlParseNmtoken(xmlParserCtxtPtr ctxt);
 CHAR *
-xmlParseEntityValue(xmlParserCtxtPtr ctxt);
+xmlParseEntityValue(xmlParserCtxtPtr ctxt, CHAR **orig);
 CHAR *
 xmlParseAttValue(xmlParserCtxtPtr ctxt);
 CHAR *
@@ -593,13 +602,13 @@ int
 xmlParseElementDecl(xmlParserCtxtPtr ctxt);
 void
 xmlParseMarkupDecl(xmlParserCtxtPtr ctxt);
-CHAR *
+int
 xmlParseCharRef(xmlParserCtxtPtr ctxt);
-CHAR *
+xmlEntityPtr
 xmlParseEntityRef(xmlParserCtxtPtr ctxt);
-CHAR *
+void
 xmlParseReference(xmlParserCtxtPtr ctxt);
-CHAR *
+void
 xmlParsePEReference(xmlParserCtxtPtr ctxt);
 void
 xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt);
@@ -630,6 +639,18 @@ xmlParseXMLDecl(xmlParserCtxtPtr ctxt);
 void
 xmlParseMisc(xmlParserCtxtPtr ctxt);
 
+/*
+ * Entities substitution
+ */
+#define XML_SUBSTITUTE_NONE	0
+#define XML_SUBSTITUTE_REF	1
+#define XML_SUBSTITUTE_PEREF	2
+#define XML_SUBSTITUTE_BOTH 	3
+
+CHAR *
+xmlDecodeEntities(xmlParserCtxtPtr ctxt, int len, int what,
+                  CHAR end, CHAR  end2, CHAR end3);
+
 /*
  * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP
  */
diff --git a/result/SVG/4rects.xml b/result/SVG/4rects.xml
new file mode 100644
index 00000000..dfaa02d3
--- /dev/null
+++ b/result/SVG/4rects.xml
@@ -0,0 +1,10 @@
+
+
+
+  Four separate rectangles
+  
+  
+  
+  
+  
+
diff --git a/result/SVG/a-valid.xml b/result/SVG/a-valid.xml
new file mode 100644
index 00000000..8f4a2042
--- /dev/null
+++ b/result/SVG/a-valid.xml
@@ -0,0 +1,9 @@
+
+
+
+  This valid svg document draws a triangle which is a hyperlink
+  
+  
+    

+  
+
diff --git a/result/SVG/a-wf.xml b/result/SVG/a-wf.xml
new file mode 100644
index 00000000..c4301bb5
--- /dev/null
+++ b/result/SVG/a-wf.xml
@@ -0,0 +1,8 @@
+
+
+  This well formed svg document draws a triangle which is a hyperlink
+  
+  
+    

+  
+
diff --git a/result/SVG/bike-errors.xml b/result/SVG/bike-errors.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/result/SVG/bike.xml b/result/SVG/bike.xml
new file mode 100644
index 00000000..f74034b7
--- /dev/null
+++ b/result/SVG/bike.xml
@@ -0,0 +1,37 @@
+
+
+
+  Kona Lavadome mountain bike
+  
+  This picture shows a mountain bike, a human-propelled, 
+  multi-terrain vehicle. While it can be succesfully used on moorland, 
+  forest, roads, and large hills it is not actually suitable for going 
+  up mountains.
+  
+  
+    
+      
+        14/12 gauge double butted spoke
+      
+      
+        black anodised low torsion hub
+      
+      
+        twin wall, eyeletted rim
+      
+      
+        8 speed, wide ratio gearing
+      
+      
+        double cross lacing of 32 spokes
+      
+    
+    
+      Front wheel
+      The front wheel provides grip, steering and some shock absorption
+      
+    
+    
+    
+  
+
diff --git a/result/SVG/circle.xml b/result/SVG/circle.xml
new file mode 100644
index 00000000..ae7d5455
--- /dev/null
+++ b/result/SVG/circle.xml
@@ -0,0 +1,9 @@
+
+
+
+  This is a blue circle with a red outline
+  
+  
+    
+  
+
diff --git a/result/SVG/defs.xml b/result/SVG/defs.xml
new file mode 100644
index 00000000..ba485729
--- /dev/null
+++ b/result/SVG/defs.xml
@@ -0,0 +1,12 @@
+
+
+
+  
+    
+    
+      
+    
+  
+  Defining things for later use
+  
+
diff --git a/result/SVG/desc.xml b/result/SVG/desc.xml
new file mode 100644
index 00000000..ed598b9f
--- /dev/null
+++ b/result/SVG/desc.xml
@@ -0,0 +1,13 @@
+
+
+
+  
+    
+    Company sales by region
+  
+    
+    This is a bar chart which shows 
+    company sales by region.
+  
+  
+
diff --git a/result/SVG/ellipse.xml b/result/SVG/ellipse.xml
new file mode 100644
index 00000000..1f723461
--- /dev/null
+++ b/result/SVG/ellipse.xml
@@ -0,0 +1,9 @@
+
+
+
+  This is an ellipse, axis aligned and centered on the origin
+  
+  
+    
+  
+
diff --git a/result/SVG/flower2.xml b/result/SVG/flower2.xml
new file mode 100644
index 00000000..f8970db3
--- /dev/null
+++ b/result/SVG/flower2.xml
@@ -0,0 +1,43 @@
+
+
+
+  This sample SVG file draws a flower
+  
+    
+    
+    
+  
+
diff --git a/result/SVG/gradient.xml b/result/SVG/gradient.xml
new file mode 100644
index 00000000..1905b603
--- /dev/null
+++ b/result/SVG/gradient.xml
@@ -0,0 +1,15 @@
+
+
+
+  Gradient example
+  
+  
+    
+      
+        
+        
+      
+    
+    
+  
+
diff --git a/result/SVG/group01.xml b/result/SVG/group01.xml
new file mode 100644
index 00000000..f39ad880
--- /dev/null
+++ b/result/SVG/group01.xml
@@ -0,0 +1,14 @@
+
+
+
+  Two groups, each of two rectangles
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
diff --git a/result/SVG/group02.xml b/result/SVG/group02.xml
new file mode 100644
index 00000000..85e1f523
--- /dev/null
+++ b/result/SVG/group02.xml
@@ -0,0 +1,12 @@
+
+
+
+  Two named groups
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/result/SVG/group03.xml b/result/SVG/group03.xml
new file mode 100644
index 00000000..20d75ad4
--- /dev/null
+++ b/result/SVG/group03.xml
@@ -0,0 +1,11 @@
+
+
+
+  Groups can nest
+  
+  
+    
+      
+    
+  
+
diff --git a/result/SVG/image-valid.xml b/result/SVG/image-valid.xml
new file mode 100644
index 00000000..d45d2297
--- /dev/null
+++ b/result/SVG/image-valid.xml
@@ -0,0 +1,9 @@
+
+
+
+  This graphic links to an external image
+  
+  
+    My image
+  
+
diff --git a/result/SVG/image-wf.xml b/result/SVG/image-wf.xml
new file mode 100644
index 00000000..54c8df1a
--- /dev/null
+++ b/result/SVG/image-wf.xml
@@ -0,0 +1,8 @@
+
+
+  This links to an external image
+  
+  
+    My image
+  
+
diff --git a/result/SVG/lin-gradient.xml b/result/SVG/lin-gradient.xml
new file mode 100644
index 00000000..645bdce3
--- /dev/null
+++ b/result/SVG/lin-gradient.xml
@@ -0,0 +1,15 @@
+
+
+
+  Linear gradient example
+  
+  
+    
+      
+        
+        
+      
+    
+    
+  
+
diff --git a/result/SVG/marker.xml b/result/SVG/marker.xml
new file mode 100644
index 00000000..013c5cd0
--- /dev/null
+++ b/result/SVG/marker.xml
@@ -0,0 +1,19 @@
+
+
+
+  
+    
+      
+    
+  
+  An double-headed arrow example using markers
+  
+  
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/result/SVG/mask.xml b/result/SVG/mask.xml
new file mode 100644
index 00000000..1204e069
--- /dev/null
+++ b/result/SVG/mask.xml
@@ -0,0 +1,12 @@
+
+
+
+  Example of using a mask
+  
+  
+    
+      
+    
+    
+  
+
diff --git a/result/SVG/mathswitch.xml b/result/SVG/mathswitch.xml
new file mode 100644
index 00000000..8f4e539b
--- /dev/null
+++ b/result/SVG/mathswitch.xml
@@ -0,0 +1,14 @@
+
+
+  This example uses the switch element to provide a 
+  fallback graphical representation of an equation, if 
+  MathML is not supported.
+  
+  
+    
+    
+      
+      Formula goes here
+    
+  
+
diff --git a/result/SVG/parentns.xml b/result/SVG/parentns.xml
new file mode 100644
index 00000000..b204637e
--- /dev/null
+++ b/result/SVG/parentns.xml
@@ -0,0 +1,6 @@
+
+
+  
+    
+  
+
diff --git a/result/SVG/path01.xml b/result/SVG/path01.xml
new file mode 100644
index 00000000..646940bd
--- /dev/null
+++ b/result/SVG/path01.xml
@@ -0,0 +1,4 @@
+
+
+  
+
diff --git a/result/SVG/path02.xml b/result/SVG/path02.xml
new file mode 100644
index 00000000..b74f9759
--- /dev/null
+++ b/result/SVG/path02.xml
@@ -0,0 +1,9 @@
+
+
+
+  
+    
+    
+    
+  
+
diff --git a/result/SVG/patternfill.xml b/result/SVG/patternfill.xml
new file mode 100644
index 00000000..425b361b
--- /dev/null
+++ b/result/SVG/patternfill.xml
@@ -0,0 +1,8 @@
+
+
+
+  
+    
+  
+  
+
diff --git a/result/SVG/polyline.xml b/result/SVG/polyline.xml
new file mode 100644
index 00000000..9fa40717
--- /dev/null
+++ b/result/SVG/polyline.xml
@@ -0,0 +1,8 @@
+
+
+
+  A sample polyline, and equivalent path
+  
+  
+  
+
diff --git a/result/SVG/private.xml b/result/SVG/private.xml
new file mode 100644
index 00000000..e69fc46c
--- /dev/null
+++ b/result/SVG/private.xml
@@ -0,0 +1,15 @@
+
+
+  
+    
+      
+        
+        
+        
+        
+      
+    
+  
+  This chart includes private data in another namespace
+  
+
diff --git a/result/SVG/rad-gradient.xml b/result/SVG/rad-gradient.xml
new file mode 100644
index 00000000..d5aadf0c
--- /dev/null
+++ b/result/SVG/rad-gradient.xml
@@ -0,0 +1,16 @@
+
+
+
+  Radial gradient example with three gradient stops
+  
+  
+    
+      
+        
+        
+        
+      
+    
+    
+  
+
diff --git a/result/SVG/rectangle.xml b/result/SVG/rectangle.xml
new file mode 100644
index 00000000..919cd23b
--- /dev/null
+++ b/result/SVG/rectangle.xml
@@ -0,0 +1,9 @@
+
+
+
+  This is a rectangle
+  
+  
+    
+  
+
diff --git a/result/SVG/richdesc.xml b/result/SVG/richdesc.xml
new file mode 100644
index 00000000..e2a15d97
--- /dev/null
+++ b/result/SVG/richdesc.xml
@@ -0,0 +1,11 @@
+
+
+  
+    This is an example SVG file
+    The global description uses markup from the 
+        
+      mydoc
+ namespace.    
+  
+  
+
diff --git a/result/SVG/script.xml b/result/SVG/script.xml
new file mode 100644
index 00000000..133c0a0c
--- /dev/null
+++ b/result/SVG/script.xml
@@ -0,0 +1,12 @@
+
+
+
+  
+    
+  
+  
+
diff --git a/result/SVG/structure01.xml b/result/SVG/structure01.xml
new file mode 100644
index 00000000..a60174a7
--- /dev/null
+++ b/result/SVG/structure01.xml
@@ -0,0 +1,6 @@
+
+
+  
+    
+  
+
diff --git a/result/SVG/style.xml b/result/SVG/style.xml
new file mode 100644
index 00000000..80dfa422
--- /dev/null
+++ b/result/SVG/style.xml
@@ -0,0 +1,10 @@
+
+
+
+  
+    
+  
+  Here is my title
+
diff --git a/result/SVG/switch.xml b/result/SVG/switch.xml
new file mode 100644
index 00000000..383a47f5
--- /dev/null
+++ b/result/SVG/switch.xml
@@ -0,0 +1,9 @@
+
+
+  
+    
+      
+      
+    
+  
+
diff --git a/result/SVG/symbol-use.xml b/result/SVG/symbol-use.xml
new file mode 100644
index 00000000..9265a666
--- /dev/null
+++ b/result/SVG/symbol-use.xml
@@ -0,0 +1,14 @@
+
+
+
+  
+    
+  
+  Examples of inline and referenced content
+  
+  
+  
+  
+    
+  
+
diff --git a/result/SVG/template.xml b/result/SVG/template.xml
new file mode 100644
index 00000000..f844b482
--- /dev/null
+++ b/result/SVG/template.xml
@@ -0,0 +1,8 @@
+
+
+  This well formed svg document contains a hyperlink
+  
+  
+    

+  
+
diff --git a/result/SVG/text01.xml b/result/SVG/text01.xml
new file mode 100644
index 00000000..0e2b44b6
--- /dev/null
+++ b/result/SVG/text01.xml
@@ -0,0 +1,11 @@
+
+
+
+  
+    XYZ
+  
+  ABC
+  
+    
+  
+
diff --git a/result/SVG/text02.xml b/result/SVG/text02.xml
new file mode 100644
index 00000000..9656ea51
--- /dev/null
+++ b/result/SVG/text02.xml
@@ -0,0 +1,25 @@
+
+
+  
+    
+      
+      
+    
+    
+      
+      
+    
+  
+  
+    123
+  
+  
+    ABC
+  
+  
+    456
+  
+  
+    DEF
+  
+
diff --git a/result/SVG/text03.xml b/result/SVG/text03.xml
new file mode 100644
index 00000000..be920311
--- /dev/null
+++ b/result/SVG/text03.xml
@@ -0,0 +1,7 @@
+
+
+  
+    123
+    456
+  
+
diff --git a/result/SVG/toap01.xml b/result/SVG/toap01.xml
new file mode 100644
index 00000000..778d92f5
--- /dev/null
+++ b/result/SVG/toap01.xml
@@ -0,0 +1,10 @@
+
+
+
+  Simple text on a path
+  
+  
+  
+    
+Text on path  
+
diff --git a/result/SVG/toap02.xml b/result/SVG/toap02.xml
new file mode 100644
index 00000000..c62aa04b
--- /dev/null
+++ b/result/SVG/toap02.xml
@@ -0,0 +1,27 @@
+
+
+
+  
+    
+      
+    
+    
+      
+    
+  
+  General graphics on a path
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/result/SVG/transform.xml b/result/SVG/transform.xml
new file mode 100644
index 00000000..65712acc
--- /dev/null
+++ b/result/SVG/transform.xml
@@ -0,0 +1,12 @@
+
+
+
+  Demonstration of coordinate transforms
+  
+  This prints 12 pixels high.
+  This prints 12 pixels high.
+  
+    This prints 24 pixels high.
+    This prints 12 pixels high.
+  
+
diff --git a/result/SVG/trivial.xml b/result/SVG/trivial.xml
new file mode 100644
index 00000000..2ff9a379
--- /dev/null
+++ b/result/SVG/trivial.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/result/SVG/twin-gradients.xml b/result/SVG/twin-gradients.xml
new file mode 100644
index 00000000..5ce25cc2
--- /dev/null
+++ b/result/SVG/twin-gradients.xml
@@ -0,0 +1,18 @@
+
+
+
+  Gradients apply to leaf nodes
+  
+  
+    
+      
+        
+        
+      
+    
+    
+      
+      
+    
+  
+
diff --git a/result/SVG/v-template.xml b/result/SVG/v-template.xml
new file mode 100644
index 00000000..20d19fc9
--- /dev/null
+++ b/result/SVG/v-template.xml
@@ -0,0 +1,6 @@
+
+
+
+  
+  
+
diff --git a/result/SVG/viewport-nest.xml b/result/SVG/viewport-nest.xml
new file mode 100644
index 00000000..c7426351
--- /dev/null
+++ b/result/SVG/viewport-nest.xml
@@ -0,0 +1,8 @@
+
+
+
+  This SVG drawing embeds another one,
+    thus establishing a new viewport
+  
+  
+
diff --git a/result/SVG/viewport-transform.xml b/result/SVG/viewport-transform.xml
new file mode 100644
index 00000000..5acbc4c0
--- /dev/null
+++ b/result/SVG/viewport-transform.xml
@@ -0,0 +1,18 @@
+
+
+
+  Transformation with establishment of a new viewport
+  
+  This prints 12 pixels high.
+  This prints 12 pixels high.
+  
+    This prints 24 pixels high.
+    This prints 12 pixels high.
+  
+  
+    
+      This prints 36 pixels high.
+      This prints 36 pixels high.
+    
+  
+
diff --git a/result/SVG/viewport.xml b/result/SVG/viewport.xml
new file mode 100644
index 00000000..26bb86c2
--- /dev/null
+++ b/result/SVG/viewport.xml
@@ -0,0 +1,6 @@
+
+
+  
+    
+  
+
diff --git a/result/SVG/wf-template.xml b/result/SVG/wf-template.xml
new file mode 100644
index 00000000..d30d8de0
--- /dev/null
+++ b/result/SVG/wf-template.xml
@@ -0,0 +1,4 @@
+
+
+  
+
diff --git a/result/dia1 b/result/dia1
new file mode 100644
index 00000000..207bd73a
--- /dev/null
+++ b/result/dia1
@@ -0,0 +1,99 @@
+
+
+  
+    
+      
+    
+  
+  
+    
+      
+        
+      
+      
+        
+      
+      
+        
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+  
+
diff --git a/result/dia2 b/result/dia2
new file mode 100644
index 00000000..207bd73a
--- /dev/null
+++ b/result/dia2
@@ -0,0 +1,99 @@
+
+
+  
+    
+      
+    
+  
+  
+    
+      
+        
+      
+      
+        
+      
+      
+        
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+  
+
diff --git a/result/dtd10 b/result/dtd10
new file mode 100644
index 00000000..82ac138b
--- /dev/null
+++ b/result/dtd10
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+]>
+
+  This
+   is a
+   valid document
+
diff --git a/result/dtd11 b/result/dtd11
new file mode 100644
index 00000000..e0df8af5
--- /dev/null
+++ b/result/dtd11
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/result/dtd2 b/result/dtd2
new file mode 100644
index 00000000..921fd94c
--- /dev/null
+++ b/result/dtd2
@@ -0,0 +1,5 @@
+
+
+]>
+This is a valid document !
diff --git a/result/dtd3 b/result/dtd3
new file mode 100644
index 00000000..6681ef7f
--- /dev/null
+++ b/result/dtd3
@@ -0,0 +1,5 @@
+
+
+]>
+This is a valid document !
diff --git a/result/dtd4 b/result/dtd4
new file mode 100644
index 00000000..6cf2444a
--- /dev/null
+++ b/result/dtd4
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/result/dtd5 b/result/dtd5
new file mode 100644
index 00000000..4c0a0c5a
--- /dev/null
+++ b/result/dtd5
@@ -0,0 +1,10 @@
+
+
+
+
+]>
+
+  This
+ is a   valid
+ document
diff --git a/result/dtd6 b/result/dtd6
new file mode 100644
index 00000000..8b3875e0
--- /dev/null
+++ b/result/dtd6
@@ -0,0 +1,11 @@
+
+
+
+
+]>
+
+  This
+   is a valid
+   document
+
diff --git a/result/dtd7 b/result/dtd7
new file mode 100644
index 00000000..4da0ce61
--- /dev/null
+++ b/result/dtd7
@@ -0,0 +1,10 @@
+
+
+
+
+]>
+
+  This
+   is a valid document
+
diff --git a/result/dtd8 b/result/dtd8
new file mode 100644
index 00000000..77ab6426
--- /dev/null
+++ b/result/dtd8
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+]>
+
+  This
+   is a valid document
+
diff --git a/result/dtd9 b/result/dtd9
new file mode 100644
index 00000000..020ab720
--- /dev/null
+++ b/result/dtd9
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+]>
+
+  This
+   is a valid document
+
diff --git a/result/ent2 b/result/ent2
index 670ce745..52e92f9d 100644
--- a/result/ent2
+++ b/result/ent2
@@ -6,4 +6,6 @@
 ]>
 
   &title;
-  This text is about XML, the &xml; and this is an embedded ℑ
+  This text is about XML, the &xml; and this is an embedded 
+  
+
diff --git a/result/p3p b/result/p3p
index e69de29b..b2ba102f 100644
--- a/result/p3p
+++ b/result/p3p
@@ -0,0 +1,22 @@
+
+
+  
+    
+      
+        
+          
+            
+            
+            
+          
+        
+      
+    
+    
+      
+        
+      
+    
+    
+  
+
diff --git a/result/svg1 b/result/svg1
new file mode 100644
index 00000000..6802e5cd
--- /dev/null
+++ b/result/svg1
@@ -0,0 +1,161 @@
+
+
+
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/result/svg2 b/result/svg2
new file mode 100644
index 00000000..5e53829a
--- /dev/null
+++ b/result/svg2
@@ -0,0 +1,54 @@
+
+
+
+  
+    
+    
+  
+  
+    
+  
+  
+  
+    
+  
+  
+    
+  
+  
+    
+    
+       Java Font definition:Dialog 0
+    
+    
+       Java Font definition:Helvetica 0
+    
+  
+  
+    this is text
+  
+  
+    
+       Java Font definition:Dialog 0
+    
+    
+       Java Font definition:Helvetica 700
+    
+  
+  
+    sadfsadfsad
+  
+  
+  
+    
+  
+  
+  
+    
+       Java Font definition:Dialog 700
+    
+    
+       Java Font definition:Dialog 700
+    
+  
+
diff --git a/result/xml1 b/result/xml1
new file mode 100644
index 00000000..d32f56cd
--- /dev/null
+++ b/result/xml1
@@ -0,0 +1,7 @@
+
+An ampersand (&#38;) may be escaped
+ numerically (&#38;#38;) or with a general entity
+  (&amp;).
">
+]>
+&example;
diff --git a/result/xml2 b/result/xml2
new file mode 100644
index 00000000..89abac15
--- /dev/null
+++ b/result/xml2
@@ -0,0 +1,8 @@
+
+
+'>
+
+
+]>
+This sample shows a &tricky; method.
diff --git a/test/SVG/4rects.xml b/test/SVG/4rects.xml
new file mode 100755
index 00000000..b8d1a655
--- /dev/null
+++ b/test/SVG/4rects.xml
@@ -0,0 +1,11 @@
+
+
+
+  Four separate rectangles
+  
+    
+    
+    
+    
+
diff --git a/test/SVG/a-valid.xml b/test/SVG/a-valid.xml
new file mode 100755
index 00000000..233b78c3
--- /dev/null
+++ b/test/SVG/a-valid.xml
@@ -0,0 +1,10 @@
+
+
+
+  This valid svg document draws a triangle which is a hyperlink
+  
+  
+    

+  
+
diff --git a/test/SVG/a-wf.xml b/test/SVG/a-wf.xml
new file mode 100755
index 00000000..756e9c64
--- /dev/null
+++ b/test/SVG/a-wf.xml
@@ -0,0 +1,9 @@
+
+
+  This well formed svg document draws a triangle which is a hyperlink
+  
+  
+    

+  
+
diff --git a/test/SVG/bike.xml b/test/SVG/bike.xml
new file mode 100755
index 00000000..796b9964
--- /dev/null
+++ b/test/SVG/bike.xml
@@ -0,0 +1,41 @@
+
+
+
+
+  Kona Lavadome mountain bike
+  
+  This picture shows a mountain bike, a human-propelled, 
+  multi-terrain vehicle. While it can be succesfully used on moorland, 
+  forest, roads, and large hills it is not actually suitable for going 
+  up mountains.
+  
+  
+    
+     14/12 gauge double butted spoke
+     
+     
+     black anodised low torsion hub
+     
+     
+     twin wall, eyeletted rim
+     
+     
+     8 speed, wide ratio gearing
+     
+     
+     double cross lacing of 32 spokes
+     
+    
+    
+    
+    Front wheel
+    The front wheel provides grip, steering and some shock absorption
+    
+    
+    
+    
+    
+    
+  
+
diff --git a/test/SVG/circle.xml b/test/SVG/circle.xml
new file mode 100755
index 00000000..44e70e7e
--- /dev/null
+++ b/test/SVG/circle.xml
@@ -0,0 +1,11 @@
+
+
+
+  This is a blue circle with a red outline
+  
+  
+    
+  
+
diff --git a/test/SVG/defs.xml b/test/SVG/defs.xml
new file mode 100755
index 00000000..0bf5f276
--- /dev/null
+++ b/test/SVG/defs.xml
@@ -0,0 +1,14 @@
+
+
+
+  
+    
+    
+      
+    
+  
+  Defining things for later use
+  
+  
+
diff --git a/test/SVG/desc.xml b/test/SVG/desc.xml
new file mode 100755
index 00000000..87838db4
--- /dev/null
+++ b/test/SVG/desc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+  
+    Company sales by region
+  
+  
+    This is a bar chart which shows 
+    company sales by region.
+  
+  
+
+
diff --git a/test/SVG/ellipse.xml b/test/SVG/ellipse.xml
new file mode 100755
index 00000000..2097ef5c
--- /dev/null
+++ b/test/SVG/ellipse.xml
@@ -0,0 +1,10 @@
+
+
+
+  This is an ellipse, axis aligned and centered on the origin
+  
+  
+    
+  
+
diff --git a/test/SVG/flower2.xml b/test/SVG/flower2.xml
new file mode 100755
index 00000000..10064c93
--- /dev/null
+++ b/test/SVG/flower2.xml
@@ -0,0 +1,44 @@
+
+
+
+  This sample SVG file draws a flower
+  
+   
+   
+   
+  
+
diff --git a/test/SVG/gradient.xml b/test/SVG/gradient.xml
new file mode 100755
index 00000000..328d5e88
--- /dev/null
+++ b/test/SVG/gradient.xml
@@ -0,0 +1,16 @@
+
+
+
+  Gradient example
+  
+  
+    
+      
+        
+        
+        
+      
+    
+    
+  
+
diff --git a/test/SVG/group01.xml b/test/SVG/group01.xml
new file mode 100755
index 00000000..906a220b
--- /dev/null
+++ b/test/SVG/group01.xml
@@ -0,0 +1,15 @@
+
+
+
+  Two groups, each of two rectangles
+  
+  
+    
+    
+  
+  
+    
+    
+  
+
diff --git a/test/SVG/group02.xml b/test/SVG/group02.xml
new file mode 100755
index 00000000..082474a8
--- /dev/null
+++ b/test/SVG/group02.xml
@@ -0,0 +1,13 @@
+
+
+
+  Two named groups
+  
+  
+    
+  
+  
+    
+  
+
diff --git a/test/SVG/group03.xml b/test/SVG/group03.xml
new file mode 100755
index 00000000..ad25e93f
--- /dev/null
+++ b/test/SVG/group03.xml
@@ -0,0 +1,13 @@
+
+
+
+  Groups can nest
+  
+  
+     
+       
+       
+     
+   
+
diff --git a/test/SVG/image-valid.xml b/test/SVG/image-valid.xml
new file mode 100755
index 00000000..320e8d2a
--- /dev/null
+++ b/test/SVG/image-valid.xml
@@ -0,0 +1,11 @@
+
+
+
+  This graphic links to an external image
+  
+  
+    My image
+  
+
diff --git a/test/SVG/image-wf.xml b/test/SVG/image-wf.xml
new file mode 100755
index 00000000..6d13b33b
--- /dev/null
+++ b/test/SVG/image-wf.xml
@@ -0,0 +1,11 @@
+
+
+  This links to an external image
+  
+  
+    My image
+  
+
diff --git a/test/SVG/lin-gradient.xml b/test/SVG/lin-gradient.xml
new file mode 100755
index 00000000..8ace2b49
--- /dev/null
+++ b/test/SVG/lin-gradient.xml
@@ -0,0 +1,16 @@
+
+
+
+  Linear gradient example
+  
+  
+    
+      
+        
+        
+      
+    
+    
+  
+
diff --git a/test/SVG/marker.xml b/test/SVG/marker.xml
new file mode 100755
index 00000000..62716a2e
--- /dev/null
+++ b/test/SVG/marker.xml
@@ -0,0 +1,28 @@
+
+
+
+  
+    
+      
+     
+   
+  An double-headed arrow example using markers
+  
+  
+    
+    
+    
+
+    
+    
+    
+
+    
+    
+    
+  
+
diff --git a/test/SVG/mask.xml b/test/SVG/mask.xml
new file mode 100755
index 00000000..f81aca1a
--- /dev/null
+++ b/test/SVG/mask.xml
@@ -0,0 +1,13 @@
+
+
+
+  Example of using a mask
+  
+  
+    
+      
+    
+    
+  
+
diff --git a/test/SVG/mathswitch.xml b/test/SVG/mathswitch.xml
new file mode 100755
index 00000000..4d28f332
--- /dev/null
+++ b/test/SVG/mathswitch.xml
@@ -0,0 +1,32 @@
+
+
+  This example uses the switch element to provide a 
+  fallback graphical representation of an equation, if 
+  MathML is not supported.
+  
+  
+  
+
+    
+    
+      
+    
+
+    
+    
+      
+      
+      Formula goes here
+    
+
+  
+
diff --git a/test/SVG/parentns.xml b/test/SVG/parentns.xml
new file mode 100755
index 00000000..ba410e1f
--- /dev/null
+++ b/test/SVG/parentns.xml
@@ -0,0 +1,12 @@
+
+
+  
+  
+     
+     
+   
+   
+
+
+
diff --git a/test/SVG/path01.xml b/test/SVG/path01.xml
new file mode 100755
index 00000000..4590b6c5
--- /dev/null
+++ b/test/SVG/path01.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/test/SVG/path02.xml b/test/SVG/path02.xml
new file mode 100755
index 00000000..a91aa61d
--- /dev/null
+++ b/test/SVG/path02.xml
@@ -0,0 +1,10 @@
+
+
+
+  
+    
+    
+    
+  
+
diff --git a/test/SVG/patternfill.xml b/test/SVG/patternfill.xml
new file mode 100755
index 00000000..292f4f7a
--- /dev/null
+++ b/test/SVG/patternfill.xml
@@ -0,0 +1,12 @@
+
+
+
+  
+    
+      
+    
+  
+  
+
diff --git a/test/SVG/polyline.xml b/test/SVG/polyline.xml
new file mode 100755
index 00000000..e6f7b629
--- /dev/null
+++ b/test/SVG/polyline.xml
@@ -0,0 +1,9 @@
+
+
+
+  A sample polyline, and equivalent path
+  
+  
+  
+
diff --git a/test/SVG/private.xml b/test/SVG/private.xml
new file mode 100755
index 00000000..36013657
--- /dev/null
+++ b/test/SVG/private.xml
@@ -0,0 +1,19 @@
+
+
+  
+    
+      
+        
+        
+        
+        
+        
+      
+    
+  
+    This chart includes private data in another namespace
+  
+  
+
diff --git a/test/SVG/rad-gradient.xml b/test/SVG/rad-gradient.xml
new file mode 100755
index 00000000..9ad7683e
--- /dev/null
+++ b/test/SVG/rad-gradient.xml
@@ -0,0 +1,17 @@
+
+
+
+  Radial gradient example with three gradient stops
+  
+  
+    
+      
+         
+         
+         
+      
+    
+    
+  
+
diff --git a/test/SVG/rectangle.xml b/test/SVG/rectangle.xml
new file mode 100755
index 00000000..e6cdeea9
--- /dev/null
+++ b/test/SVG/rectangle.xml
@@ -0,0 +1,10 @@
+
+
+
+  This is a rectangle
+  
+  
+    
+  
+
diff --git a/test/SVG/richdesc.xml b/test/SVG/richdesc.xml
new file mode 100755
index 00000000..ccf8c8dc
--- /dev/null
+++ b/test/SVG/richdesc.xml
@@ -0,0 +1,12 @@
+
+
+   
+      This is an example SVG file
+      The global description uses markup from the 
+        mydoc namespace.
+   
+   
+   
+   
+
diff --git a/test/SVG/script.xml b/test/SVG/script.xml
new file mode 100755
index 00000000..600365e1
--- /dev/null
+++ b/test/SVG/script.xml
@@ -0,0 +1,13 @@
+
+
+
+  
+    
+  
+  
+
diff --git a/test/SVG/structure01.xml b/test/SVG/structure01.xml
new file mode 100755
index 00000000..dec91436
--- /dev/null
+++ b/test/SVG/structure01.xml
@@ -0,0 +1,10 @@
+
+
+   
+   
+      
+   
+   
+
+
diff --git a/test/SVG/style.xml b/test/SVG/style.xml
new file mode 100755
index 00000000..ba150418
--- /dev/null
+++ b/test/SVG/style.xml
@@ -0,0 +1,11 @@
+
+
+
+  
+    
+  
+  Here is my title
+
diff --git a/test/SVG/switch.xml b/test/SVG/switch.xml
new file mode 100755
index 00000000..18955c9b
--- /dev/null
+++ b/test/SVG/switch.xml
@@ -0,0 +1,21 @@
+
+
+  
+    
+    
+
+      
+      
+
+      
+      
+    
+  
+
+
+
diff --git a/test/SVG/symbol-use.xml b/test/SVG/symbol-use.xml
new file mode 100755
index 00000000..83bc4585
--- /dev/null
+++ b/test/SVG/symbol-use.xml
@@ -0,0 +1,28 @@
+
+
+
+  
+    
+      
+    
+  
+
+  Examples of inline and referenced content
+  
+  
+  
+  
+    
+  
+
+  
+  
+
+  
+  
+    
+    
+  
+
+
diff --git a/test/SVG/template.xml b/test/SVG/template.xml
new file mode 100755
index 00000000..0a9fee77
--- /dev/null
+++ b/test/SVG/template.xml
@@ -0,0 +1,9 @@
+
+
+  This well formed svg document contains a hyperlink
+  
+  
+    

+  
+
diff --git a/test/SVG/text01.xml b/test/SVG/text01.xml
new file mode 100755
index 00000000..395bafb1
--- /dev/null
+++ b/test/SVG/text01.xml
@@ -0,0 +1,12 @@
+
+
+
+  
+    XYZ
+  
+  ABC
+  
+    
+  
+
diff --git a/test/SVG/text02.xml b/test/SVG/text02.xml
new file mode 100755
index 00000000..7b95292f
--- /dev/null
+++ b/test/SVG/text02.xml
@@ -0,0 +1,17 @@
+
+
+  
+    
+      
+      
+    
+    
+      
+      
+    
+  
+  123
+  ABC
+  456
+  DEF
diff --git a/test/SVG/text03.xml b/test/SVG/text03.xml
new file mode 100755
index 00000000..fae9af1a
--- /dev/null
+++ b/test/SVG/text03.xml
@@ -0,0 +1,8 @@
+
+
+  
+    123
+    456
+  
+
diff --git a/test/SVG/toap01.xml b/test/SVG/toap01.xml
new file mode 100755
index 00000000..32e16e67
--- /dev/null
+++ b/test/SVG/toap01.xml
@@ -0,0 +1,10 @@
+
+
+
+  Simple text on a path
+  
+  
+  Text on path
+
diff --git a/test/SVG/toap02.xml b/test/SVG/toap02.xml
new file mode 100755
index 00000000..68980931
--- /dev/null
+++ b/test/SVG/toap02.xml
@@ -0,0 +1,33 @@
+
+
+
+  
+    
+      
+    
+    
+      
+    
+  
+  
+  General graphics on a path
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
+
diff --git a/test/SVG/transform.xml b/test/SVG/transform.xml
new file mode 100755
index 00000000..13075ee2
--- /dev/null
+++ b/test/SVG/transform.xml
@@ -0,0 +1,26 @@
+
+
+
+  Demonstration of coordinate transforms
+  
+  
+   This prints 12 pixels high.
+   This prints 12 pixels high.
+
+   
+   
+
+      
+      This prints 24 pixels high.
+
+      
+      This prints 12 pixels high.
+
+   
+
+
diff --git a/test/SVG/trivial.xml b/test/SVG/trivial.xml
new file mode 100755
index 00000000..b6122be8
--- /dev/null
+++ b/test/SVG/trivial.xml
@@ -0,0 +1,6 @@
+
+
+ 
+
+
diff --git a/test/SVG/twin-gradients.xml b/test/SVG/twin-gradients.xml
new file mode 100755
index 00000000..6213f1b9
--- /dev/null
+++ b/test/SVG/twin-gradients.xml
@@ -0,0 +1,19 @@
+
+
+
+  Gradients apply to leaf nodes
+  
+  
+    
+      
+        
+        
+      
+    
+    
+      
+      
+   
+  
+
diff --git a/test/SVG/v-template.xml b/test/SVG/v-template.xml
new file mode 100755
index 00000000..d8643d74
--- /dev/null
+++ b/test/SVG/v-template.xml
@@ -0,0 +1,9 @@
+
+
+
+  
+  
+  
+  
+
diff --git a/test/SVG/viewport-nest.xml b/test/SVG/viewport-nest.xml
new file mode 100755
index 00000000..981a7acc
--- /dev/null
+++ b/test/SVG/viewport-nest.xml
@@ -0,0 +1,13 @@
+
+
+
+  This SVG drawing embeds another one,
+    thus establishing a new viewport
+  
+  
+  
+     
+  
+
diff --git a/test/SVG/viewport-transform.xml b/test/SVG/viewport-transform.xml
new file mode 100755
index 00000000..e2434bd7
--- /dev/null
+++ b/test/SVG/viewport-transform.xml
@@ -0,0 +1,46 @@
+
+
+
+  Transformation with establishment of a new viewport
+  
+  
+   This prints 12 pixels high.
+   This prints 12 pixels high.
+
+   
+   
+
+      
+      This prints 24 pixels high.
+
+      
+      This prints 12 pixels high.
+   
+
+   
+   
+
+      
+      
+
+         
+         This prints 36 pixels high.
+         This prints 36 pixels high.
+
+      
+   
+
+
diff --git a/test/SVG/viewport.xml b/test/SVG/viewport.xml
new file mode 100755
index 00000000..0923fae2
--- /dev/null
+++ b/test/SVG/viewport.xml
@@ -0,0 +1,11 @@
+
+
+   
+   
+   
+      
+      
+      
+   
+
diff --git a/test/SVG/wf-template.xml b/test/SVG/wf-template.xml
new file mode 100755
index 00000000..f1cad85d
--- /dev/null
+++ b/test/SVG/wf-template.xml
@@ -0,0 +1,7 @@
+
+
+  
+  
+
+
diff --git a/test/dav1 b/test/dav1
index 6a6474cf..cbfd4c42 100644
--- a/test/dav1
+++ b/test/dav1
@@ -1,24 +1,25 @@
-
-
-
-
- 
-      
-	   
-		Box type A
-	   
-	   
-		J.J. Dingleheimerschmidt
-	   
-      
-      HTTP/1.1 200 OK
- 
- 
-      
-      HTTP/1.1 403 Forbidden
-       The user does not have access to the DingALing property.
+
+
+  
+    
+      
+        Box type A
+      
+      
+        J.J. Dingleheimerschmidt
+      
+    
+    HTTP/1.1 200 OK
+  
+  
+    
+      
+      
+    
+    HTTP/1.1 403 Forbidden
+     The user does not have access to the DingALing property.
       
- 
-  There has been an access violation error.
+  
+   There has been an access violation error.
  
 
diff --git a/test/dav10 b/test/dav10
index 536112cf..4b00da4e 100644
--- a/test/dav10
+++ b/test/dav10
@@ -1,5 +1,4 @@
-
-
-
+
+
   http://www.ics.uci.edu/~ejw/contact.html
 
diff --git a/test/dav11 b/test/dav11
index 16ee59a4..8ac23d68 100644
--- a/test/dav11
+++ b/test/dav11
@@ -1,22 +1,21 @@
-
-
-
- 
-      
-	   write
-	   exclusive
-	   
-	   
-		
+
+
+  
+    
+      write
+      exclusive
+      
+      
+        
 		http://www.ics.uci.edu/~ejw/contact.html
 		
-	   
-	   Second-604800
-	   
-		
+      
+      Second-604800
+      
+        
 	   opaquelocktoken:xyz122393481230912asdfa09s8df09s7df
 		
-	   
-      
- 
+      
+    
+  
 
diff --git a/test/dav12 b/test/dav12
index 87ac0bf6..d8d03fe9 100644
--- a/test/dav12
+++ b/test/dav12
@@ -1,3 +1,2 @@
-
-
-http://www.ics.uci.edu/~ejw/contact.html
+
+http://www.ics.uci.edu/~ejw/contact.html
diff --git a/test/dav13 b/test/dav13
index ccb786da..f44ae382 100644
--- a/test/dav13
+++ b/test/dav13
@@ -1,17 +1,16 @@
-
-
-
- 
-      
+
+
+  
+    
 	   http://webdav.sb.aol.com/workspace/webdav/proposal.doc
       
-      
+    
 	   http://webdav.sb.aol.com/workspace/webdav/
       
-      HTTP/1.1 202 Accepted
- 
- 
-      http://foo.bar/blah
-      HTTP/1.1 403 Forbidden
- 
+    HTTP/1.1 202 Accepted
+  
+  
+    http://foo.bar/blah
+    HTTP/1.1 403 Forbidden
+  
 
diff --git a/test/dav15 b/test/dav15
index 603d6afc..b80802e0 100644
--- a/test/dav15
+++ b/test/dav15
@@ -1,22 +1,20 @@
-
-
-
-
- 
-      
-	   Source
-	   http://foo.bar/program
-	   http://foo.bar/src/main.c
-      
-      
-	   Library
-	   http://foo.bar/program
-	   http://foo.bar/src/main.lib
-      
-      
-	   Makefile
-	   http://foo.bar/program
-	   http://foo.bar/src/makefile
-      
- 
+
+
+  
+    
+      Source
+      http://foo.bar/program
+      http://foo.bar/src/main.c
+    
+    
+      Library
+      http://foo.bar/program
+      http://foo.bar/src/main.lib
+    
+    
+      Makefile
+      http://foo.bar/program
+      http://foo.bar/src/makefile
+    
+  
 
diff --git a/test/dav16 b/test/dav16
index f9bb41d4..9a7dc361 100644
--- a/test/dav16
+++ b/test/dav16
@@ -1,5 +1,6 @@
-
-
-
- 
+
+
+  
+    
+  
 
diff --git a/test/dav17 b/test/dav17
index 1d1eabe8..11376625 100644
--- a/test/dav17
+++ b/test/dav17
@@ -1,23 +1,22 @@
-
-
-
- 
-      
-	   
-		
-		     write
-		     exclusive
-		     
-			  http://foo.com/doc/
-		     
-		     Jane Smith
-		     Infinite
-		     
-			  iamuri:unique!!!!!
-		     
-		
-	   
-      
-      HTTP/1.1 200 OK
- 
+
+
+  
+    
+      
+        
+          write
+          exclusive
+          
+            http://foo.com/doc/
+          
+          Jane Smith
+          Infinite
+          
+            iamuri:unique!!!!!
+          
+        
+      
+    
+    HTTP/1.1 200 OK
+  
 
diff --git a/test/dav18 b/test/dav18
index 0582163b..3de1c199 100644
--- a/test/dav18
+++ b/test/dav18
@@ -1,5 +1,6 @@
-
-
-
- 
+
+
+  
+    
+  
 
diff --git a/test/dav19 b/test/dav19
index 3adf64e0..9535ffcf 100644
--- a/test/dav19
+++ b/test/dav19
@@ -1,19 +1,18 @@
-
-
-
- 
-      
-	   
-		
-		     Write
-		     Exclusive
-		
-		
-		     Write
-		     Shared
-		
-	   
-      
-      HTTP/1.1 200 OK
- 
+
+
+  
+    
+      
+        
+          Write
+          Exclusive
+        
+        
+          Write
+          Shared
+        
+      
+    
+    HTTP/1.1 200 OK
+  
 
diff --git a/test/dav2 b/test/dav2
index 19428057..f831b4bb 100644
--- a/test/dav2
+++ b/test/dav2
@@ -1,26 +1,24 @@
-
-
-
-
- 
-      http://www.foo.bar/container/
-      
-	   
-		Box type A
-	   
-	   
-		Hadrian
-	   
-      
-      HTTP 1.1 200 OK
- 
- 
-      http://www.foo.bar/container/index.html
-      
-	   
-		Box type B
-	   
-      
-      HTTP 1.1 200 OK
- 
+
+
+  
+    http://www.foo.bar/container/
+    
+      
+        Box type A
+      
+      
+        Hadrian
+      
+    
+    HTTP 1.1 200 OK
+  
+  
+    http://www.foo.bar/container/index.html
+    
+      
+        Box type B
+      
+    
+    HTTP 1.1 200 OK
+  
 
diff --git a/test/dav3 b/test/dav3
index 5602e7df..986b3fec 100644
--- a/test/dav3
+++ b/test/dav3
@@ -1,20 +1,18 @@
-
-
-
-
- 
-      http://www.foo.bar/container/
-      
-	   
-	   
-      
-      HTTP 1.1 200 OK
- 
- 
-      http://www.foo.bar/container/index.html
-      
-	   
-      
-      HTTP 1.1 200 OK
- 
+
+
+  
+    http://www.foo.bar/container/
+    
+      
+      
+    
+    HTTP 1.1 200 OK
+  
+  
+    http://www.foo.bar/container/index.html
+    
+      
+    
+    HTTP 1.1 200 OK
+  
 
diff --git a/test/dav4 b/test/dav4
index efca282d..9ab7ceb3 100644
--- a/test/dav4
+++ b/test/dav4
@@ -1,16 +1,16 @@
-
-
-
-
- 
-      
-	   
-		Jim Whitehead
-		Roy Fielding
-	   
-      
- 
- 
-      
- 
+
+
+  
+    
+      
+        Jim Whitehead
+        Roy Fielding
+      
+    
+  
+  
+    
+      
+    
+  
 
diff --git a/test/dav5 b/test/dav5
index 8c13b4be..68ebab97 100644
--- a/test/dav5
+++ b/test/dav5
@@ -1,15 +1,17 @@
-
-
-
-
- 
-      
-      HTTP/1.1 420 Method Failure
- 
- 
-      
-      HTTP/1.1 409 Conflict
- 
-  Copyright Owner can not be deleted or
+
+
+  
+    
+      
+    
+    HTTP/1.1 420 Method Failure
+  
+  
+    
+      
+    
+    HTTP/1.1 409 Conflict
+  
+   Copyright Owner can not be deleted or
 altered.
 
diff --git a/test/dav6 b/test/dav6
index 045b4d4e..3d0de249 100644
--- a/test/dav6
+++ b/test/dav6
@@ -1,23 +1,22 @@
-
-
-
- 
-      http://www.microsoft.com/user/yarong/dav_drafts/
+
+
+  
+    http://www.microsoft.com/user/yarong/dav_drafts/
       
-      
-	   
-		
-	   
-      
-      HTTP 1.1 200 OK
- 
- 
-      
+    
+      
+        
+      
+    
+    HTTP 1.1 200 OK
+  
+  
+    
       http://www.microsoft.com/user/yarong/dav_drafts/base
       
-      
-	   
-      
-      HTTP 1.1 200 OK
- 
+    
+      
+    
+    HTTP 1.1 200 OK
+  
 
diff --git a/test/dav7 b/test/dav7
index e8f6ba36..ec4a9525 100644
--- a/test/dav7
+++ b/test/dav7
@@ -1,17 +1,16 @@
-
-
-
- 
-      http://www.foo.bar/container/resource1
-      http://www.foo.bar/container/resource2
-      HTTP/1.1 200 OK
- 
- 
-      http://www.foo.bar/container/
-      HTTP/1.1 420 Method Failure
- 
- 
-      http://www.foo.bar/container/resource3
-      HTTP/1.1 412 Precondition Failed
- 
+
+
+  
+    http://www.foo.bar/container/resource1
+    http://www.foo.bar/container/resource2
+    HTTP/1.1 200 OK
+  
+  
+    http://www.foo.bar/container/
+    HTTP/1.1 420 Method Failure
+  
+  
+    http://www.foo.bar/container/resource3
+    HTTP/1.1 412 Precondition Failed
+  
 
diff --git a/test/dav8 b/test/dav8
index 03691f29..7f99baf6 100644
--- a/test/dav8
+++ b/test/dav8
@@ -1,15 +1,14 @@
-
-
-
- 
-      http://www.foo.bar/othercontainer/resource1
-      http://www.foo.bar/othercontainer/resource2
-      http://www.foo.bar/othercontainer/
-      http://www.foo.bar/othercontainer/R2/D2
-      HTTP/1.1 201 Created
- 
- 
-      http://www.foo.bar/othercontainer/R2/
-      HTTP/1.1 412 Precondition Failed
- 
+
+
+  
+    http://www.foo.bar/othercontainer/resource1
+    http://www.foo.bar/othercontainer/resource2
+    http://www.foo.bar/othercontainer/
+    http://www.foo.bar/othercontainer/R2/D2
+    HTTP/1.1 201 Created
+  
+  
+    http://www.foo.bar/othercontainer/R2/
+    HTTP/1.1 412 Precondition Failed
+  
 
diff --git a/test/dav9 b/test/dav9
index 233db8b3..8ed63b81 100644
--- a/test/dav9
+++ b/test/dav9
@@ -1,19 +1,18 @@
-
-
-
- 
-      http://www.foo.bar/container/resource1
-      http://www.foo.bar/container/resource2
-      http://www.foo.bar/container/
-      http://www.foo.bar/container/C2/R2
-      HTTP/1.1 201 Created
- 
- 
-      http://www.foo.bar/container/C2
-      HTTP/1.1 420 Method Failure
- 
- 
-      http://www.foo.bar/othercontainer/C2
-      HTTP/1.1 409 Conflict
- 
+
+
+  
+    http://www.foo.bar/container/resource1
+    http://www.foo.bar/container/resource2
+    http://www.foo.bar/container/
+    http://www.foo.bar/container/C2/R2
+    HTTP/1.1 201 Created
+  
+  
+    http://www.foo.bar/container/C2
+    HTTP/1.1 420 Method Failure
+  
+  
+    http://www.foo.bar/othercontainer/C2
+    HTTP/1.1 409 Conflict
+  
 
diff --git a/test/dia1 b/test/dia1
new file mode 100644
index 00000000..207bd73a
--- /dev/null
+++ b/test/dia1
@@ -0,0 +1,99 @@
+
+
+  
+    
+      
+    
+  
+  
+    
+      
+        
+      
+      
+        
+      
+      
+        
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+  
+
diff --git a/test/dia2 b/test/dia2
new file mode 100644
index 00000000..207bd73a
--- /dev/null
+++ b/test/dia2
@@ -0,0 +1,99 @@
+
+
+  
+    
+      
+    
+  
+  
+    
+      
+        
+      
+      
+        
+      
+      
+        
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+      
+    
+  
+
diff --git a/test/dtd10 b/test/dtd10
new file mode 100644
index 00000000..f5e49e75
--- /dev/null
+++ b/test/dtd10
@@ -0,0 +1,8 @@
+
+
+
+
+
+]>
+This is a valid document
diff --git a/test/dtd11 b/test/dtd11
new file mode 100644
index 00000000..b32675fe
--- /dev/null
+++ b/test/dtd11
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/test/dtd2 b/test/dtd2
new file mode 100644
index 00000000..3bcc1010
--- /dev/null
+++ b/test/dtd2
@@ -0,0 +1,4 @@
+
+]>
+This is a valid document !
diff --git a/test/dtd3 b/test/dtd3
new file mode 100644
index 00000000..63f44a5c
--- /dev/null
+++ b/test/dtd3
@@ -0,0 +1,5 @@
+
+]>
+This is a valid document !
+
diff --git a/test/dtd4 b/test/dtd4
new file mode 100644
index 00000000..5457b919
--- /dev/null
+++ b/test/dtd4
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/test/dtd5 b/test/dtd5
new file mode 100644
index 00000000..a33889b8
--- /dev/null
+++ b/test/dtd5
@@ -0,0 +1,6 @@
+
+
+
+]>
+This is a valid document
diff --git a/test/dtd6 b/test/dtd6
new file mode 100644
index 00000000..35e63fcd
--- /dev/null
+++ b/test/dtd6
@@ -0,0 +1,6 @@
+
+
+
+]>
+This is a valid document
diff --git a/test/dtd7 b/test/dtd7
new file mode 100644
index 00000000..b151c21c
--- /dev/null
+++ b/test/dtd7
@@ -0,0 +1,6 @@
+
+
+
+]>
+This is a valid document
diff --git a/test/dtd8 b/test/dtd8
new file mode 100644
index 00000000..ce7a2915
--- /dev/null
+++ b/test/dtd8
@@ -0,0 +1,8 @@
+
+
+
+
+
+]>
+This is a valid document
diff --git a/test/dtd9 b/test/dtd9
new file mode 100644
index 00000000..144b8c55
--- /dev/null
+++ b/test/dtd9
@@ -0,0 +1,8 @@
+
+
+
+
+
+]>
+This is a valid document
diff --git a/test/ent2 b/test/ent2
index 533f5a37..155e2d27 100644
--- a/test/ent2
+++ b/test/ent2
@@ -6,6 +6,6 @@
 ]>
 
   &title;
-  This text is about XML, the &xml; and this is an embedded ℑ
+  This text is about XML, the &xml; and this is an embedded 
 
 
diff --git a/test/p3p b/test/p3p
index d21325ea..1e5fd075 100644
--- a/test/p3p
+++ b/test/p3p
@@ -1,7 +1,7 @@
 
-
-
-
+
   
@@ -15,7 +15,7 @@
   
   
   
-  
+  
     
   
   
diff --git a/test/rdf1 b/test/rdf1
index ea6763e7..d44c3c6d 100644
--- a/test/rdf1
+++ b/test/rdf1
@@ -1,8 +1,6 @@
-
-
-
-
-  
+
+
+  
     rpm
     2.5
     2
diff --git a/test/svg1 b/test/svg1
new file mode 100644
index 00000000..53bf38fd
--- /dev/null
+++ b/test/svg1
@@ -0,0 +1,163 @@
+
+
+
+ 
+ 
+ 
+    
+ 
+ 
+    
+ 
+ 
+    
+ 
+ 
+    
+ 
+ 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+ 
+ 
+    
+    
+ 
+ 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+ 
+ 
+    
+    
+ 
+ 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+ 
+ 
+    
+    
+    
+ 
+ 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+ 
+ 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
diff --git a/test/svg2 b/test/svg2
new file mode 100644
index 00000000..aa1adac0
--- /dev/null
+++ b/test/svg2
@@ -0,0 +1,58 @@
+
+
+
+ 
+    
+    
+ 
+ 
+    
+ 
+ 
+ 
+ 
+   
+ 
+ 
+   
+ 
+ 
+    
+   
+      Java Font definition:Dialog 0 
+   
+   
+      Java Font definition:Helvetica 0 
+   
+ 
+ 
+   this is text
+ 
+ 
+   
+      Java Font definition:Dialog 0 
+   
+   
+      Java Font definition:Helvetica 700 
+   
+ 
+ 
+   sadfsadfsad
+ 
+ 
+ 
+ 
+   
+ 
+ 
+ 
+ 
+   
+      Java Font definition:Dialog 700 
+   
+   
+      Java Font definition:Dialog 700 
+   
+
+
diff --git a/test/xml1 b/test/xml1
new file mode 100644
index 00000000..40df24a9
--- /dev/null
+++ b/test/xml1
@@ -0,0 +1,7 @@
+
+An ampersand (&#38;) may be escaped
+ numerically (&#38;#38;) or with a general entity
+  (&amp;).
" >
+]>
+&example;
diff --git a/test/xml2 b/test/xml2
new file mode 100644
index 00000000..922314be
--- /dev/null
+++ b/test/xml2
@@ -0,0 +1,8 @@
+
+
+
+' >
+%xx;
+]>
+This sample shows a &tricky; method.
diff --git a/testSAX.c b/testSAX.c
index f742bce0..8d646915 100644
--- a/testSAX.c
+++ b/testSAX.c
@@ -28,6 +28,7 @@
 #include 
 
 #include "parser.h"
+#include "parserInternals.h" /* only for xmlNewInputFromFile() */
 #include "tree.h"
 #include "debugXML.h"
 
@@ -63,6 +64,7 @@ xmlSAXHandler emptySAXHandlerStruct = {
 };
 
 xmlSAXHandlerPtr emptySAXHandler = &emptySAXHandlerStruct;
+extern xmlSAXHandlerPtr debugSAXHandler;
 
 /*
  * Note: there is a couple of errors introduced on purpose.
@@ -148,8 +150,14 @@ void
 internalSubsetDebug(xmlParserCtxtPtr ctxt, const CHAR *name,
 	       const CHAR *ExternalID, const CHAR *SystemID)
 {
+    xmlDtdPtr externalSubset;
+
     fprintf(stdout, "SAX.internalSubset(%s, %s, %s)\n",
             name, ExternalID, SystemID);
+
+    if ((ExternalID != NULL) || (SystemID != NULL)) {
+        externalSubset = xmlSAXParseDTD(debugSAXHandler, ExternalID, SystemID);
+    }
 }
 
 /**
@@ -171,6 +179,9 @@ resolveEntityDebug(xmlParserCtxtPtr ctxt, const CHAR *publicId, const CHAR *syst
 {
     fprintf(stdout, "SAX.resolveEntity(%s, %s)\n",
             (char *)publicId, (char *)systemId);
+    if (systemId != NULL) {
+        return(xmlNewInputFromFile(ctxt, systemId));
+    }
     return(NULL);
 }
 
diff --git a/tester.c b/tester.c
index 927eda2d..f2a7cf17 100644
--- a/tester.c
+++ b/tester.c
@@ -33,6 +33,7 @@
 static int debug = 0;
 static int copy = 0;
 static int recovery = 0;
+static int noent = 0;
 
 /*
  * Note: there is a couple of errors introduced on purpose.
@@ -184,7 +185,11 @@ int main(int argc, char **argv) {
 	else if ((!strcmp(argv[i], "-recover")) ||
 	         (!strcmp(argv[i], "--recover")))
 	    recovery++;
+	else if ((!strcmp(argv[i], "-noent")) ||
+	         (!strcmp(argv[i], "--noent")))
+	    noent++;
     }
+    if (noent != 0) xmlSubstituteEntitiesDefault(1);
     for (i = 1; i < argc ; i++) {
 	if (argv[i][0] != '-') {
 	    parseAndPrintFile(argv[i]);
diff --git a/tree.c b/tree.c
index c1e1ebd6..617264cd 100644
--- a/tree.c
+++ b/tree.c
@@ -478,7 +478,7 @@ xmlStringLenGetNodeList(xmlDocPtr doc, const CHAR *value, int len) {
 	    while ((*cur != 0) && (cur - value < len) && (*cur != ';')) cur++;
 	    if ((*cur == 0) || (cur - value >= len)) {
 	        fprintf(stderr,
-		        "xmlStringGetNodeList: unterminated entity %30s\n", q);
+		    "xmlStringLenGetNodeList: unterminated entity %30s\n", q);
 	        return(ret);
 	    }
             if (cur != q) {
@@ -2292,7 +2292,7 @@ xmlBufferWriteCHAR(xmlBufferPtr buf, const CHAR *string) {
 
 /**
  * xmlBufferWriteChar:
- * @buf:  the XML buffer
+ * @buf:  the XML buffer output
  * @string:  the string to add
  *
  * routine which manage and grows an output buffer. This one add
@@ -2304,8 +2304,39 @@ xmlBufferWriteChar(xmlBufferPtr buf, const char *string) {
 }
 
 
+/**
+ * xmlBufferWriteQuotedString:
+ * @buf:  the XML buffer output
+ * @string:  the string to add
+ *
+ * routine which manage and grows an output buffer. This one writes
+ * a quoted or double quoted CHAR string, checking first if it holds
+ * quote or double-quotes internally
+ */
+void
+xmlBufferWriteQuotedString(xmlBufferPtr buf, const CHAR *string) {
+    /*
+     * TODO: fix strchr by xmlStrchr to work coreectly on UTF-8 !!!
+     */
+    if (strchr(string, '"')) {
+        if (strchr(string, '\'')) {
+	    fprintf(stderr,
+ "xmlBufferWriteQuotedString: string contains quote and double-quotes !\n");
+	}
+        xmlBufferCCat(buf, "'");
+        xmlBufferCat(buf, string);
+        xmlBufferCCat(buf, "'");
+    } else {
+        xmlBufferCCat(buf, "\"");
+        xmlBufferCat(buf, string);
+        xmlBufferCCat(buf, "\"");
+    }
+}
+
+
 /**
  * xmlGlobalNsDump:
+ * @buf:  the XML buffer output
  * @cur:  a namespace
  *
  * Dump a global Namespace, this is the old version based on PIs.
@@ -2319,14 +2350,12 @@ xmlGlobalNsDump(xmlBufferPtr buf, xmlNsPtr cur) {
     if (cur->type == XML_GLOBAL_NAMESPACE) {
 	xmlBufferWriteChar(buf, "href != NULL) {
-	    xmlBufferWriteChar(buf, " href=\"");
-	    xmlBufferWriteCHAR(buf, cur->href);
-	    xmlBufferWriteChar(buf, "\"");
+	    xmlBufferWriteChar(buf, " href=");
+	    xmlBufferWriteQuotedString(buf, cur->href);
 	}
 	if (cur->prefix != NULL) {
-	    xmlBufferWriteChar(buf, " AS=\"");
-	    xmlBufferWriteCHAR(buf, cur->prefix);
-	    xmlBufferWriteChar(buf, "\"");
+	    xmlBufferWriteChar(buf, " AS=");
+	    xmlBufferWriteQuotedString(buf, cur->prefix);
 	}
 	xmlBufferWriteChar(buf, "?>\n");
     }
@@ -2334,6 +2363,7 @@ xmlGlobalNsDump(xmlBufferPtr buf, xmlNsPtr cur) {
 
 /**
  * xmlGlobalNsListDump:
+ * @buf:  the XML buffer output
  * @cur:  the first namespace
  *
  * Dump a list of global Namespace, this is the old version based on PIs.
@@ -2348,6 +2378,7 @@ xmlGlobalNsListDump(xmlBufferPtr buf, xmlNsPtr cur) {
 
 /**
  * xmlNsDump:
+ * @buf:  the XML buffer output
  * @cur:  a namespace
  *
  * Dump a local Namespace definition.
@@ -2366,14 +2397,14 @@ xmlNsDump(xmlBufferPtr buf, xmlNsPtr cur) {
 	    xmlBufferWriteCHAR(buf, cur->prefix);
 	} else
 	    xmlBufferWriteChar(buf, " xmlns");
-	xmlBufferWriteChar(buf, "=\"");
-	xmlBufferWriteCHAR(buf, cur->href);
-	xmlBufferWriteChar(buf, "\"");
+	xmlBufferWriteChar(buf, "=");
+	xmlBufferWriteQuotedString(buf, cur->href);
     }
 }
 
 /**
  * xmlNsListDump:
+ * @buf:  the XML buffer output
  * @cur:  the first namespace
  *
  * Dump a list of local Namespace definitions.
@@ -2389,6 +2420,7 @@ xmlNsListDump(xmlBufferPtr buf, xmlNsPtr cur) {
 
 /**
  * xmlDtdDump:
+ * @buf:  the XML buffer output
  * @doc:  the document
  * 
  * Dump the XML document DTD, if any.
@@ -2404,15 +2436,13 @@ xmlDtdDump(xmlBufferPtr buf, xmlDocPtr doc) {
     xmlBufferWriteChar(buf, "name);
     if (cur->ExternalID != NULL) {
-	xmlBufferWriteChar(buf, " PUBLIC \"");
-	xmlBufferWriteCHAR(buf, cur->ExternalID);
-	xmlBufferWriteChar(buf, "\" \"");
-	xmlBufferWriteCHAR(buf, cur->SystemID);
-	xmlBufferWriteChar(buf, "\"");
+	xmlBufferWriteChar(buf, " PUBLIC ");
+	xmlBufferWriteQuotedString(buf, cur->ExternalID);
+	xmlBufferWriteChar(buf, " ");
+	xmlBufferWriteQuotedString(buf, cur->SystemID);
     }  else if (cur->SystemID != NULL) {
-	xmlBufferWriteChar(buf, " SYSTEM \"");
-	xmlBufferWriteCHAR(buf, cur->SystemID);
-	xmlBufferWriteChar(buf, "\"");
+	xmlBufferWriteChar(buf, " SYSTEM ");
+	xmlBufferWriteQuotedString(buf, cur->SystemID);
     }
     if ((cur->entities == NULL) && (cur->elements == NULL) &&
         (cur->attributes == NULL) && (cur->notations == NULL)) {
@@ -2436,6 +2466,7 @@ xmlDtdDump(xmlBufferPtr buf, xmlDocPtr doc) {
 
 /**
  * xmlAttrDump:
+ * @buf:  the XML buffer output
  * @doc:  the document
  * @cur:  the attribute pointer
  *
@@ -2453,9 +2484,8 @@ xmlAttrDump(xmlBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur) {
     xmlBufferWriteCHAR(buf, cur->name);
     value = xmlNodeListGetString(doc, cur->val, 0);
     if (value) {
-	xmlBufferWriteChar(buf, "=\"");
-	xmlBufferWriteCHAR(buf, value);
-	xmlBufferWriteChar(buf, "\"");
+	xmlBufferWriteChar(buf, "=");
+	xmlBufferWriteQuotedString(buf, value);
 	free(value);
     } else  {
 	xmlBufferWriteChar(buf, "=\"\"");
@@ -2464,6 +2494,7 @@ xmlAttrDump(xmlBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur) {
 
 /**
  * xmlAttrListDump:
+ * @buf:  the XML buffer output
  * @doc:  the document
  * @cur:  the first attribute pointer
  *
@@ -2486,6 +2517,7 @@ static void
 xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level);
 /**
  * xmlNodeListDump:
+ * @buf:  the XML buffer output
  * @doc:  the document
  * @cur:  the first node
  * @level: the imbrication level for indenting
@@ -2518,6 +2550,7 @@ xmlNodeListDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
 
 /**
  * xmlNodeDump:
+ * @buf:  the XML buffer output
  * @doc:  the document
  * @cur:  the current node
  * @level: the imbrication level for indenting
@@ -2589,6 +2622,7 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
 
 /**
  * xmlDocContentDump:
+ * @buf:  the XML buffer output
  * @cur:  the document
  *
  * Dump an XML document.
@@ -2596,15 +2630,13 @@ xmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur, int level) {
 static void
 xmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur) {
     if (oldXMLWDcompatibility)
-	xmlBufferWriteChar(buf, "version);
-    xmlBufferWriteChar(buf, "\"");
+	xmlBufferWriteChar(buf, "version);
     if (cur->encoding != NULL) {
-        xmlBufferWriteChar(buf, " encoding=\"");
-	xmlBufferWriteCHAR(buf, cur->encoding);
-	xmlBufferWriteChar(buf, "\"");
+        xmlBufferWriteChar(buf, " encoding=");
+	xmlBufferWriteQuotedString(buf, cur->encoding);
     }
     switch (cur->standalone) {
         case 0:
diff --git a/tree.h b/tree.h
index ff6b55f7..5907e24f 100644
--- a/tree.h
+++ b/tree.h
@@ -362,6 +362,7 @@ CHAR *xmlNodeGetContent(xmlNodePtr cur);
  */
 void xmlBufferWriteCHAR(xmlBufferPtr buf, const CHAR *string);
 void xmlBufferWriteChar(xmlBufferPtr buf, const char *string);
+void xmlBufferWriteQuotedString(xmlBufferPtr buf, const CHAR *string);
 
 /*
  * Saving
diff --git a/valid.c b/valid.c
index 409db5bd..21655374 100644
--- a/valid.c
+++ b/valid.c
@@ -394,12 +394,10 @@ xmlCopyElementTable(xmlElementTablePtr table) {
 
 /**
  * xmlDumpElementTable:
+ * @buf:  the XML buffer output
  * @table:  An element table
  *
  * This will dump the content of the element table as an XML DTD definition
- *
- * NOTE: TODO an extra parameter allowing a reentant implementation will
- *       be added.
  */
 void
 xmlDumpElementTable(xmlBufferPtr buf, xmlElementTablePtr table) {
@@ -755,12 +753,10 @@ xmlCopyAttributeTable(xmlAttributeTablePtr table) {
 
 /**
  * xmlDumpAttributeTable:
+ * @buf:  the XML buffer output
  * @table:  An attribute table
  *
  * This will dump the content of the attribute table as an XML DTD definition
- *
- * NOTE: TODO an extra parameter allowing a reentant implementation will
- *       be added.
  */
 void
 xmlDumpAttributeTable(xmlBufferPtr buf, xmlAttributeTablePtr table) {
@@ -820,15 +816,13 @@ xmlDumpAttributeTable(xmlBufferPtr buf, xmlAttributeTablePtr table) {
             case XML_ATTRIBUTE_IMPLIED:
 		xmlBufferWriteChar(buf, " #IMPLIED");
 		if (cur->defaultValue != NULL) {
-		    xmlBufferWriteChar(buf, " \"");
-		    xmlBufferWriteCHAR(buf, cur->defaultValue);
-		    xmlBufferWriteChar(buf, "\"");
+		    xmlBufferWriteChar(buf, " ");
+		    xmlBufferWriteQuotedString(buf, cur->defaultValue);
 		}
                 break;
             case XML_ATTRIBUTE_FIXED:
-		xmlBufferWriteChar(buf, " #FIXED \"");
-		xmlBufferWriteCHAR(buf, cur->defaultValue);
-		xmlBufferWriteChar(buf, "\"");
+		xmlBufferWriteChar(buf, " #FIXED ");
+		xmlBufferWriteQuotedString(buf, cur->defaultValue);
                 break;
 	    default:
 	        fprintf(stderr,
@@ -1053,12 +1047,10 @@ xmlCopyNotationTable(xmlNotationTablePtr table) {
 
 /**
  * xmlDumpNotationTable:
+ * @buf:  the XML buffer output
  * @table:  A notation table
  *
  * This will dump the content of the notation table as an XML DTD definition
- *
- * NOTE: TODO an extra parameter allowing a reentant implementation will
- *       be added.
  */
 void
 xmlDumpNotationTable(xmlBufferPtr buf, xmlNotationTablePtr table) {
@@ -1072,9 +1064,8 @@ xmlDumpNotationTable(xmlBufferPtr buf, xmlNotationTablePtr table) {
 	xmlBufferWriteChar(buf, "name);
 	if (cur->PublicID != NULL) {
-	    xmlBufferWriteChar(buf, " PUBLIC \"");
-	    xmlBufferWriteCHAR(buf, cur->PublicID);
-	    xmlBufferWriteChar(buf, "\"");
+	    xmlBufferWriteChar(buf, " PUBLIC ");
+	    xmlBufferWriteQuotedString(buf, cur->PublicID);
 	    if (cur->SystemID != NULL) {
 		xmlBufferWriteChar(buf, " ");
 		xmlBufferWriteCHAR(buf, cur->SystemID);