diff --git a/ChangeLog b/ChangeLog index 80674cd6..cc932f3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 25 21:45:03 CET 2004 Daniel Veillard + + * configure.in NEWS doc/*: preparing release 2.6.5, rebuilt the + docs, checked rngparser stuff does not end up in the tarball + Sun Jan 25 20:59:20 CET 2004 Daniel Veillard * python/libxml.c: applied patch from Frederic Peters diff --git a/NEWS b/NEWS index eeded5c9..69b26813 100644 --- a/NEWS +++ b/NEWS @@ -15,10 +15,34 @@ to test those - More testing on RelaxNG Schemas +2.6.5: Jan 25 2004: + - Bugfixes: dictionnaries for schemas (William Brack), regexp segfault + (William), xs:all problem (William), a number of XPointer bugfixes + (William), xmllint error go to stderr, DTD validation problem with + namespace, memory leak (William), SAX1 cleanup and minimal options fixes + (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union + evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin), + XML Schemas double free (Steve Ball), XInclude with no href, argument + callbacks order for XPath callbacks (Frederic Peters) + - Documentation: python scripts (William Brack), xslt stylesheets (John + Fleck), doc (Sven Zimmerman), I/O example. + - Python bindings: fixes (William), enum support (Stéphane Bidoul), + structured error reporting (Stéphane Bidoul) + - XInclude: various fixes for conformance, problem related to dictionnary + references (William & me), recursion (William) + - xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred + Mickautsch), + - xmlSchemas: normalizedString datatype (John Belmonte) + - code cleanup for strings functions (William) + - Windows: compiler patches (Mark Vakoc) + - Parser optimizations, a few new XPath and dictionnary APIs for future + XSLT optimizations. + + 2.6.4: Dec 24 2003: - Windows build fixes (Igor Zlatkovic) - - Some serious XInclude problems reported by Oleg Paraschenko and - - Unix and Makefile packaging fixes (me, William Brack, + - Some serious XInclude problems reported by Oleg Paraschenko and + - Unix and Makefile packaging fixes (me, William Brack, - Documentation improvements (John Fleck, William Brack), example fix (Lucas Brasilino) - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of diff --git a/configure.in b/configure.in index cd931016..bc56453f 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=4 +LIBXML_MICRO_VERSION=5 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 536d37ca..707c44b0 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -232,6 +232,7 @@ A:link, A:visited, A:active { text-decoration: underline }
Compile
xmlAutomataCompile
xmlPatterncompile
xmlXPathCompile
+xmlXPathCtxtCompile
xmlXPathStringEvalNumber
Compress
docbCreateFileParserCtxt
docbParseFile
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 40985e7b..5e827286 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -424,6 +424,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlShellPwd
compilation
xmlPatterncompile
xmlXPathCompile
+xmlXPathCtxtCompile
compile
xmlPatterncompile
compile-time
docbCreateFileParserCtxt
docbParseFile
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index a52927c7..5964ee64 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -342,23 +342,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaNewParserCtxt
explored
xmlXPathAxisFunc
exposing
xmlTextReaderRead
-
expression
_xmlXPathContext
-_xmlXPathParserContext
-xmlRegFreeExecCtxt
-xmlRegNewExecCtxt
-xmlRegexpCompile
-xmlRegexpExec
-xmlRegexpIsDeterminist
-xmlRegexpPrint
-xmlXPathCompile
-xmlXPathCompiledEval
-xmlXPathDebugDumpCompExpr
-xmlXPathEval
-xmlXPathEvalExpr
-xmlXPathEvalExpression
-xmlXPathNewParserContext
-xmlXPathStringEvalNumber
-xmlXPtrEval
expressions
LIBXML_REGEXP_ENABLED
exslSetsDistinctSorted
xmlXPathDistinct
exslSetsLeadingSorted
xmlXPathLeading
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 1b88e414..5ada7673 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -200,6 +200,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReaderNewFile
xmlReaderNewIO
xmlReaderNewMemory
+xmlRelaxParserSetFlag
xmlXIncludeSetFlags
flat
xmlStringGetNodeList
xmlStringLenGetNodeList
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 6ca853b8..ea3ebe45 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -278,6 +278,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserPrintFileInfo
xmlRelaxNGGetValidErrors
xmlRelaxNGSetValidErrors
+xmlRelaxParserSetFlag
xmlSAX2EndElementNs
xmlSAX2StartElementNs
xmlSchemaSetValidErrors
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index d79c380c..9dfb9a30 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -79,6 +79,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputBufferWriteString
particular
_xmlNodeSet
pass
xmlCurrentChar
+xmlRelaxParserSetFlag
xmlTextReaderSetErrorHandler
passed
CHECK_ARITY
xmlAutomataNewTransition
@@ -322,6 +323,7 @@ A:link, A:visited, A:active { text-decoration: underline }
prior
xmlSetupParserForBuffer
private
xmlCatalogLocalResolve
xmlCatalogLocalResolveURI
+xmlRelaxParserSetFlag
problem
xmlParseBalancedChunkMemory
xmlParseBalancedChunkMemoryRecover
xmlParseCtxtExternalEntity
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index b0a9ba8a..01bc2c69 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -316,6 +316,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlRNewMutex
xmlNewRMutex
xmlReader
LIBXML_READER_ENABLED
xmlRefPtr
xmlAddRef
+
xmlRelaxNGParserFlag
xmlRelaxParserSetFlag
xmlRelaxNGValidatePushElement
xmlRelaxNGValidateFullElement
xmlSAX2Attribute
attribute
xmlSAX2AttributeDecl
attributeDecl
@@ -406,6 +407,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathPopNumber
xmlXPathPopString
xmlXPathCompExprPtr
xmlXPathCompile
+xmlXPathCtxtCompile
xmlXPathContext
xmlXPathFreeContext
xmlXPathNewContext
xmlXPtrNewContext
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html index 4c9005c4..804196af 100644 --- a/doc/APIchunk6.html +++ b/doc/APIchunk6.html @@ -145,6 +145,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGValidatePopElement
xmlRelaxNGValidatePushCData
xmlRelaxNGValidatePushElement
+xmlRelaxParserSetFlag
xmlTextReaderRelaxNGSetSchema
xmlTextReaderRelaxNGValidate
RelaxNGs
xmlRelaxNGNewDocParserCtxt
@@ -315,6 +316,7 @@ A:link, A:visited, A:active { text-decoration: underline }
See
xmlLinkGetData
xmlParseNotationDecl
Seems
xmlParseTextDecl
+
Semi
xmlRelaxParserSetFlag
Send
xmlNanoFTPQuit
Set
htmlHandleOmittedElem
initGenericErrorDefaultFunc
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index b4513b04..571ea72c 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -841,7 +841,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternMatch
xmlPatternPtr
xmlPatterncompile
-

Module relaxng:

XML_RELAXNG_ERR_ATTREXTRANS
+

Module relaxng:

XML_RELAXNGP_CRNG
+XML_RELAXNGP_FREE_DOC
+XML_RELAXNGP_NONE
+XML_RELAXNG_ERR_ATTREXTRANS
XML_RELAXNG_ERR_ATTRNAME
XML_RELAXNG_ERR_ATTRNONS
XML_RELAXNG_ERR_ATTRVALID
@@ -897,6 +900,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGParse
xmlRelaxNGParserCtxt
xmlRelaxNGParserCtxtPtr
+xmlRelaxNGParserFlag
xmlRelaxNGPtr
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
@@ -910,6 +914,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGValidatePushElement
xmlRelaxNGValidityErrorFunc
xmlRelaxNGValidityWarningFunc
+xmlRelaxParserSetFlag

Module schemasInternals:

XML_SCHEMAS_ANYATTR_LAX
XML_SCHEMAS_ANYATTR_SKIP
XML_SCHEMAS_ANYATTR_STRICT
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 858aefc3..d9bae301 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -1660,6 +1660,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGGetParserErrors
xmlRelaxNGParse
xmlRelaxNGSetParserErrors
+xmlRelaxParserSetFlag

Type xmlRelaxNGPtr:

xmlRelaxNGDump
xmlRelaxNGDumpTree
xmlRelaxNGFree
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 16401c59..253679b9 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -510,6 +510,9 @@ A:link, A:visited, A:active { text-decoration: underline } XML_READER_TYPE_WHITESPACE
XML_READER_TYPE_XML_DECLARATION
XML_REGEXP_COMPILE_ERROR
+XML_RELAXNGP_CRNG
+XML_RELAXNGP_FREE_DOC
+XML_RELAXNGP_NONE
XML_RELAXNG_ERR_ATTREXTRANS
XML_RELAXNG_ERR_ATTRNAME
XML_RELAXNG_ERR_ATTRNONS
@@ -2024,6 +2027,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGParse
xmlRelaxNGParserCtxt
xmlRelaxNGParserCtxtPtr
+xmlRelaxNGParserFlag
xmlRelaxNGPtr
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
@@ -2037,6 +2041,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGValidatePushElement
xmlRelaxNGValidityErrorFunc
xmlRelaxNGValidityWarningFunc
+xmlRelaxParserSetFlag
xmlRemoveID
xmlRemoveProp
xmlRemoveRef
diff --git a/doc/apibuild.py b/doc/apibuild.py index a0b3f28d..688403fe 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -27,6 +27,8 @@ ignored_files = { "testOOM.c": "out of memory tester", "testOOMlib.h": "out of memory tester", "testOOMlib.c": "out of memory tester", + "rngparser.c": "not yet integrated", + "rngparser.h": "not yet integrated", } ignored_words = { diff --git a/doc/encoding.html b/doc/encoding.html index 5f6166b7..3b7e5a31 100644 --- a/doc/encoding.html +++ b/doc/encoding.html @@ -25,10 +25,10 @@ encoding for ASCII and to save space for Western encodings, but it is a bit more complex to handle in practice. UTF-16 use 2 bytes per character (and sometimes combines two pairs), it makes implementation easier, but looks a bit overkill for Western languages encoding. Moreover the XML specification -allows the document to be encoded in other encodings at the condition that they -are clearly labeled as such. For example the following is a wellformed XML -document encoded in ISO-8859-1 and using accentuated letters that we French -like for both markup and content:

<?xml version="1.0" encoding="ISO-8859-1"?>
+allows the document to be encoded in other encodings at the condition that
+they are clearly labeled as such. For example the following is a wellformed
+XML document encoded in ISO-8859-1 and using accentuated letters that we
+French like for both markup and content:
<?xml version="1.0" encoding="ISO-8859-1"?>
 <très>là</très>
Having internationalization support in libxml2 means the following:
  • the document is properly parsed
    • 
   
  • informations about it's encoding are saved
    • 
   
  • it can be modified
    • 
@@ -92,8 +92,8 @@ rationales for those choices:
    • keeping the native encoding in the inte
 (internationalization) support get triggered only during I/O operation, i.e.
 when reading a document or saving one. Let's look first at the reading
 sequence:
      1. when a document is processed, we usually don't know the encoding, a
-    simple heuristic allows to detect UTF-16 and UCS-4 from encodings
-    where the ASCII range (0-0x7F) maps with ASCII
        2. 
+    simple heuristic allows to detect UTF-16 and UCS-4 from encodings where
+    the ASCII range (0-0x7F) maps with ASCII
   
      2. the xml declaration if available is parsed, including the encoding
     declaration. At that point, if the autodetected encoding is different
     from the one declared a call to xmlSwitchEncoding() is issued.
        3. 
@@ -154,8 +154,8 @@ encoding:
        1. if no encoding is given, libxml2 will look for an encoding
     resume the conversion. This guarantees that any document will be saved
     without losses (except for markup names where this is not legal, this is
     a problem in the current version, in practice avoid using non-ascii
-    characters for tag or attribute names). A special "ascii" encoding
-    name is used to save documents to a pure ascii form can be used when
+    characters for tag or attribute names). A special "ascii" encoding name
+    is used to save documents to a pure ascii form can be used when
     portability is really crucial
          2. 
 
        Here are a few examples based on the same test document:
        ~/XML -> ./xmllint isolat1 
 <?xml version="1.0" encoding="ISO-8859-1"?>
diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml
index c7973835..77988632 100644
--- a/doc/examples/examples.xml
+++ b/doc/examples/examples.xml
@@ -144,39 +144,40 @@
       <libxml/xmlwriter.h>
     
     
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
       
-      
-      
-      
-      
-      
-      
+      
+      
+      
+      
+      
+      
     
   
   
@@ -313,6 +314,9 @@
     
       
     
+    
+      
+    
     
       
     
diff --git a/doc/html/libxml-relaxng.html b/doc/html/libxml-relaxng.html
index 515870b4..7644e442 100644
--- a/doc/html/libxml-relaxng.html
+++ b/doc/html/libxml-relaxng.html
@@ -15,6 +15,7 @@ The content of this structure is not made public by the API.
 
        Structure xmlRelaxNGParserCtxt
        struct _xmlRelaxNGParserCtxt
 The content of this structure is not made public by the API.
 
        Typedef xmlRelaxNGParserCtxt * xmlRelaxNGParserCtxtPtr
+
        Enum xmlRelaxNGParserFlag
 
        Typedef xmlRelaxNG * xmlRelaxNGPtr
 
        Structure xmlRelaxNGValidCtxt
        struct _xmlRelaxNGValidCtxt
 The content of this structure is not made public by the API.
@@ -46,12 +47,18 @@ void	xmlRelaxNGValidityErrorFunc	(voi
 
        Function type: xmlRelaxNGValidityWarningFunc
 void	xmlRelaxNGValidityWarningFunc	(void * ctx, 
        					 const char * msg, 
        					 ... ...)
 
        
+
        int	xmlRelaxParserSetFlag		(xmlRelaxNGParserCtxtPtr ctxt, 
        					 int flags)
        
 
        Description
        
 
        Structure xmlRelaxNG
        Structure xmlRelaxNG
        struct _xmlRelaxNG {
 The content of this structure is not made public by the API.
 }
        Structure xmlRelaxNGParserCtxt
        Structure xmlRelaxNGParserCtxt
        struct _xmlRelaxNGParserCtxt {
 The content of this structure is not made public by the API.
-}
        Structure xmlRelaxNGValidCtxt
        Structure xmlRelaxNGValidCtxt
        struct _xmlRelaxNGValidCtxt {
+}
        Enum xmlRelaxNGParserFlag
        Enum xmlRelaxNGParserFlag {
+    XML_RELAXNGP_NONE = 0
+    XML_RELAXNGP_FREE_DOC = 1
+    XML_RELAXNGP_CRNG = 2
+}
+
        Structure xmlRelaxNGValidCtxt
        Structure xmlRelaxNGValidCtxt
        struct _xmlRelaxNGValidCtxt {
 The content of this structure is not made public by the API.
 }
        Enum xmlRelaxNGValidErr
        Enum xmlRelaxNGValidErr {
     XML_RELAXNG_OK = 0
@@ -141,4 +148,6 @@ void	xmlRelaxNGValidityErrorFunc	(void * ctx, 
        					 const char * msg, 
        Function type: xmlRelaxNGValidityWarningFunc
        Function type: xmlRelaxNGValidityWarningFunc
 void	xmlRelaxNGValidityWarningFunc	(void * ctx, 
        					 const char * msg, 
        					 ... ...)
 
        ctx:
        msg:
        ...:

        
-
        Daniel Veillard
        
+
        Function: xmlRelaxParserSetFlag
        int	xmlRelaxParserSetFlag		(xmlRelaxNGParserCtxtPtr ctxt, 
        					 int flags)
        
+
        Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .
        
+
        ctxt:a RelaxNG parser context
        flags:a set of flags values
        Returns:0 if success and -1 in case of error
        Daniel Veillard
        
diff --git a/doc/html/libxml-xmlschemas.html b/doc/html/libxml-xmlschemas.html
index 39289854..4c298be5 100644
--- a/doc/html/libxml-xmlschemas.html
+++ b/doc/html/libxml-xmlschemas.html
@@ -57,6 +57,7 @@ void	xmlSchemaValidityWarningFunc	(v
     xmlHashTablePtr	groupDecl
     xmlDictPtr	dict
     void *	includes	: the includes, this is opaque for now
+    int	preserve	: whether to free the document
 }
        Structure xmlSchemaParserCtxt
        Structure xmlSchemaParserCtxt
        struct _xmlSchemaParserCtxt {
 The content of this structure is not made public by the API.
 }
        Structure xmlSchemaValidCtxt
        Structure xmlSchemaValidCtxt
        struct _xmlSchemaValidCtxt {
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 137aef18..373c1ae6 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -244,8 +244,8 @@ int	xmlXPathConvertFunc		(xmlXPath
 
        val:an XPath object
        Returns:the new object, the old one is freed (or the operation is done directly on @val)
        Function: xmlXPathConvertString
        xmlXPathObjectPtr	xmlXPathConvertString	(xmlXPathObjectPtr val)
        
 
        Converts an existing object to its string() equivalent
        
 
        val:an XPath object
        Returns:the new object, the old one is freed (or the operation is done directly on @val)
        Function: xmlXPathCtxtCompile
        xmlXPathCompExprPtr	xmlXPathCtxtCompile	(xmlXPathContextPtr ctxt, 
        						 const xmlChar * str)
        
-
        
-
        ctxt:
        str:
        Returns:
        Function: xmlXPathEval
        xmlXPathObjectPtr	xmlXPathEval	(const xmlChar * str, 
        					 xmlXPathContextPtr ctx)
        
+
        Compile an XPath expression
        
+
        ctxt:an XPath context
        str:the XPath expression
        Returns:the xmlXPathCompExprPtr resulting from the compilation or NULL. the caller has to free the object.
        Function: xmlXPathEval
        xmlXPathObjectPtr	xmlXPathEval	(const xmlChar * str, 
        					 xmlXPathContextPtr ctx)
        
 
        Evaluate the XPath Location Path in the given context.
        
 
        str:the XPath expression
        ctx:the XPath context
        Returns:the xmlXPathObjectPtr resulting from the evaluation or NULL. the caller has to free the object.
        Function: xmlXPathEvalExpression
        xmlXPathObjectPtr	xmlXPathEvalExpression	(const xmlChar * str, 
        						 xmlXPathContextPtr ctxt)
        
 
        Evaluate the XPath expression in the given context.
        
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 982fa630..4ebef9aa 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -940,53 +940,57 @@
      implementation of the Relax-NG validation
      implementation of the Relax-NG validation 
      Daniel Veillard 
-     
      
-     
+     
      
-     
      
-     
-     
-     
-     
+     
      
-     
      
-     
      
      
-     
-     
-     
-     
-     
-     
+     
+     
      
-     
-     
-     
-     
+     
      
      
-     
-     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
+     
      
      
-     
-     
      
-     
+     
      
-     
      
      
      
-     
+     
      
      
      
+     
      
      
      
@@ -1008,6 +1012,7 @@
      
      
      
+     
      
     
     
@@ -4042,6 +4047,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -5004,6 +5012,7 @@ actually an xmlCharEncoding'/>
     
     
     
+    
     
     
     
@@ -5099,6 +5108,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
       
@@ -10522,6 +10532,12 @@ actually an xmlCharEncoding'/>
       
       
     
+    
+      Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .
+      
+      
+      
+    
     
       Remove the given attribute from the ID table maintained internally.
       
@@ -13795,10 +13811,10 @@ actually an xmlCharEncoding'/>
       
     
     
-      
-      
-      
-      
+      Compile an XPath expression
+      
+      
+      
     
     
       Dumps the tree of the compiled XPath expression.
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 16e99c33..b7112a9b 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -504,6 +504,9 @@
     
     
     
+    
+    
+    
     
     
     
@@ -2018,6 +2021,7 @@
     
     
     
+    
     
     
     
@@ -2031,6 +2035,7 @@
     
     
     
+    
     
     
     
@@ -3362,6 +3367,9 @@
       
       
       
+      
+      
+      
       
       
       
@@ -4912,6 +4920,7 @@
       
       
       
+      
       
       
       
@@ -4925,6 +4934,7 @@
       
       
       
+      
       
       
       
@@ -8330,6 +8340,7 @@
       
       
       
+      
     
     
       
@@ -9670,6 +9681,9 @@
       
     
     
+      
+      
+      
       
       
       
@@ -9726,6 +9740,7 @@
       
       
       
+      
       
       
       
@@ -9739,6 +9754,7 @@
       
       
       
+      
     
     
       
@@ -12386,6 +12402,7 @@
           
           
           
+          
           
         
         
@@ -14600,6 +14617,7 @@
           
           
           
+          
           
           
         
@@ -14849,6 +14867,9 @@
         
           
         
+        
+          
+        
         
           
         
@@ -17308,6 +17329,7 @@
         
           
           
+          
         
         
           
@@ -19031,25 +19053,6 @@
         
           
         
-        
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-          
-        
         
           
         
@@ -19341,6 +19344,7 @@
           
           
           
+          
           
         
         
@@ -20344,6 +20348,7 @@
           
           
           
+          
           
           
           
@@ -22360,6 +22365,7 @@
         
         
           
+          
           
         
         
@@ -22741,6 +22747,7 @@
         
           
           
+          
         
         
           
@@ -26612,6 +26619,9 @@
         
           
         
+        
+          
+        
         
           
         
@@ -26825,6 +26835,7 @@
         
         
           
+          
         
         
           
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index bcc2f4b7..cc342193 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,20 +8,30 @@
   
   
     libxml2
-    2.6.4
-     Dec 24 2003
+    2.6.5
+     Jan 25 2004
     http://xmlsoft.org/
-       - Windows build fixes (Igor Zlatkovic)
-   - Some serious XInclude problems reported by Oleg Paraschenko and 
-   - Unix and Makefile packaging fixes (me, William Brack, 
-   - Documentation improvements (John Fleck, William Brack), example fix
-    (Lucas Brasilino)
-   - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
-    NULL strings (William Brack) , API building reader or parser from
-    filedescriptor should not close it, changed XPath sorting to be stable
-    again (William Brack), xmlGetNodePath() generating '(null)' (William
-    Brack), DTD validation and namespace bug (William Brack), XML Schemas
-    double inclusion behaviour
+       - Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
+   - Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
+   - Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)
+   - XInclude: various fixes for conformance, problem related to dictionnary
+    references (William & me), recursion (William)
+   - xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), 
+   - xmlSchemas: normalizedString datatype (John Belmonte)
+   - code cleanup for strings functions (William)
+   - Windows: compiler patches (Mark Vakoc)
+   - Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
 
 
   
diff --git a/doc/news.html b/doc/news.html
index 73fb70cf..eba19dbf 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,9 +12,30 @@ for a really accurate description
        Items not finished and worked on, get i
 to test those
        2.6.5: Jan 25 2004
        • Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
          • 
+  
        • Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
          • 
+  
        • Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)
          • 
+  
        • XInclude: various fixes for conformance, problem related to dictionnary
+    references (William & me), recursion (William)
          • 
+  
        • xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), 
          • 
+  
        • xmlSchemas: normalizedString datatype (John Belmonte)
          • 
+  
        • code cleanup for strings functions (William)
          • 
+  
        • Windows: compiler patches (Mark Vakoc)
          • 
+  
        • Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
          • 
 
        2.6.4: Dec 24 2003
        • Windows build fixes (Igor Zlatkovic)
          • 
-  
        • Some serious XInclude problems reported by Oleg Paraschenko and 
          • 
-  
        • Unix and Makefile packaging fixes (me, William Brack, 
          • 
+  
        • Some serious XInclude problems reported by Oleg Paraschenko and
          • 
+  
        • Unix and Makefile packaging fixes (me, William Brack,
          • 
   
        • Documentation improvements (John Fleck, William Brack), example fix
     (Lucas Brasilino)
          • 
   
        • bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
diff --git a/doc/xml.html b/doc/xml.html
index 47484b2f..f7035920 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -662,11 +662,36 @@ to test those
          
   Schemas
          • 
 
        
 
+
        2.6.5: Jan 25 2004
        
+
          
+  
        • Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
          • 
+  
        • Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
          • 
+  
        • Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)
          • 
+  
        • XInclude: various fixes for conformance, problem related to dictionnary
+    references (William & me), recursion (William)
          • 
+  
        • xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), 
          • 
+  
        • xmlSchemas: normalizedString datatype (John Belmonte)
          • 
+  
        • code cleanup for strings functions (William)
          • 
+  
        • Windows: compiler patches (Mark Vakoc)
          • 
+  
        • Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
          • 
+
        
+
 
        2.6.4: Dec 24 2003
        
 
          
   
        • Windows build fixes (Igor Zlatkovic)
          • 
-  
        • Some serious XInclude problems reported by Oleg Paraschenko and 
          • 
-  
        • Unix and Makefile packaging fixes (me, William Brack, 
          • 
+  
        • Some serious XInclude problems reported by Oleg Paraschenko and
          • 
+  
        • Unix and Makefile packaging fixes (me, William Brack,
          • 
   
        • Documentation improvements (John Fleck, William Brack), example fix
     (Lucas Brasilino)
          • 
   
        • bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
@@ -2776,10 +2801,10 @@ encoding for ASCII and to save space for Western encodings, but it is a bit
 more complex to handle in practice. UTF-16 use 2 bytes per character (and
 sometimes combines two pairs), it makes implementation easier, but looks a
 bit overkill for Western languages encoding. Moreover the XML specification
-allows the document to be encoded in other encodings at the condition that they
-are clearly labeled as such. For example the following is a wellformed XML
-document encoded in ISO-8859-1 and using accentuated letters that we French
-like for both markup and content:
          
+allows the document to be encoded in other encodings at the condition that
+they are clearly labeled as such. For example the following is a wellformed
+XML document encoded in ISO-8859-1 and using accentuated letters that we
+French like for both markup and content:
          
 
          <?xml version="1.0" encoding="ISO-8859-1"?>
 <très>là</très>
          
 
@@ -2871,8 +2896,8 @@ when reading a document or saving one. Let's look first at the reading
 sequence:
          
 
            
   
          1. when a document is processed, we usually don't know the encoding, a
-    simple heuristic allows to detect UTF-16 and UCS-4 from encodings
-    where the ASCII range (0-0x7F) maps with ASCII
            2. 
+    simple heuristic allows to detect UTF-16 and UCS-4 from encodings where
+    the ASCII range (0-0x7F) maps with ASCII
   
          2. the xml declaration if available is parsed, including the encoding
     declaration. At that point, if the autodetected encoding is different
     from the one declared a call to xmlSwitchEncoding() is issued.
            3. 
@@ -2937,8 +2962,8 @@ encoding:
            
     resume the conversion. This guarantees that any document will be saved
     without losses (except for markup names where this is not legal, this is
     a problem in the current version, in practice avoid using non-ascii
-    characters for tag or attribute names). A special "ascii" encoding
-    name is used to save documents to a pure ascii form can be used when
+    characters for tag or attribute names). A special "ascii" encoding name
+    is used to save documents to a pure ascii form can be used when
     portability is really crucial
 
          
 
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 8325abce..54414554 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -1013,6 +1013,7 @@ Class relaxNgParserCtxt()
     # functions from module relaxng
     relaxNGFreeParserCtxt()
     relaxNGParse()
+    relaxParserSetFlag()
 
 
 Class outputBuffer(ioWriteWrapper)