From 7b465bdf11b83b8214fb376e745c41474132bcc6 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 24 Jul 2009 09:02:51 +0200 Subject: [PATCH] Fixed apibuild.py, regenerated doc and interfaces * doc/apibuild.py: fixed the parsing after the change of macro name * doc/* testapi.c: regenerated --- doc/APIchunk12.html | 6 +++- doc/APIchunk15.html | 4 --- doc/APIchunk17.html | 2 +- doc/APIchunk18.html | 4 +-- doc/APIchunk19.html | 4 +++ doc/APIchunk20.html | 4 --- doc/APIchunk3.html | 2 +- doc/APIfiles.html | 8 ++++-- doc/APIsymbols.html | 8 ++++-- doc/DOM.html | 2 +- doc/FAQ.html | 4 +-- doc/apibuild.py | 1 + doc/devhelp/libxml2-c14n.html | 33 ++++++++++++++-------- doc/devhelp/libxml2-xmlversion.html | 16 +++++------ doc/devhelp/libxml2.devhelp | 6 +++- doc/docs.html | 2 +- doc/downloads.html | 2 +- doc/html/libxml-c14n.html | 24 ++++++++++------ doc/html/libxml-xmlversion.html | 4 +-- doc/libxml2-api.xml | 30 ++++++++++++-------- doc/libxml2-refs.xml | 44 ++++++++++++++++++----------- doc/news.html | 2 +- testapi.c | 42 +++++++++++++-------------- 23 files changed, 151 insertions(+), 103 deletions(-) diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 7b512f7d..09a7f42a 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -37,7 +37,11 @@ A:link, A:visited, A:active { text-decoration: underline } w-w x-x y-z -

Letter c:

cache
xmlXPathContextSetCache
+

Letter c:

c14n
xmlC14NDocDumpMemory
+xmlC14NDocSave
+xmlC14NDocSaveTo
+xmlC14NExecute
+
cache
xmlXPathContextSetCache
cached
xmlXPathContextSetCache
caching:
xmlXPathContextSetCache
calculated
xmlStrncatNew
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 8c21a09c..e9c70916 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -203,10 +203,6 @@ A:link, A:visited, A:active { text-decoration: underline }
flag
XML_SCHEMAS_ELEM_CIRCULAR
htmlSetMetaEncoding
initxmlDefaultSAXHandler
-xmlC14NDocDumpMemory
-xmlC14NDocSave
-xmlC14NDocSaveTo
-xmlC14NExecute
xmlSAX2InitDefaultSAXHandler
xmlTextReaderIsValid
flagged
_htmlElemDesc
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 341967b8..393b11e7 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -211,7 +211,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPtrLocationSetRemove
xmlXPtrNewRange
indicate
ATTRIBUTE_ALLOC_SIZE
-ATTRIBUTE_PRINTF
+LIBXML_ATTR_FORMAT
xmlParseExternalID
xmlParserInputGrow
xmlParserInputRead
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html index 89985fbd..d01e8ad6 100644 --- a/doc/APIchunk18.html +++ b/doc/APIchunk18.html @@ -274,11 +274,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlUnlockLibrary
lifetime
xmlBufferCreateStatic
xmlExpCtxtNbCons
-
like
ATTRIBUTE_PRINTF
-IS_CHAR_CH
+
like
IS_CHAR_CH
IS_DIGIT_CH
IS_EXTENDER_CH
IS_LETTER_CH
+LIBXML_ATTR_FORMAT
LIBXML_DOTTED_VERSION
LIBXML_TREE_ENABLED
xmlCharEncOutFunc
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 01804064..316d025b 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -244,6 +244,10 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlParserCtxt
docbCreatePushParserCtxt
htmlCreatePushParserCtxt
+xmlC14NDocDumpMemory
+xmlC14NDocSave
+xmlC14NDocSaveTo
+xmlC14NExecute
xmlCreatePushParserCtxt
xmlGetCompressMode
xmlKeepBlanksDefault
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index 0ef5ec11..a629e7ef 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -208,10 +208,6 @@ A:link, A:visited, A:active { text-decoration: underline }
non-blank
xmlParseElementChildrenContentDecl
non-determinist
_xmlValidCtxt
non-empty
xmlXPathBooleanFunction
-
non-exclusive
xmlC14NDocDumpMemory
-xmlC14NDocSave
-xmlC14NDocSaveTo
-xmlC14NExecute
non-final
xmlRegExecPushString
xmlRegExecPushString2
non-negative
xmlC14NDocSaveTo
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html index 27e667a0..c4260606 100644 --- a/doc/APIchunk3.html +++ b/doc/APIchunk3.html @@ -127,8 +127,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathFunctionLookup
xmlXPathFunctionLookupNS

Letter G:

GCC
ATTRIBUTE_ALLOC_SIZE
-ATTRIBUTE_PRINTF
ATTRIBUTE_UNUSED
+LIBXML_ATTR_FORMAT
GEDecl
xmlParseEntityDecl
GET
xmlNanoHTTPFetch
xmlNanoHTTPOpen
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 7ed0d9b3..c9490cf3 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -192,11 +192,15 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAX2UnparsedEntityDecl
xmlSAXDefaultVersion
xmlSAXVersion
-

Module c14n:

xmlC14NDocDumpMemory
+

Module c14n:

XML_C14N_1_0
+XML_C14N_1_1
+XML_C14N_EXCLUSIVE_1_0
+xmlC14NDocDumpMemory
xmlC14NDocSave
xmlC14NDocSaveTo
xmlC14NExecute
xmlC14NIsVisibleCallback
+xmlC14NMode

Module catalog:

XML_CATALOGS_NAMESPACE
XML_CATALOG_PI
XML_CATA_ALLOW_ALL
@@ -3126,9 +3130,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlUCSIsYiSyllables
xmlUCSIsYijingHexagramSymbols

Module xmlversion:

ATTRIBUTE_ALLOC_SIZE
-ATTRIBUTE_PRINTF
ATTRIBUTE_UNUSED
DEBUG_MEMORY_LOCATION
+LIBXML_ATTR_FORMAT
LIBXML_AUTOMATA_ENABLED
LIBXML_C14N_ENABLED
LIBXML_CATALOG_ENABLED
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 126e387f..79a9d672 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -8,7 +8,6 @@ H2 {font-family: Verdana,Arial,Helvetica} H3 {font-family: Verdana,Arial,Helvetica} A:link, A:visited, A:active { text-decoration: underline } Alphabetic List of Symbols in libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

The XML C parser and toolkit of Gnome

Alphabetic List of Symbols in libxml2

Developer Menu
API Indexes
Related links

Letter A:

ATTRIBUTE_ALLOC_SIZE
-ATTRIBUTE_PRINTF
ATTRIBUTE_UNUSED

Letter B:

BAD_CAST
BASE_BUFFER_SIZE
@@ -59,7 +58,8 @@ A:link, A:visited, A:active { text-decoration: underline } IS_LETTER_CH
IS_PUBIDCHAR
IS_PUBIDCHAR_CH
-

Letter L:

LIBXML_AUTOMATA_ENABLED
+

Letter L:

LIBXML_ATTR_FORMAT
+LIBXML_AUTOMATA_ENABLED
LIBXML_C14N_ENABLED
LIBXML_CATALOG_ENABLED
LIBXML_DEBUG_ENABLED
@@ -149,8 +149,11 @@ A:link, A:visited, A:active { text-decoration: underline } XML_BUFFER_ALLOC_EXACT
XML_BUFFER_ALLOC_IMMUTABLE
XML_BUFFER_ALLOC_IO
+XML_C14N_1_0
+XML_C14N_1_1
XML_C14N_CREATE_CTXT
XML_C14N_CREATE_STACK
+XML_C14N_EXCLUSIVE_1_0
XML_C14N_INVALID_NODE
XML_C14N_RELATIVE_NAMESPACE
XML_C14N_REQUIRES_UTF8
@@ -1775,6 +1778,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlC14NDocSaveTo
xmlC14NExecute
xmlC14NIsVisibleCallback
+xmlC14NMode
xmlCanonicPath
xmlCatalog
xmlCatalogAdd
diff --git a/doc/DOM.html b/doc/DOM.html index 8bfc9163..8840c150 100644 --- a/doc/DOM.html +++ b/doc/DOM.html @@ -12,6 +12,6 @@ Object Model; this is an API for accessing XML or HTML structured documents. Native support for DOM in Gnome is on the way (module gnome-dom), and will be based on gnome-xml. This will be a far cleaner interface to manipulate XML files within Gnome since it won't expose the internal -structure.

The current DOM implementation on top of libxml2 is the gdome2 Gnome module, this +structure.

The current DOM implementation on top of libxml2 is the gdome2 Gnome module, this is a full DOM interface, thanks to Paolo Casarini, check the Gdome2 homepage for more information.

Daniel Veillard

diff --git a/doc/FAQ.html b/doc/FAQ.html index 64549428..dfeb4016 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -239,10 +239,10 @@ pnode=pxmlDoc->children->children; examples.

  • look for examples of use for libxml2 function using the Gnome code or by asking on Google.
    • -
  • Browse +
  • Browse the libxml2 source , I try to write code as clean and documented as possible, so looking at it may be helpful. In particular the code - of xmllint.c and of the various testXXX.c test programs should + of xmllint.c and of the various testXXX.c test programs should provide good examples of how to do things with the library.

    • diff --git a/doc/apibuild.py b/doc/apibuild.py index b7fa22e3..2936d784 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -74,6 +74,7 @@ ignored_words = { "X_IN_Y": (5, "macro function builder"), "ATTRIBUTE_ALLOC_SIZE": (3, "macro for gcc checking extension"), "ATTRIBUTE_PRINTF": (5, "macro for gcc printf args checking extension"), + "LIBXML_ATTR_FORMAT": (5, "macro for gcc printf args checking extension"), } def escape(raw): diff --git a/doc/devhelp/libxml2-c14n.html b/doc/devhelp/libxml2-c14n.html index e60f229f..914500eb 100644 --- a/doc/devhelp/libxml2-c14n.html +++ b/doc/devhelp/libxml2-c14n.html @@ -43,11 +43,12 @@

    Author(s): Aleksey Sanin <aleksey@aleksey.com>

    Synopsis

    - 
    int	xmlC14NExecute			(xmlDocPtr doc, 
    					 xmlC14NIsVisibleCallback is_visible_callback, 
    					 void * user_data, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf);
-int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf);
+      
    typedef enum xmlC14NMode;
+int	xmlC14NExecute			(xmlDocPtr doc, 
    					 xmlC14NIsVisibleCallback is_visible_callback, 
    					 void * user_data, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf);
+int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf);
 typedef int xmlC14NIsVisibleCallback	(void * user_data, 
    					 xmlNodePtr node, 
    					 xmlNodePtr parent);
-int	xmlC14NDocSave			(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 const char * filename, 
    					 int compression);
-int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlChar ** doc_txt_ptr);
+int	xmlC14NDocSave			(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 const char * filename, 
    					 int compression);
+int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlChar ** doc_txt_ptr);
    @@ -56,25 +57,33 @@ int xmlC14NDocDumpMemory (

    Details

    +

    Enum xmlC14NMode

    enum xmlC14NMode {
+    XML_C14N_1_0 = 0 /* Origianal C14N 1.0 spec */
+    XML_C14N_EXCLUSIVE_1_0 = 1 /* Exclusive C14N 1.0 spec */
+    XML_C14N_1_1 = 2 /*  C14N 1.1 spec */
+};
+

    +

    +

    Function type xmlC14NIsVisibleCallback

    int	xmlC14NIsVisibleCallback	(void * user_data, 
    					     xmlNodePtr node, 
    					 xmlNodePtr parent)

    Signature for a C14N callback on visible nodes

    user_data:user data
    node:the curent node
    parent:the parent node
    Returns:1 if the node should be included
    -

    xmlC14NDocDumpMemory ()

    int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlChar ** doc_txt_ptr)
    
+        
    xmlC14NDocDumpMemory ()
    int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlChar ** doc_txt_ptr)
    
 
    Dumps the canonized image of given XML document into memory. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
    
-
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    doc_txt_ptr:the memory pointer for allocated canonical XML text; the caller of this functions is responsible for calling xmlFree() to free allocated memory
    Returns:the number of bytes written on success or a negative value on fail
    
+
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    mode:the c14n mode (see @xmlC14NMode)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    doc_txt_ptr:the memory pointer for allocated canonical XML text; the caller of this functions is responsible for calling xmlFree() to free allocated memory
    Returns:the number of bytes written on success or a negative value on fail
    -

    xmlC14NDocSave ()

    int	xmlC14NDocSave			(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 const char * filename, 
    					 int compression)
    
+        
    xmlC14NDocSave ()
    int	xmlC14NDocSave			(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 const char * filename, 
    					 int compression)
    
 
    Dumps the canonized image of given XML document into the file. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
    
-
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    filename:the filename to store canonical XML image
    compression:the compression level (zlib requred): -1 - libxml default, 0 - uncompressed, >0 - compression level
    Returns:the number of bytes written success or a negative value on fail
    
+
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    mode:the c14n mode (see @xmlC14NMode)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    filename:the filename to store canonical XML image
    compression:the compression level (zlib requred): -1 - libxml default, 0 - uncompressed, >0 - compression level
    Returns:the number of bytes written success or a negative value on fail
    -

    xmlC14NDocSaveTo ()

    int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf)
    
+        
    xmlC14NDocSaveTo ()
    int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
    					 xmlNodeSetPtr nodes, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf)
    
 
    Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
    
-
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
    Returns:non-negative value on success or a negative value on fail
    
+
    doc:the XML document for canonization
    nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
    mode:the c14n mode (see @xmlC14NMode)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
    Returns:non-negative value on success or a negative value on fail
    -

    xmlC14NExecute ()

    int	xmlC14NExecute			(xmlDocPtr doc, 
    					 xmlC14NIsVisibleCallback is_visible_callback, 
    					 void * user_data, 
    					 int exclusive, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf)
    
+        
    xmlC14NExecute ()
    int	xmlC14NExecute			(xmlDocPtr doc, 
    					 xmlC14NIsVisibleCallback is_visible_callback, 
    					 void * user_data, 
    					 int mode, 
    					 xmlChar ** inclusive_ns_prefixes, 
    					 int with_comments, 
    					 xmlOutputBufferPtr buf)
    
 
    Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
    
-
    doc:the XML document for canonization
    is_visible_callback:the function to use to determine is node visible or not
    user_data:the first parameter for @is_visible_callback function (in most cases, it is nodes set)
    exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
    Returns:non-negative value on success or a negative value on fail
    
+
    doc:the XML document for canonization
    is_visible_callback:the function to use to determine is node visible or not
    user_data:the first parameter for @is_visible_callback function (in most cases, it is nodes set)
    mode:the c14n mode (see @xmlC14NMode)
    inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
    with_comments:include comments in the result (!=0) or not (==0)
    buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
    Returns:non-negative value on success or a negative value on fail
    diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html index 28cc5a86..4b57b46f 100644 --- a/doc/devhelp/libxml2-xmlversion.html +++ b/doc/devhelp/libxml2-xmlversion.html @@ -44,7 +44,7 @@

    Synopsis

    #define LIBXML_VERSION_EXTRA;
-#define LIBXML_DOCB_ENABLED;
+#define LIBXML_MODULES_ENABLED;
 #define LIBXML_LEGACY_ENABLED;
 #define LIBXML_READER_ENABLED;
 #define LIBXML_THREAD_ENABLED;
@@ -53,8 +53,8 @@
 #define LIBXML_DEBUG_ENABLED;
 #define LIBXML_XINCLUDE_ENABLED;
 #define ATTRIBUTE_UNUSED;
-#define LIBXML_MODULES_ENABLED;
-#define ATTRIBUTE_PRINTF;
+#define LIBXML_DOCB_ENABLED;
+#define LIBXML_PUSH_ENABLED;
 #define LIBXML_SAX1_ENABLED;
 #define WITHOUT_TRIO;
 #define LIBXML_SCHEMATRON_ENABLED;
@@ -76,10 +76,10 @@
 #define LIBXML_AUTOMATA_ENABLED;
 #define LIBXML_ZLIB_ENABLED;
 #define ATTRIBUTE_ALLOC_SIZE;
-#define LIBXML_PUSH_ENABLED;
 #define LIBXML_C14N_ENABLED;
 #define LIBXML_SCHEMAS_ENABLED;
 #define DEBUG_MEMORY_LOCATION;
+#define LIBXML_ATTR_FORMAT;
 #define LIBXML_TEST_VERSION;
 #define LIBXML_XPATH_ENABLED;
 #define LIBXML_EXPR_ENABLED;
@@ -97,10 +97,6 @@ void	xmlCheckVersion			(int version);
       
    
         
    Macro ATTRIBUTE_ALLOC_SIZE
    #define ATTRIBUTE_ALLOC_SIZE;
 
    Macro used to indicate to GCC this is an allocator function
    
-
    
-        
    
-        
    Macro ATTRIBUTE_PRINTF
    #define ATTRIBUTE_PRINTF;
-
    Macro used to indicate to GCC the parameter are printf like
    
 
    
         
    
         
    Macro ATTRIBUTE_UNUSED
    #define ATTRIBUTE_UNUSED;
@@ -109,6 +105,10 @@ void	xmlCheckVersion			(int version);
         
    
         
    Macro DEBUG_MEMORY_LOCATION
    #define DEBUG_MEMORY_LOCATION;
 
    Whether the memory debugging is configured in
    
+
    
+        
    
+        
    Macro LIBXML_ATTR_FORMAT
    #define LIBXML_ATTR_FORMAT;
+
    Macro used to indicate to GCC the parameter are printf like
    
 
    
         
    
         
    Macro LIBXML_AUTOMATA_ENABLED
    #define LIBXML_AUTOMATA_ENABLED;
diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index ce525af1..9690218a 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -53,7 +53,6 @@
   
   
     
-    
     
     
     
@@ -92,6 +91,7 @@
     
     
     
+    
     
     
     
@@ -343,8 +343,11 @@
     
     
     
+    
+    
     
     
+    
     
     
     
@@ -1559,6 +1562,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/docs.html b/doc/docs.html
index f548f4c6..12efc21a 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -24,7 +24,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     documentation explaining how to use the libxml SAX interface.
   
  • George Lebl wrote an article
     for IBM developerWorks about using libxml.
    • 
-  
  • Check the TODO
+  
  • Check the TODO
     file.
    • 
   
  • Read the 1.x to 2.x upgrade path
     description. If you are starting a new project using libxml you should
diff --git a/doc/downloads.html b/doc/downloads.html
index 4b4adfa3..20f96027 100644
--- a/doc/downloads.html
+++ b/doc/downloads.html
@@ -28,7 +28,7 @@ Windows binaries made by Igor Zlatovic are available in the libxml-docs.tar.gz.
    • 
 
    Contributions:
    I do accept external contributions, especially if compiling on another
 platform,  get in touch with the list to upload the package, wrappers for
-various languages have been provided, and can be found in the bindings section
    Libxml2 is also available from SVN:
    • The Gnome SVN
+various languages have been provided, and can be found in the bindings section
      Libxml2 is also available from SVN:
      • The Gnome SVN
     base. Check the Gnome SVN Tools
     page; the SVN module is libxml2.
        
   
        • 
diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html
index dfcb9c5a..f17bea4f 100644
--- a/doc/html/libxml-c14n.html
+++ b/doc/html/libxml-c14n.html
@@ -10,23 +10,29 @@ A:link, A:visited, A:active { text-decoration: underline }
 Module c14n from libxml2
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module c14n from libxml2
        API Menu
        API Indexes
        Related links
        PrevSAX2UpAPI documentationHomeThe XML C parser and toolkit of GnomecatalogNext
        the c14n modules provides a  "Canonical XML" implementation
        Table of Contents
        int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlChar ** doc_txt_ptr)
        
-
        int	xmlC14NDocSave			(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 const char * filename, 
        					 int compression)
        
-
        int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
-
        int	xmlC14NExecute			(xmlDocPtr doc, 
        					 xmlC14NIsVisibleCallback is_visible_callback, 
        					 void * user_data, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
+    Module c14n from libxml2
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module c14n from libxml2
        API Menu
        API Indexes
        Related links
        PrevSAX2UpAPI documentationHomeThe XML C parser and toolkit of GnomecatalogNext
        the c14n modules provides a  "Canonical XML" implementation
        Table of Contents
        Enum xmlC14NMode
+
        int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlChar ** doc_txt_ptr)
        
+
        int	xmlC14NDocSave			(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 const char * filename, 
        					 int compression)
        
+
        int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
+
        int	xmlC14NExecute			(xmlDocPtr doc, 
        					 xmlC14NIsVisibleCallback is_visible_callback, 
        					 void * user_data, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
 
        Function type: xmlC14NIsVisibleCallback
 int	xmlC14NIsVisibleCallback	(void * user_data, 
        					 xmlNodePtr node, 
        					 xmlNodePtr parent)
 
        
 
        Description
        
-
        Function: xmlC14NDocDumpMemory
        int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlChar ** doc_txt_ptr)
        
+
        Enum xmlC14NMode
        Enum xmlC14NMode {
+    XML_C14N_1_0 = 0 : Origianal C14N 1.0 spec
+    XML_C14N_EXCLUSIVE_1_0 = 1 : Exclusive C14N 1.0 spec
+    XML_C14N_1_1 = 2 : C14N 1.1 spec
+}
+
        Function: xmlC14NDocDumpMemory
        int	xmlC14NDocDumpMemory		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlChar ** doc_txt_ptr)
        
 
        Dumps the canonized image of given XML document into memory. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
        
-
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        doc_txt_ptr:the memory pointer for allocated canonical XML text; the caller of this functions is responsible for calling xmlFree() to free allocated memory
        Returns:the number of bytes written on success or a negative value on fail
        Function: xmlC14NDocSave
        int	xmlC14NDocSave			(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 const char * filename, 
        					 int compression)
        
+
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        mode:the c14n mode (see @xmlC14NMode)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        doc_txt_ptr:the memory pointer for allocated canonical XML text; the caller of this functions is responsible for calling xmlFree() to free allocated memory
        Returns:the number of bytes written on success or a negative value on fail
        Function: xmlC14NDocSave
        int	xmlC14NDocSave			(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 const char * filename, 
        					 int compression)
        
 
        Dumps the canonized image of given XML document into the file. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
        
-
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        filename:the filename to store canonical XML image
        compression:the compression level (zlib requred): -1 - libxml default, 0 - uncompressed, >0 - compression level
        Returns:the number of bytes written success or a negative value on fail
        Function: xmlC14NDocSaveTo
        int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
+
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        mode:the c14n mode (see @xmlC14NMode)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        filename:the filename to store canonical XML image
        compression:the compression level (zlib requred): -1 - libxml default, 0 - uncompressed, >0 - compression level
        Returns:the number of bytes written success or a negative value on fail
        Function: xmlC14NDocSaveTo
        int	xmlC14NDocSaveTo		(xmlDocPtr doc, 
        					 xmlNodeSetPtr nodes, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
 
        Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
        
-
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
        Returns:non-negative value on success or a negative value on fail
        Function: xmlC14NExecute
        int	xmlC14NExecute			(xmlDocPtr doc, 
        					 xmlC14NIsVisibleCallback is_visible_callback, 
        					 void * user_data, 
        					 int exclusive, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
+
        doc:the XML document for canonization
        nodes:the nodes set to be included in the canonized image or NULL if all document nodes should be included
        mode:the c14n mode (see @xmlC14NMode)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
        Returns:non-negative value on success or a negative value on fail
        Function: xmlC14NExecute
        int	xmlC14NExecute			(xmlDocPtr doc, 
        					 xmlC14NIsVisibleCallback is_visible_callback, 
        					 void * user_data, 
        					 int mode, 
        					 xmlChar ** inclusive_ns_prefixes, 
        					 int with_comments, 
        					 xmlOutputBufferPtr buf)
        
 
        Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)
        
-
        doc:the XML document for canonization
        is_visible_callback:the function to use to determine is node visible or not
        user_data:the first parameter for @is_visible_callback function (in most cases, it is nodes set)
        exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
        Returns:non-negative value on success or a negative value on fail
        Function type: xmlC14NIsVisibleCallback
        Function type: xmlC14NIsVisibleCallback
+
        doc:the XML document for canonization
        is_visible_callback:the function to use to determine is node visible or not
        user_data:the first parameter for @is_visible_callback function (in most cases, it is nodes set)
        mode:the c14n mode (see @xmlC14NMode)
        inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
        with_comments:include comments in the result (!=0) or not (==0)
        buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
        Returns:non-negative value on success or a negative value on fail
        Function type: xmlC14NIsVisibleCallback
        Function type: xmlC14NIsVisibleCallback
 int	xmlC14NIsVisibleCallback	(void * user_data, 
        					 xmlNodePtr node, 
        					 xmlNodePtr parent)
 
        Signature for a C14N callback on visible nodes
        user_data:user data
        node:the curent node
        parent:the parent node
        Returns:1 if the node should be included

        
 
        Daniel Veillard
        
diff --git a/doc/html/libxml-xmlversion.html b/doc/html/libxml-xmlversion.html
index 3317c0a7..4d4d2eb7 100644
--- a/doc/html/libxml-xmlversion.html
+++ b/doc/html/libxml-xmlversion.html
@@ -10,12 +10,12 @@ A:link, A:visited, A:active { text-decoration: underline }
 Module xmlversion from libxml2
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module xmlversion from libxml2
        API Menu
        API Indexes
        Related links
        PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
        compile-time version informations for the XML library 
        Table of Contents
        #define ATTRIBUTE_ALLOC_SIZE
        #define ATTRIBUTE_PRINTF
        #define ATTRIBUTE_UNUSED
        #define DEBUG_MEMORY_LOCATION
        #define LIBXML_AUTOMATA_ENABLED
        #define LIBXML_C14N_ENABLED
        #define LIBXML_CATALOG_ENABLED
        #define LIBXML_DEBUG_ENABLED
        #define LIBXML_DEBUG_RUNTIME
        #define LIBXML_DOCB_ENABLED
        #define LIBXML_DOTTED_VERSION
        #define LIBXML_EXPR_ENABLED
        #define LIBXML_FTP_ENABLED
        #define LIBXML_HTML_ENABLED
        #define LIBXML_HTTP_ENABLED
        #define LIBXML_ICONV_ENABLED
        #define LIBXML_ISO8859X_ENABLED
        #define LIBXML_LEGACY_ENABLED
        #define LIBXML_MODULES_ENABLED
        #define LIBXML_MODULE_EXTENSION
        #define LIBXML_OUTPUT_ENABLED
        #define LIBXML_PATTERN_ENABLED
        #define LIBXML_PUSH_ENABLED
        #define LIBXML_READER_ENABLED
        #define LIBXML_REGEXP_ENABLED
        #define LIBXML_SAX1_ENABLED
        #define LIBXML_SCHEMAS_ENABLED
        #define LIBXML_SCHEMATRON_ENABLED
        #define LIBXML_TEST_VERSION
        #define LIBXML_THREAD_ENABLED
        #define LIBXML_TREE_ENABLED
        #define LIBXML_UNICODE_ENABLED
        #define LIBXML_VALID_ENABLED
        #define LIBXML_VERSION
        #define LIBXML_VERSION_EXTRA
        #define LIBXML_VERSION_STRING
        #define LIBXML_WRITER_ENABLED
        #define LIBXML_XINCLUDE_ENABLED
        #define LIBXML_XPATH_ENABLED
        #define LIBXML_XPTR_ENABLED
        #define LIBXML_ZLIB_ENABLED
        #define WITHOUT_TRIO
        #define WITH_TRIO
        void	xmlCheckVersion			(int version)
        
+    Module xmlversion from libxml2
        Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
        Made with Libxml2 Logo
        Module xmlversion from libxml2
        API Menu
        API Indexes
        Related links
        PrevxmlunicodeUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlwriterNext
        compile-time version informations for the XML library 
        Table of Contents
        #define ATTRIBUTE_ALLOC_SIZE
        #define ATTRIBUTE_UNUSED
        #define DEBUG_MEMORY_LOCATION
        #define LIBXML_ATTR_FORMAT
        #define LIBXML_AUTOMATA_ENABLED
        #define LIBXML_C14N_ENABLED
        #define LIBXML_CATALOG_ENABLED
        #define LIBXML_DEBUG_ENABLED
        #define LIBXML_DEBUG_RUNTIME
        #define LIBXML_DOCB_ENABLED
        #define LIBXML_DOTTED_VERSION
        #define LIBXML_EXPR_ENABLED
        #define LIBXML_FTP_ENABLED
        #define LIBXML_HTML_ENABLED
        #define LIBXML_HTTP_ENABLED
        #define LIBXML_ICONV_ENABLED
        #define LIBXML_ISO8859X_ENABLED
        #define LIBXML_LEGACY_ENABLED
        #define LIBXML_MODULES_ENABLED
        #define LIBXML_MODULE_EXTENSION
        #define LIBXML_OUTPUT_ENABLED
        #define LIBXML_PATTERN_ENABLED
        #define LIBXML_PUSH_ENABLED
        #define LIBXML_READER_ENABLED
        #define LIBXML_REGEXP_ENABLED
        #define LIBXML_SAX1_ENABLED
        #define LIBXML_SCHEMAS_ENABLED
        #define LIBXML_SCHEMATRON_ENABLED
        #define LIBXML_TEST_VERSION
        #define LIBXML_THREAD_ENABLED
        #define LIBXML_TREE_ENABLED
        #define LIBXML_UNICODE_ENABLED
        #define LIBXML_VALID_ENABLED
        #define LIBXML_VERSION
        #define LIBXML_VERSION_EXTRA
        #define LIBXML_VERSION_STRING
        #define LIBXML_WRITER_ENABLED
        #define LIBXML_XINCLUDE_ENABLED
        #define LIBXML_XPATH_ENABLED
        #define LIBXML_XPTR_ENABLED
        #define LIBXML_ZLIB_ENABLED
        #define WITHOUT_TRIO
        #define WITH_TRIO
        void	xmlCheckVersion			(int version)
        
 
        Description
        
 
        Macro: ATTRIBUTE_ALLOC_SIZE
        #define ATTRIBUTE_ALLOC_SIZE
        Macro used to indicate to GCC this is an allocator function
        
-
        Macro: ATTRIBUTE_PRINTF
        #define ATTRIBUTE_PRINTF
        Macro used to indicate to GCC the parameter are printf like
        
 
        Macro: ATTRIBUTE_UNUSED
        #define ATTRIBUTE_UNUSED
        Macro used to signal to GCC unused function parameters
        
 
        Macro: DEBUG_MEMORY_LOCATION
        #define DEBUG_MEMORY_LOCATION
        Whether the memory debugging is configured in
        
+
        Macro: LIBXML_ATTR_FORMAT
        #define LIBXML_ATTR_FORMAT
        Macro used to indicate to GCC the parameter are printf like
        
 
        Macro: LIBXML_AUTOMATA_ENABLED
        #define LIBXML_AUTOMATA_ENABLED
        Whether the automata interfaces are compiled in
        
 
        Macro: LIBXML_C14N_ENABLED
        #define LIBXML_C14N_ENABLED
        Whether the Canonicalization support is configured in
        
 
        Macro: LIBXML_CATALOG_ENABLED
        #define LIBXML_CATALOG_ENABLED
        Whether the Catalog support is configured in
        
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index af077c90..ce4b035f 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -217,6 +217,10 @@
      Provide Canonical XML and Exclusive XML Canonicalization
      the c14n modules provides a  "Canonical XML" implementation
      Aleksey Sanin <aleksey@aleksey.com> 
+     
+     
+     
+     
      
      
      
@@ -3336,7 +3340,7 @@
      compile-time version informations for the XML library 
      Daniel Veillard 
      
-     
+     
      
      
      
@@ -3345,8 +3349,8 @@
      
      
      
-     
-     
+     
+     
      
      
      
@@ -3368,10 +3372,10 @@
      
      
      
-     
      
      
      
+     
      
      
      
@@ -3771,9 +3775,6 @@
     
       Macro used to indicate to GCC this is an allocator function
     
-    
-      Macro used to indicate to GCC the parameter are printf like
-    
     
       Macro used to signal to GCC unused function parameters
     
@@ -3910,6 +3911,9 @@
       Same as IS_PUBIDCHAR but for single-byte value
       
     
+    
+      Macro used to indicate to GCC the parameter are printf like
+    
     
       Whether the automata interfaces are compiled in
     
@@ -4624,8 +4628,11 @@
     
     
     
+    
+    
     
     
+    
     
     
     
@@ -5927,6 +5934,7 @@ if necessary or NULL'/>
     
     
     
+    
     
     
     
@@ -8581,7 +8589,7 @@ Could we use @subtypes for this?'/>
       
       
       
-      
+      
       
       
       
@@ -8592,7 +8600,7 @@ Could we use @subtypes for this?'/>
       
       
       
-      
+      
       
       
       
@@ -8604,7 +8612,7 @@ Could we use @subtypes for this?'/>
       
       
       
-      
+      
       
       
       
@@ -8616,7 +8624,7 @@ Could we use @subtypes for this?'/>
       
       
       
-      
+      
       
       
       
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 4dbd5aa1..8bd731b6 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -2,7 +2,6 @@
 
   
     
-    
     
     
     
@@ -53,6 +52,7 @@
     
     
     
+    
     
     
     
@@ -143,8 +143,11 @@
     
     
     
+    
+    
     
     
+    
     
     
     
@@ -1769,6 +1772,7 @@
     
     
     
+    
     
     
     
@@ -3529,7 +3533,6 @@
   
     
       
-      
       
     
     
@@ -3592,6 +3595,7 @@
       
     
     
+      
       
       
       
@@ -3692,8 +3696,11 @@
       
       
       
+      
+      
       
       
+      
       
       
       
@@ -5354,6 +5361,7 @@
       
       
       
+      
       
       
       
@@ -10779,11 +10787,15 @@
       
     
     
+      
+      
+      
       
       
       
       
       
+      
     
     
       
@@ -13787,9 +13799,9 @@
     
     
       
-      
       
       
+      
       
       
       
@@ -15758,8 +15770,8 @@
       
         
           
-          
           
+          
         
         
           
@@ -19724,6 +19736,12 @@
     
     
       
+        
+          
+          
+          
+          
+        
         
           
         
@@ -22678,10 +22696,6 @@
           
           
           
-          
-          
-          
-          
           
           
         
@@ -23691,7 +23705,7 @@
         
         
           
-          
+          
           
           
           
@@ -24470,11 +24484,11 @@
           
         
         
-          
           
           
           
           
+          
           
           
           
@@ -25017,6 +25031,10 @@
           
           
           
+          
+          
+          
+          
           
           
           
@@ -25408,12 +25426,6 @@
         
           
         
-        
-          
-          
-          
-          
-        
         
           
           
diff --git a/doc/news.html b/doc/news.html
index 50d59a1a..3b625d4a 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,7 +12,7 @@ to help those
        The change log describes the recents commits
-to the SVN code base.
        Here is the list of public releases:
        2.7.3: Jan 18 2009
        • Build fix: fix build when HTML support is not included.
          • 
+to the SVN code base.
          Here is the list of public releases:
          2.7.3: Jan 18 2009
          • Build fix: fix build when HTML support is not included.
            • 
   
          • Bug fixes: avoid memory overflow in gigantic text nodes,
       indentation problem on the writed (Rob Richards),
       xmlAddChildList pointer problem (Rob Richards and Kevin Milburn),
diff --git a/testapi.c b/testapi.c
index 7f55f6f1..93c41566 100644
--- a/testapi.c
+++ b/testapi.c
@@ -5345,8 +5345,8 @@ test_xmlC14NDocDumpMemory(void) {
     int n_doc;
     xmlNodeSetPtr nodes; /* the nodes set to be included in the canonized image or NULL if all document nodes should be included */
     int n_nodes;
-    int exclusive; /* the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization) */
-    int n_exclusive;
+    int mode; /* the c14n mode (see @xmlC14NMode) */
+    int n_mode;
     xmlChar ** inclusive_ns_prefixes; /* the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) */
     int n_inclusive_ns_prefixes;
     int with_comments; /* include comments in the result (!=0) or not (==0) */
@@ -5356,24 +5356,24 @@ test_xmlC14NDocDumpMemory(void) {
 
     for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
     for (n_nodes = 0;n_nodes < gen_nb_xmlNodeSetPtr;n_nodes++) {
-    for (n_exclusive = 0;n_exclusive < gen_nb_int;n_exclusive++) {
+    for (n_mode = 0;n_mode < gen_nb_int;n_mode++) {
     for (n_inclusive_ns_prefixes = 0;n_inclusive_ns_prefixes < gen_nb_xmlChar_ptr_ptr;n_inclusive_ns_prefixes++) {
     for (n_with_comments = 0;n_with_comments < gen_nb_int;n_with_comments++) {
     for (n_doc_txt_ptr = 0;n_doc_txt_ptr < gen_nb_xmlChar_ptr_ptr;n_doc_txt_ptr++) {
         mem_base = xmlMemBlocks();
         doc = gen_xmlDocPtr(n_doc, 0);
         nodes = gen_xmlNodeSetPtr(n_nodes, 1);
-        exclusive = gen_int(n_exclusive, 2);
+        mode = gen_int(n_mode, 2);
         inclusive_ns_prefixes = gen_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, 3);
         with_comments = gen_int(n_with_comments, 4);
         doc_txt_ptr = gen_xmlChar_ptr_ptr(n_doc_txt_ptr, 5);
 
-        ret_val = xmlC14NDocDumpMemory(doc, nodes, exclusive, inclusive_ns_prefixes, with_comments, doc_txt_ptr);
+        ret_val = xmlC14NDocDumpMemory(doc, nodes, mode, inclusive_ns_prefixes, with_comments, doc_txt_ptr);
         desret_int(ret_val);
         call_tests++;
         des_xmlDocPtr(n_doc, doc, 0);
         des_xmlNodeSetPtr(n_nodes, nodes, 1);
-        des_int(n_exclusive, exclusive, 2);
+        des_int(n_mode, mode, 2);
         des_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, inclusive_ns_prefixes, 3);
         des_int(n_with_comments, with_comments, 4);
         des_xmlChar_ptr_ptr(n_doc_txt_ptr, doc_txt_ptr, 5);
@@ -5384,7 +5384,7 @@ test_xmlC14NDocDumpMemory(void) {
 	    test_ret++;
             printf(" %d", n_doc);
             printf(" %d", n_nodes);
-            printf(" %d", n_exclusive);
+            printf(" %d", n_mode);
             printf(" %d", n_inclusive_ns_prefixes);
             printf(" %d", n_with_comments);
             printf(" %d", n_doc_txt_ptr);
@@ -5414,8 +5414,8 @@ test_xmlC14NDocSave(void) {
     int n_doc;
     xmlNodeSetPtr nodes; /* the nodes set to be included in the canonized image or NULL if all document nodes should be included */
     int n_nodes;
-    int exclusive; /* the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization) */
-    int n_exclusive;
+    int mode; /* the c14n mode (see @xmlC14NMode) */
+    int n_mode;
     xmlChar ** inclusive_ns_prefixes; /* the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) */
     int n_inclusive_ns_prefixes;
     int with_comments; /* include comments in the result (!=0) or not (==0) */
@@ -5427,7 +5427,7 @@ test_xmlC14NDocSave(void) {
 
     for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
     for (n_nodes = 0;n_nodes < gen_nb_xmlNodeSetPtr;n_nodes++) {
-    for (n_exclusive = 0;n_exclusive < gen_nb_int;n_exclusive++) {
+    for (n_mode = 0;n_mode < gen_nb_int;n_mode++) {
     for (n_inclusive_ns_prefixes = 0;n_inclusive_ns_prefixes < gen_nb_xmlChar_ptr_ptr;n_inclusive_ns_prefixes++) {
     for (n_with_comments = 0;n_with_comments < gen_nb_int;n_with_comments++) {
     for (n_filename = 0;n_filename < gen_nb_fileoutput;n_filename++) {
@@ -5435,18 +5435,18 @@ test_xmlC14NDocSave(void) {
         mem_base = xmlMemBlocks();
         doc = gen_xmlDocPtr(n_doc, 0);
         nodes = gen_xmlNodeSetPtr(n_nodes, 1);
-        exclusive = gen_int(n_exclusive, 2);
+        mode = gen_int(n_mode, 2);
         inclusive_ns_prefixes = gen_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, 3);
         with_comments = gen_int(n_with_comments, 4);
         filename = gen_fileoutput(n_filename, 5);
         compression = gen_int(n_compression, 6);
 
-        ret_val = xmlC14NDocSave(doc, nodes, exclusive, inclusive_ns_prefixes, with_comments, filename, compression);
+        ret_val = xmlC14NDocSave(doc, nodes, mode, inclusive_ns_prefixes, with_comments, filename, compression);
         desret_int(ret_val);
         call_tests++;
         des_xmlDocPtr(n_doc, doc, 0);
         des_xmlNodeSetPtr(n_nodes, nodes, 1);
-        des_int(n_exclusive, exclusive, 2);
+        des_int(n_mode, mode, 2);
         des_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, inclusive_ns_prefixes, 3);
         des_int(n_with_comments, with_comments, 4);
         des_fileoutput(n_filename, filename, 5);
@@ -5458,7 +5458,7 @@ test_xmlC14NDocSave(void) {
 	    test_ret++;
             printf(" %d", n_doc);
             printf(" %d", n_nodes);
-            printf(" %d", n_exclusive);
+            printf(" %d", n_mode);
             printf(" %d", n_inclusive_ns_prefixes);
             printf(" %d", n_with_comments);
             printf(" %d", n_filename);
@@ -5490,8 +5490,8 @@ test_xmlC14NDocSaveTo(void) {
     int n_doc;
     xmlNodeSetPtr nodes; /* the nodes set to be included in the canonized image or NULL if all document nodes should be included */
     int n_nodes;
-    int exclusive; /* the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization) */
-    int n_exclusive;
+    int mode; /* the c14n mode (see @xmlC14NMode) */
+    int n_mode;
     xmlChar ** inclusive_ns_prefixes; /* the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) */
     int n_inclusive_ns_prefixes;
     int with_comments; /* include comments in the result (!=0) or not (==0) */
@@ -5501,24 +5501,24 @@ test_xmlC14NDocSaveTo(void) {
 
     for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) {
     for (n_nodes = 0;n_nodes < gen_nb_xmlNodeSetPtr;n_nodes++) {
-    for (n_exclusive = 0;n_exclusive < gen_nb_int;n_exclusive++) {
+    for (n_mode = 0;n_mode < gen_nb_int;n_mode++) {
     for (n_inclusive_ns_prefixes = 0;n_inclusive_ns_prefixes < gen_nb_xmlChar_ptr_ptr;n_inclusive_ns_prefixes++) {
     for (n_with_comments = 0;n_with_comments < gen_nb_int;n_with_comments++) {
     for (n_buf = 0;n_buf < gen_nb_xmlOutputBufferPtr;n_buf++) {
         mem_base = xmlMemBlocks();
         doc = gen_xmlDocPtr(n_doc, 0);
         nodes = gen_xmlNodeSetPtr(n_nodes, 1);
-        exclusive = gen_int(n_exclusive, 2);
+        mode = gen_int(n_mode, 2);
         inclusive_ns_prefixes = gen_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, 3);
         with_comments = gen_int(n_with_comments, 4);
         buf = gen_xmlOutputBufferPtr(n_buf, 5);
 
-        ret_val = xmlC14NDocSaveTo(doc, nodes, exclusive, inclusive_ns_prefixes, with_comments, buf);
+        ret_val = xmlC14NDocSaveTo(doc, nodes, mode, inclusive_ns_prefixes, with_comments, buf);
         desret_int(ret_val);
         call_tests++;
         des_xmlDocPtr(n_doc, doc, 0);
         des_xmlNodeSetPtr(n_nodes, nodes, 1);
-        des_int(n_exclusive, exclusive, 2);
+        des_int(n_mode, mode, 2);
         des_xmlChar_ptr_ptr(n_inclusive_ns_prefixes, inclusive_ns_prefixes, 3);
         des_int(n_with_comments, with_comments, 4);
         des_xmlOutputBufferPtr(n_buf, buf, 5);
@@ -5529,7 +5529,7 @@ test_xmlC14NDocSaveTo(void) {
 	    test_ret++;
             printf(" %d", n_doc);
             printf(" %d", n_nodes);
-            printf(" %d", n_exclusive);
+            printf(" %d", n_mode);
             printf(" %d", n_inclusive_ns_prefixes);
             printf(" %d", n_with_comments);
             printf(" %d", n_buf);