From 06500c8aa660aeb6ae964c7a840e21b928f906c3 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 7 Sep 2004 09:12:44 +0000 Subject: [PATCH] some cleanup checking for xmllint and xsltproc in configure.in, fixed make * configure.in doc/Makefile.am xstc/Makefile.am: some cleanup checking for xmllint and xsltproc in configure.in, fixed make dist w.r.t. the new xstc subdir. * doc/*: rebuilt Daniel --- ChangeLog | 7 + configure.in | 2 + doc/APIchunk1.html | 1 - doc/APIchunk10.html | 10 +- doc/APIchunk14.html | 3 +- doc/APIchunk17.html | 4 +- doc/APIchunk20.html | 1 + doc/APIchunk21.html | 3 +- doc/APIchunk22.html | 1 + doc/APIchunk24.html | 1 - doc/APIchunk25.html | 1 + doc/APIchunk4.html | 1 + doc/APIchunk8.html | 7 +- doc/APIfiles.html | 7 + doc/APIsymbols.html | 7 + doc/Makefile.am | 45 ++- doc/html/libxml-schemasInternals.html | 5 +- doc/html/libxml-xmlerror.html | 263 +++++++------- doc/html/libxml-xmlstring.html | 4 +- doc/libxml-doc.el | 14 +- doc/libxml2-api.xml | 294 ++++++++------- doc/libxml2-refs.xml | 46 ++- python/libxml2class.txt | 494 +++++++++++++------------- xstc/Makefile.am | 38 +- 24 files changed, 694 insertions(+), 565 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a514d61..1ce22afc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 7 11:10:36 CEST 2004 Daniel Veillard + + * configure.in doc/Makefile.am xstc/Makefile.am: some cleanup + checking for xmllint and xsltproc in configure.in, fixed + make dist w.r.t. the new xstc subdir. + * doc/*: rebuilt + Mon Sep 6 16:42:59 CEST 2004 Kasimier Buchcik * xstc/xstc.py: Changed to finally validate instance documents. diff --git a/configure.in b/configure.in index 1db95126..24d26194 100644 --- a/configure.in +++ b/configure.in @@ -40,6 +40,8 @@ AC_PATH_PROG(RM, rm, /bin/rm) AC_PATH_PROG(MV, mv, /bin/mv) AC_PATH_PROG(TAR, tar, /bin/tar) AC_PATH_PROG(PERL, perl, /usr/bin/perl) +AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xsltproc) +AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) dnl Make sure we have an ANSI compiler AM_C_PROTOTYPES diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 9aa46f8e..d46e2924 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -147,7 +147,6 @@ A:link, A:visited, A:active { text-decoration: underline }
Changes
xmlSetExternalEntityLoader
Char
IS_BYTE_CHAR
IS_CHAR
-xmlGetUTF8Char
xmlParseCDSect
xmlParseCharRef
xmlParseComment
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 4b83fff3..c36da572 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -216,7 +216,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBuildURI
xmlUTF8Strlen
checkings
xmlValidateOneElement
-
checks
htmlAutoCloseTag
+
checks
XML_SCHEMAS_ATTRGROUP_MARKED
+htmlAutoCloseTag
htmlIsAutoClosed
htmlNodeStatus
xmlCheckFilename
@@ -260,6 +261,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseExternalEntity
xmlParseInNodeContext
xmlSAXParseEntity
+
circular
XML_SCHEMAS_ATTRGROUP_MARKED
cleanly
xmlCheckHTTPInput
cleans
xmlNanoFTPScanProxy
xmlNanoHTTPScanProxy
@@ -437,7 +439,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCatalogResolve
xmlCatalogResolveURI
completed
xmlValidateDocumentFinal
-
completely
xmlNodeGetBase
+
completely
xmlGetUTF8Char
+xmlNodeGetBase
complex
XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
complexType
XML_SCHEMAS_TYPE_FINAL_EXTENSION
@@ -593,7 +596,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathSubstringBeforeFunction
xmlXPathTrailing
xmlXPathTrailingSorted
-
contained
xmlNodeListGetRawString
+
contained
xmlGetUTF8Char
+xmlNodeListGetRawString
xmlNodeListGetString
xmlParseElementChildrenContentDecl
xmlParseMarkupDecl
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index e827c1ab..649004cb 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -147,7 +147,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathFloorFunction
xmlXPathSubstringFunction
greater-than
xmlNewTextChild
-
group
XML_SCHEMAS_ELEM_FINAL_ABSENT
+
group
XML_SCHEMAS_ATTRGROUP_MARKED
+XML_SCHEMAS_ELEM_FINAL_ABSENT
_xmlSchemaAttribute
_xmlSchemaAttributeGroup
ftpListCallback
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 2abb3c69..0da1252d 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -78,7 +78,8 @@ A:link, A:visited, A:active { text-decoration: underline }
mark
xmlStrcat
xmlStrdup
xmlTextReaderQuoteChar
-
marked
_xmlParserInput
+
marked
XML_SCHEMAS_ATTRGROUP_MARKED
+_xmlParserInput
marker
xmlDecodeEntities
xmlStringDecodeEntities
xmlStringLenDecodeEntities
@@ -205,6 +206,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataNewOnceTrans
xmlBufferGrow
xmlBufferResize
+xmlGetUTF8Char
minus
xmlXPathStringFunction
minute
ftpListCallback
misleading
xmlParsePEReference
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index 44eccb0f..b4700d9d 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -281,6 +281,7 @@ A:link, A:visited, A:active { text-decoration: underline }
present
xmlBufferCreateStatic
xmlDictLookup
xmlDictQLookup
+xmlGetUTF8Char
xmlNewNs
xmlTextReaderConstValue
xmlTextReaderValue
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index fb106894..e866c566 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -247,7 +247,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddRef
xmlFreeRefTable
xmlNewCharRef
-
referenced
xmlLinkGetData
+
referenced
_xmlSchemaAttributeGroup
+xmlLinkGetData
xmlParseAttValue
references
htmlParseEntityRef
xmlGetRefs
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 3b9c8607..0e30ad0e 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -231,6 +231,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathTrailing
xmlXPathTrailingSorted
sets
initxmlDefaultSAXHandler
+xmlGetUTF8Char
xmlSAX2InitDefaultSAXHandler
xmlXPathDifference
xmlXPathIntersection
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index df5a637d..5acf26ab 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -154,7 +154,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNamespaceParseQName
xmlSplitQName
xmlSplitQName2
-
updates
xmlGetUTF8Char
upon
checkNamespace
xlinkNodeDetectFunc
upper
xmlIsRef
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index d734f7c8..f19743f0 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -168,6 +168,7 @@ A:link, A:visited, A:active { text-decoration: underline }
with_ns
_xmlNodeSet
within
_xmlValidCtxt
xmlAutomataNewCounterTrans
+xmlGetUTF8Char
xmlNewDocComment
xmlNewDocNode
xmlNewDocNodeEatName
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 7cced339..ee4c4fab 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -118,6 +118,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Malayalam
xmlUCSIsMalayalam
Maps
xmlChildrenNode
xmlRootNode
+
Marks
XML_SCHEMAS_ATTRGROUP_MARKED
Markup
xmlParseExternalSubset
xmlParseMarkupDecl
Match
xmlParseElement
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 0c31d9d9..eb0b620f 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -288,7 +288,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderRelaxNGValidate
activation
xmlGetLineNo
acts
xmlGetProp
-
actual
xmlXPathFreeNodeSet
+
actual
xmlGetUTF8Char
+xmlXPathFreeNodeSet
xmlXPtrFreeLocationSet
actually
_xmlDoc
_xmlParserCtxt
@@ -643,10 +644,12 @@ A:link, A:visited, A:active { text-decoration: underline }
assumes
xmlBuildRelativeURI
assuming
xmlSaveFileTo
xmlSaveFormatFileTo
+
assure
xmlGetUTF8Char
atomic
xmlGcMemGet
xmlGcMemSetup
attached
xmlTextReaderGetRemainder
-
attr
_xmlID
+
attr
XML_SCHEMAS_ATTRGROUP_MARKED
+_xmlID
_xmlRef
attribute-list
xmlParseDefaultDecl
xmlParseEntityRef
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 97efe033..dfd66cb5 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -938,6 +938,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_ANY_SKIP
XML_SCHEMAS_ANY_STRICT
XML_SCHEMAS_ATTRGROUP_GLOBAL
+XML_SCHEMAS_ATTRGROUP_MARKED
XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
XML_SCHEMAS_ATTR_FIXED
XML_SCHEMAS_ATTR_GLOBAL
@@ -1025,6 +1026,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_TYPE_FINAL_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_UNION
XML_SCHEMAS_TYPE_GLOBAL
+XML_SCHEMAS_TYPE_MARKED
XML_SCHEMAS_TYPE_MIXED
XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
XML_SCHEMAS_TYPE_VARIETY_ABSENT
@@ -2082,6 +2084,8 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAP_INVALID_MINOCCURS
XML_SCHEMAP_INVALID_REF_AND_SUBTYPE
XML_SCHEMAP_INVALID_WHITE_SPACE
+XML_SCHEMAP_MG_PROPS_CORRECT_1
+XML_SCHEMAP_MG_PROPS_CORRECT_2
XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD
XML_SCHEMAP_NOATTR_NOREF
XML_SCHEMAP_NOROOT
@@ -2118,6 +2122,9 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAP_SRC_ATTRIBUTE_3_1
XML_SCHEMAP_SRC_ATTRIBUTE_3_2
XML_SCHEMAP_SRC_ATTRIBUTE_4
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3
XML_SCHEMAP_SRC_ELEMENT_1
XML_SCHEMAP_SRC_ELEMENT_2_1
XML_SCHEMAP_SRC_ELEMENT_2_2
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 813c48a9..682e9b8d 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -771,6 +771,8 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAP_INVALID_MINOCCURS
XML_SCHEMAP_INVALID_REF_AND_SUBTYPE
XML_SCHEMAP_INVALID_WHITE_SPACE
+XML_SCHEMAP_MG_PROPS_CORRECT_1
+XML_SCHEMAP_MG_PROPS_CORRECT_2
XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD
XML_SCHEMAP_NOATTR_NOREF
XML_SCHEMAP_NOROOT
@@ -807,6 +809,9 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAP_SRC_ATTRIBUTE_3_1
XML_SCHEMAP_SRC_ATTRIBUTE_3_2
XML_SCHEMAP_SRC_ATTRIBUTE_4
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2
+XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3
XML_SCHEMAP_SRC_ELEMENT_1
XML_SCHEMAP_SRC_ELEMENT_2_1
XML_SCHEMAP_SRC_ELEMENT_2_2
@@ -873,6 +878,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_ANY_SKIP
XML_SCHEMAS_ANY_STRICT
XML_SCHEMAS_ATTRGROUP_GLOBAL
+XML_SCHEMAS_ATTRGROUP_MARKED
XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
XML_SCHEMAS_ATTR_FIXED
XML_SCHEMAS_ATTR_GLOBAL
@@ -986,6 +992,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_TYPE_FINAL_RESTRICTION
XML_SCHEMAS_TYPE_FINAL_UNION
XML_SCHEMAS_TYPE_GLOBAL
+XML_SCHEMAS_TYPE_MARKED
XML_SCHEMAS_TYPE_MIXED
XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
XML_SCHEMAS_TYPE_VARIETY_ABSENT
diff --git a/doc/Makefile.am b/doc/Makefile.am index 01e196ef..3ca14916 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -33,62 +33,61 @@ api: libxml2-api.xml libxml2-refs.xml $(APIPAGES) $(srcdir)/html/index.html $(WI web: $(PAGES) ../elfgcchack.h: $(srcdir)/elfgcchack.xsl $(srcdir)/libxml2-api.xml - -@(if [ -x $(bindir)/xsltproc ] ; then \ + -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the elfgcchack.h header" ; \ - $(bindir)/xsltproc --nonet $(srcdir)/elfgcchack.xsl $(srcdir)/libxml2-api.xml > elfgcchack.h ; \ + $(XSLTPROC) --nonet $(srcdir)/elfgcchack.xsl $(srcdir)/libxml2-api.xml > elfgcchack.h ; \ if [ "`diff -q elfgcchack.h ../elfgcchack.h`" ] ; then \ echo "updating ../elfgcchack.h"; \ cp elfgcchack.h ../elfgcchack.h; \ fi ; rm -f elfgcchack.h ; fi ); $(PAGES): xml.html site.xsl - -@(if [ -x $(bindir)/xsltproc ] ; then \ + -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML Web pages from xml.html" ; \ - $(bindir)/xsltproc --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/xml.html > index.html ; fi ); - -@(if [ -x $(bindir)/xmllint ] ; then \ + $(XSLTPROC) --nonet --html $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/xml.html > index.html ; fi ); + -@(if [ -x $(XMLLINT) ] ; then \ echo "Validating the HTML Web pages" ; \ - $(bindir)/xmllint --nonet --valid --noout $(PAGES) ; fi ); + $(XMLLINT) --nonet --valid --noout $(PAGES) ; fi ); $(top_srcdir)/NEWS: $(top_srcdir)/doc/news.xsl $(top_srcdir)/doc/news.html - -@(if [ -x $(bindir)/xsltproc ] ; then \ - $(bindir)/xsltproc --nonet $(top_srcdir)/doc/news.xsl $(top_srcdir)/doc/news.html > $(top_srcdir)/NEWS ; fi ); + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) --nonet $(top_srcdir)/doc/news.xsl $(top_srcdir)/doc/news.html > $(top_srcdir)/NEWS ; fi ); libxml2.xsa: $(top_srcdir)/doc/xsa.xsl $(top_srcdir)/doc/news.html - -@(if [ -x $(bindir)/xsltproc ] ; then \ + -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the NEWS file" ; \ - $(bindir)/xsltproc --nonet $(top_srcdir)/doc/xsa.xsl $(top_srcdir)/doc/news.html > libxml2.xsa ; fi ); + $(XSLTPROC) --nonet $(top_srcdir)/doc/xsa.xsl $(top_srcdir)/doc/news.html > libxml2.xsa ; fi ); $(APIPAGES): libxml2-api.xml libxml2-refs.xml $(top_srcdir)/doc/site.xsl $(top_srcdir)/doc/api.xsl - -@(if [ -x $(bindir)/xsltproc ] ; then \ + -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML API pages from libxml2-refs.xml" ; \ - $(bindir)/xsltproc --nonet --html $(top_srcdir)/doc/api.xsl \ + $(XSLTPROC) --nonet --html $(top_srcdir)/doc/api.xsl \ $(top_srcdir)/doc/xml.html ; fi ); - -@(if [ -x $(bindir)/xmllint ] ; then \ + -@(if [ -x $(XMLLINT) ] ; then \ echo "Validating the HTML API pages" ; \ - $(bindir)/xmllint --nonet --valid --noout API*.html ; fi ); + $(XMLLINT) --nonet --valid --noout API*.html ; fi ); $(srcdir)/html/index.html: libxml2-api.xml $(srcdir)/newapi.xsl - -@(if [ -x $(bindir)/xsltproc ] ; then \ + -@(if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(bindir)/xsltproc \ - --nonet $(srcdir)/newapi.xsl libxml2-api.xml ; fi ) - -@(if [ -x $(bindir)/xmllint ] ; then \ + $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libxml2-api.xml ; fi ) + -@(if [ -x $(XMLLINT) ] ; then \ echo "Validating the resulting XHTML pages" ; \ - $(bindir)/xmllint --nonet --valid --noout html/*.html ; fi ); + $(XMLLINT) --nonet --valid --noout html/*.html ; fi ); $(WIN32_DIR)/libxml2.def.src: libxml2-api.xml - -@(if [ -x $(bindir)/xsltproc ] ; then \ - $(bindir)/xsltproc -o $(WIN32_DIR)/libxml2.def.src \ + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) -o $(WIN32_DIR)/libxml2.def.src \ --nonet $(WIN32_DIR)/defgen.xsl libxml2-api.xml ; fi ) libxml2-api.xml libxml2-refs.xml: apibuild.py ../include/libxml/*.h ../*.c -(./apibuild.py) xmllint.1: xmllint.xml - -@(xsltproc --nonet xmllint.xml) + -@($(XSLTPROC) --nonet xmllint.xml) xmlcatalog.1: xmlcatalog_man.xml - -@(xsltproc --nonet xmlcatalog_man.xml) + -@($(XSLTPROC) --nonet xmlcatalog_man.xml) clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt diff --git a/doc/html/libxml-schemasInternals.html b/doc/html/libxml-schemasInternals.html index 82735373..c5814ff2 100644 --- a/doc/html/libxml-schemasInternals.html +++ b/doc/html/libxml-schemasInternals.html @@ -10,7 +10,7 @@ A:link, A:visited, A:active { text-decoration: underline } Module schemasInternals from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module schemasInternals from libxml2

API Menu
API Indexes
Related links
PrevrelaxngUpAPI documentationHomeThe XML C parser and toolkit of GnomethreadsNext

internal interfaces for the XML Schemas handling and schema validity checking

Table of Contents

#define XML_SCHEMAS_ANYATTR_LAX
#define XML_SCHEMAS_ANYATTR_SKIP
#define XML_SCHEMAS_ANYATTR_STRICT
#define XML_SCHEMAS_ANY_LAX
#define XML_SCHEMAS_ANY_SKIP
#define XML_SCHEMAS_ANY_STRICT
#define XML_SCHEMAS_ATTRGROUP_GLOBAL
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
#define XML_SCHEMAS_ATTR_FIXED
#define XML_SCHEMAS_ATTR_GLOBAL
#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
#define XML_SCHEMAS_ATTR_NSDEFAULT
#define XML_SCHEMAS_ATTR_USE_OPTIONAL
#define XML_SCHEMAS_ATTR_USE_PROHIBITED
#define XML_SCHEMAS_ATTR_USE_REQUIRED
#define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION
#define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION
#define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION
#define XML_SCHEMAS_ELEM_ABSTRACT
#define XML_SCHEMAS_ELEM_BLOCK_ABSENT
#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION
#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
#define XML_SCHEMAS_ELEM_CIRCULAR
#define XML_SCHEMAS_ELEM_DEFAULT
#define XML_SCHEMAS_ELEM_FINAL_ABSENT
#define XML_SCHEMAS_ELEM_FINAL_EXTENSION
#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION
#define XML_SCHEMAS_ELEM_FIXED
#define XML_SCHEMAS_ELEM_GLOBAL
#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
#define XML_SCHEMAS_ELEM_NILLABLE
#define XML_SCHEMAS_ELEM_NSDEFAULT
#define XML_SCHEMAS_ELEM_REF
#define XML_SCHEMAS_ELEM_TOPLEVEL
#define XML_SCHEMAS_FACET_COLLAPSE
#define XML_SCHEMAS_FACET_PRESERVE
#define XML_SCHEMAS_FACET_REPLACE
#define XML_SCHEMAS_FACET_UNKNOWN
#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION
#define XML_SCHEMAS_FINAL_DEFAULT_LIST
#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION
#define XML_SCHEMAS_FINAL_DEFAULT_UNION
#define XML_SCHEMAS_INCLUDING_CONVERT_NS
#define XML_SCHEMAS_QUALIF_ATTR
#define XML_SCHEMAS_QUALIF_ELEM
#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_DEFAULT
#define XML_SCHEMAS_TYPE_FINAL_EXTENSION
#define XML_SCHEMAS_TYPE_FINAL_LIST
#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_UNION
#define XML_SCHEMAS_TYPE_GLOBAL
#define XML_SCHEMAS_TYPE_MIXED
#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
#define XML_SCHEMAS_TYPE_VARIETY_ABSENT
#define XML_SCHEMAS_TYPE_VARIETY_ATOMIC
#define XML_SCHEMAS_TYPE_VARIETY_LIST
#define XML_SCHEMAS_TYPE_VARIETY_UNION
#define XML_SCHEMAS_WILDCARD_COMPLETE
Structure xmlSchemaAnnot
struct _xmlSchemaAnnot
+    Module schemasInternals from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo
Module schemasInternals from libxml2
API Menu
API Indexes
Related links
PrevrelaxngUpAPI documentationHomeThe XML C parser and toolkit of GnomethreadsNext
internal interfaces for the XML Schemas handling and schema validity checking 
Table of Contents
#define XML_SCHEMAS_ANYATTR_LAX
#define XML_SCHEMAS_ANYATTR_SKIP
#define XML_SCHEMAS_ANYATTR_STRICT
#define XML_SCHEMAS_ANY_LAX
#define XML_SCHEMAS_ANY_SKIP
#define XML_SCHEMAS_ANY_STRICT
#define XML_SCHEMAS_ATTRGROUP_GLOBAL
#define XML_SCHEMAS_ATTRGROUP_MARKED
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
#define XML_SCHEMAS_ATTR_FIXED
#define XML_SCHEMAS_ATTR_GLOBAL
#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED
#define XML_SCHEMAS_ATTR_NSDEFAULT
#define XML_SCHEMAS_ATTR_USE_OPTIONAL
#define XML_SCHEMAS_ATTR_USE_PROHIBITED
#define XML_SCHEMAS_ATTR_USE_REQUIRED
#define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION
#define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION
#define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION
#define XML_SCHEMAS_ELEM_ABSTRACT
#define XML_SCHEMAS_ELEM_BLOCK_ABSENT
#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION
#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
#define XML_SCHEMAS_ELEM_CIRCULAR
#define XML_SCHEMAS_ELEM_DEFAULT
#define XML_SCHEMAS_ELEM_FINAL_ABSENT
#define XML_SCHEMAS_ELEM_FINAL_EXTENSION
#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION
#define XML_SCHEMAS_ELEM_FIXED
#define XML_SCHEMAS_ELEM_GLOBAL
#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED
#define XML_SCHEMAS_ELEM_NILLABLE
#define XML_SCHEMAS_ELEM_NSDEFAULT
#define XML_SCHEMAS_ELEM_REF
#define XML_SCHEMAS_ELEM_TOPLEVEL
#define XML_SCHEMAS_FACET_COLLAPSE
#define XML_SCHEMAS_FACET_PRESERVE
#define XML_SCHEMAS_FACET_REPLACE
#define XML_SCHEMAS_FACET_UNKNOWN
#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION
#define XML_SCHEMAS_FINAL_DEFAULT_LIST
#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION
#define XML_SCHEMAS_FINAL_DEFAULT_UNION
#define XML_SCHEMAS_INCLUDING_CONVERT_NS
#define XML_SCHEMAS_QUALIF_ATTR
#define XML_SCHEMAS_QUALIF_ELEM
#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_DEFAULT
#define XML_SCHEMAS_TYPE_FINAL_EXTENSION
#define XML_SCHEMAS_TYPE_FINAL_LIST
#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_UNION
#define XML_SCHEMAS_TYPE_GLOBAL
#define XML_SCHEMAS_TYPE_MARKED
#define XML_SCHEMAS_TYPE_MIXED
#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
#define XML_SCHEMAS_TYPE_VARIETY_ABSENT
#define XML_SCHEMAS_TYPE_VARIETY_ATOMIC
#define XML_SCHEMAS_TYPE_VARIETY_LIST
#define XML_SCHEMAS_TYPE_VARIETY_UNION
#define XML_SCHEMAS_WILDCARD_COMPLETE
Structure xmlSchemaAnnot
struct _xmlSchemaAnnot
 
Typedef xmlSchemaAnnot * xmlSchemaAnnotPtr
 
Structure xmlSchemaAttribute
struct _xmlSchemaAttribute
 
Structure xmlSchemaAttributeGroup
struct _xmlSchemaAttributeGroup
@@ -50,6 +50,7 @@ The content of this structure is not made public by the API.
 
Macro: XML_SCHEMAS_ANY_SKIP
#define XML_SCHEMAS_ANY_SKIP
Skip unknown attribute from validation

 
Macro: XML_SCHEMAS_ANY_STRICT
#define XML_SCHEMAS_ANY_STRICT
Used by wildcards. Apply strict validation rules

 
Macro: XML_SCHEMAS_ATTRGROUP_GLOBAL
#define XML_SCHEMAS_ATTRGROUP_GLOBAL
The attribute wildcard has been already builded.

+
Macro: XML_SCHEMAS_ATTRGROUP_MARKED
#define XML_SCHEMAS_ATTRGROUP_MARKED
Marks the attr group as marked; used for circular checks.

 
Macro: XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
The attribute wildcard has been already builded.

 
Macro: XML_SCHEMAS_ATTR_FIXED
#define XML_SCHEMAS_ATTR_FIXED
the attribute has a fixed value

 
Macro: XML_SCHEMAS_ATTR_GLOBAL
#define XML_SCHEMAS_ATTR_GLOBAL

@@ -98,6 +99,7 @@ The content of this structure is not made public by the API.
 
Macro: XML_SCHEMAS_TYPE_FINAL_RESTRICTION
#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION
the simpleType/complexType has a final of "restriction".

 
Macro: XML_SCHEMAS_TYPE_FINAL_UNION
#define XML_SCHEMAS_TYPE_FINAL_UNION
the simpleType has a final of "union".

 
Macro: XML_SCHEMAS_TYPE_GLOBAL
#define XML_SCHEMAS_TYPE_GLOBAL
the type is global

+
Macro: XML_SCHEMAS_TYPE_MARKED
#define XML_SCHEMAS_TYPE_MARKED

 
Macro: XML_SCHEMAS_TYPE_MIXED
#define XML_SCHEMAS_TYPE_MIXED
the element content type is mixed

 
Macro: XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD
the complexType owns an attribute wildcard, i.e. it can be freed by the complexType

 
Macro: XML_SCHEMAS_TYPE_VARIETY_ABSENT
#define XML_SCHEMAS_TYPE_VARIETY_ABSENT
the simpleType has a variety of "absent".

@@ -139,6 +141,7 @@ The content of this structure is not made public by the API.
     int	flags
     xmlSchemaWildcardPtr	attributeWildcard
     const xmlChar *	refPrefix
+    xmlSchemaAttributeGroupPtr	refItem	: The referenced attribute group
 }
Structure xmlSchemaAttributeLink
Structure xmlSchemaAttributeLink
struct _xmlSchemaAttributeLink {
     struct _xmlSchemaAttributeLink *	next	: the next attribute link ...
     struct _xmlSchemaAttribute *	attr	: the linked attribute
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index 6cfe7deb..4d0c9f32 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -524,122 +524,122 @@ void	xmlStructuredErrorFunc		(void * userD
     XML_SCHEMAP_UNKNOWN_UNION_CHILD = 1754 : 1754
     XML_SCHEMAP_ELEM_DEFAULT_FIXED = 1755 : 1755
     XML_SCHEMAP_REGEXP_INVALID = 1756 : 1756
-    XML_SCHEMAP_FAILED_LOAD = 1757 : 1756
-    XML_SCHEMAP_NOTHING_TO_PARSE = 1758 : 1757
-    XML_SCHEMAP_NOROOT = 1759 : 1758
-    XML_SCHEMAP_REDEFINED_GROUP = 1760 : 1759
-    XML_SCHEMAP_REDEFINED_TYPE = 1761 : 1760
-    XML_SCHEMAP_REDEFINED_ELEMENT = 1762 : 1761
-    XML_SCHEMAP_REDEFINED_ATTRGROUP = 1763 : 1762
-    XML_SCHEMAP_REDEFINED_ATTR = 1764 : 1763
-    XML_SCHEMAP_REDEFINED_NOTATION = 1765 : 1764
-    XML_SCHEMAP_FAILED_PARSE = 1766 : 1765
-    XML_SCHEMAP_UNKNOWN_PREFIX = 1767 : 1766
-    XML_SCHEMAP_DEF_AND_PREFIX = 1768 : 1767
-    XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD = 1769 : 1768
-    XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI = 1770 : 1769
-    XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI = 1771 : 1770
-    XML_SCHEMAP_NOT_SCHEMA = 1772 : 1771
-    XML_SCHEMAP_UNKNOWN_MEMBER_TYPE = 1773 : 1772
-    XML_SCHEMAP_INVALID_ATTR_USE = 1774 : 1773
-    XML_SCHEMAP_RECURSIVE = 1775 : 1774
-    XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE = 1776 : 1775
-    XML_SCHEMAP_INVALID_ATTR_COMBINATION = 1777 : 1776
-    XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION = 1778 : 1777
-    XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD = 1779 : 1778
-    XML_SCHEMAP_INVALID_ATTR_NAME = 1780 : 1779
-    XML_SCHEMAP_REF_AND_CONTENT = 1781 : 1780
-    XML_SCHEMAP_CT_PROPS_CORRECT_1 = 1782 : 1781
-    XML_SCHEMAP_CT_PROPS_CORRECT_2 = 1783 : 1782
-    XML_SCHEMAP_CT_PROPS_CORRECT_3 = 1784 : 1783
-    XML_SCHEMAP_CT_PROPS_CORRECT_4 = 1785 : 1784
-    XML_SCHEMAP_CT_PROPS_CORRECT_5 = 1786 : 1785
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1 = 1787 : 1786
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1 = 1788 : 1787
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2 = 1789 : 1788
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2 = 1790 : 1789
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3 = 1791 : 1790
-    XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER = 1792 : 1791
-    XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE = 1793 : 1792
-    XML_SCHEMAP_UNION_NOT_EXPRESSIBLE = 1794 : 1793
-    XML_SCHEMAP_SRC_IMPORT_3_1 = 1795 : 1794
-    XML_SCHEMAP_SRC_IMPORT_3_2 = 1796 : 1795
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1 = 1797 : 1796
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2 = 1798 : 1797
-    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3 = 1799 : 1798
-    XML_SCHEMAP_COS_CT_EXTENDS_1_3 = 1800 : 1799
-    XML_SCHEMAV_NOROOT = 1800
-    XML_SCHEMAV_UNDECLAREDELEM = 1801 : 1801
-    XML_SCHEMAV_NOTTOPLEVEL = 1802 : 1802
-    XML_SCHEMAV_MISSING = 1803 : 1803
-    XML_SCHEMAV_WRONGELEM = 1804 : 1804
-    XML_SCHEMAV_NOTYPE = 1805 : 1805
-    XML_SCHEMAV_NOROLLBACK = 1806 : 1806
-    XML_SCHEMAV_ISABSTRACT = 1807 : 1807
-    XML_SCHEMAV_NOTEMPTY = 1808 : 1808
-    XML_SCHEMAV_ELEMCONT = 1809 : 1809
-    XML_SCHEMAV_HAVEDEFAULT = 1810 : 1810
-    XML_SCHEMAV_NOTNILLABLE = 1811 : 1811
-    XML_SCHEMAV_EXTRACONTENT = 1812 : 1812
-    XML_SCHEMAV_INVALIDATTR = 1813 : 1813
-    XML_SCHEMAV_INVALIDELEM = 1814 : 1814
-    XML_SCHEMAV_NOTDETERMINIST = 1815 : 1815
-    XML_SCHEMAV_CONSTRUCT = 1816 : 1816
-    XML_SCHEMAV_INTERNAL = 1817 : 1817
-    XML_SCHEMAV_NOTSIMPLE = 1818 : 1818
-    XML_SCHEMAV_ATTRUNKNOWN = 1819 : 1819
-    XML_SCHEMAV_ATTRINVALID = 1820 : 1820
-    XML_SCHEMAV_VALUE = 1821 : 1821
-    XML_SCHEMAV_FACET = 1822 : 1822
-    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1 = 1823 : 1823
-    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2 = 1824 : 1824
-    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3 = 1825 : 1825
-    XML_SCHEMAV_CVC_TYPE_3_1_1 = 1826 : 1826
-    XML_SCHEMAV_CVC_TYPE_3_1_2 = 1827 : 1827
-    XML_SCHEMAV_CVC_FACET_VALID = 1828 : 1828
-    XML_SCHEMAV_CVC_LENGTH_VALID = 1829 : 1829
-    XML_SCHEMAV_CVC_MINLENGTH_VALID = 1830 : 1830
-    XML_SCHEMAV_CVC_MAXLENGTH_VALID = 1831 : 1831
-    XML_SCHEMAV_CVC_MININCLUSIVE_VALID = 1832 : 1832
-    XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID = 1833 : 1833
-    XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID = 1834 : 1834
-    XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID = 1835 : 1835
-    XML_SCHEMAV_CVC_TOTALDIGITS_VALID = 1836 : 1836
-    XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID = 1837 : 1837
-    XML_SCHEMAV_CVC_PATTERN_VALID = 1838 : 1838
-    XML_SCHEMAV_CVC_ENUMERATION_VALID = 1839 : 1839
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1 = 1840 : 1840
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2 = 1841 : 1841
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3 = 1842 : 1842
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4 = 1843 : 1843
-    XML_SCHEMAV_CVC_ELT_1 = 1844 : 1844
-    XML_SCHEMAV_CVC_ELT_2 = 1845 : 1845
-    XML_SCHEMAV_CVC_ELT_3_1 = 1846
-    XML_SCHEMAV_CVC_ELT_3_2_1 = 1847
-    XML_SCHEMAV_CVC_ELT_3_2_2 = 1848
-    XML_SCHEMAV_CVC_ELT_4_1 = 1849
-    XML_SCHEMAV_CVC_ELT_4_2 = 1850
-    XML_SCHEMAV_CVC_ELT_4_3 = 1851
-    XML_SCHEMAV_CVC_ELT_5_1_1 = 1852
-    XML_SCHEMAV_CVC_ELT_5_1_2 = 1853
-    XML_SCHEMAV_CVC_ELT_5_2_1 = 1854
-    XML_SCHEMAV_CVC_ELT_5_2_2_1 = 1855
-    XML_SCHEMAV_CVC_ELT_5_2_2_2_1 = 1856
-    XML_SCHEMAV_CVC_ELT_5_2_2_2_2 = 1857
-    XML_SCHEMAV_CVC_ELT_6 = 1858
-    XML_SCHEMAV_CVC_ELT_7 = 1859
-    XML_SCHEMAV_CVC_ATTRIBUTE_1 = 1860
-    XML_SCHEMAV_CVC_ATTRIBUTE_2 = 1861
-    XML_SCHEMAV_CVC_ATTRIBUTE_3 = 1862
-    XML_SCHEMAV_CVC_ATTRIBUTE_4 = 1863
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1 = 1864
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1 = 1865
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2 = 1866
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_4 = 1867
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1 = 1868
-    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2 = 1869
-    XML_SCHEMAV_ELEMENT_CONTENT = 1870 : 1846 non-W3C
-    XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING = 1871 : non-W3C
+    XML_SCHEMAP_FAILED_LOAD = 1757 : 1757
+    XML_SCHEMAP_NOTHING_TO_PARSE = 1758 : 1758
+    XML_SCHEMAP_NOROOT = 1759 : 1759
+    XML_SCHEMAP_REDEFINED_GROUP = 1760 : 1760
+    XML_SCHEMAP_REDEFINED_TYPE = 1761 : 1761
+    XML_SCHEMAP_REDEFINED_ELEMENT = 1762 : 1762
+    XML_SCHEMAP_REDEFINED_ATTRGROUP = 1763 : 1763
+    XML_SCHEMAP_REDEFINED_ATTR = 1764 : 1764
+    XML_SCHEMAP_REDEFINED_NOTATION = 1765 : 1765
+    XML_SCHEMAP_FAILED_PARSE = 1766 : 1766
+    XML_SCHEMAP_UNKNOWN_PREFIX = 1767 : 1767
+    XML_SCHEMAP_DEF_AND_PREFIX = 1768 : 1768
+    XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD = 1769 : 1769
+    XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI = 1770 : 1770
+    XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI = 1771 : 1771
+    XML_SCHEMAP_NOT_SCHEMA = 1772 : 1772
+    XML_SCHEMAP_UNKNOWN_MEMBER_TYPE = 1773 : 1773
+    XML_SCHEMAP_INVALID_ATTR_USE = 1774 : 1774
+    XML_SCHEMAP_RECURSIVE = 1775 : 1775
+    XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE = 1776 : 1776
+    XML_SCHEMAP_INVALID_ATTR_COMBINATION = 1777 : 1777
+    XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION = 1778 : 1778
+    XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD = 1779 : 1779
+    XML_SCHEMAP_INVALID_ATTR_NAME = 1780 : 1780
+    XML_SCHEMAP_REF_AND_CONTENT = 1781 : 1781
+    XML_SCHEMAP_CT_PROPS_CORRECT_1 = 1782 : 1782
+    XML_SCHEMAP_CT_PROPS_CORRECT_2 = 1783 : 1783
+    XML_SCHEMAP_CT_PROPS_CORRECT_3 = 1784 : 1784
+    XML_SCHEMAP_CT_PROPS_CORRECT_4 = 1785 : 1785
+    XML_SCHEMAP_CT_PROPS_CORRECT_5 = 1786 : 1786
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1 = 1787 : 1787
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1 = 1788 : 1788
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2 = 1789 : 1789
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2 = 1790 : 1790
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3 = 1791 : 1791
+    XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER = 1792 : 1792
+    XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE = 1793 : 1793
+    XML_SCHEMAP_UNION_NOT_EXPRESSIBLE = 1794 : 1794
+    XML_SCHEMAP_SRC_IMPORT_3_1 = 1795 : 1795
+    XML_SCHEMAP_SRC_IMPORT_3_2 = 1796 : 1796
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1 = 1797 : 1797
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2 = 1798 : 1798
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3 = 1799 : 1799
+    XML_SCHEMAP_COS_CT_EXTENDS_1_3 = 1800 : 1800
+    XML_SCHEMAV_NOROOT = 1801
+    XML_SCHEMAV_UNDECLAREDELEM = 1802 : 1802
+    XML_SCHEMAV_NOTTOPLEVEL = 1803 : 1803
+    XML_SCHEMAV_MISSING = 1804 : 1804
+    XML_SCHEMAV_WRONGELEM = 1805 : 1805
+    XML_SCHEMAV_NOTYPE = 1806 : 1806
+    XML_SCHEMAV_NOROLLBACK = 1807 : 1807
+    XML_SCHEMAV_ISABSTRACT = 1808 : 1808
+    XML_SCHEMAV_NOTEMPTY = 1809 : 1809
+    XML_SCHEMAV_ELEMCONT = 1810 : 1810
+    XML_SCHEMAV_HAVEDEFAULT = 1811 : 1811
+    XML_SCHEMAV_NOTNILLABLE = 1812 : 1812
+    XML_SCHEMAV_EXTRACONTENT = 1813 : 1813
+    XML_SCHEMAV_INVALIDATTR = 1814 : 1814
+    XML_SCHEMAV_INVALIDELEM = 1815 : 1815
+    XML_SCHEMAV_NOTDETERMINIST = 1816 : 1816
+    XML_SCHEMAV_CONSTRUCT = 1817 : 1817
+    XML_SCHEMAV_INTERNAL = 1818 : 1818
+    XML_SCHEMAV_NOTSIMPLE = 1819 : 1819
+    XML_SCHEMAV_ATTRUNKNOWN = 1820 : 1820
+    XML_SCHEMAV_ATTRINVALID = 1821 : 1821
+    XML_SCHEMAV_VALUE = 1822 : 1822
+    XML_SCHEMAV_FACET = 1823 : 1823
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1 = 1824 : 1824
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2 = 1825 : 1825
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3 = 1826 : 1826
+    XML_SCHEMAV_CVC_TYPE_3_1_1 = 1827 : 1827
+    XML_SCHEMAV_CVC_TYPE_3_1_2 = 1828 : 1828
+    XML_SCHEMAV_CVC_FACET_VALID = 1829 : 1829
+    XML_SCHEMAV_CVC_LENGTH_VALID = 1830 : 1830
+    XML_SCHEMAV_CVC_MINLENGTH_VALID = 1831 : 1831
+    XML_SCHEMAV_CVC_MAXLENGTH_VALID = 1832 : 1832
+    XML_SCHEMAV_CVC_MININCLUSIVE_VALID = 1833 : 1833
+    XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID = 1834 : 1834
+    XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID = 1835 : 1835
+    XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID = 1836 : 1836
+    XML_SCHEMAV_CVC_TOTALDIGITS_VALID = 1837 : 1837
+    XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID = 1838 : 1838
+    XML_SCHEMAV_CVC_PATTERN_VALID = 1839 : 1839
+    XML_SCHEMAV_CVC_ENUMERATION_VALID = 1840 : 1840
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1 = 1841 : 1841
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2 = 1842 : 1842
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3 = 1843 : 1843
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4 = 1844 : 1844
+    XML_SCHEMAV_CVC_ELT_1 = 1845 : 1845
+    XML_SCHEMAV_CVC_ELT_2 = 1846 : 1846
+    XML_SCHEMAV_CVC_ELT_3_1 = 1847 : 1847
+    XML_SCHEMAV_CVC_ELT_3_2_1 = 1848 : 1848
+    XML_SCHEMAV_CVC_ELT_3_2_2 = 1849 : 1849
+    XML_SCHEMAV_CVC_ELT_4_1 = 1850 : 1850
+    XML_SCHEMAV_CVC_ELT_4_2 = 1851 : 1851
+    XML_SCHEMAV_CVC_ELT_4_3 = 1852 : 1852
+    XML_SCHEMAV_CVC_ELT_5_1_1 = 1853 : 1853
+    XML_SCHEMAV_CVC_ELT_5_1_2 = 1854 : 1854
+    XML_SCHEMAV_CVC_ELT_5_2_1 = 1855 : 1855
+    XML_SCHEMAV_CVC_ELT_5_2_2_1 = 1856 : 1856
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_1 = 1857 : 1857
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_2 = 1858 : 1858
+    XML_SCHEMAV_CVC_ELT_6 = 1859 : 1859
+    XML_SCHEMAV_CVC_ELT_7 = 1860 : 1860
+    XML_SCHEMAV_CVC_ATTRIBUTE_1 = 1861 : 1861
+    XML_SCHEMAV_CVC_ATTRIBUTE_2 = 1862 : 1862
+    XML_SCHEMAV_CVC_ATTRIBUTE_3 = 1863 : 1863
+    XML_SCHEMAV_CVC_ATTRIBUTE_4 = 1864 : 1864
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1 = 1865 : 1865
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1 = 1866 : 1866
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2 = 1867 : 1867
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_4 = 1868 : 1868
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1 = 1869 : 1869
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2 = 1870 : 1870
+    XML_SCHEMAV_ELEMENT_CONTENT = 1871 : 1871
+    XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING = 1872 : 1872
     XML_XPTR_UNKNOWN_SCHEME = 1900
     XML_XPTR_CHILDSEQ_START = 1901 : 1901
     XML_XPTR_EVAL_FAILED = 1902 : 1902
@@ -712,19 +712,24 @@ void	xmlStructuredErrorFunc		(void * userD
     XML_SCHEMAP_SRC_ATTRIBUTE_4 = 3055 : 3055
     XML_SCHEMAP_NO_XMLNS = 3056 : 3056
     XML_SCHEMAP_NO_XSI = 3057 : 3057
-    XML_SCHEMAP_COS_VALID_DEFAULT_1 = 3058
-    XML_SCHEMAP_COS_VALID_DEFAULT_2_1 = 3059
-    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1 = 3060
-    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2 = 3061
-    XML_SCHEMAP_CVC_SIMPLE_TYPE = 3062
-    XML_SCHEMAP_COS_CT_EXTENDS_1_1 = 3063
-    XML_SCHEMAP_SRC_IMPORT_1_1 = 3064
-    XML_SCHEMAP_SRC_IMPORT_1_2 = 3065
-    XML_SCHEMAP_SRC_IMPORT_2 = 3066
-    XML_SCHEMAP_SRC_IMPORT_2_1 = 3067
-    XML_SCHEMAP_SRC_IMPORT_2_2 = 3068
-    XML_SCHEMAP_INTERNAL = 3069 : non-W3C
-    XML_SCHEMAP_NOT_DETERMINISTIC = 3070 : non-W3C
+    XML_SCHEMAP_COS_VALID_DEFAULT_1 = 3058 : 3058
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_1 = 3059 : 3059
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1 = 3060 : 3060
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2 = 3061 : 3061
+    XML_SCHEMAP_CVC_SIMPLE_TYPE = 3062 : 3062
+    XML_SCHEMAP_COS_CT_EXTENDS_1_1 = 3063 : 3063
+    XML_SCHEMAP_SRC_IMPORT_1_1 = 3064 : 3064
+    XML_SCHEMAP_SRC_IMPORT_1_2 = 3065 : 3065
+    XML_SCHEMAP_SRC_IMPORT_2 = 3066 : 3066
+    XML_SCHEMAP_SRC_IMPORT_2_1 = 3067 : 3067
+    XML_SCHEMAP_SRC_IMPORT_2_2 = 3068 : 3068
+    XML_SCHEMAP_INTERNAL = 3069 : 3069 non-W3C
+    XML_SCHEMAP_NOT_DETERMINISTIC = 3070 : 3070 non-W3C
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1 = 3071 : 3071
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2 = 3072 : 3072
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3 = 3073 : 3073
+    XML_SCHEMAP_MG_PROPS_CORRECT_1 = 3074 : 3074
+    XML_SCHEMAP_MG_PROPS_CORRECT_2 = 3075 : 3075
 }
 
Function: initGenericErrorDefaultFunc
void	initGenericErrorDefaultFunc	(xmlGenericErrorFunc * handler)

 
Set or reset (if NULL) the default handler for generic errors to the builtin error function.

diff --git a/doc/html/libxml-xmlstring.html b/doc/html/libxml-xmlstring.html
index 47029d9f..490df42f 100644
--- a/doc/html/libxml-xmlstring.html
+++ b/doc/html/libxml-xmlstring.html
@@ -50,8 +50,8 @@ A:link, A:visited, A:active { text-decoration: underline }
 
cur:the input char *
len:the len of @cur
Returns:a new xmlChar * or NULL
Function: xmlCheckUTF8
int	xmlCheckUTF8			(const unsigned char * utf)

 
Checks @utf for being valid UTF-8. @utf is assumed to be null-terminated. This function is not super-strict, as it will allow longer UTF-8 sequences than necessary. Note that Java is capable of producing these sequences if provoked. Also note, this routine checks for the 4-byte maximum size, but does not check for 0x10ffff maximum value.

 
utf:Pointer to putative UTF-8 encoded string.
Returns:value: true if @utf is valid.
Function: xmlGetUTF8Char
int	xmlGetUTF8Char			(const unsigned char * utf, 
					 int * len)

-
Read one UTF8 Char from @utf

-
utf:a sequence of UTF-8 encoded bytes
len:a pointer to @bytes len
Returns:the char value or -1 in case of error, and updates *len with the number of bytes consumed
Function: xmlStrEqual
int	xmlStrEqual			(const xmlChar * str1, 
					 const xmlChar * str2)

+
Read the first UTF8 character from @utf

+
utf:a sequence of UTF-8 encoded bytes
len:a pointer to the minimum number of bytes present in the sequence. This is used to assure the next character is completely contained within the sequence.
Returns:the char value or -1 in case of error, and sets *len to the actual number of bytes consumed (0 in case of error)
Function: xmlStrEqual
int	xmlStrEqual			(const xmlChar * str1, 
					 const xmlChar * str2)

 
Check if both string are equal of have same content Should be a bit more readable and faster than xmlStrEqual()

 
str1:the first xmlChar *
str2:the second xmlChar *
Returns:1 if they are equal, 0 if they are different
Function: xmlStrPrintf
int	xmlStrPrintf			(xmlChar * buf, 
					 int len, 
					 const xmlChar * msg, 
					 ... ...)

 
Formats @msg and places result into @buf.

diff --git a/doc/libxml-doc.el b/doc/libxml-doc.el
index 51b7aad4..43d9688a 100644
--- a/doc/libxml-doc.el
+++ b/doc/libxml-doc.el
@@ -32,7 +32,7 @@
 ;;  "Look up libxml-symbols and start browser on documentation." t)
 ;;
 ;; 2. adapt libxmldoc-root:
-;; i.e. (setq libxmldoc-root "~/libxml2-2.0.0/doc/html/")
+;; i.e. (setq libxmldoc-root "~/libxml2-2.0.0/doc/html")
 ;;
 ;; 3. change the filter-regex: by default, cpp-defines, callbacks and
 ;; html-functions are excluded (C-h v libxmldoc-filter-regexp)
@@ -63,13 +63,11 @@
 ;; (thing-at-point 'word) if it matches a symbol
 ;; Thu Jun 22 02:37:46 2000: filtering is only done for completion
 ;; Thu Jun 22 21:03:41 2000: libxmldoc-browse-url can be customized
-
 ;; Thu May 31 2001 (Geert): 
 ;;       - Changed the `gnome-xml-' html file prefix into `libxml-'.
 ;;       - Changed the 'word match from thing-at-point into 'symbol.
 ;;         With 'word, identifiers with an underscore (e.g. BAD_CAST)
 ;;         don't get matched.
-
 ;; Fri Jun  8 16:29:18 2001, Sat Jun 23 16:19:47 2001:
 ;; complete rewrite of libxmldoc-lookup-symbol
 ;; by Felix Natter , Geert Kloosterman :
@@ -86,6 +84,8 @@
 ;; minibuffer's value of case-fold-search, and not the one in the
 ;; c-mode buffer that we had set => so there's a new *-string-match-cs
 ;; (case sensitive) function which binds case-fold-search and runs string-match
+;; Wed Sep 1 20:26:29 2004: adapted for libxml2-2.6.9: handle
+;; document-relative (#XXX) links
 
 ;;; TODO:
 ;; - use command-execute for libxmldoc-browse-url
@@ -192,13 +192,17 @@ buffer's value of case-fold-search (different from GNU Emacs)."
         (uri))
     (message "collecting libxml-symbols...")
     (while (car files)
+      (message "processing %s" (car files))
       (with-temp-buffer
         (insert-file-contents (car files))
         (goto-char (point-min))
         (while (re-search-forward
                 "]*href[ \t\n]*=[ \t\n]*\"\\([^=>]*\\)\"[^>]*>" nil t nil)
-          (setq uri (concat "file://" (expand-file-name libxmldoc-root) "/"
-                            (match-string 1)))
+          ;; is it a relative link (#XXX)?
+          (if (char-equal (elt (match-string 1) 0) ?#)
+              (setq uri (concat "file://" (car files) (match-string 1)))
+            (setq uri (concat "file://" (expand-file-name libxmldoc-root)
+                              "/" (match-string 1))))
           (if (not (re-search-forward "\\([^<]*\\)<" nil t nil))
               (error "regexp error while getting libxml-symbols.."))
           ;; this needs add-to-list because i.e. xmlChar appears often
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index adbb9a80..2d275032 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1045,7 +1045,7 @@
      
      
      
-     
+     
      
      
      
@@ -1060,9 +1060,10 @@
      
      
      
+     
      
      
-     
+     
      
      
      
@@ -1086,11 +1087,12 @@
      
      
      
-     
-     
      
+     
+     
      
      
+     
      
      
      
@@ -1837,6 +1839,7 @@
      
      
      
+     
      
      
      
@@ -2028,6 +2031,7 @@
      
      
      
+     
      
      
      
@@ -2072,6 +2076,7 @@
      
      
      
+     
      
      
      
@@ -2137,6 +2142,7 @@
      
      
      
+     
      
      
      
@@ -2208,6 +2214,7 @@
      
      
      
+     
      
      
      
@@ -2354,7 +2361,7 @@
      
      
      
-     
+     
      
      
      
@@ -2431,7 +2438,7 @@
      
      
      
-     
+     
      
      
      
@@ -3708,6 +3715,9 @@
     
       The attribute wildcard has been already builded.
     
+    
+      Marks the attr group as marked; used for circular checks.
+    
     
       The attribute wildcard has been already builded.
     
@@ -3844,6 +3854,8 @@
     
       the type is global
     
+    
+    
     
       the element content type is mixed
     
@@ -4662,8 +4674,8 @@
     
     
     
-    
-    
+    
+    
     
     
     
@@ -4686,25 +4698,25 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -4716,20 +4728,20 @@
     
     
     
-    
-    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -4738,28 +4750,30 @@
     
     
     
-    
+    
+    
+    
     
-    
+    
     
-    
+    
     
-    
-    
+    
+    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -4774,17 +4788,20 @@
     
     
     
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -4797,9 +4814,9 @@
     
     
     
-    
+    
     
-    
+    
     
     
     
@@ -4815,11 +4832,11 @@
     
     
     
-    
+    
     
-    
+    
     
-    
+    
     
     
     
@@ -4829,7 +4846,7 @@
     
     
     
-    
+    
     
     
     
@@ -4903,78 +4920,78 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -5797,6 +5814,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
     
@@ -9026,10 +9044,10 @@ actually an xmlCharEncoding'/>
       
     
     
-      Read one UTF8 Char from @utf
-      
+      Read the first UTF8 character from @utf
+      
       
-      
+      
     
     
       Default handling of defined entities, when should we define a new input stream ? When do we just handle that as a set of chars ?  OBSOLETE: to be removed at some point.
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 0e7ed3f9..8d8c6620 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -765,6 +765,8 @@
     
     
     
+    
+    
     
     
     
@@ -801,6 +803,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -867,6 +872,7 @@
     
     
     
+    
     
     
     
@@ -980,6 +986,7 @@
     
     
     
+    
     
     
     
@@ -3937,6 +3944,8 @@
       
       
       
+      
+      
       
       
       
@@ -3973,6 +3982,9 @@
       
       
       
+      
+      
+      
       
       
       
@@ -4039,6 +4051,7 @@
       
       
       
+      
       
       
       
@@ -4152,6 +4165,7 @@
       
       
       
+      
       
       
       
@@ -10497,6 +10511,7 @@
       
       
       
+      
       
       
       
@@ -10584,6 +10599,7 @@
       
       
       
+      
       
       
       
@@ -11659,6 +11675,8 @@
       
       
       
+      
+      
       
       
       
@@ -11695,6 +11713,9 @@
       
       
       
+      
+      
+      
       
       
       
@@ -13312,7 +13333,6 @@
         
           
           
-          
           
           
           
@@ -14826,6 +14846,9 @@
           
           
         
+        
+          
+        
         
           
           
@@ -16986,6 +17009,7 @@
           
         
         
+          
           
           
         
@@ -17498,6 +17522,9 @@
           
           
         
+        
+          
+        
         
           
           
@@ -17506,6 +17533,7 @@
           
         
         
+          
           
           
         
@@ -18167,6 +18195,7 @@
           
         
         
+          
           
           
           
@@ -18226,6 +18255,9 @@
           
           
         
+        
+          
+        
         
           
         
@@ -18500,6 +18532,7 @@
           
         
         
+          
           
         
         
@@ -18726,6 +18759,7 @@
           
         
         
+          
           
           
           
@@ -20946,6 +20980,7 @@
           
         
         
+          
           
           
           
@@ -22482,6 +22517,7 @@
           
         
         
+          
           
         
         
@@ -22667,6 +22703,7 @@
           
           
           
+          
         
         
           
@@ -23970,6 +24007,7 @@
           
           
           
+          
           
           
           
@@ -24614,6 +24652,7 @@
           
         
         
+          
           
           
         
@@ -25415,6 +25454,7 @@
         
         
           
+          
           
           
           
@@ -26969,9 +27009,6 @@
           
           
         
-        
-          
-        
         
           
           
@@ -27313,6 +27350,7 @@
         
           
           
+          
           
           
           
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 661ed015..9e2496ed 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -644,6 +644,56 @@ Class xmlDoc(xmlNode)
 
     # functions from module xpointer
     xpointerNewContext()
+Class xpathContext()
+    # accessors
+    contextDoc()
+    contextNode()
+    contextPosition()
+    contextSize()
+    function()
+    functionURI()
+    setContextDoc()
+    setContextNode()
+
+    # functions from module python
+    registerXPathFunction()
+
+    # functions from module xpath
+    xpathEval()
+    xpathEvalExpression()
+    xpathFreeContext()
+
+    # functions from module xpathInternals
+    xpathNewParserContext()
+    xpathNsLookup()
+    xpathRegisterAllFunctions()
+    xpathRegisterNs()
+    xpathRegisteredFuncsCleanup()
+    xpathRegisteredNsCleanup()
+    xpathRegisteredVariablesCleanup()
+    xpathVariableLookup()
+    xpathVariableLookupNS()
+
+    # functions from module xpointer
+    xpointerEval()
+
+
+Class xmlAttribute(xmlNode)
+Class catalog()
+
+    # functions from module catalog
+    add()
+    catalogIsEmpty()
+    convertSGMLCatalog()
+    dump()
+    remove()
+    resolve()
+    resolvePublic()
+    resolveSystem()
+    resolveURI()
+
+
+Class xmlElement(xmlNode)
 
 
 Class xmlAttr(xmlNode)
@@ -662,12 +712,100 @@ Class xmlAttr(xmlNode)
     # functions from module valid
     removeID()
     removeRef()
+
+
+Class xmlTextReader(xmlTextReaderCore)
+
+    # functions from module xmlreader
+    AttributeCount()
+    BaseUri()
+    Close()
+    CurrentDoc()
+    CurrentNode()
+    Depth()
+    Expand()
+    GetAttribute()
+    GetAttributeNo()
+    GetAttributeNs()
+    GetParserProp()
+    GetRemainder()
+    HasAttributes()
+    HasValue()
+    IsDefault()
+    IsEmptyElement()
+    IsValid()
+    LocalName()
+    LookupNamespace()
+    MoveToAttribute()
+    MoveToAttributeNo()
+    MoveToAttributeNs()
+    MoveToElement()
+    MoveToFirstAttribute()
+    MoveToNextAttribute()
+    Name()
+    NamespaceUri()
+    NewDoc()
+    NewFd()
+    NewFile()
+    NewMemory()
+    NewWalker()
+    Next()
+    NextSibling()
+    NodeType()
+    Normalization()
+    Prefix()
+    Preserve()
+    QuoteChar()
+    Read()
+    ReadAttributeValue()
+    ReadInnerXml()
+    ReadOuterXml()
+    ReadState()
+    ReadString()
+    RelaxNGSetSchema()
+    RelaxNGValidate()
+    SetParserProp()
+    String()
+    Value()
+    XmlLang()
 Class xmlReg()
 
     # functions from module xmlregexp
     regexpExec()
     regexpIsDeterminist()
     regexpPrint()
+
+
+Class xmlEntity(xmlNode)
+
+    # functions from module parserInternals
+    handleEntity()
+Class relaxNgSchema()
+
+    # functions from module relaxng
+    relaxNGDump()
+    relaxNGDumpTree()
+    relaxNGNewValidCtxt()
+
+    # functions from module xmlreader
+    RelaxNGSetSchema()
+Class Schema()
+
+    # functions from module xmlschemas
+    schemaDump()
+    schemaNewValidCtxt()
+Class Error()
+    # accessors
+    code()
+    domain()
+    file()
+    level()
+    line()
+    message()
+
+    # functions from module xmlerror
+    copyError()
+    resetError()
 Class relaxNgValidCtxt()
 
     # functions from module relaxng
@@ -676,6 +814,73 @@ Class relaxNgValidCtxt()
     relaxNGValidatePopElement()
     relaxNGValidatePushCData()
     relaxNGValidatePushElement()
+Class xpathParserContext()
+    # accessors
+    context()
+
+    # functions from module xpathInternals
+    xpathAddValues()
+    xpathBooleanFunction()
+    xpathCeilingFunction()
+    xpathCompareValues()
+    xpathConcatFunction()
+    xpathContainsFunction()
+    xpathCountFunction()
+    xpathDivValues()
+    xpathEqualValues()
+    xpathErr()
+    xpathEvalExpr()
+    xpathFalseFunction()
+    xpathFloorFunction()
+    xpathFreeParserContext()
+    xpathIdFunction()
+    xpathLangFunction()
+    xpathLastFunction()
+    xpathLocalNameFunction()
+    xpathModValues()
+    xpathMultValues()
+    xpathNamespaceURIFunction()
+    xpathNextAncestor()
+    xpathNextAncestorOrSelf()
+    xpathNextAttribute()
+    xpathNextChild()
+    xpathNextDescendant()
+    xpathNextDescendantOrSelf()
+    xpathNextFollowing()
+    xpathNextFollowingSibling()
+    xpathNextNamespace()
+    xpathNextParent()
+    xpathNextPreceding()
+    xpathNextPrecedingSibling()
+    xpathNextSelf()
+    xpathNormalizeFunction()
+    xpathNotEqualValues()
+    xpathNotFunction()
+    xpathNumberFunction()
+    xpathParseNCName()
+    xpathParseName()
+    xpathPopBoolean()
+    xpathPopNumber()
+    xpathPopString()
+    xpathPositionFunction()
+    xpathRoot()
+    xpathRoundFunction()
+    xpathStartsWithFunction()
+    xpathStringFunction()
+    xpathStringLengthFunction()
+    xpathSubValues()
+    xpathSubstringAfterFunction()
+    xpathSubstringBeforeFunction()
+    xpathSubstringFunction()
+    xpathSumFunction()
+    xpathTranslateFunction()
+    xpathTrueFunction()
+    xpathValueFlipSign()
+    xpatherror()
+
+    # functions from module xpointer
+    xpointerEvalRangePredicate()
+    xpointerRangeToFunction()
 
 
 Class parserCtxt(parserCtxtCore)
@@ -783,94 +988,6 @@ Class xmlDtd(xmlNode)
     dtdElementDesc()
     dtdQAttrDesc()
     dtdQElementDesc()
-Class relaxNgParserCtxt()
-
-    # functions from module relaxng
-    relaxNGParse()
-    relaxParserSetFlag()
-Class xpathParserContext()
-    # accessors
-    context()
-
-    # functions from module xpathInternals
-    xpathAddValues()
-    xpathBooleanFunction()
-    xpathCeilingFunction()
-    xpathCompareValues()
-    xpathConcatFunction()
-    xpathContainsFunction()
-    xpathCountFunction()
-    xpathDivValues()
-    xpathEqualValues()
-    xpathErr()
-    xpathEvalExpr()
-    xpathFalseFunction()
-    xpathFloorFunction()
-    xpathFreeParserContext()
-    xpathIdFunction()
-    xpathLangFunction()
-    xpathLastFunction()
-    xpathLocalNameFunction()
-    xpathModValues()
-    xpathMultValues()
-    xpathNamespaceURIFunction()
-    xpathNextAncestor()
-    xpathNextAncestorOrSelf()
-    xpathNextAttribute()
-    xpathNextChild()
-    xpathNextDescendant()
-    xpathNextDescendantOrSelf()
-    xpathNextFollowing()
-    xpathNextFollowingSibling()
-    xpathNextNamespace()
-    xpathNextParent()
-    xpathNextPreceding()
-    xpathNextPrecedingSibling()
-    xpathNextSelf()
-    xpathNormalizeFunction()
-    xpathNotEqualValues()
-    xpathNotFunction()
-    xpathNumberFunction()
-    xpathParseNCName()
-    xpathParseName()
-    xpathPopBoolean()
-    xpathPopNumber()
-    xpathPopString()
-    xpathPositionFunction()
-    xpathRoot()
-    xpathRoundFunction()
-    xpathStartsWithFunction()
-    xpathStringFunction()
-    xpathStringLengthFunction()
-    xpathSubValues()
-    xpathSubstringAfterFunction()
-    xpathSubstringBeforeFunction()
-    xpathSubstringFunction()
-    xpathSumFunction()
-    xpathTranslateFunction()
-    xpathTrueFunction()
-    xpathValueFlipSign()
-    xpatherror()
-
-    # functions from module xpointer
-    xpointerEvalRangePredicate()
-    xpointerRangeToFunction()
-Class SchemaParserCtxt()
-
-    # functions from module xmlschemas
-    schemaParse()
-Class catalog()
-
-    # functions from module catalog
-    add()
-    catalogIsEmpty()
-    convertSGMLCatalog()
-    dump()
-    remove()
-    resolve()
-    resolvePublic()
-    resolveSystem()
-    resolveURI()
 
 
 Class xmlNs(xmlNode)
@@ -894,6 +1011,48 @@ Class xmlNs(xmlNode)
 
     # functions from module xpathInternals
     xpathNodeSetFreeNs()
+
+
+Class inputBuffer(ioReadWrapper)
+
+    # functions from module xmlIO
+    grow()
+    push()
+    read()
+
+    # functions from module xmlreader
+    newTextReader()
+Class relaxNgParserCtxt()
+
+    # functions from module relaxng
+    relaxNGParse()
+    relaxParserSetFlag()
+
+
+Class outputBuffer(ioWriteWrapper)
+
+    # functions from module HTMLtree
+    htmlDocContentDumpFormatOutput()
+    htmlDocContentDumpOutput()
+    htmlNodeDumpFormatOutput()
+    htmlNodeDumpOutput()
+
+    # functions from module tree
+    nodeDumpOutput()
+    saveFileTo()
+    saveFormatFileTo()
+
+    # functions from module xmlIO
+    write()
+    writeString()
+Class SchemaParserCtxt()
+
+    # functions from module xmlschemas
+    schemaParse()
+Class SchemaValidCtxt()
+
+    # functions from module xmlschemas
+    schemaValidateDoc()
 Class xmlTextReaderLocator()
 
     # functions from module xmlreader
@@ -924,162 +1083,3 @@ Class URI()
     parseURIReference()
     printURI()
     saveUri()
-
-
-Class xmlAttribute(xmlNode)
-Class xpathContext()
-    # accessors
-    contextDoc()
-    contextNode()
-    contextPosition()
-    contextSize()
-    function()
-    functionURI()
-    setContextDoc()
-    setContextNode()
-
-    # functions from module python
-    registerXPathFunction()
-
-    # functions from module xpath
-    xpathEval()
-    xpathEvalExpression()
-    xpathFreeContext()
-
-    # functions from module xpathInternals
-    xpathNewParserContext()
-    xpathNsLookup()
-    xpathRegisterAllFunctions()
-    xpathRegisterNs()
-    xpathRegisteredFuncsCleanup()
-    xpathRegisteredNsCleanup()
-    xpathRegisteredVariablesCleanup()
-    xpathVariableLookup()
-    xpathVariableLookupNS()
-
-    # functions from module xpointer
-    xpointerEval()
-
-
-Class xmlElement(xmlNode)
-
-
-Class xmlTextReader(xmlTextReaderCore)
-
-    # functions from module xmlreader
-    AttributeCount()
-    BaseUri()
-    Close()
-    CurrentDoc()
-    CurrentNode()
-    Depth()
-    Expand()
-    GetAttribute()
-    GetAttributeNo()
-    GetAttributeNs()
-    GetParserProp()
-    GetRemainder()
-    HasAttributes()
-    HasValue()
-    IsDefault()
-    IsEmptyElement()
-    IsValid()
-    LocalName()
-    LookupNamespace()
-    MoveToAttribute()
-    MoveToAttributeNo()
-    MoveToAttributeNs()
-    MoveToElement()
-    MoveToFirstAttribute()
-    MoveToNextAttribute()
-    Name()
-    NamespaceUri()
-    NewDoc()
-    NewFd()
-    NewFile()
-    NewMemory()
-    NewWalker()
-    Next()
-    NextSibling()
-    NodeType()
-    Normalization()
-    Prefix()
-    Preserve()
-    QuoteChar()
-    Read()
-    ReadAttributeValue()
-    ReadInnerXml()
-    ReadOuterXml()
-    ReadState()
-    ReadString()
-    RelaxNGSetSchema()
-    RelaxNGValidate()
-    SetParserProp()
-    String()
-    Value()
-    XmlLang()
-
-
-Class xmlEntity(xmlNode)
-
-    # functions from module parserInternals
-    handleEntity()
-Class Schema()
-
-    # functions from module xmlschemas
-    schemaDump()
-    schemaNewValidCtxt()
-Class Error()
-    # accessors
-    code()
-    domain()
-    file()
-    level()
-    line()
-    message()
-
-    # functions from module xmlerror
-    copyError()
-    resetError()
-Class relaxNgSchema()
-
-    # functions from module relaxng
-    relaxNGDump()
-    relaxNGDumpTree()
-    relaxNGNewValidCtxt()
-
-    # functions from module xmlreader
-    RelaxNGSetSchema()
-
-
-Class inputBuffer(ioReadWrapper)
-
-    # functions from module xmlIO
-    grow()
-    push()
-    read()
-
-    # functions from module xmlreader
-    newTextReader()
-Class SchemaValidCtxt()
-
-    # functions from module xmlschemas
-    schemaValidateDoc()
-
-
-Class outputBuffer(ioWriteWrapper)
-
-    # functions from module HTMLtree
-    htmlDocContentDumpFormatOutput()
-    htmlDocContentDumpOutput()
-    htmlNodeDumpFormatOutput()
-    htmlNodeDumpOutput()
-
-    # functions from module tree
-    nodeDumpOutput()
-    saveFileTo()
-    saveFormatFileTo()
-
-    # functions from module xmlIO
-    write()
-    writeString()
diff --git a/xstc/Makefile.am b/xstc/Makefile.am
index 99dd9f71..45309ff0 100644
--- a/xstc/Makefile.am
+++ b/xstc/Makefile.am
@@ -1,31 +1,50 @@
+#
+# Definition for the tests from W3C
+#
 PYSCRIPTS=nist-test.py ms-test.py sun-test.py
 TESTDIRS=msxsdtest nisttest suntest
 TARBALL=XSTC-20020116.tar.gz
 TARBALLURL=http://www.w3.org/2001/05/xmlschema-test-collection/$(TARBALL)
 
+#
+# The local data and scripts
+#
+EXTRA_DIST=xstc.py sun-test-def.xml ms-test-def.xml nist-test-def.xml	\
+	   xstc-to-python.xsl
+
+#
+# Nothing is done by make, only make tests and
+# only if Python and Schemas are enabled.
+#
 all:
 
+#
+# The python tests are generated via XSLT
+#
 nist-test.py: nist-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/nist-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
 ms-test.py: ms-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/ms-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
 sun-test.py: sun-test-def.xml xstc-to-python.xsl
-	-@(if [ -x $(bindir)/xsltproc ] ; then				\
+	-@(if [ -x $(XSLTPROC) ] ; then				\
 	  echo "Rebuilding script" $@ ;					\
-	  $(bindir)/xsltproc --nonet $(srcdir)/xstc-to-python.xsl	\
+	  $(XSLTPROC) --nonet $(srcdir)/xstc-to-python.xsl	\
 	                     $(srcdir)/sun-test-def.xml > $@ ;		\
 	  chmod +x $@ ; fi )
 
+#
+# Rule to load the test description and extract the informations
+#
 $(TESTDIRS):
 	-@(if [ ! -f $(TARBALL) ] ; then 				\
 	   echo "Missing the test suite description, trying to fetch it" ;\
@@ -38,6 +57,10 @@ $(TESTDIRS):
 	   echo "done" ;						\
 	   fi);
 
+#
+# The actual test run if present. PYTHONPATH is updated to make sure
+# we run the version from the loacl build and not preinstalled bindings
+#
 pytests: $(PYSCRIPTS) $(TESTDIRS)
 	-@(if [ -x nist-test.py -a -d nisttest ] ; then 		\
 	   echo "## Running NIST Schemas tests";			\
@@ -59,6 +82,9 @@ tests:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   $(MAKE) MAKEFLAGS+=--silent pytests ; fi);
 
+#
+# Heavy, works well only on RHEL3
+#
 valgrind:
 	-@(if [ -x $(PYTHON) ] ; then 					\
 	   echo '## Running the regression tests under Valgrind' ;	\