From a372cbf5821302ebaf757235b29ba812df78204d Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Thu, 27 Mar 2025 15:17:22 +0100 Subject: [PATCH] Update documentation for 2.14.0 --- doc/devhelp/general.html | 2 +- doc/devhelp/libxml2-HTMLparser.html | 200 ++-- doc/devhelp/libxml2-HTMLtree.html | 12 +- doc/devhelp/libxml2-SAX2.html | 28 +- doc/devhelp/libxml2-catalog.html | 16 +- doc/devhelp/libxml2-chvalid.html | 2 +- doc/devhelp/libxml2-debugXML.html | 583 +----------- doc/devhelp/libxml2-dict.html | 2 +- doc/devhelp/libxml2-encoding.html | 415 +++++++-- doc/devhelp/libxml2-entities.html | 50 +- doc/devhelp/libxml2-globals.html | 57 +- doc/devhelp/libxml2-list.html | 2 +- doc/devhelp/libxml2-nanohttp.html | 2 +- doc/devhelp/libxml2-parser.html | 1035 +++++++++++++++++---- doc/devhelp/libxml2-parserInternals.html | 545 ++--------- doc/devhelp/libxml2-pattern.html | 2 +- doc/devhelp/libxml2-relaxng.html | 26 + doc/devhelp/libxml2-schemasInternals.html | 182 ++-- doc/devhelp/libxml2-threads.html | 34 +- doc/devhelp/libxml2-tree.html | 882 ++++++++---------- doc/devhelp/libxml2-uri.html | 36 +- doc/devhelp/libxml2-valid.html | 182 ++-- doc/devhelp/libxml2-xinclude.html | 26 + doc/devhelp/libxml2-xlink.html | 8 +- doc/devhelp/libxml2-xmlIO.html | 142 +-- doc/devhelp/libxml2-xmlerror.html | 53 +- doc/devhelp/libxml2-xmlmemory.html | 4 +- doc/devhelp/libxml2-xmlreader.html | 80 +- doc/devhelp/libxml2-xmlregexp.html | 578 +----------- doc/devhelp/libxml2-xmlsave.html | 39 +- doc/devhelp/libxml2-xmlschemas.html | 48 +- doc/devhelp/libxml2-xmlstring.html | 12 +- doc/devhelp/libxml2-xmlversion.html | 49 +- doc/devhelp/libxml2-xmlwriter.html | 51 +- doc/devhelp/libxml2-xpath.html | 125 ++- doc/devhelp/libxml2-xpathInternals.html | 138 +-- doc/devhelp/libxml2-xpointer.html | 472 +--------- doc/devhelp/libxml2.devhelp2 | 462 ++------- doc/libxml2-api.xml | 2 +- doc/xmllint.1 | 6 +- doc/xmllint.html | 3 + 41 files changed, 2560 insertions(+), 4033 deletions(-) diff --git a/doc/devhelp/general.html b/doc/devhelp/general.html index 8b7ae7ba..1212cdd3 100644 --- a/doc/devhelp/general.html +++ b/doc/devhelp/general.html @@ -16,6 +16,6 @@ libxml2 Reference Manual

libxml2 API Modules

-

HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX - Old SAX version 1 handler, deprecated
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanoftp - minimal FTP implementation
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines and limits exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schematron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlunicode - Unicode character APIs
xmlversion - compile-time version information
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

+

HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines and limits exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schematron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlversion - compile-time version information
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

diff --git a/doc/devhelp/libxml2-HTMLparser.html b/doc/devhelp/libxml2-HTMLparser.html index 22942a88..6e6d1c53 100644 --- a/doc/devhelp/libxml2-HTMLparser.html +++ b/doc/devhelp/libxml2-HTMLparser.html @@ -21,7 +21,8 @@

Author(s): Daniel Veillard

Synopsis

-
#define htmlDefaultSubelement(elt);
+
#define UTF8ToHtml;
+#define htmlDefaultSubelement(elt);
 #define htmlElementAllowedHereDesc(parent, elt);
 #define htmlRequiredAttrs(elt);
 typedef xmlDocPtr htmlDocPtr;
@@ -39,7 +40,6 @@ typedef enum htmlParserOption;
 typedef xmlSAXHandler htmlSAXHandler;
 typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;
 typedef enum htmlStatus;
-int	UTF8ToHtml			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
 htmlStatus	htmlAttrAllowed		(const htmlElemDesc * elt, 
					 const xmlChar * attr, 
					 int legacy);
 int	htmlAutoCloseTag		(htmlDocPtr doc, 
					 const xmlChar * name, 
					 htmlNodePtr elem);
 htmlParserCtxtPtr	htmlCreateFileParserCtxt	(const char * filename, 
							 const char * encoding);
@@ -52,6 +52,7 @@ int	htmlAutoCloseTag		(htmlDocPtr	htmlCtxtReadIO		(htmlParserCtxtPtr ctxt, 
					 xmlInputReadCallback ioread, 
					 xmlInputCloseCallback ioclose, 
					 void * ioctx, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
 htmlDocPtr	htmlCtxtReadMemory	(htmlParserCtxtPtr ctxt, 
					 const char * buffer, 
					 int size, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
 void	htmlCtxtReset			(htmlParserCtxtPtr ctxt);
+int	htmlCtxtSetOptions		(xmlParserCtxtPtr ctxt, 
					 int options);
 int	htmlCtxtUseOptions		(htmlParserCtxtPtr ctxt, 
					 int options);
 int	htmlElementAllowedHere		(const htmlElemDesc * parent, 
					 const xmlChar * elt);
 htmlStatus	htmlElementStatusHere	(const htmlElemDesc * parent, 
					 const htmlElemDesc * elt);
@@ -81,6 +82,7 @@ const htmlEntityDesc *	htmlDocPtr	htmlSAXParseDoc		(const xmlChar * cur, 
					 const char * encoding, 
					 htmlSAXHandlerPtr sax, 
					 void * userData);
 htmlDocPtr	htmlSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 htmlSAXHandlerPtr sax, 
					 void * userData);
 const htmlElemDesc *	htmlTagLookup	(const xmlChar * tag);
+int	htmlUTF8ToHtml			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);

Description

@@ -89,6 +91,14 @@ const htmlElemDesc *

+Macro UTF8ToHtml

+
#define UTF8ToHtml;
+
+

+
+
+
+

Macro htmlDefaultSubelement

#define htmlDefaultSubelement(elt);
@@ -150,20 +160,21 @@ const htmlElemDesc * Structure htmlElemDesc 
struct _htmlElemDesc {
-    const char *	name	: The tag name
-    char	startTag	: Whether the start tag can be implied
-    char	endTag	: Whether the end tag can be implied
-    char	saveEndTag	: Whether the end tag should be saved
-    char	empty	: Is this an empty element ?
-    char	depr	: Is this a deprecated element ?
-    char	dtd	: 1: only in Loose DTD, 2: only Frameset one
-    char	isinline	: is this a block 0 or inline 1 element
-    const char *	desc	: the description NRK Jan.2003 * New fields encapsulating HTML structur
-    const char **	subelts	: allowed sub-elements of this element
-    const char *	defaultsubelt	: subelement for suggested auto-repair if necessary or NULL
-    const char **	attrs_opt	: Optional Attributes
-    const char **	attrs_depr	: Additional deprecated attributes
-    const char **	attrs_req	: Required attributes
+    const char *	name
+    char	startTag
+    char	endTag
+    char	saveEndTag
+    char	empty
+    char	depr
+    char	dtd
+    char	isinline
+    const char *	desc
+    const char **	subelts
+    const char *	defaultsubelt
+    const char **	attrs_opt
+    const char **	attrs_depr
+    const char **	attrs_req
+    int	dataMode
 } htmlElemDesc;

@@ -181,9 +192,9 @@ const htmlElemDesc * Structure htmlEntityDesc 
struct _htmlEntityDesc {
-    unsigned int	value	: the UNICODE value for the character
-    const char *	name	: The entity name
-    const char *	desc	: the description
+    unsigned int	value
+    const char *	name
+    const char *	desc
 } htmlEntityDesc;

@@ -249,16 +260,19 @@ const htmlElemDesc * Enum htmlParserOption 
enum htmlParserOption {
-    HTML_PARSE_RECOVER = 1 /* Relaxed parsing */
+    HTML_PARSE_RECOVER = 1 /* No effect */
+    HTML_PARSE_HTML5 = 2 /* HTML5 support */
     HTML_PARSE_NODEFDTD = 4 /* do not default a doctype if not found */
     HTML_PARSE_NOERROR = 32 /* suppress error reports */
     HTML_PARSE_NOWARNING = 64 /* suppress warning reports */
-    HTML_PARSE_PEDANTIC = 128 /* pedantic error reporting */
+    HTML_PARSE_PEDANTIC = 128 /* No effect */
     HTML_PARSE_NOBLANKS = 256 /* remove blank nodes */
-    HTML_PARSE_NONET = 2048 /* Forbid network access */
+    HTML_PARSE_NONET = 2048 /* No effect */
     HTML_PARSE_NOIMPLIED = 8192 /* Do not add implied html/body... elements */
     HTML_PARSE_COMPACT = 65536 /* compact small text nodes */
-    HTML_PARSE_IGNORE_ENC = 2097152 /*  ignore internal document encoding hint */
+    HTML_PARSE_HUGE = 524288 /* relax any hardcoded limit from the parser */
+    HTML_PARSE_IGNORE_ENC = 2097152 /* ignore internal document encoding hint */
+    HTML_PARSE_BIG_LINES = 4194304 /*  Store big lines numbers in text PSVI field */
 };

@@ -304,43 +318,10 @@ const htmlElemDesc *

-UTF8ToHtml ()

-
int	UTF8ToHtml			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

-
-

Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out.

-
-- - - - - - - - - - - - - - - - - - - - - - -
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:0 if success, -2 if the transcoding fails, or -1 otherwise The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.
-
-
-
-

htmlAttrAllowed ()

htmlStatus	htmlAttrAllowed		(const htmlElemDesc * elt, 
					 const xmlChar * attr, 
					 int legacy)
-

Checks whether an attribute is valid for an element Has full knowledge of Required and Deprecated attributes

+

DEPRECATED: Don't use.

@@ -350,8 +331,7 @@ const htmlElemDesc * - + @@ -359,8 +339,7 @@ const htmlElemDesc * - +
attr:HTML attribute -HTML attribute
legacy:
Returns:one of HTML_REQUIRED, HTML_VALID, HTML_DEPRECATED, HTML_INVALID -HTML_VALID
@@ -371,7 +350,7 @@ const htmlElemDesc * htmlAutoCloseTag () 
int	htmlAutoCloseTag		(htmlDocPtr doc, 
					 const xmlChar * name, 
					 htmlNodePtr elem)
-

The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag.

+

DEPRECATED: Internal function, don't use. The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag.

@@ -590,7 +569,7 @@ const htmlElemDesc * htmlCtxtReadFile ()
htmlDocPtr	htmlCtxtReadFile	(htmlParserCtxtPtr ctxt, 
					 const char * filename, 
					 const char * encoding, 
					 int options)
-

Parse an HTML file from the filesystem, the network or a user-defined resource loader. See xmlNewInputURL and htmlCtxtUseOptions for details.

+

Parse an HTML file from the filesystem, the network or a user-defined resource loader. See htmlCtxtUseOptions for details.

@@ -623,7 +602,7 @@ const htmlElemDesc * htmlCtxtReadIO ()
htmlDocPtr	htmlCtxtReadIO		(htmlParserCtxtPtr ctxt, 
					 xmlInputReadCallback ioread, 
					 xmlInputCloseCallback ioclose, 
					 void * ioctx, 
					 const char * URL, 
					 const char * encoding, 
					 int options)
-

Parse an HTML document from I/O functions and source and build a tree. See xmlNewInputIO and htmlCtxtUseOptions for details.

+

Parse an HTML document from I/O functions and source and build a tree. See htmlCtxtUseOptions for details.

@@ -721,10 +700,35 @@ const htmlElemDesc *

+htmlCtxtSetOptions ()

+
int	htmlCtxtSetOptions		(xmlParserCtxtPtr ctxt, 
					 int options)

+
+

Applies the options to the parser context. Unset options are cleared. Available since 2.14.0. With older versions, you can use htmlCtxtUseOptions. HTML_PARSE_RECOVER No effect as of 2.14.0. HTML_PARSE_HTML5 Make the tokenizer emit a SAX callback for each token. This results in unbalanced invocations of startElement and endElement. For now, this is only usable with custom SAX callbacks. HTML_PARSE_NODEFDTD Do not default to a doctype if none was found. HTML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. HTML_PARSE_NOWARNING Disable warning reports. HTML_PARSE_PEDANTIC No effect. HTML_PARSE_NOBLANKS Remove some text nodes containing only whitespace from the result document. Which nodes are removed depends on a conservative heuristic. The reindenting feature of the serialization code relies on this option to be set when parsing. Use of this option is DISCOURAGED. HTML_PARSE_NONET No effect. HTML_PARSE_NOIMPLIED Do not add implied html, head or body elements. HTML_PARSE_COMPACT Store small strings directly in the node struct to save memory. HTML_PARSE_HUGE Relax some internal limits. Available since 2.14.0. Use XML_PARSE_HUGE works with older versions. Maximum size of text nodes, tags, comments, CDATA sections normal: 10M huge: 1B Maximum size of names, system literals, pubid literals normal: 50K huge: 10M Maximum nesting depth of elements normal: 256 huge: 2048 HTML_PARSE_IGNORE_ENC Ignore the encoding in the HTML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. HTML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535. Available since 2.14.0.

+
++ + + + + + + + + + + + + + +
ctxt:an HTML parser context
options:a bitmask of xmlParserOption values
Returns:0 in case of success, the set of unknown or unimplemented options in case of error.
+
+
+
+

htmlCtxtUseOptions ()

int	htmlCtxtUseOptions		(htmlParserCtxtPtr ctxt, 
					 int options)
-

Applies the options to the parser context

+

DEPRECATED: Use htmlCtxtSetOptions. Applies the options to the parser context. The following options are never cleared and can only be enabled: HTML_PARSE_NODEFDTD HTML_PARSE_NOERROR HTML_PARSE_NOWARNING HTML_PARSE_NOIMPLIED HTML_PARSE_COMPACT HTML_PARSE_HUGE HTML_PARSE_IGNORE_ENC HTML_PARSE_BIG_LINES

@@ -749,7 +753,7 @@ const htmlElemDesc * htmlElementAllowedHere ()
int	htmlElementAllowedHere		(const htmlElemDesc * parent, 
					 const xmlChar * elt)
-

Checks whether an HTML element may be a direct child of a parent element. Note - doesn't check for deprecated elements

+

DEPRECATED: Don't use.

@@ -763,7 +767,7 @@ const htmlElemDesc * - +
Returns:1 if allowed; 0 otherwise.1
@@ -774,7 +778,7 @@ const htmlElemDesc * htmlElementStatusHere () 
htmlStatus	htmlElementStatusHere	(const htmlElemDesc * parent, 
					 const htmlElemDesc * elt)
-

Checks whether an HTML element may be a direct child of a parent element. and if so whether it is valid or deprecated.

+

DEPRECATED: Don't use.

@@ -788,8 +792,7 @@ const htmlElemDesc * - +
Returns:one of HTML_VALID, HTML_DEPRECATED, HTML_INVALID -HTML_VALID
@@ -923,7 +926,7 @@ const htmlElemDesc * htmlIsAutoClosed () 
int	htmlIsAutoClosed		(htmlDocPtr doc, 
					 htmlNodePtr elem)
-

The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child

+

DEPRECATED: Internal function, don't use. The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child

@@ -948,17 +951,17 @@ const htmlElemDesc * htmlIsScriptAttribute ()
int	htmlIsScriptAttribute		(const xmlChar * name)
-

Check if an attribute is of content type Script

+

Check if an attribute is of content type Script

- + - +
name:an attribute namean attribute name
Returns:1 is the attribute is a script 0 otherwise1 is the attribute is a script 0 otherwise
@@ -969,7 +972,7 @@ const htmlElemDesc * htmlNewParserCtxt () 
htmlParserCtxtPtr	htmlNewParserCtxt	(void)
-

Allocate and initialize a new HTML parser context. This can be used to parse HTML documents into DOM trees with functions like xmlCtxtReadFile or xmlCtxtReadMemory. See htmlCtxtUseOptions for parser options. See xmlCtxtSetErrorHandler for advanced error handling. See xmlNewInputURL, xmlNewInputMemory, xmlNewInputIO and similar functions for advanced input control. See htmlNewSAXParserCtxt for custom SAX parsers.

+

Allocate and initialize a new HTML parser context. This can be used to parse HTML documents into DOM trees with functions like xmlCtxtReadFile or xmlCtxtReadMemory. See htmlCtxtUseOptions for parser options. See xmlCtxtSetErrorHandler for advanced error handling. See htmlNewSAXParserCtxt for custom SAX parsers.

@@ -1009,7 +1012,7 @@ const htmlElemDesc * htmlNodeStatus ()
htmlStatus	htmlNodeStatus		(htmlNodePtr node, 
					 int legacy)
-

Checks whether the tree node is valid. Experimental (the author only uses the HTML enhancements in a SAX parser)

+

DEPRECATED: Don't use.

@@ -1023,7 +1026,7 @@ const htmlElemDesc * - +
Returns:for Element nodes, a return from htmlElementAllowedHere (if legacy allowed) or htmlElementStatusHere (otherwise). for Attribute nodes, a return from htmlAttrAllowed for other nodes, HTML_NA (no checks performed)HTML_VALID
@@ -1034,7 +1037,7 @@ const htmlElemDesc * htmlParseCharRef () 
int	htmlParseCharRef		(htmlParserCtxtPtr ctxt)
-

DEPRECATED: Internal function, don't use. parse Reference declarations [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'

+

DEPRECATED: Internal function, don't use.

@@ -1044,7 +1047,7 @@ const htmlElemDesc * - +
Returns:the value parsed (as an int)0
@@ -1150,7 +1153,7 @@ const htmlElemDesc * htmlParseEntityRef () 
const htmlEntityDesc *	htmlParseEntityRef	(htmlParserCtxtPtr ctxt, 
						 const xmlChar ** str)
-

DEPRECATED: Internal function, don't use. parse an HTML ENTITY references [68] EntityRef ::= '&' Name ';'

+

DEPRECATED: Internal function, don't use.

@@ -1164,7 +1167,7 @@ const htmlElemDesc * - +
Returns:the associated htmlEntityDescPtr if found, or NULL otherwise, if non-NULL *str will have to be freed by the caller.NULL.
@@ -1175,7 +1178,7 @@ const htmlElemDesc * htmlParseFile () 
htmlDocPtr	htmlParseFile		(const char * filename, 
					 const char * encoding)
-

Parse an HTML file and build a tree. See xmlNewInputURL for details.

+

Parse an HTML file and build a tree.

@@ -1456,6 +1459,39 @@ const htmlElemDesc *
+
+

+htmlUTF8ToHtml ()

+
int	htmlUTF8ToHtml			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

+
+

Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out.

+
++ + + + + + + + + + + + + + + + + + + + + + +
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:0 if success, -2 if the transcoding fails, or -1 otherwise The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.
+
+
diff --git a/doc/devhelp/libxml2-HTMLtree.html b/doc/devhelp/libxml2-HTMLtree.html index 7e60ab61..80662663 100644 --- a/doc/devhelp/libxml2-HTMLtree.html +++ b/doc/devhelp/libxml2-HTMLtree.html @@ -13,7 +13,7 @@ Prev Up Home -Next +Next libxml2 Reference Manual

HTMLtree

@@ -56,7 +56,7 @@ int htmlSetMetaEncoding (Macro HTML_COMMENT_NODE 
#define HTML_COMMENT_NODE;
-

Macro. A comment in a HTML document is really implemented the same way as a comment in an XML document.

+

Macro. A comment in a HTML document is really implemented the same way as a comment in an XML document.

@@ -64,7 +64,7 @@ int htmlSetMetaEncoding (Macro HTML_ENTITY_REF_NODE 
#define HTML_ENTITY_REF_NODE;
-

Macro. An entity reference in a HTML document is really implemented the same way as an entity reference in an XML document.

+

Macro. An entity reference in a HTML document is really implemented the same way as an entity reference in an XML document.

@@ -250,17 +250,17 @@ int htmlSetMetaEncoding (htmlIsBooleanAttr () 
int	htmlIsBooleanAttr		(const xmlChar * name)
-

Determine if a given attribute is a boolean attribute.

+

DEPRECATED: Internal function, don't use. Determine if a given attribute is a boolean attribute.

- + - +
name:the name of the attribute to checkthe name of the attribute to check
Returns:false if the attribute is not boolean, true otherwise.false if the attribute is not boolean, true otherwise.
diff --git a/doc/devhelp/libxml2-SAX2.html b/doc/devhelp/libxml2-SAX2.html index 410229ce..b4ac60bb 100644 --- a/doc/devhelp/libxml2-SAX2.html +++ b/doc/devhelp/libxml2-SAX2.html @@ -10,7 +10,7 @@ - + @@ -85,7 +85,7 @@ int xmlSAXVersion (xmlSAX2AttributeDecl ()
void	xmlSAX2AttributeDecl		(void * ctx, 
					 const xmlChar * elem, 
					 const xmlChar * fullname, 
					 int type, 
					 int def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree)
-

An attribute definition has been parsed

+

An attribute definition has been parsed

PrevPrev Up Home Next
@@ -99,11 +99,11 @@ int xmlSAXVersion (fullname: - + - + @@ -111,7 +111,7 @@ int xmlSAXVersion (defaultValue: - + @@ -242,7 +242,7 @@ int xmlSAXVersion (xmlSAX2EndElement ()
void	xmlSAX2EndElement		(void * ctx, 
					 const xmlChar * name)
-

called when the end of an element has been detected.

+

DEPRECATED: Don't call this function directly. called when the end of an element has been detected. Used for HTML and SAX1.

the attribute namethe attribute name
type:the attribute typethe attribute type
def:the attribute default valuethe attribute default value
tree:
@@ -721,7 +721,7 @@ int xmlSAXVersion (xmlSAX2ResolveEntity ()
xmlParserInputPtr	xmlSAX2ResolveEntity	(void * ctx, 
						 const xmlChar * publicId, 
						 const xmlChar * systemId)
-

The entity loader, to control the loading of external entities, the application can either: - override this xmlSAX2ResolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it's own entity resolution routine

+

This is only used to load DTDs. The preferred way to install custom resolvers is xmlCtxtSetResourceLoader.

@@ -739,7 +739,7 @@ int xmlSAXVersion (Returns: - +
the xmlParserInputPtr if inlined or NULL for DOM behaviour.a parser input.
@@ -750,7 +750,7 @@ int xmlSAXVersion (xmlSAX2SetDocumentLocator () 
void	xmlSAX2SetDocumentLocator	(void * ctx, 
					 xmlSAXLocatorPtr loc)
-

Receive the document locator at startup, actually xmlDefaultSAXLocator Everything is available on the context, so this is useless in our case.

+

Receive the document locator at startup, actually xmlDefaultSAXLocator Everything is available on the context, so this is useless in our case.

@@ -786,7 +786,7 @@ int xmlSAXVersion (xmlSAX2StartElement ()
void	xmlSAX2StartElement		(void * ctx, 
					 const xmlChar * fullname, 
					 const xmlChar ** atts)
-

called when an opening tag has been processed.

+

DEPRECATED: Don't call this function directly. Called when an opening tag has been processed. Used for HTML and SAX1.

@@ -849,7 +849,7 @@ int xmlSAXVersion (attributes: - +
pointer to the array of (localname/prefix/URI/value/end) attribute values.pointer to the array of (localname/prefix/URI/value/end) attribute values.
@@ -893,17 +893,17 @@ int xmlSAXVersion (xmlSAXDefaultVersion () 
int	xmlSAXDefaultVersion		(int version)
-

DEPRECATED: Use parser option XML_PARSE_SAX1. Set the default version of SAX used globally by the library. By default, during initialization the default is set to 2. Note that it is generally a better coding style to use xmlSAXVersion() to set up the version explicitly for a given parsing context.

+

DEPRECATED: Use parser option XML_PARSE_SAX1. Has no effect.

- + - +
version:the version, 1 or 2the version, must be 2
Returns:the previous value in case of success and -1 in case of error.2 in case of success and -1 in case of error.
diff --git a/doc/devhelp/libxml2-catalog.html b/doc/devhelp/libxml2-catalog.html index 39d65dcd..f00b095f 100644 --- a/doc/devhelp/libxml2-catalog.html +++ b/doc/devhelp/libxml2-catalog.html @@ -242,7 +242,7 @@ The content of this structure is not made public by the API. xmlACatalogResolvePublic () 
xmlChar *	xmlACatalogResolvePublic	(xmlCatalogPtr catal, 
						 const xmlChar * pubID)
-

Try to lookup the catalog local reference associated to a public ID in that catalog

+

Try to lookup the catalog local reference associated to a public ID in that catalog

@@ -424,7 +424,7 @@ The content of this structure is not made public by the API. xmlCatalogGetDefaults ()
xmlCatalogAllow	xmlCatalogGetDefaults	(void)
-

Used to get the user preference w.r.t. to what catalogs should be accepted

+

DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_CATALOG_PI. Used to get the user preference w.r.t. to what catalogs should be accepted

@@ -439,7 +439,7 @@ The content of this structure is not made public by the API. xmlCatalogGetPublic ()
const xmlChar *	xmlCatalogGetPublic	(const xmlChar * pubID)
-

Try to lookup the catalog reference associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()

+

Try to lookup the catalog reference associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()

@@ -460,7 +460,7 @@ The content of this structure is not made public by the API. xmlCatalogGetSystem ()
const xmlChar *	xmlCatalogGetSystem	(const xmlChar * sysID)
-

Try to lookup the catalog reference associated to a system ID DEPRECATED, use xmlCatalogResolveSystem()

+

Try to lookup the catalog reference associated to a system ID DEPRECATED, use xmlCatalogResolveSystem()

@@ -602,7 +602,7 @@ The content of this structure is not made public by the API. xmlCatalogResolvePublic ()
xmlChar *	xmlCatalogResolvePublic	(const xmlChar * pubID)
-

Try to lookup the catalog reference associated to a public ID

+

Try to lookup the catalog reference associated to a public ID

@@ -686,7 +686,7 @@ The content of this structure is not made public by the API. xmlCatalogSetDefaultPrefer ()
xmlCatalogPrefer	xmlCatalogSetDefaultPrefer	(xmlCatalogPrefer prefer)
-

Allows to set the preference between public and system for deletion in XML Catalog resolution. C.f. section 4.1.1 of the spec Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM

+

DEPRECATED: This setting is global and not thread-safe. Allows to set the preference between public and system for deletion in XML Catalog resolution. C.f. section 4.1.1 of the spec Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM

@@ -707,7 +707,7 @@ The content of this structure is not made public by the API. xmlCatalogSetDefaults ()
void	xmlCatalogSetDefaults		(xmlCatalogAllow allow)
-

Used to set the user preference w.r.t. to what catalogs should be accepted

+

DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_CATALOG_PI. Used to set the user preference w.r.t. to what catalogs should be accepted

@@ -758,7 +758,7 @@ The content of this structure is not made public by the API. xmlInitializeCatalog ()
void	xmlInitializeCatalog		(void)
-

Do the catalog initialization. this function is not thread safe, catalog initialization should preferably be done once at startup

+

Load the default system catalog.

diff --git a/doc/devhelp/libxml2-chvalid.html b/doc/devhelp/libxml2-chvalid.html index 121c9ffa..8eba8386 100644 --- a/doc/devhelp/libxml2-chvalid.html +++ b/doc/devhelp/libxml2-chvalid.html @@ -292,7 +292,7 @@ int xmlIsPubidChar (unsigned int ch); 
struct _xmlChRangeGroup {
     int	nbShortRange
     int	nbLongRange
-    const xmlChSRange *	shortRange	: points to an array of ranges
+    const xmlChSRange *	shortRange
     const xmlChLRange *	longRange
 } xmlChRangeGroup;
diff --git a/doc/devhelp/libxml2-debugXML.html b/doc/devhelp/libxml2-debugXML.html index ec134dc1..3433670e 100644 --- a/doc/devhelp/libxml2-debugXML.html +++ b/doc/devhelp/libxml2-debugXML.html @@ -22,10 +22,7 @@

Author(s): Daniel Veillard

Synopsis

-
typedef struct _xmlShellCtxt xmlShellCtxt;
-typedef xmlShellCtxt * xmlShellCtxtPtr;
-const char *	xmlBoolToText		(int boolval);
-int	xmlDebugCheckDocument		(FILE * output, 
					 xmlDocPtr doc);
+
int	xmlDebugCheckDocument		(FILE * output, 
					 xmlDocPtr doc);
 void	xmlDebugDumpAttr		(FILE * output, 
					 xmlAttrPtr attr, 
					 int depth);
 void	xmlDebugDumpAttrList		(FILE * output, 
					 xmlAttrPtr attr, 
					 int depth);
 void	xmlDebugDumpDTD			(FILE * output, 
					 xmlDtdPtr dtd);
@@ -36,24 +33,6 @@ void	xmlDebugDumpNode		(FILE * output, 

 void	xmlDebugDumpNodeList		(FILE * output, 
					 xmlNodePtr node, 
					 int depth);
 void	xmlDebugDumpOneNode		(FILE * output, 
					 xmlNodePtr node, 
					 int depth);
 void	xmlDebugDumpString		(FILE * output, 
					 const xmlChar * str);
-int	xmlLsCountNode			(xmlNodePtr node);
-void	xmlLsOneNode			(FILE * output, 
					 xmlNodePtr node);
-void	xmlShell			(xmlDocPtr doc, 
					 const char * filename, 
					 xmlShellReadlineFunc input, 
					 FILE * output);
-int	xmlShellBase			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellCat			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-typedef int xmlShellCmd			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellDir			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellDu			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr tree, 
					 xmlNodePtr node2);
-int	xmlShellList			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellLoad			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-void	xmlShellPrintNode		(xmlNodePtr node);
-void	xmlShellPrintXPathError		(int errorType, 
					 const char * arg);
-void	xmlShellPrintXPathResult	(xmlXPathObjectPtr list);
-int	xmlShellPwd			(xmlShellCtxtPtr ctxt, 
					 char * buffer, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-typedef char * xmlShellReadlineFunc		(char * prompt);
-int	xmlShellSave			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellValidate		(xmlShellCtxtPtr ctxt, 
					 char * dtd, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);
-int	xmlShellWrite			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2);

Description

@@ -62,105 +41,6 @@ int xmlShellWrite (

-Structure xmlShellCtxt

-
struct _xmlShellCtxt {
-    char *	filename
-    xmlDocPtr	doc
-    xmlNodePtr	node
-    xmlXPathContextPtr	pctxt
-    int	loaded
-    FILE *	output
-    xmlShellReadlineFunc	input
-} xmlShellCtxt;
-
-

-
-
-
-

-Typedef xmlShellCtxtPtr

-
xmlShellCtxt * xmlShellCtxtPtr;
-
-

-
-
-
-

-Function type xmlShellCmd

-
int	xmlShellCmd			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

This is a generic signature for the XML shell functions.

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:a shell context
arg:a string argument
node:a first node
node2:a second node
Returns:an int, negative returns indicating errors.
- -
-
-

-Function type xmlShellReadlineFunc

-
char *	xmlShellReadlineFunc		(char * prompt)

-
-

This is a generic signature for the XML shell input function.

-
-- - - - - - - - - - -
prompt:a string prompt
Returns:a string which will be freed by the Shell.
-
-
-
-

-xmlBoolToText ()

-
const char *	xmlBoolToText		(int boolval)

-
-

Convenient way to turn bool into text

-
-- - - - - - - - - - -
boolval:a bool to turn into text
Returns:a pointer to either "True" or "False"
-
-
-
-

xmlDebugCheckDocument ()

int	xmlDebugCheckDocument		(FILE * output, 
					 xmlDocPtr doc)
@@ -189,7 +69,7 @@ int xmlShellWrite (xmlDebugDumpAttr () 
void	xmlDebugDumpAttr		(FILE * output, 
					 xmlAttrPtr attr, 
					 int depth)
-

Dumps debug information for the attribute

+

Dumps debug information for the attribute

@@ -199,8 +79,7 @@ int xmlShellWrite (attr: - + @@ -215,7 +94,7 @@ int xmlShellWrite (xmlDebugDumpAttrList ()
void	xmlDebugDumpAttrList		(FILE * output, 
					 xmlAttrPtr attr, 
					 int depth)
-

Dumps debug information for the attribute list

+

Dumps debug information for the attribute list

the attribute -the attribute
depth:
@@ -225,7 +104,7 @@ int xmlShellWrite (attr: - + @@ -415,458 +294,6 @@ int xmlShellWrite ( -

-xmlLsCountNode ()

-
int	xmlLsCountNode			(xmlNodePtr node)

-
-

Count the children of @node.

-
the attribute listthe attribute list
depth:
-- - - - - - - - - - -
node:the node to count
Returns:the number of children of @node.
-
-
-
-

-xmlLsOneNode ()

-
void	xmlLsOneNode			(FILE * output, 
					 xmlNodePtr node)

-
-

Dump to @output the type and name of @node.

-
-- - - - - - - - - - -
output:the FILE * for the output
node:the node to dump
-
-
-
-

-xmlShell ()

-
void	xmlShell			(xmlDocPtr doc, 
					 const char * filename, 
					 xmlShellReadlineFunc input, 
					 FILE * output)

-
-

Implements the XML shell This allow to load, validate, view, modify and save a document using a environment similar to a UNIX commandline.

-
-- - - - - - - - - - - - - - - - - - -
doc:the initial document
filename:the output buffer
input:the line reading function
output:the output FILE*, defaults to stdout if NULL
-
-
-
-

-xmlShellBase ()

-
int	xmlShellBase			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "base" dumps the current XML base of the node

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
arg:unused
node:a node
node2:unused
Returns:0
-
-
-
-

-xmlShellCat ()

-
int	xmlShellCat			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "cat" dumps the serialization node content (XML or HTML).

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
arg:unused
node:a node
node2:unused
Returns:0
-
-
-
-

-xmlShellDir ()

-
int	xmlShellDir			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "dir" dumps information about the node (namespace, attributes, content).

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
arg:unused
node:a node
node2:unused
Returns:0
-
-
-
-

-xmlShellDu ()

-
int	xmlShellDu			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr tree, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "du" show the structure of the subtree under node @tree If @tree is null, the command works on the current node.

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
arg:unused
tree:a node defining a subtree
node2:unused
Returns:0 or -1 in case of error
-
-
-
-

-xmlShellList ()

-
int	xmlShellList			(xmlShellCtxtPtr ctxt, 
					 char * arg, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "ls" Does an Unix like listing of the given node (like a directory)

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
arg:unused
node:a node
node2:unused
Returns:0
-
-
-
-

-xmlShellLoad ()

-
int	xmlShellLoad			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "load" loads a new document specified by the filename

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
filename:the file name
node:unused
node2:unused
Returns:0 or -1 if loading failed
-
-
-
-

-xmlShellPrintNode ()

-
void	xmlShellPrintNode		(xmlNodePtr node)

-
-

Print node to the output FILE

-
-- - - - -
node:a non-null node to print to the output FILE
-
-
-
-

-xmlShellPrintXPathError ()

-
void	xmlShellPrintXPathError		(int errorType, 
					 const char * arg)

-
-

Print the xpath error to libxml default error channel

-
-- - - - - - - - - - -
errorType:valid xpath error id
arg:the argument that cause xpath to fail
-
-
-
-

-xmlShellPrintXPathResult ()

-
void	xmlShellPrintXPathResult	(xmlXPathObjectPtr list)

-
-

Prints result to the output FILE

-
-- - - - -
list:a valid result generated by an xpath evaluation
-
-
-
-

-xmlShellPwd ()

-
int	xmlShellPwd			(xmlShellCtxtPtr ctxt, 
					 char * buffer, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "pwd" Show the full path from the root to the node, if needed building thumblers when similar elements exists at a given ancestor level. The output is compatible with XPath commands.

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
buffer:the output buffer
node:a node
node2:unused
Returns:0 or -1 in case of error
-
-
-
-

-xmlShellSave ()

-
int	xmlShellSave			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "save" Write the current document to the filename, or it's original name

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
filename:the file name (optional)
node:unused
node2:unused
Returns:0 or -1 in case of error
-
-
-
-

-xmlShellValidate ()

-
int	xmlShellValidate		(xmlShellCtxtPtr ctxt, 
					 char * dtd, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "validate" Validate the document, if a DTD path is provided, then the validation is done against the given DTD.

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
dtd:the DTD URI (optional)
node:unused
node2:unused
Returns:0 or -1 in case of error
-
-
-
-

-xmlShellWrite ()

-
int	xmlShellWrite			(xmlShellCtxtPtr ctxt, 
					 char * filename, 
					 xmlNodePtr node, 
					 xmlNodePtr node2)

-
-

Implements the XML shell function "write" Write the current node to the filename, it saves the serialization of the subtree under the @node specified

-
-- - - - - - - - - - - - - - - - - - - - - - -
ctxt:the shell context
filename:the file name
node:a node in the tree
node2:unused
Returns:0 or -1 in case of error
-
-
diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html index d2a56c10..282d86f1 100644 --- a/doc/devhelp/libxml2-dict.html +++ b/doc/devhelp/libxml2-dict.html @@ -258,7 +258,7 @@ The content of this structure is not made public by the API. xmlDictReference () 
int	xmlDictReference		(xmlDictPtr dict)
-

Increment the reference counter of a dictionary

+

Increment the reference counter of a dictionary

diff --git a/doc/devhelp/libxml2-encoding.html b/doc/devhelp/libxml2-encoding.html index f656c169..3b9708df 100644 --- a/doc/devhelp/libxml2-encoding.html +++ b/doc/devhelp/libxml2-encoding.html @@ -22,21 +22,27 @@

Author(s): Daniel Veillard

Synopsis

-
typedef enum xmlCharEncError;
+
#define UTF8Toisolat1;
+#define isolat1ToUTF8;
+typedef enum xmlCharEncError;
+typedef enum xmlCharEncFlags;
 typedef enum xmlCharEncoding;
 typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
 typedef xmlCharEncodingHandler * xmlCharEncodingHandlerPtr;
-int	UTF8Toisolat1			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
-int	isolat1ToUTF8			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
 int	xmlAddEncodingAlias		(const char * name, 
					 const char * alias);
 int	xmlCharEncCloseFunc		(xmlCharEncodingHandler * handler);
+typedef void xmlCharEncConvCtxtDtor		(void * vctxt);
+typedef xmlCharEncError xmlCharEncConvFunc	(void * vctxt, 
					 unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen, 
					 int flush);
+typedef xmlParserErrors xmlCharEncConvImpl	(void * vctxt, 
					 const char * name, 
					 xmlCharEncFlags flags, 
					 xmlCharEncodingHandler ** out);
 int	xmlCharEncFirstLine		(xmlCharEncodingHandler * handler, 
					 xmlBufferPtr out, 
					 xmlBufferPtr in);
 int	xmlCharEncInFunc		(xmlCharEncodingHandler * handler, 
					 xmlBufferPtr out, 
					 xmlBufferPtr in);
+xmlParserErrors	xmlCharEncNewCustomHandler	(const char * name, 
						 xmlCharEncConvFunc input, 
						 xmlCharEncConvFunc output, 
						 xmlCharEncConvCtxtDtor ctxtDtor, 
						 void * inputCtxt, 
						 void * outputCtxt, 
						 xmlCharEncodingHandler ** out);
 int	xmlCharEncOutFunc		(xmlCharEncodingHandler * handler, 
					 xmlBufferPtr out, 
					 xmlBufferPtr in);
 typedef int xmlCharEncodingInputFunc	(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
 typedef int xmlCharEncodingOutputFunc	(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
 void	xmlCleanupCharEncodingHandlers	(void);
 void	xmlCleanupEncodingAliases	(void);
+xmlParserErrors	xmlCreateCharEncodingHandler	(const char * name, 
						 xmlCharEncFlags flags, 
						 xmlCharEncConvImpl impl, 
						 void * implCtxt, 
						 xmlCharEncodingHandler ** out);
 int	xmlDelEncodingAlias		(const char * alias);
 xmlCharEncoding	xmlDetectCharEncoding	(const unsigned char * in, 
					 int len);
 xmlCharEncodingHandlerPtr	xmlFindCharEncodingHandler	(const char * name);
@@ -44,11 +50,13 @@ int	xmlDelEncodingAlias		(const char * alias)
 const char *	xmlGetCharEncodingName	(xmlCharEncoding enc);
 const char *	xmlGetEncodingAlias	(const char * alias);
 void	xmlInitCharEncodingHandlers	(void);
-int	xmlLookupCharEncodingHandler	(xmlCharEncoding enc, 
					 xmlCharEncodingHandler ** out);
+int	xmlIsolat1ToUTF8		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);
+xmlParserErrors	xmlLookupCharEncodingHandler	(xmlCharEncoding enc, 
						 xmlCharEncodingHandler ** out);
 xmlCharEncodingHandlerPtr	xmlNewCharEncodingHandler	(const char * name, 
							 xmlCharEncodingInputFunc input, 
							 xmlCharEncodingOutputFunc output);
-int	xmlOpenCharEncodingHandler	(const char * name, 
					 int output, 
					 xmlCharEncodingHandler ** out);
+xmlParserErrors	xmlOpenCharEncodingHandler	(const char * name, 
						 int output, 
						 xmlCharEncodingHandler ** out);
 xmlCharEncoding	xmlParseCharEncoding	(const char * name);
 void	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler);
+int	xmlUTF8ToIsolat1		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen);

Description

@@ -57,13 +65,28 @@ void xmlRegisterCharEncodingHandler

+Macro UTF8Toisolat1

+
#define UTF8Toisolat1;
+
+

+
+
+
+

+Macro isolat1ToUTF8

+
#define isolat1ToUTF8;
+
+

+
+
+
+

Enum xmlCharEncError

enum xmlCharEncError {
-    XML_ENC_ERR_MEMORY = -5
-    XML_ENC_ERR_INTERNAL = -4
-    XML_ENC_ERR_PARTIAL = -3
+    XML_ENC_ERR_MEMORY = -4
+    XML_ENC_ERR_SPACE = -3
     XML_ENC_ERR_INPUT = -2
-    XML_ENC_ERR_SPACE = -1
+    XML_ENC_ERR_INTERNAL = -1
     XML_ENC_ERR_SUCCESS = 0
 };
@@ -72,6 +95,17 @@ void xmlRegisterCharEncodingHandler

+Enum xmlCharEncFlags

+
enum xmlCharEncFlags {
+    XML_ENC_INPUT = 1
+    XML_ENC_OUTPUT = 2
+};
+
+

+
+
+
+

Enum xmlCharEncoding

enum xmlCharEncoding {
     XML_CHAR_ENCODING_ERROR = -1 /* No char encoding detected */
@@ -97,7 +131,15 @@ void	xmlRegisterCharEncodingHandlerXML_CHAR_ENCODING_2022_JP = 19 /* ISO-2022-JP */
     XML_CHAR_ENCODING_SHIFT_JIS = 20 /* Shift_JIS */
     XML_CHAR_ENCODING_EUC_JP = 21 /* EUC-JP */
-    XML_CHAR_ENCODING_ASCII = 22 /*  pure ASCII */
+    XML_CHAR_ENCODING_ASCII = 22 /* pure ASCII Available since 2.14.0 */
+    XML_CHAR_ENCODING_UTF16 = 23 /* UTF-16 native */
+    XML_CHAR_ENCODING_HTML = 24 /* HTML (output only) */
+    XML_CHAR_ENCODING_8859_10 = 25 /* ISO-8859-10 */
+    XML_CHAR_ENCODING_8859_11 = 26 /* ISO-8859-11 */
+    XML_CHAR_ENCODING_8859_13 = 27 /* ISO-8859-13 */
+    XML_CHAR_ENCODING_8859_14 = 28 /* ISO-8859-14 */
+    XML_CHAR_ENCODING_8859_15 = 29 /* ISO-8859-15 */
+    XML_CHAR_ENCODING_8859_16 = 30 /*  ISO-8859-16 */
 };

@@ -108,12 +150,10 @@ void xmlRegisterCharEncodingHandlerStructure xmlCharEncodingHandler 
struct _xmlCharEncodingHandler {
     char *	name
-    xmlCharEncodingInputFunc	input
-    xmlCharEncodingOutputFunc	output
-    iconv_t	iconv_in
-    iconv_t	iconv_out
-    struct _uconv_t *	uconv_in
-    struct _uconv_t *	uconv_out
+    void *	inputCtxt
+    void *	outputCtxt
+    xmlCharEncConvCtxtDtor	ctxtDtor
+    int	flags
 } xmlCharEncodingHandler;

@@ -129,10 +169,99 @@ void xmlRegisterCharEncodingHandler

+Function type xmlCharEncConvCtxtDtor

+
void	xmlCharEncConvCtxtDtor		(void * vctxt)

+
+

Free a conversion context.

+
++ + + + +
vctxt:conversion context
+ +
+
+

+Function type xmlCharEncConvFunc

+
xmlCharEncError	xmlCharEncConvFunc	(void * vctxt, 
					 unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen, 
					 int flush)

+
+

Convert between character encodings. The value of @inlen after return is the number of bytes consumed and @outlen is the number of bytes produced. If the converter can consume partial multi-byte sequences, the @flush flag can be used to detect truncated sequences at EOF. Otherwise, the flag can be ignored.

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
vctxt:conversion context
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of input bytes
inlen:the length of @in
flush:end of input
Returns:an XML_ENC_ERR code.
+
+
+
+

+Function type xmlCharEncConvImpl

+
xmlParserErrors	xmlCharEncConvImpl	(void * vctxt, 
					 const char * name, 
					 xmlCharEncFlags flags, 
					 xmlCharEncodingHandler ** out)

+
+

If this function returns XML_ERR_OK, it must fill the @out pointer with an encoding handler. The handler can be obtained from xmlCharEncNewCustomHandler. @flags can contain XML_ENC_INPUT, XML_ENC_OUTPUT or both.

+
++ + + + + + + + + + + + + + + + + + + + + + +
vctxt:user data
name:encoding name
flags:bit mask of flags
out:pointer to resulting handler
Returns:an xmlParserErrors code.
+
+
+
+

Function type xmlCharEncodingInputFunc

int	xmlCharEncodingInputFunc	(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)
-

Take a block of chars in the original encoding and try to convert it to an UTF-8 block of chars out.

+

Convert characters to UTF-8. On success, the value of @inlen after return is the number of bytes consumed and @outlen is the number of bytes produced.

@@ -154,7 +283,7 @@ void xmlRegisterCharEncodingHandler - +
Returns:the number of bytes written, -1 if lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictiable. The value of @outlen after return is the number of octets consumed.the number of bytes written or an XML_ENC_ERR code.
@@ -165,7 +294,7 @@ void xmlRegisterCharEncodingHandlerFunction type xmlCharEncodingOutputFunc 
int	xmlCharEncodingOutputFunc	(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)
-

Take a block of UTF-8 chars in and try to convert it to another encoding. Note: a first call designed to produce heading info is called with in = NULL. If stateful this should also initialize the encoder state.

+

Convert characters from UTF-8. On success, the value of @inlen after return is the number of bytes consumed and @outlen is the number of bytes produced.

@@ -187,73 +316,7 @@ void xmlRegisterCharEncodingHandler - - - -
Returns:the number of bytes written, -1 if lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictiable. The value of @outlen after return is the number of octets produced.
-
-
-
-

-UTF8Toisolat1 ()

-
int	UTF8Toisolat1			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

-
-

Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1 block of chars out.

-
-- - - - - - - - - - - - - - - - - - - - - - -
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:the number of bytes written or an XML_ENC_ERR code. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets produced.
-
-
-
-

-isolat1ToUTF8 ()

-
int	isolat1ToUTF8			(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

-
-

Take a block of ISO Latin 1 chars in and try to convert it to an UTF-8 block of chars out.

-
-- - - - - - - - - - - - - - - - - - - - +
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of ISO Latin 1 chars
inlen:the length of @in
Returns:the number of bytes written or an XML_ENC_ERR code. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets produced.the number of bytes written or an XML_ENC_ERR code.
@@ -264,7 +327,7 @@ void xmlRegisterCharEncodingHandlerxmlAddEncodingAlias () 
int	xmlAddEncodingAlias		(const char * name, 
					 const char * alias)
-

Registers an alias @alias for an encoding named @name. Existing alias will be overwritten.

+

DEPRECATED: This function modifies global state and is not thread-safe. Registers an alias @alias for an encoding named @name. Existing alias will be overwritten.

@@ -289,7 +352,7 @@ void xmlRegisterCharEncodingHandlerxmlCharEncCloseFunc ()
int	xmlCharEncCloseFunc		(xmlCharEncodingHandler * handler)
-

Generic front-end for encoding handler close function

+

Releases an xmlCharEncodingHandler. Must be called after a handler is no longer in use.

@@ -299,7 +362,7 @@ void xmlRegisterCharEncodingHandler - +
Returns:0 if success, or -1 in case of error0.
@@ -365,6 +428,51 @@ void xmlRegisterCharEncodingHandler

+xmlCharEncNewCustomHandler ()

+
xmlParserErrors	xmlCharEncNewCustomHandler	(const char * name, 
						 xmlCharEncConvFunc input, 
						 xmlCharEncConvFunc output, 
						 xmlCharEncConvCtxtDtor ctxtDtor, 
						 void * inputCtxt, 
						 void * outputCtxt, 
						 xmlCharEncodingHandler ** out)

+
+

Create a custom xmlCharEncodingHandler.

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
name:the encoding name
input:input callback which converts to UTF-8
output:output callback which converts from UTF-8
ctxtDtor:context destructor
inputCtxt:context for input callback
outputCtxt:context for output callback
out:pointer to resulting handler
Returns:an xmlParserErrors code.
+
+
+
+

xmlCharEncOutFunc ()

int	xmlCharEncOutFunc		(xmlCharEncodingHandler * handler, 
					 xmlBufferPtr out, 
					 xmlBufferPtr in)
@@ -405,7 +513,44 @@ void xmlRegisterCharEncodingHandlerxmlCleanupEncodingAliases () 
void	xmlCleanupEncodingAliases	(void)
-

Unregisters all aliases

+

DEPRECATED: This function modifies global state and is not thread-safe. Unregisters all aliases

+
+
+
+

+xmlCreateCharEncodingHandler ()

+
xmlParserErrors	xmlCreateCharEncodingHandler	(const char * name, 
						 xmlCharEncFlags flags, 
						 xmlCharEncConvImpl impl, 
						 void * implCtxt, 
						 xmlCharEncodingHandler ** out)

+
+

Find or create a handler matching the encoding. The following converters are looked up in order: - Built-in handler (UTF-8, UTF-16, ISO-8859-1, ASCII) - Custom implementation if provided - User-registered global handler (deprecated) - iconv if enabled - ICU if enabled The handler must be closed with xmlCharEncCloseFunc. If the encoding is UTF-8, a NULL handler and no error code will be returned. @flags can contain XML_ENC_INPUT, XML_ENC_OUTPUT or both. Available since 2.14.0.

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +
name:a string describing the char encoding.
flags:bit mask of flags
impl:a conversion implementation (optional)
implCtxt:user data for conversion implementation (optional)
out:pointer to result
Returns:XML_ERR_OK, XML_ERR_UNSUPPORTED_ENCODING or another xmlParserErrors error code.
@@ -413,7 +558,7 @@ void xmlRegisterCharEncodingHandlerxmlDelEncodingAlias () 
int	xmlDelEncodingAlias		(const char * alias)
-

Unregisters an encoding alias @alias

+

DEPRECATED: This function modifies global state and is not thread-safe. Unregisters an encoding alias @alias

@@ -459,7 +604,7 @@ void xmlRegisterCharEncodingHandlerxmlFindCharEncodingHandler ()
xmlCharEncodingHandlerPtr	xmlFindCharEncodingHandler	(const char * name)
-

DEPRECATED: Use xmlOpenCharEncodingHandler which has better error reporting.

+

DEPRECATED: Use xmlOpenCharEncodingHandler which has better error reporting. If the encoding is UTF-8, this will return a no-op handler that shouldn't be used.

@@ -522,7 +667,7 @@ void xmlRegisterCharEncodingHandlerxmlGetEncodingAlias ()
const char *	xmlGetEncodingAlias	(const char * alias)
-

Lookup an encoding name for the given alias.

+

DEPRECATED: This function is not thread-safe. Lookup an encoding name for the given alias.

@@ -548,10 +693,43 @@ void xmlRegisterCharEncodingHandler

-xmlLookupCharEncodingHandler ()

-
int	xmlLookupCharEncodingHandler	(xmlCharEncoding enc, 
					 xmlCharEncodingHandler ** out)

+xmlIsolat1ToUTF8 ()
+
int	xmlIsolat1ToUTF8		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

 

-
Find or create a handler matching the encoding. If no default or registered handler could be found, try to create a handler using iconv or ICU if supported. The handler must be closed with xmlCharEncCloseFunc. Available since 2.13.0.

+
Take a block of ISO Latin 1 chars in and try to convert it to an UTF-8 block of chars out.

+
++ + + + + + + + + + + + + + + + + + + + + + +
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of ISO Latin 1 chars
inlen:the length of @in
Returns:the number of bytes written or an XML_ENC_ERR code. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets produced.
+
+
+
+

+xmlLookupCharEncodingHandler ()

+
xmlParserErrors	xmlLookupCharEncodingHandler	(xmlCharEncoding enc, 
						 xmlCharEncodingHandler ** out)

+
+

Find or create a handler matching the encoding. The following converters are looked up in order: - Built-in handler (UTF-8, UTF-16, ISO-8859-1, ASCII) - User-registered global handler (deprecated) - iconv if enabled - ICU if enabled The handler must be closed with xmlCharEncCloseFunc. If the encoding is UTF-8, a NULL handler and no error code will be returned. Available since 2.13.0.

@@ -565,7 +743,7 @@ void xmlRegisterCharEncodingHandler - +
Returns:an xmlParserErrors error code.XML_ERR_OK, XML_ERR_UNSUPPORTED_ENCODING or another xmlParserErrors error code.
@@ -576,7 +754,7 @@ void xmlRegisterCharEncodingHandlerxmlNewCharEncodingHandler () 
xmlCharEncodingHandlerPtr	xmlNewCharEncodingHandler	(const char * name, 
							 xmlCharEncodingInputFunc input, 
							 xmlCharEncodingOutputFunc output)
-

Create and registers an xmlCharEncodingHandler.

+

DEPRECATED: This function modifies global state and is not thread-safe. Create and registers an xmlCharEncodingHandler.

@@ -603,9 +781,9 @@ void xmlRegisterCharEncodingHandler

xmlOpenCharEncodingHandler ()

-
int	xmlOpenCharEncodingHandler	(const char * name, 
					 int output, 
					 xmlCharEncodingHandler ** out)

+
xmlParserErrors	xmlOpenCharEncodingHandler	(const char * name, 
						 int output, 
						 xmlCharEncodingHandler ** out)

 

-
Find or create a handler matching the encoding. If no default or registered handler could be found, try to create a handler using iconv or ICU if supported. The handler must be closed with xmlCharEncCloseFunc. Available since 2.13.0.

+
Find or create a handler matching the encoding. The following converters are looked up in order: - Built-in handler (UTF-8, UTF-16, ISO-8859-1, ASCII) - User-registered global handler (deprecated) - iconv if enabled - ICU if enabled The handler must be closed with xmlCharEncCloseFunc. If the encoding is UTF-8, a NULL handler and no error code will be returned. Available since 2.13.0.
@@ -623,7 +801,7 @@ void xmlRegisterCharEncodingHandler - +
Returns:an xmlParserErrors error code.XML_ERR_OK, XML_ERR_UNSUPPORTED_ENCODING or another xmlParserErrors error code.
@@ -655,7 +833,7 @@ void xmlRegisterCharEncodingHandlerxmlRegisterCharEncodingHandler () 
void	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler)
-

Register the char encoding handler, surprising, isn't it ?

+

DEPRECATED: This function modifies global state and is not thread-safe. Register the char encoding handler.

@@ -665,6 +843,39 @@ void xmlRegisterCharEncodingHandler
+
+

+xmlUTF8ToIsolat1 ()

+
int	xmlUTF8ToIsolat1		(unsigned char * out, 
					 int * outlen, 
					 const unsigned char * in, 
					 int * inlen)

+
+

Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1 block of chars out.

+
++ + + + + + + + + + + + + + + + + + + + + + +
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:the number of bytes written or an XML_ENC_ERR code. The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets produced.
+
+
diff --git a/doc/devhelp/libxml2-entities.html b/doc/devhelp/libxml2-entities.html index 243f3544..13fb36b1 100644 --- a/doc/devhelp/libxml2-entities.html +++ b/doc/devhelp/libxml2-entities.html @@ -28,12 +28,10 @@ typedef enum xmlEntityType; xmlEntityPtr xmlAddDocEntity (xmlDocPtr doc,
const xmlChar * name,
int type,
const xmlChar * ExternalID,
const xmlChar * SystemID,
const xmlChar * content); xmlEntityPtr xmlAddDtdEntity (xmlDocPtr doc,
const xmlChar * name,
int type,
const xmlChar * ExternalID,
const xmlChar * SystemID,
const xmlChar * content); int xmlAddEntity (xmlDocPtr doc,
int extSubset,
const xmlChar * name,
int type,
const xmlChar * ExternalID,
const xmlChar * SystemID,
const xmlChar * content,
xmlEntityPtr * out); -void xmlCleanupPredefinedEntities (void); xmlEntitiesTablePtr xmlCopyEntitiesTable (xmlEntitiesTablePtr table); xmlEntitiesTablePtr xmlCreateEntitiesTable (void); void xmlDumpEntitiesTable (xmlBufferPtr buf,
xmlEntitiesTablePtr table); void xmlDumpEntityDecl (xmlBufferPtr buf,
xmlEntityPtr ent); -const xmlChar * xmlEncodeEntities (xmlDocPtr doc,
const xmlChar * input); xmlChar * xmlEncodeEntitiesReentrant (xmlDocPtr doc,
const xmlChar * input); xmlChar * xmlEncodeSpecialChars (const xmlDoc * doc,
const xmlChar * input); void xmlFreeEntitiesTable (xmlEntitiesTablePtr table); @@ -42,7 +40,6 @@ void xmlFreeEntity (xmlEntityPtr xmlGetDtdEntity (xmlDocPtr doc,
const xmlChar * name); xmlEntityPtr xmlGetParameterEntity (xmlDocPtr doc,
const xmlChar * name); xmlEntityPtr xmlGetPredefinedEntity (const xmlChar * name); -void xmlInitializePredefinedEntities (void); xmlEntityPtr xmlNewEntity (xmlDocPtr doc,
const xmlChar * name,
int type,
const xmlChar * ExternalID,
const xmlChar * SystemID,
const xmlChar * content); @@ -216,14 +213,6 @@ The content of this structure is not made public by the API.

-xmlCleanupPredefinedEntities ()

-
void	xmlCleanupPredefinedEntities	(void)

-
-

Cleanup up the predefined entities table. Deprecated call

-
-
-
-

xmlCopyEntitiesTable ()

xmlEntitiesTablePtr	xmlCopyEntitiesTable	(xmlEntitiesTablePtr table)
@@ -302,35 +291,10 @@ The content of this structure is not made public by the API.

-xmlEncodeEntities ()

-
const xmlChar *	xmlEncodeEntities	(xmlDocPtr doc, 
					 const xmlChar * input)

-
-

TODO: remove xmlEncodeEntities, once we are not afraid of breaking binary compatibility People must migrate their code to xmlEncodeEntitiesReentrant ! This routine will issue a warning when encountered.

-
-- - - - - - - - - - - - - - -
doc:the document containing the string
input:A string to convert to XML.
Returns:NULL
-
-
-
-

xmlEncodeEntitiesReentrant ()

xmlChar *	xmlEncodeEntitiesReentrant	(xmlDocPtr doc, 
						 const xmlChar * input)
-

Do a global encoding of a string, replacing the predefined entities and non ASCII values with their entities and CharRef counterparts. Contrary to xmlEncodeEntities, this routine is reentrant, and result must be deallocated.

+

Do a global encoding of a string, replacing the predefined entities and non ASCII values with their entities and CharRef counterparts. Contrary to xmlEncodeEntities, this routine is reentrant, and result must be deallocated. This escapes '<', '>', '&' and '\r'. If the document has no encoding, non-ASCII codepoints are escaped. There is some special handling for HTML documents.

@@ -355,13 +319,13 @@ The content of this structure is not made public by the API. xmlEncodeSpecialChars ()
xmlChar *	xmlEncodeSpecialChars	(const xmlDoc * doc, 
					 const xmlChar * input)
-

Do a global encoding of a string, replacing the predefined entities this routine is reentrant, and result must be deallocated.

+

Do a global encoding of a string, replacing the predefined entities this routine is reentrant, and result must be deallocated. This escapes '<', '>', '&', '"' and '\r' chars.

- + @@ -503,14 +467,6 @@ The content of this structure is not made public by the API.

-xmlInitializePredefinedEntities ()

-
void	xmlInitializePredefinedEntities	(void)

-
-

Set up the predefined entities. Deprecated call

-
-
-
-

xmlNewEntity ()

xmlEntityPtr	xmlNewEntity		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 int type, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID, 
					 const xmlChar * content)
diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html index bf8bbd17..59c882eb 100644 --- a/doc/devhelp/libxml2-globals.html +++ b/doc/devhelp/libxml2-globals.html @@ -22,65 +22,12 @@

Author(s):

Synopsis

-
typedef struct _xmlGlobalState xmlGlobalState;
-typedef xmlGlobalState * xmlGlobalStatePtr;
-xmlGlobalStatePtr	xmlGetGlobalState	(void);
-void	xmlInitializeGlobalState	(xmlGlobalStatePtr gs);
-
+

 

 
Description

 

 
Details

-

-

-

-Structure xmlGlobalState

-
struct _xmlGlobalState {
-The content of this structure is not made public by the API.
-} xmlGlobalState;
-

-

-

-

-

-

-Typedef xmlGlobalStatePtr

-
xmlGlobalState * xmlGlobalStatePtr;
-

-

-

-

-

-

-xmlGetGlobalState ()

-
xmlGlobalStatePtr	xmlGetGlobalState	(void)

-

-
DEPRECATED

-

 
 
 

 doc:the document containing the stringunused
 

 

 input:
 

--
-
-
-
-


Returns:NULL.

-

-

-

-

-xmlInitializeGlobalState ()

-
void	xmlInitializeGlobalState	(xmlGlobalStatePtr gs)

-

-
DEPRECATED: No-op.

-

--
-
-
-
-


gs:a pointer to a newly allocated global state

-

-

-

+

 
 
 
diff --git a/doc/devhelp/libxml2-list.html b/doc/devhelp/libxml2-list.html
index 6d188020..95928ca9 100644
--- a/doc/devhelp/libxml2-list.html
+++ b/doc/devhelp/libxml2-list.html
@@ -13,7 +13,7 @@
 Prev
 Up
 Home
-Next
+Next
 libxml2 Reference Manual
 
 
list

diff --git a/doc/devhelp/libxml2-nanohttp.html b/doc/devhelp/libxml2-nanohttp.html
index aa382eac..95964494 100644
--- a/doc/devhelp/libxml2-nanohttp.html
+++ b/doc/devhelp/libxml2-nanohttp.html
@@ -10,7 +10,7 @@
 
 
 
-
+
diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html
index 5813629c..064855de 100644
--- a/doc/devhelp/libxml2-parser.html
+++ b/doc/devhelp/libxml2-parser.html
@@ -26,6 +26,7 @@
 #define XML_SAX2_MAGIC;
 typedef struct _xmlAttrHashBucket xmlAttrHashBucket;
 typedef enum xmlFeature;
+typedef enum xmlParserInputFlags;
 typedef enum xmlParserInputState;
 typedef enum xmlParserMode;
 typedef struct _xmlParserNodeInfo xmlParserNodeInfo;
@@ -34,6 +35,8 @@ typedef struct _xmlParserNodeInfoSeq xmlParserNo
 typedef xmlParserNodeInfoSeq * xmlParserNodeInfoSeqPtr;
 typedef struct _xmlParserNsData xmlParserNsData;
 typedef enum xmlParserOption;
+typedef enum xmlParserStatus;
+typedef enum xmlResourceType;
 typedef struct _xmlSAXHandlerV1 xmlSAXHandlerV1;
 typedef xmlSAXHandlerV1 * xmlSAXHandlerV1Ptr;
 typedef struct _xmlStartTag xmlStartTag;
@@ -75,7 +78,22 @@ void	xmlClearParserCtxt		(xmlParserCtxtPtrxmlCreateDocParserCtxt	(const xmlChar * str);
 xmlParserCtxtPtrxmlCreateIOParserCtxt	(xmlSAXHandlerPtr sax, 
						 void * user_data, 
xmlInputReadCallback ioread, 
xmlInputCloseCallback ioclose, 
						 void * ioctx, 
xmlCharEncoding enc);
 xmlParserCtxtPtrxmlCreatePushParserCtxt	(xmlSAXHandlerPtr sax, 
						 void * user_data, 
						 const char * chunk, 
						 int size, 
						 const char * filename);
+void *	xmlCtxtGetCatalogs		(xmlParserCtxtPtr ctxt);
+const xmlChar *	xmlCtxtGetDeclaredEncoding	(xmlParserCtxtPtr ctxt);
+xmlDictPtrxmlCtxtGetDict		(xmlParserCtxtPtr ctxt);
+xmlDocPtrxmlCtxtGetDocument	(xmlParserCtxtPtr ctxt);
+int	xmlCtxtGetOptions		(xmlParserCtxtPtr ctxt);
+void *	xmlCtxtGetPrivate		(xmlParserCtxtPtr ctxt);
+xmlSAXHandler *	xmlCtxtGetSaxHandler	(xmlParserCtxtPtr ctxt);
+int	xmlCtxtGetStandalone		(xmlParserCtxtPtr ctxt);
+xmlParserStatusxmlCtxtGetStatus	(xmlParserCtxt * ctxt);
+xmlValidCtxtPtrxmlCtxtGetValidCtxt	(xmlParserCtxtPtr ctxt);
+const xmlChar *	xmlCtxtGetVersion	(xmlParserCtxtPtr ctxt);
+int	xmlCtxtIsHtml			(xmlParserCtxtPtr ctxt);
+int	xmlCtxtIsStopped		(xmlParserCtxtPtr ctxt);
+xmlNodePtrxmlCtxtParseContent	(xmlParserCtxtPtr ctxt, 
xmlParserInputPtr input, 
xmlNodePtr node, 
					 int hasTextDecl);
 xmlDocPtrxmlCtxtParseDocument	(xmlParserCtxtPtr ctxt, 
xmlParserInputPtr input);
+xmlDtdPtrxmlCtxtParseDtd		(xmlParserCtxtPtr ctxt, 
xmlParserInputPtr input, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId);
 xmlDocPtrxmlCtxtReadDoc		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * str, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
 xmlDocPtrxmlCtxtReadFd		(xmlParserCtxtPtr ctxt, 
					 int fd, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
 xmlDocPtrxmlCtxtReadFile		(xmlParserCtxtPtr ctxt, 
					 const char * filename, 
					 const char * encoding, 
					 int options);
@@ -83,25 +101,37 @@ void	xmlClearParserCtxt		(xmlDocPtrxmlCtxtReadMemory	(xmlParserCtxtPtr ctxt, 
					 const char * buffer, 
					 int size, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
 void	xmlCtxtReset			(xmlParserCtxtPtr ctxt);
 int	xmlCtxtResetPush		(xmlParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 const char * filename, 
					 const char * encoding);
+void	xmlCtxtSetCatalogs		(xmlParserCtxtPtr ctxt, 
					 void * catalogs);
+void	xmlCtxtSetCharEncConvImpl	(xmlParserCtxtPtr ctxt, 
xmlCharEncConvImpl impl, 
					 void * vctxt);
+void	xmlCtxtSetDict			(xmlParserCtxtPtr ctxt, 
xmlDictPtr dict);
 void	xmlCtxtSetErrorHandler		(xmlParserCtxtPtr ctxt, 
xmlStructuredErrorFunc handler, 
					 void * data);
 void	xmlCtxtSetMaxAmplification	(xmlParserCtxtPtr ctxt, 
					 unsigned maxAmpl);
 int	xmlCtxtSetOptions		(xmlParserCtxtPtr ctxt, 
					 int options);
+void	xmlCtxtSetPrivate		(xmlParserCtxtPtr ctxt, 
					 void * priv);
+void	xmlCtxtSetResourceLoader	(xmlParserCtxtPtr ctxt, 
xmlResourceLoader loader, 
					 void * vctxt);
+int	xmlCtxtSetSaxHandler		(xmlParserCtxtPtr ctxt, 
					 const xmlSAXHandler * sax);
 int	xmlCtxtUseOptions		(xmlParserCtxtPtr ctxt, 
					 int options);
+int	xmlCtxtValidateDocument		(xmlParserCtxtPtr ctxt, 
xmlDocPtr doc);
+int	xmlCtxtValidateDtd		(xmlParserCtxtPtr ctxt, 
xmlDocPtr doc, 
xmlDtdPtr dtd);
 typedef xmlParserInputPtrxmlExternalEntityLoader	(const char * URL, 
						 const char * ID, 
xmlParserCtxtPtr context);
 void	xmlFreeParserCtxt		(xmlParserCtxtPtr ctxt);
 xmlExternalEntityLoaderxmlGetExternalEntityLoader	(void);
-int	xmlGetFeature			(xmlParserCtxtPtr ctxt, 
					 const char * name, 
					 void * result);
-int	xmlGetFeaturesList		(int * len, 
					 const char ** result);
 int	xmlHasFeature			(xmlFeature feature);
 xmlDtdPtrxmlIOParseDTD		(xmlSAXHandlerPtr sax, 
xmlParserInputBufferPtr input, 
xmlCharEncoding enc);
 void	xmlInitGlobals			(void);
 void	xmlInitNodeInfoSeq		(xmlParserNodeInfoSeqPtr seq);
 void	xmlInitParser			(void);
 int	xmlInitParserCtxt		(xmlParserCtxtPtr ctxt);
+xmlParserErrorsxmlInputSetEncodingHandler	(xmlParserInputPtr input, 
xmlCharEncodingHandlerPtr handler);
 int	xmlKeepBlanksDefault		(int val);
 int	xmlLineNumbersDefault		(int val);
 xmlParserInputPtrxmlLoadExternalEntity	(const char * URL, 
						 const char * ID, 
xmlParserCtxtPtr ctxt);
 xmlParserInputPtrxmlNewIOInputStream	(xmlParserCtxtPtr ctxt, 
xmlParserInputBufferPtr buf, 
xmlCharEncoding enc);
+xmlParserInputPtrxmlNewInputFromFd	(const char * url, 
						 int fd, 
xmlParserInputFlags flags);
+xmlParserInputPtrxmlNewInputFromIO	(const char * url, 
xmlInputReadCallback ioRead, 
xmlInputCloseCallback ioClose, 
						 void * ioCtxt, 
xmlParserInputFlags flags);
+xmlParserInputPtrxmlNewInputFromMemory	(const char * url, 
						 const void * mem, 
						 size_t size, 
xmlParserInputFlags flags);
+xmlParserInputPtrxmlNewInputFromString	(const char * url, 
						 const char * str, 
xmlParserInputFlags flags);
+xmlParserErrorsxmlNewInputFromUrl	(const char * filename, 
xmlParserInputFlags flags, 
xmlParserInputPtr * out);
 xmlParserCtxtPtrxmlNewParserCtxt	(void);
 xmlParserCtxtPtrxmlNewSAXParserCtxt	(const xmlSAXHandler * sax, 
						 void * userData);
 int	xmlParseBalancedChunkMemory	(xmlDocPtr doc, 
xmlSAXHandlerPtr sax, 
					 void * user_data, 
					 int depth, 
					 const xmlChar * string, 
xmlNodePtr * lst);
@@ -115,7 +145,7 @@ int	xmlParseDocument		(xmlParseExtParsedEnt		(xmlParserCtxtPtr ctxt);
 int	xmlParseExternalEntity		(xmlDocPtr doc, 
xmlSAXHandlerPtr sax, 
					 void * user_data, 
					 int depth, 
					 const xmlChar * URL, 
					 const xmlChar * ID, 
xmlNodePtr * list);
 xmlDocPtrxmlParseFile		(const char * filename);
-xmlParserErrorsxmlParseInNodeContext	(xmlNodePtr node, 
					 const char * data, 
					 int datalen, 
					 int options, 
xmlNodePtr * lst);
+xmlParserErrorsxmlParseInNodeContext	(xmlNodePtr node, 
					 const char * data, 
					 int datalen, 
					 int options, 
xmlNodePtr * listOut);
 xmlDocPtrxmlParseMemory		(const char * buffer, 
					 int size);
 void	xmlParserAddNodeInfo		(xmlParserCtxtPtr ctxt, 
xmlParserNodeInfoPtr info);
 const xmlParserNodeInfo *	xmlParserFindNodeInfo	(xmlParserCtxtPtr ctx, 
xmlNodePtr node);
@@ -132,6 +162,7 @@ int	xmlPedanticParserDefault	(int val);
 xmlDocPtrxmlRecoverDoc		(const xmlChar * cur);
 xmlDocPtrxmlRecoverFile		(const char * filename);
 xmlDocPtrxmlRecoverMemory	(const char * buffer, 
					 int size);
+typedef xmlParserErrorsxmlResourceLoader	(void * ctxt, 
					 const char * url, 
					 const char * publicId, 
xmlResourceType type, 
xmlParserInputFlags flags, 
xmlParserInputPtr * out);
 xmlDtdPtrxmlSAXParseDTD		(xmlSAXHandlerPtr sax, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID);
 xmlDocPtrxmlSAXParseDoc		(xmlSAXHandlerPtr sax, 
					 const xmlChar * cur, 
					 int recovery);
 xmlDocPtrxmlSAXParseEntity	(xmlSAXHandlerPtr sax, 
					 const char * filename);
@@ -142,7 +173,6 @@ int	xmlPedanticParserDefault	(int val);
 int	xmlSAXUserParseFile		(xmlSAXHandlerPtr sax, 
					 void * user_data, 
					 const char * filename);
 int	xmlSAXUserParseMemory		(xmlSAXHandlerPtr sax, 
					 void * user_data, 
					 const char * buffer, 
					 int size);
 void	xmlSetExternalEntityLoader	(xmlExternalEntityLoader f);
-int	xmlSetFeature			(xmlParserCtxtPtr ctxt, 
					 const char * name, 
					 void * value);
 void	xmlSetupParserForBuffer		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * buffer, 
					 const char * filename);
 void	xmlStopParser			(xmlParserCtxtPtr ctxt);
 int	xmlSubstituteEntitiesDefault	(int val);
@@ -151,7 +181,6 @@ int	xmlThrDefGetWarningsDefaultValue
 int	xmlThrDefKeepBlanksDefaultValue	(int v);
 int	xmlThrDefLineNumbersDefaultValue	(int v);
 int	xmlThrDefLoadExtDtdDefaultValue	(int v);
-int	xmlThrDefParserDebugEntities	(int v);
 int	xmlThrDefPedanticParserDefaultValue	(int v);
 int	xmlThrDefSubstituteEntitiesDefaultValue	(int v);
 
@@ -223,6 +252,7 @@ The content of this structure is not made public by the API.
     XML_WITH_ZLIB = 31
     XML_WITH_ICU = 32
     XML_WITH_LZMA = 33
+    XML_WITH_RELAXNG = 34 /* since 2.14.0 */
     XML_WITH_NONE = 99999 /*  just to be sure of allocation size */
 };
 
@@ -231,6 +261,19 @@ The content of this structure is not made public by the API.
 

 

+Enum xmlParserInputFlags

+
enum xmlParserInputFlags {
+    XML_INPUT_BUF_STATIC = 2
+    XML_INPUT_BUF_ZERO_TERMINATED = 4
+    XML_INPUT_UNZIP = 8
+    XML_INPUT_NETWORK = 16
+};
+

+

+

+

+

+

 Enum xmlParserInputState

 
enum xmlParserInputState {
     XML_PARSER_EOF = -1 /* nothing is to be parsed */
@@ -276,7 +319,7 @@ The content of this structure is not made public by the API.
 

 Structure xmlParserNodeInfo

 
struct _xmlParserNodeInfo {
-    const struct _xmlNode *	node	: Position & line # that text that created the node begins & ends on
+    const struct _xmlNode *	node
     unsigned long	begin_pos
     unsigned long	begin_line
     unsigned long	end_pos
@@ -350,8 +393,40 @@ The content of this structure is not made public by the API.
     XML_PARSE_HUGE = 524288 /* relax any hardcoded limit from the parser */
     XML_PARSE_OLDSAX = 1048576 /* parse using SAX2 interface before 2.7.0 */
     XML_PARSE_IGNORE_ENC = 2097152 /* ignore internal document encoding hint */
-    XML_PARSE_BIG_LINES = 4194304 /* Store big lines numbers in text PSVI field */
-    XML_PARSE_NO_XXE = 8388608 /*  disable loading of external content */
+    XML_PARSE_BIG_LINES = 4194304 /* Store big lines numbers in text PSVI field since 2.13.0 */
+    XML_PARSE_NO_XXE = 8388608 /* disable loading of external content since 2.14.0 */
+    XML_PARSE_UNZIP = 16777216 /* allow compressed content */
+    XML_PARSE_NO_SYS_CATALOG = 33554432 /* disable global system catalog */
+    XML_PARSE_CATALOG_PI = 67108864 /*  allow catalog PIs */
+};
+

+

+

+

+

+

+Enum xmlParserStatus

+
enum xmlParserStatus {
+    XML_STATUS_NOT_WELL_FORMED = 1
+    XML_STATUS_NOT_NS_WELL_FORMED = 2
+    XML_STATUS_DTD_VALIDATION_FAILED = 4
+    XML_STATUS_CATASTROPHIC_ERROR = 8
+};
+

+

+

+

+

+

+Enum xmlResourceType

+
enum xmlResourceType {
+    XML_RESOURCE_UNKNOWN = 0
+    XML_RESOURCE_MAIN_DOCUMENT = 1
+    XML_RESOURCE_DTD = 2
+    XML_RESOURCE_GENERAL_ENTITY = 3
+    XML_RESOURCE_PARAMETER_ENTITY = 4
+    XML_RESOURCE_XINCLUDE = 5
+    XML_RESOURCE_XINCLUDE_TEXT = 6
 };
 

 

@@ -384,7 +459,7 @@ The content of this structure is not made public by the API.
     commentSAXFunc	comment
     warningSAXFunc	warning
     errorSAXFunc	error
-    fatalErrorSAXFunc	fatalError	: unused error() get all the errors
+    fatalErrorSAXFunc	fatalError
     getParameterEntitySAXFunc	getParameterEntity
     cdataBlockSAXFunc	cdataBlock
     externalSubsetSAXFunc	externalSubset
@@ -417,7 +492,7 @@ The content of this structure is not made public by the API.
 Function type attributeDeclSAXFunc
 
void	attributeDeclSAXFunc		(void * ctx, 
					 const xmlChar * elem, 
					 const xmlChar * fullname, 
					 int type, 
					 int def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree)

 

-
An attribute definition has been parsed.

+
An attribute definition has been parsed.

 
PrevPrev
 Up
 Home
 Next								 						 						 											 					 						 						 									 					 					 					 					 					 					  						 							 					 							 							 							 						 							 							 						 						 							 							 						 					 							 					 					 					 							 						 						 							 			 					 					 					 			
 

@@ -431,11 +506,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -443,7 +518,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -458,7 +533,7 @@ The content of this structure is not made public by the API.
 Function type attributeSAXFunc
void	attributeSAXFunc		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element.

+
Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element.

 
 
 

 fullname:the attribute namethe attribute name
 

 

 type:the attribute typethe attribute type
 

 

 def:

 

 defaultValue:the attribute default valuethe attribute default value
 

 

 tree:
 
 

@@ -468,11 +543,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+

 
 
 

 name:The attribute name, including namespace prefixThe attribute name, including namespace prefix
 

 

 value:The attribute valueThe attribute value
 

 
 

@@ -534,7 +609,7 @@ The content of this structure is not made public by the API.
 Function type commentSAXFunc
 
void	commentSAXFunc			(void * ctx, 
					 const xmlChar * value)

 

-
A comment has been parsed.

+
A comment has been parsed.

 

@@ -544,7 +619,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 value:the comment contentthe comment content
 

 
 

@@ -857,7 +932,7 @@ The content of this structure is not made public by the API.
 Function type ignorableWhitespaceSAXFunc
 
void	ignorableWhitespaceSAXFunc	(void * ctx, 
					 const xmlChar * ch, 
					 int len)

 

-
Receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters.

+
Receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters.

 

@@ -987,7 +1062,7 @@ The content of this structure is not made public by the API.
 Function type referenceSAXFunc
void	referenceSAXFunc		(void * ctx, 
					 const xmlChar * name)

 

-
Called when an entity reference is detected.

+
Called when an entity reference is detected.

 
 
 
 

@@ -1037,7 +1112,7 @@ The content of this structure is not made public by the API.
 Function type setDocumentLocatorSAXFunc
void	setDocumentLocatorSAXFunc	(void * ctx, 
					 xmlSAXLocatorPtr loc)

 

-
Receive the document locator at startup, actually xmlDefaultSAXLocator. Everything is available on the context, so this is useless in our case.

+
Receive the document locator at startup, actually xmlDefaultSAXLocator. Everything is available on the context, so this is useless in our case.

 
 
 
 

@@ -1111,7 +1186,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 attributes:pointer to the array of (localname/prefix/URI/value/end) attribute values.pointer to the array of (localname/prefix/URI/value/end) attribute values.
 

 
 

@@ -1246,34 +1321,43 @@ The content of this structure is not made public by the API.
 

 

 

-Variable oldXMLWDcompatibility

-
const int oldXMLWDcompatibility;
+Function type xmlResourceLoader
+
xmlParserErrors	xmlResourceLoader	(void * ctxt, 
					 const char * url, 
					 const char * publicId, 
					 xmlResourceType type, 
					 xmlParserInputFlags flags, 
					 xmlParserInputPtr * out)

 

-
Global setting, DEPRECATED.

-

-

-

-

-Variable xmlDefaultSAXHandler

-
const xmlSAXHandlerV1 xmlDefaultSAXHandler;
-

-
DEPRECATED: This handler is unused and will be removed from future versions. Default SAX version1 handler for XML, builds the DOM tree

-

-

-

-

-Variable xmlDefaultSAXLocator

-
const xmlSAXLocator xmlDefaultSAXLocator;
-

-
DEPRECATED: Don't use The default SAX Locator { getPublicId, getSystemId, getLineNumber, getColumnNumber}

-

-

-

-

-Variable xmlParserDebugEntities

-
const int xmlParserDebugEntities;
-

-
DEPRECATED: Don't use Global setting, asking the parser to print out debugging information. while handling entities. Disabled by default

+
Callback for custom resource loaders. @flags can contain XML_INPUT_UNZIP and XML_INPUT_NETWORK. On success, @out should be set to a new parser input object and XML_ERR_OK should be returned.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
url:URL to load
publicId:publid ID from DTD (optional)
type:resource type
flags:flags
out:result pointer
Returns:an xmlParserErrors code.

 

 

 

@@ -1289,7 +1373,7 @@ The content of this structure is not made public by the API.
 xmlByteConsumed ()
 
long	xmlByteConsumed			(xmlParserCtxtPtr ctxt)

 

-
This function provides the current index of the parser relative to the start of the current entity. This function is computed in bytes from the beginning starting at zero and finishing at the size in byte of the file if parsing a file. The function is of constant cost if the input is UTF-8 but can be costly if run on non-UTF-8 input.

+
DEPRECATED: Don't use. This function provides the current index of the parser relative to the start of the current entity. This function is computed in bytes from the beginning starting at zero and finishing at the size in byte of the file if parsing a file. The function is of constant cost if the input is UTF-8 but can be costly if run on non-UTF-8 input.

 

@@ -1318,7 +1402,7 @@ The content of this structure is not made public by the API.
 xmlCleanupParser ()
void	xmlCleanupParser		(void)

 

-
This function name is somewhat misleading. It does not clean up parser state, it cleans up memory allocated by the library itself. It is a cleanup function for the XML library. It tries to reclaim all related global memory allocated for the library processing. It doesn't deallocate any document related memory. One should call xmlCleanupParser() only when the process has finished using the library and all XML/HTML documents built with it. See also xmlInitParser() which has the opposite function of preparing the library for operations. WARNING: if your application is multithreaded or has plugin support calling this may crash the application if another thread or a plugin is still using libxml2. It's sometimes very hard to guess if libxml2 is in use in the application, some libraries or plugins may use it without notice. In case of doubt abstain from calling this function or do it just before calling exit() to avoid leak reports from valgrind !

+
This function is named somewhat misleadingly. It does not clean up parser state but global memory allocated by the library itself. Since 2.9.11, cleanup is performed automatically if a shared or dynamic libxml2 library is unloaded. This function should only be used to avoid false positives from memory leak checkers in static builds. WARNING: xmlCleanupParser assumes that all other threads that called libxml2 functions have terminated. No library calls must be made after calling this function. In general, THIS FUNCTION SHOULD ONLY BE CALLED RIGHT BEFORE THE WHOLE PROCESS EXITS.

@@ -1419,7 +1503,7 @@ The content of this structure is not made public by the API.
 xmlCreatePushParserCtxt ()
 
xmlParserCtxtPtr	xmlCreatePushParserCtxt	(xmlSAXHandlerPtr sax, 
						 void * user_data, 
						 const char * chunk, 
						 int size, 
						 const char * filename)

 

-
Create a parser context for using the XML parser in push mode. See xmlParseChunk. Passing an initial chunk is useless and deprecated. @filename is used as base URI to fetch external entities and for error reports.

+
Create a parser context for using the XML parser in push mode. See xmlParseChunk. Passing an initial chunk is useless and deprecated. The push parser doesn't support recovery mode or the XML_PARSE_NOBLANKS option. @filename is used as base URI to fetch external entities and for error reports.

 

 
 
 
 
 
 

@@ -1445,7 +1529,313 @@ The content of this structure is not made public by the API.
 
-
+
+
+
+

 
 
 

 Returns:the new parser context or NULL in case of error.the new parser context or NULL if a memory allocation failed.

+

+

+

+

+xmlCtxtGetCatalogs ()

+
void *	xmlCtxtGetCatalogs		(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the local catalogs.

+

+

+

+

+xmlCtxtGetDeclaredEncoding ()

+
const xmlChar *	xmlCtxtGetDeclaredEncoding	(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the encoding from the encoding declaration. This can differ from the actual encoding.

+

+

+

+

+xmlCtxtGetDict ()

+
xmlDictPtr	xmlCtxtGetDict		(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the dictionary.

+

+

+

+

+xmlCtxtGetDocument ()

+
xmlDocPtr	xmlCtxtGetDocument	(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the parsed document or NULL if a fatal error occurred when parsing. The document must be freed by the caller. Resets the context's document to NULL.

+

+

+

+

+xmlCtxtGetOptions ()

+
int	xmlCtxtGetOptions		(xmlParserCtxtPtr ctxt)

+

+
Get the current options of the parser context. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:an XML parser context
Returns:the current options set in the parser context, or -1 if ctxt is NULL.

+

+

+

+

+xmlCtxtGetPrivate ()

+
void *	xmlCtxtGetPrivate		(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the private application data.

+

+

+

+

+xmlCtxtGetSaxHandler ()

+
xmlSAXHandler *	xmlCtxtGetSaxHandler	(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the SAX handler struct. This is not a copy and must not be freed. Handlers can be updated.

+

+

+

+

+xmlCtxtGetStandalone ()

+
int	xmlCtxtGetStandalone		(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the value from the standalone document declaration.

+

+

+

+

+xmlCtxtGetStatus ()

+
xmlParserStatus	xmlCtxtGetStatus	(xmlParserCtxt * ctxt)

+

+
Get well-formedness and validation status after parsing. Also reports catastrophic errors which are not related to parsing like out-of-memory, I/O or other errors. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:an XML parser context
Returns:a bitmask of XML_STATUS_* flags ORed together.

+

+

+

+

+xmlCtxtGetValidCtxt ()

+
xmlValidCtxtPtr	xmlCtxtGetValidCtxt	(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the validation context.

+

+

+

+

+xmlCtxtGetVersion ()

+
const xmlChar *	xmlCtxtGetVersion	(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:the version from the XML declaration.

+

+

+

+

+xmlCtxtIsHtml ()

+
int	xmlCtxtIsHtml			(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:1 if this is a HTML parser context, 0 otherwise.

+

+

+

+

+xmlCtxtIsStopped ()

+
int	xmlCtxtIsStopped		(xmlParserCtxtPtr ctxt)

+

+
Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
Returns:1 if the parser is stopped, 0 otherwise.

+

+

+

+

+xmlCtxtParseContent ()

+
xmlNodePtr	xmlCtxtParseContent	(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input, 
					 xmlNodePtr node, 
					 int hasTextDecl)

+

+
Parse a well-balanced chunk of XML matching the 'content' production. Namespaces in scope of @node and entities of @node's document are recognized. When validating, the DTD of @node's document is used. Always consumes @input even in error case. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
input:parser input
node:target node or document
hasTextDecl:whether to parse text declaration
Returns:a node list or NULL in case of error.
 

 
 

@@ -1478,6 +1868,39 @@ The content of this structure is not made public by the API.
 

 

 

+xmlCtxtParseDtd ()

+
xmlDtdPtr	xmlCtxtParseDtd		(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input, 
					 const xmlChar * publicId, 
					 const xmlChar * systemId)

+

+
Parse a DTD. Option XML_PARSE_DTDLOAD should be enabled in the parser context to make external entities work. Availabe since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:a parser context
input:a parser input
publicId:public ID of the DTD (optional)
systemId:system ID of the DTD (optional)
Returns:the resulting xmlDtdPtr or NULL in case of error. @input will be freed by the function in any case.

+

+

+

+

 xmlCtxtReadDoc ()

 
xmlDocPtr	xmlCtxtReadDoc		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * str, 
					 const char * URL, 
					 const char * encoding, 
					 int options)

 

@@ -1557,7 +1980,7 @@ The content of this structure is not made public by the API.
 xmlCtxtReadFile ()
 
xmlDocPtr	xmlCtxtReadFile		(xmlParserCtxtPtr ctxt, 
					 const char * filename, 
					 const char * encoding, 
					 int options)

 

-
Parse an XML file from the filesystem, the network or a user-defined resource loader. See xmlNewInputURL and xmlCtxtUseOptions for details.

+
Parse an XML file from the filesystem, the network or a user-defined resource loader. This function always enables the XML_PARSE_UNZIP option for backward compatibility. This feature is potentially insecure and might be removed from later versions.

 

@@ -1728,6 +2151,73 @@ The content of this structure is not made public by the API.
 

 

+xmlCtxtSetCatalogs ()

+
void	xmlCtxtSetCatalogs		(xmlParserCtxtPtr ctxt, 
					 void * catalogs)

+

+
Available since 2.14.0. Set the local catalogs.

+

 
 
 

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
catalogs:catalogs pointer

+

+

+

+

+xmlCtxtSetCharEncConvImpl ()

+
void	xmlCtxtSetCharEncConvImpl	(xmlParserCtxtPtr ctxt, 
					 xmlCharEncConvImpl impl, 
					 void * vctxt)

+

+
Installs a custom implementation to convert between character encodings. This bypasses legacy feature like global encoding handlers or encoding aliases. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
impl:callback
vctxt:user data

+

+

+

+

+xmlCtxtSetDict ()

+
void	xmlCtxtSetDict			(xmlParserCtxtPtr ctxt, 
					 xmlDictPtr dict)

+

+
Available since 2.14.0. Set the dictionary. This should only be done immediately after creating a parser context.

+

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
dict:dictionary

+

+

+

+

 xmlCtxtSetErrorHandler ()

 
void	xmlCtxtSetErrorHandler		(xmlParserCtxtPtr ctxt, 
					 xmlStructuredErrorFunc handler, 
					 void * data)

 

@@ -1777,7 +2267,7 @@ The content of this structure is not made public by the API.
 xmlCtxtSetOptions ()
 
int	xmlCtxtSetOptions		(xmlParserCtxtPtr ctxt, 
					 int options)

 

-
Applies the options to the parser context. Unset options are cleared. Available since 2.13.0. With older versions, you can use xmlCtxtUseOptions. XML_PARSE_RECOVER Enable "recovery" mode which allows non-wellformed documents. How this mode behaves exactly is unspecified and may change without further notice. Use of this feature is DISCOURAGED. XML_PARSE_NOENT Despite the confusing name, this option enables substitution of entities. The resulting tree won't contain any entity reference nodes. This option also enables loading of external entities (both general and parameter entities) which is dangerous. If you process untrusted data, it's recommended to set the XML_PARSE_NO_XXE option to disable loading of external entities. XML_PARSE_DTDLOAD Enables loading of an external DTD and the loading and substitution of external parameter entities. Has no effect if XML_PARSE_NO_XXE is set. XML_PARSE_DTDATTR Adds default attributes from the DTD to the result document. Implies XML_PARSE_DTDLOAD, but loading of external content can be disabled with XML_PARSE_NO_XXE. XML_PARSE_DTDVALID This option enables DTD validation which requires to load external DTDs and external entities (both general and parameter entities) unless XML_PARSE_NO_XXE was set. XML_PARSE_NO_XXE Disables loading of external DTDs or entities. XML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. XML_PARSE_NOWARNING Disable warning reports. XML_PARSE_PEDANTIC Enable some pedantic warnings. XML_PARSE_NOBLANKS Remove some text nodes containing only whitespace from the result document. Which nodes are removed depends on DTD element declarations or a conservative heuristic. The reindenting feature of the serialization code relies on this option to be set when parsing. Use of this option is DISCOURAGED. XML_PARSE_SAX1 Always invoke the deprecated SAX1 startElement and endElement handlers. This option is DEPRECATED. XML_PARSE_NONET Disable network access with the builtin HTTP and FTP clients. XML_PARSE_NODICT Create a document without interned strings, making all strings separate memory allocations. XML_PARSE_NSCLEAN Remove redundant namespace declarations from the result document. XML_PARSE_NOCDATA Output normal text nodes instead of CDATA nodes. XML_PARSE_COMPACT Store small strings directly in the node struct to save memory. XML_PARSE_OLD10 Use old Name productions from before XML 1.0 Fifth Edition. This options is DEPRECATED. XML_PARSE_HUGE Relax some internal limits. Maximum size of text nodes, tags, comments, processing instructions, CDATA sections, entity values normal: 10M huge: 1B Maximum size of names, system literals, pubid literals normal: 50K huge: 10M Maximum nesting depth of elements normal: 256 huge: 2048 Maximum nesting depth of entities normal: 20 huge: 40 XML_PARSE_OLDSAX Enable an unspecified legacy mode for SAX parsers. This option is DEPRECATED. XML_PARSE_IGNORE_ENC Ignore the encoding in the XML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. XML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535.

+
Applies the options to the parser context. Unset options are cleared. Available since 2.13.0. With older versions, you can use xmlCtxtUseOptions. XML_PARSE_RECOVER Enable "recovery" mode which allows non-wellformed documents. How this mode behaves exactly is unspecified and may change without further notice. Use of this feature is DISCOURAGED. Not supported by the push parser. XML_PARSE_NOENT Despite the confusing name, this option enables substitution of entities. The resulting tree won't contain any entity reference nodes. This option also enables loading of external entities (both general and parameter entities) which is dangerous. If you process untrusted data, it's recommended to set the XML_PARSE_NO_XXE option to disable loading of external entities. XML_PARSE_DTDLOAD Enables loading of an external DTD and the loading and substitution of external parameter entities. Has no effect if XML_PARSE_NO_XXE is set. XML_PARSE_DTDATTR Adds default attributes from the DTD to the result document. Implies XML_PARSE_DTDLOAD, but loading of external content can be disabled with XML_PARSE_NO_XXE. XML_PARSE_DTDVALID This option enables DTD validation which requires to load external DTDs and external entities (both general and parameter entities) unless XML_PARSE_NO_XXE was set. XML_PARSE_NO_XXE Disables loading of external DTDs or entities. Available since 2.13.0. XML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. XML_PARSE_NOWARNING Disable warning reports. XML_PARSE_PEDANTIC Enable some pedantic warnings. XML_PARSE_NOBLANKS Remove some whitespace from the result document. Where to remove whitespace depends on DTD element declarations or a broken heuristic with unfixable bugs. Use of this option is DISCOURAGED. Not supported by the push parser. XML_PARSE_SAX1 Always invoke the deprecated SAX1 startElement and endElement handlers. This option is DEPRECATED. XML_PARSE_NONET Disable network access with the builtin HTTP client. XML_PARSE_NODICT Create a document without interned strings, making all strings separate memory allocations. XML_PARSE_NSCLEAN Remove redundant namespace declarations from the result document. XML_PARSE_NOCDATA Output normal text nodes instead of CDATA nodes. XML_PARSE_COMPACT Store small strings directly in the node struct to save memory. XML_PARSE_OLD10 Use old Name productions from before XML 1.0 Fifth Edition. This options is DEPRECATED. XML_PARSE_HUGE Relax some internal limits. Maximum size of text nodes, tags, comments, processing instructions, CDATA sections, entity values normal: 10M huge: 1B Maximum size of names, system literals, pubid literals normal: 50K huge: 10M Maximum nesting depth of elements normal: 256 huge: 2048 Maximum nesting depth of entities normal: 20 huge: 40 XML_PARSE_OLDSAX Enable an unspecified legacy mode for SAX parsers. This option is DEPRECATED. XML_PARSE_IGNORE_ENC Ignore the encoding in the XML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. XML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535. XML_PARSE_UNZIP Enable input decompression. Setting this option is discouraged to avoid zip bombs. Available since 2.14.0. XML_PARSE_NO_SYS_CATALOG Disables the global system XML catalog. Available since 2.14.0. XML_PARSE_CATALOG_PI Enable XML catalog processing instructions. Available since 2.14.0.

 

@@ -1799,6 +2289,77 @@ The content of this structure is not made public by the API.
 

 

+xmlCtxtSetPrivate ()

+
void	xmlCtxtSetPrivate		(xmlParserCtxtPtr ctxt, 
					 void * priv)

+

+
Available since 2.14.0. Set the private application data.

+

 
 
 

++
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
priv:private application data

+

+

+

+

+xmlCtxtSetResourceLoader ()

+
void	xmlCtxtSetResourceLoader	(xmlParserCtxtPtr ctxt, 
					 xmlResourceLoader loader, 
					 void * vctxt)

+

+
Installs a custom callback to load documents, DTDs or external entities. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
loader:callback
vctxt:user data

+

+

+

+

+xmlCtxtSetSaxHandler ()

+
int	xmlCtxtSetSaxHandler		(xmlParserCtxtPtr ctxt, 
					 const xmlSAXHandler * sax)

+

+
Available since 2.14.0. Set the SAX handler struct to a copy of @sax.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:parser context
sax:SAX handler
Returns:0 on success or -1 if arguments are invalid or a memory allocation failed.

+

+

+

+

 xmlCtxtUseOptions ()

 
int	xmlCtxtUseOptions		(xmlParserCtxtPtr ctxt, 
					 int options)

 

@@ -1825,6 +2386,60 @@ The content of this structure is not made public by the API.
 

 

 

+xmlCtxtValidateDocument ()

+
int	xmlCtxtValidateDocument		(xmlParserCtxtPtr ctxt, 
					 xmlDocPtr doc)

+

+
Validate a document. Like xmlValidateDocument but uses the parser context's error handler. Option XML_PARSE_DTDLOAD should be enabled in the parser context to make external entities work. Availabe since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:a parser context
doc:a document instance
Returns:1 if valid or 0 otherwise.

+

+

+

+

+xmlCtxtValidateDtd ()

+
int	xmlCtxtValidateDtd		(xmlParserCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlDtdPtr dtd)

+

+
Validate a document against a DTD. Like xmlValidateDtd but uses the parser context's error handler. Availabe since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:a parser context
doc:a document instance
dtd:a dtd instance
Returns:1 if valid or 0 otherwise.

+

+

+

+

 xmlFreeParserCtxt ()

 
void	xmlFreeParserCtxt		(xmlParserCtxtPtr ctxt)

 

@@ -1843,7 +2458,7 @@ The content of this structure is not made public by the API.
 xmlGetExternalEntityLoader ()
 
xmlExternalEntityLoader	xmlGetExternalEntityLoader	(void)

 

-
Get the default external entity resolver function for the application

+
DEPRECATED: See xmlSetExternalEntityLoader. Get the default external entity resolver function for the application

 

@@ -1855,60 +2470,6 @@ The content of this structure is not made public by the API.
 

 

-xmlGetFeature ()

-
int	xmlGetFeature			(xmlParserCtxtPtr ctxt, 
					 const char * name, 
					 void * result)

-

-
Read the current value of one feature of this parser instance

-

 
 

 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML/HTML parser context
name:the feature name
result:location to store the result
Returns:-1 in case or error, 0 otherwise

-

-

-

-

-xmlGetFeaturesList ()

-
int	xmlGetFeaturesList		(int * len, 
					 const char ** result)

-

-
Copy at most *@len feature names into the @result array

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


len:the length of the features name array (input/output)
result:an array of string to be filled with the features name.
Returns:-1 in case or error, or the total number of features, len is updated with the number of strings copied, strings must not be deallocated

-

-

-

-

 xmlHasFeature ()

 
int	xmlHasFeature			(xmlFeature feature)

 

@@ -1933,7 +2494,7 @@ The content of this structure is not made public by the API.
 xmlIOParseDTD ()
 
xmlDtdPtr	xmlIOParseDTD		(xmlSAXHandlerPtr sax, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc)

 

-
Load and parse a DTD

+
DEPRECATED: Use xmlCtxtParseDtd. Load and parse a DTD

 

@@ -1985,7 +2546,7 @@ The content of this structure is not made public by the API.
 xmlInitParser ()
void	xmlInitParser			(void)

 

-
Initialization function for the XML parser. Call once from the main thread before using the library in multithreaded programs.

+
Initialization function for the XML parser. For older versions, it's recommended to call this function once from the main thread before using the library in multithreaded programs. Since 2.14.0, there's no distinction between threads. It should be unnecessary to call this function.

@@ -2011,6 +2572,31 @@ The content of this structure is not made public by the API.
 

 

 

+xmlInputSetEncodingHandler ()

+
xmlParserErrors	xmlInputSetEncodingHandler	(xmlParserInputPtr input, 
						 xmlCharEncodingHandlerPtr handler)

+

+
Use encoding handler to decode input data. Closes the handler on error.

+

 
 
 
 
 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


input:the input stream
handler:the encoding handler
Returns:an xmlParserErrors code.

+

+

+

+

 xmlKeepBlanksDefault ()

 
int	xmlKeepBlanksDefault		(int val)

 

@@ -2056,7 +2642,7 @@ The content of this structure is not made public by the API.
 xmlLoadExternalEntity ()
 
xmlParserInputPtr	xmlLoadExternalEntity	(const char * URL, 
						 const char * ID, 
						 xmlParserCtxtPtr ctxt)

 

-

+
@URL is a filename or URL. If if contains the substring "://", it is assumed to be a Legacy Extended IRI. Otherwise, it is treated as a filesystem path. @ID is an optional XML public ID, typically from a doctype declaration. It is used for catalog lookups. If catalog lookup is enabled (default is yes) and URL or ID are found in system or local XML catalogs, URL is replaced with the result. Then the following resource loaders will be called if they were registered (in order of precedence): - the resource loader set with xmlCtxtSetResourceLoader - the global external entity loader set with xmlSetExternalEntityLoader (without catalog resolution, deprecated) - the per-thread xmlParserInputBufferCreateFilenameFunc set with xmlParserInputBufferCreateFilenameDefault (deprecated) - the default loader which will return - the result from a matching global input callback set with xmlRegisterInputCallbacks (deprecated) - a HTTP resource if support is compiled in. - a file opened from the filesystem, with automatic detection of compressed files if support is compiled in.

 

@@ -2111,6 +2697,163 @@ The content of this structure is not made public by the API.
 

 

+xmlNewInputFromFd ()

+
xmlParserInputPtr	xmlNewInputFromFd	(const char * url, 
						 int fd, 
						 xmlParserInputFlags flags)

+

+
Creates a new parser input to read from a zero-terminated string. @url is used as base to resolve external entities and for error reporting. @fd is closed after parsing has finished. Supported @flags are XML_INPUT_UNZIP to decompress data automatically. This feature is deprecated and will be removed in a future release. Available since 2.14.0.

+

 
 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


url:base URL (optional)
fd:file descriptor
flags:input flags
Returns:a new parser input or NULL if a memory allocation failed.

+

+

+

+

+xmlNewInputFromIO ()

+
xmlParserInputPtr	xmlNewInputFromIO	(const char * url, 
						 xmlInputReadCallback ioRead, 
						 xmlInputCloseCallback ioClose, 
						 void * ioCtxt, 
						 xmlParserInputFlags flags)

+

+
Creates a new parser input to read from input callbacks and cintext. @url is used as base to resolve external entities and for error reporting. @ioRead is called to read new data into a provided buffer. It must return the number of bytes written into the buffer ot a negative xmlParserErrors code on failure. @ioClose is called after parsing has finished. @ioCtxt is an opaque pointer passed to the callbacks. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


url:base URL (optional)
ioRead:read callback
ioClose:close callback (optional)
ioCtxt:IO context
flags:unused, pass 0
Returns:a new parser input or NULL if a memory allocation failed.

+

+

+

+

+xmlNewInputFromMemory ()

+
xmlParserInputPtr	xmlNewInputFromMemory	(const char * url, 
						 const void * mem, 
						 size_t size, 
						 xmlParserInputFlags flags)

+

+
Creates a new parser input to read from a memory area. @url is used as base to resolve external entities and for error reporting. If the XML_INPUT_BUF_STATIC flag is set, the memory area must stay unchanged until parsing has finished. This can avoid temporary copies. If the XML_INPUT_BUF_ZERO_TERMINATED flag is set, the memory area must contain a zero byte after the buffer at position @size. This can avoid temporary copies. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


url:base URL (optional)
mem:pointer to char array
size:size of array
flags:optimization hints
Returns:a new parser input or NULL if a memory allocation failed.

+

+

+

+

+xmlNewInputFromString ()

+
xmlParserInputPtr	xmlNewInputFromString	(const char * url, 
						 const char * str, 
						 xmlParserInputFlags flags)

+

+
Creates a new parser input to read from a zero-terminated string. @url is used as base to resolve external entities and for error reporting. If the XML_INPUT_BUF_STATIC flag is set, the string must stay unchanged until parsing has finished. This can avoid temporary copies. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


url:base URL (optional)
str:zero-terminated string
flags:optimization hints
Returns:a new parser input or NULL if a memory allocation failed.

+

+

+

+

+xmlNewInputFromUrl ()

+
xmlParserErrors	xmlNewInputFromUrl	(const char * filename, 
					 xmlParserInputFlags flags, 
					 xmlParserInputPtr * out)

+

+
Create a new input stream based on a file or a URL. The flag XML_INPUT_UNZIP allows decompression. The flag XML_INPUT_NETWORK allows network access. The following resource loaders will be called if they were registered (in order of precedence): - the per-thread xmlParserInputBufferCreateFilenameFunc set with xmlParserInputBufferCreateFilenameDefault (deprecated) - the default loader which will return - the result from a matching global input callback set with xmlRegisterInputCallbacks (deprecated) - a HTTP resource if support is compiled in. - a file opened from the filesystem, with automatic detection of compressed files if support is compiled in. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


filename:the filename to use as entity
flags:XML_INPUT flags
out:pointer to new parser input
Returns:an xmlParserErrors code.

+

+

+

+

 xmlNewParserCtxt ()

 
xmlParserCtxtPtr	xmlNewParserCtxt	(void)

 

@@ -2240,7 +2983,7 @@ The content of this structure is not made public by the API.
 xmlParseChunk ()
 
int	xmlParseChunk			(xmlParserCtxtPtr ctxt, 
					 const char * chunk, 
					 int size, 
					 int terminate)

 

-
Parse a chunk of memory in push parser mode. Assumes that the parser context was initialized with xmlCreatePushParserCtxt. The last chunk, which will often be empty, must be marked with the @terminate flag. With the default SAX callbacks, the resulting document will be available in ctxt->myDoc. This pointer will not be freed by the library. If the document isn't well-formed, ctxt->myDoc is set to NULL. The push parser doesn't support recovery mode.

+
Parse a chunk of memory in push parser mode. Assumes that the parser context was initialized with xmlCreatePushParserCtxt. The last chunk, which will often be empty, must be marked with the @terminate flag. With the default SAX callbacks, the resulting document will be available in ctxt->myDoc. This pointer will not be freed when calling xmlFreeParserCtxt and must be freed by the caller. If the document isn't well-formed, it will still be returned in ctxt->myDoc. As an exception, xmlCtxtResetPush will free the document in ctxt->myDoc. So ctxt->myDoc should be set to NULL after extracting the document.

 

@@ -2395,7 +3138,7 @@ The content of this structure is not made public by the API.
 xmlParseExtParsedEnt ()
int	xmlParseExtParsedEnt		(xmlParserCtxtPtr ctxt)

 

-
parse a general parsed entity An external general parsed entity is well-formed if it matches the production labeled extParsedEnt. [78] extParsedEnt ::= TextDecl? content

+
DEPRECATED: Internal function, don't use. parse a general parsed entity An external general parsed entity is well-formed if it matches the production labeled extParsedEnt. [78] extParsedEnt ::= TextDecl? content

 
 
 
 

@@ -2480,9 +3223,9 @@ The content of this structure is not made public by the API.
 

 

 xmlParseInNodeContext ()

-
xmlParserErrors	xmlParseInNodeContext	(xmlNodePtr node, 
					 const char * data, 
					 int datalen, 
					 int options, 
					 xmlNodePtr * lst)

+
xmlParserErrors	xmlParseInNodeContext	(xmlNodePtr node, 
					 const char * data, 
					 int datalen, 
					 int options, 
					 xmlNodePtr * listOut)

 

-
Parse a well-balanced chunk of an XML document within the context (DTD, namespaces, etc ...) of the given node. The allowed sequence for the data is a Well Balanced Chunk defined by the content production in the XML grammar: [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)*

+
Parse a well-balanced chunk of an XML document within the context (DTD, namespaces, etc ...) of the given node. The allowed sequence for the data is a Well Balanced Chunk defined by the content production in the XML grammar: [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)* This function assumes the encoding of @node's document which is typically not what you want. A better alternative is xmlCtxtParseContent.

 

 
 

@@ -2504,7 +3247,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -2756,7 +3499,7 @@ The content of this structure is not made public by the API.
 xmlReadFile ()
xmlDocPtr	xmlReadFile		(const char * filename, 
					 const char * encoding, 
					 int options)

 

-
Convenience function to parse an XML file from the filesystem, the network or a global user-define resource loader. See xmlCtxtReadFile for details.

+
Convenience function to parse an XML file from the filesystem, the network or a global user-define resource loader. This function always enables the XML_PARSE_UNZIP option for backward compatibility. If a "-" filename is passed, it will read from stdin. Both of these features are potentially insecure and might be removed from later versions. See xmlCtxtReadFile for details.

 
 
 
 
lst:listOut:
 the return value for the set of parsed nodes
 

 

 
 

@@ -2934,7 +3677,7 @@ The content of this structure is not made public by the API.
 xmlSAXParseDTD ()
xmlDtdPtr	xmlSAXParseDTD		(xmlSAXHandlerPtr sax, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

 

-
DEPRECATED: Don't use. Load and parse an external subset.

+
DEPRECATED: Use xmlCtxtParseDtd. Load and parse an external subset.

 
 
 
 

@@ -3212,7 +3955,7 @@ The content of this structure is not made public by the API.
 xmlSetExternalEntityLoader ()
void	xmlSetExternalEntityLoader	(xmlExternalEntityLoader f)

 

-
Changes the defaultexternal entity resolver function for the application

+
DEPRECATED: This is a global setting and not thread-safe. Use xmlCtxtSetResourceLoader or similar functions. Changes the default external entity resolver function for the application.

 
 
 
 

@@ -3224,35 +3967,6 @@ The content of this structure is not made public by the API.
 

 

-xmlSetFeature ()

-
int	xmlSetFeature			(xmlParserCtxtPtr ctxt, 
					 const char * name, 
					 void * value)

-

-
Change the current value of one feature of this parser instance

-

 
 

 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML/HTML parser context
name:the feature name
value:pointer to the location of the new value
Returns:-1 in case or error, 0 otherwise

-

-

-

-

 xmlSetupParserForBuffer ()

 
void	xmlSetupParserForBuffer		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * buffer, 
					 const char * filename)

 

@@ -3419,27 +4133,6 @@ The content of this structure is not made public by the API.
 

 

 

-xmlThrDefParserDebugEntities ()

-
int	xmlThrDefParserDebugEntities	(int v)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


v:
Returns:

-

-

-

-

 xmlThrDefPedanticParserDefaultValue ()

 
int	xmlThrDefPedanticParserDefaultValue	(int v)

 

diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html
index 13adbc87..9c4e6de7 100644
--- a/doc/devhelp/libxml2-parserInternals.html
+++ b/doc/devhelp/libxml2-parserInternals.html
@@ -22,8 +22,7 @@
 
Author(s): Daniel Veillard 

 

 
Synopsis

-
#define INPUT_CHUNK;
-#define IS_ASCII_DIGIT(c);
+
#define IS_ASCII_DIGIT(c);
 #define IS_ASCII_LETTER(c);
 #define IS_BASECHAR(c);
 #define IS_BLANK(c);
@@ -52,12 +51,9 @@
 #define XML_SUBSTITUTE_NONE;
 #define XML_SUBSTITUTE_PEREF;
 #define XML_SUBSTITUTE_REF;
-xmlParserInputPtr	inputPop	(xmlParserCtxtPtr ctxt);
-int	inputPush			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value);
-const xmlChar *	namePop			(xmlParserCtxtPtr ctxt);
-int	namePush			(xmlParserCtxtPtr ctxt, 
					 const xmlChar * value);
-xmlNodePtr	nodePop			(xmlParserCtxtPtr ctxt);
-int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value);
+#define inputPop;
+#define inputPush;
+#define xmlParserMaxDepth;
 int	xmlCheckLanguageID		(const xmlChar * lang);
 int	xmlCopyChar			(int len, 
					 xmlChar * out, 
					 int val);
 int	xmlCopyCharMultiByte		(xmlChar * out, 
					 int val);
@@ -66,15 +62,11 @@ int	xmlCopyCharMultiByte		(xmlParserCtxtPtr	xmlCreateMemoryParserCtxt	(const char * buffer, 
							 int size);
 xmlParserCtxtPtr	xmlCreateURLParserCtxt	(const char * filename, 
						 int options);
 void	xmlCtxtErrMemory		(xmlParserCtxtPtr ctxt);
+xmlParserInputPtr	xmlCtxtPopInput	(xmlParserCtxtPtr ctxt);
+int	xmlCtxtPushInput		(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value);
 int	xmlCurrentChar			(xmlParserCtxtPtr ctxt, 
					 int * len);
-xmlChar *	xmlDecodeEntities	(xmlParserCtxtPtr ctxt, 
					 int len, 
					 int what, 
					 xmlChar end, 
					 xmlChar end2, 
					 xmlChar end3);
-typedef void xmlEntityReferenceFunc		(xmlEntityPtr ent, 
					 xmlNodePtr firstNode, 
					 xmlNodePtr lastNode);
 void	xmlFreeInputStream		(xmlParserInputPtr input);
-void	xmlHandleEntity			(xmlParserCtxtPtr ctxt, 
					 xmlEntityPtr entity);
 int	xmlIsLetter			(int c);
-xmlChar *	xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
-xmlChar *	xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
-xmlChar *	xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** prefix);
 xmlParserInputPtr	xmlNewEntityInputStream	(xmlParserCtxtPtr ctxt, 
						 xmlEntityPtr ent);
 xmlParserInputPtr	xmlNewInputFromFile	(xmlParserCtxtPtr ctxt, 
						 const char * filename);
 xmlParserInputPtr	xmlNewInputStream	(xmlParserCtxtPtr ctxt);
@@ -109,7 +101,6 @@ void	xmlParseExternalSubset		(xmlParseMarkupDecl		(xmlParserCtxtPtr ctxt);
 void	xmlParseMisc			(xmlParserCtxtPtr ctxt);
 const xmlChar *	xmlParseName		(xmlParserCtxtPtr ctxt);
-void	xmlParseNamespace		(xmlParserCtxtPtr ctxt);
 xmlChar *	xmlParseNmtoken		(xmlParserCtxtPtr ctxt);
 void	xmlParseNotationDecl		(xmlParserCtxtPtr ctxt);
 xmlEnumerationPtr	xmlParseNotationType	(xmlParserCtxtPtr ctxt);
@@ -117,7 +108,6 @@ void	xmlParsePEReference		(xmlParsePI			(xmlParserCtxtPtr ctxt);
 const xmlChar *	xmlParsePITarget	(xmlParserCtxtPtr ctxt);
 xmlChar *	xmlParsePubidLiteral	(xmlParserCtxtPtr ctxt);
-xmlChar *	xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
 void	xmlParseReference		(xmlParserCtxtPtr ctxt);
 int	xmlParseSDDecl			(xmlParserCtxtPtr ctxt);
 const xmlChar *	xmlParseStartTag	(xmlParserCtxtPtr ctxt);
@@ -127,12 +117,9 @@ void	xmlParseTextDecl		(xmlChar *	xmlParseVersionNum	(xmlParserCtxtPtr ctxt);
 void	xmlParseXMLDecl			(xmlParserCtxtPtr ctxt);
 void	xmlParserHandlePEReference	(xmlParserCtxtPtr ctxt);
-void	xmlParserHandleReference	(xmlParserCtxtPtr ctxt);
 void	xmlParserInputShrink		(xmlParserInputPtr in);
 xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt);
 int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input);
-xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt);
-void	xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func);
 int	xmlSkipBlankChars		(xmlParserCtxtPtr ctxt);
 xmlChar *	xmlSplitQName		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * name, 
					 xmlChar ** prefixOut);
 int	xmlStringCurrentChar		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * cur, 
					 int * len);
@@ -150,14 +137,6 @@ int	xmlSwitchToEncoding		(
 

 

-Macro INPUT_CHUNK

-
#define INPUT_CHUNK;
-

-
The parser tries to always have that amount of input ready. One of the point is providing context when reporting errors.

-

-

-

-

 Macro IS_ASCII_DIGIT

 
#define IS_ASCII_DIGIT(c);
 

@@ -523,35 +502,26 @@ int	xmlSwitchToEncoding		(
 

-Function type xmlEntityReferenceFunc

-
void	xmlEntityReferenceFunc		(xmlEntityPtr ent, 
					 xmlNodePtr firstNode, 
					 xmlNodePtr lastNode)

+Macro inputPop
+
#define inputPop;
 

-
Callback function used when one needs to be able to track back the provenance of a chunk of nodes inherited from an entity replacement.

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ent:the entity
firstNode:the fist node in the chunk
lastNode:the last nod in the chunk

+

 

 

 

 

-Variable xmlParserMaxDepth

-
const unsigned int xmlParserMaxDepth;
+Macro inputPush
+
#define inputPush;
 

-
arbitrary depth limit for the XML documents that we allow to process. This is not a limitation of the parser but a safety boundary feature. It can be disabled with the XML_PARSE_HUGE parser option.

+

+

+

+

+

+Macro xmlParserMaxDepth

+
#define xmlParserMaxDepth;
+

+

 

 

 

@@ -580,148 +550,10 @@ int	xmlSwitchToEncoding		(
 

-inputPop ()

-
xmlParserInputPtr	inputPop	(xmlParserCtxtPtr ctxt)

-

-
Pops the top parser input from the input stack

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the input just removed

-

-

-

-

-inputPush ()

-
int	inputPush			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value)

-

-
Pushes a new parser input on top of the input stack

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
value:the parser input
Returns:-1 in case of error, the index in the stack otherwise

-

-

-

-

-namePop ()

-
const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)

-

-
DEPRECATED: Internal function, do not use. Pops the top element name from the name stack

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the name just removed

-

-

-

-

-namePush ()

-
int	namePush			(xmlParserCtxtPtr ctxt, 
					 const xmlChar * value)

-

-
DEPRECATED: Internal function, do not use. Pushes a new element name on top of the name stack

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
value:the element name
Returns:-1 in case of error, the index in the stack otherwise

-

-

-

-

-nodePop ()

-
xmlNodePtr	nodePop			(xmlParserCtxtPtr ctxt)

-

-
DEPRECATED: Internal function, do not use. Pops the top element node from the node stack

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the node just removed

-

-

-

-

-nodePush ()

-
int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value)

-

-
DEPRECATED: Internal function, do not use. Pushes a new element node on top of the node stack

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
value:the element node
Returns:-1 in case of error, the index in the stack otherwise

-

-

-

-

 xmlCheckLanguageID ()

 
int	xmlCheckLanguageID		(const xmlChar * lang)

 

-
DEPRECATED: Internal function, do not use. Checks that the value conforms to the LanguageID production: NOTE: this is somewhat deprecated, those productions were removed from the XML Second edition. [33] LanguageID ::= Langcode ('-' Subcode)* [34] Langcode ::= ISO639Code | IanaCode | UserCode [35] ISO639Code ::= ([a-z] | [A-Z]) ([a-z] | [A-Z]) [36] IanaCode ::= ('i' | 'I') '-' ([a-z] | [A-Z])+ [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+ [38] Subcode ::= ([a-z] | [A-Z])+ The current REC reference the successors of RFC 1766, currently 5646 http://www.rfc-editor.org/rfc/rfc5646.txt langtag = language ["-" script] ["-" region] *("-" variant) *("-" extension) ["-" privateuse] language = 2*3ALPHA ; shortest ISO 639 code ["-" extlang] ; sometimes followed by ; extended language subtags / 4ALPHA ; or reserved for future use / 5*8ALPHA ; or registered language subtag extlang = 3ALPHA ; selected ISO 639 codes *2("-" 3ALPHA) ; permanently reserved script = 4ALPHA ; ISO 15924 code region = 2ALPHA ; ISO 3166-1 code / 3DIGIT ; UN M.49 code variant = 5*8alphanum ; registered variants / (DIGIT 3alphanum) extension = singleton 1*("-" (2*8alphanum)) ; Single alphanumerics ; "x" reserved for private use singleton = DIGIT ; 0 - 9 / %x41-57 ; A - W / %x59-5A ; Y - Z / %x61-77 ; a - w / %x79-7A ; y - z it sounds right to still allow Irregular i-xxx IANA and user codes too The parser below doesn't try to cope with extension or privateuse that could be added but that's not interoperable anyway

+
DEPRECATED: Internal function, do not use. Checks that the value conforms to the LanguageID production: NOTE: this is somewhat deprecated, those productions were removed from the XML Second edition. [33] LanguageID ::= Langcode ('-' Subcode)* [34] Langcode ::= ISO639Code | IanaCode | UserCode [35] ISO639Code ::= ([a-z] | [A-Z]) ([a-z] | [A-Z]) [36] IanaCode ::= ('i' | 'I') '-' ([a-z] | [A-Z])+ [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+ [38] Subcode ::= ([a-z] | [A-Z])+ The current REC reference the successors of RFC 1766, currently 5646 http://www.rfc-editor.org/rfc/rfc5646.txt langtag = language ["-" script] ["-" region] *("-" variant) *("-" extension) ["-" privateuse] language = 2*3ALPHA ; shortest ISO 639 code ["-" extlang] ; sometimes followed by ; extended language subtags / 4ALPHA ; or reserved for future use / 5*8ALPHA ; or registered language subtag extlang = 3ALPHA ; selected ISO 639 codes *2("-" 3ALPHA) ; permanently reserved script = 4ALPHA ; ISO 15924 code region = 2ALPHA ; ISO 3166-1 code / 3DIGIT ; UN M.49 code variant = 5*8alphanum ; registered variants / (DIGIT 3alphanum) extension = singleton 1*("-" (2*8alphanum)) ; Single alphanumerics ; "x" reserved for private use singleton = DIGIT ; 0 - 9 / %x41-57 ; A - W / %x59-5A ; Y - Z / %x61-77 ; a - w / %x79-7A ; y - z it sounds right to still allow Irregular i-xxx IANA and user codes too The parser below doesn't try to cope with extension or privateuse that could be added but that's not interoperable anyway

 

@@ -742,7 +574,7 @@ int	xmlSwitchToEncoding		(xmlCopyChar ()
int	xmlCopyChar			(int len, 
					 xmlChar * out, 
					 int val)

 

-
append the char value in the array

+
DEPRECATED: Don't use. append the char value in the array

 
 
 
 

@@ -772,7 +604,7 @@ int	xmlSwitchToEncoding		(xmlCopyCharMultiByte ()
int	xmlCopyCharMultiByte		(xmlChar * out, 
					 int val)

 

-
append the char value in the array

+
DEPRECATED: Internal function, don't use. append the char value in the array

 
 
 
 

@@ -798,7 +630,7 @@ int	xmlSwitchToEncoding		(xmlCreateEntityParserCtxt ()
xmlParserCtxtPtr	xmlCreateEntityParserCtxt	(const xmlChar * URL, 
							 const xmlChar * ID, 
							 const xmlChar * base)

 

-
DEPRECATED: Use xmlNewInputURL. Create a parser context for an external entity Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.

+
DEPRECATED: Don't use. Create a parser context for an external entity Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time.

 
 
 
 

@@ -911,6 +743,52 @@ int	xmlSwitchToEncoding		(
 

+xmlCtxtPopInput ()

+
xmlParserInputPtr	xmlCtxtPopInput	(xmlParserCtxtPtr ctxt)

+

+
Pops the top parser input from the input stack

+

 
 

++
+
+
+
+
+
+
+
+
+
+


ctxt:an XML parser context
Returns:the input just removed

+

+

+

+

+xmlCtxtPushInput ()

+
int	xmlCtxtPushInput		(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value)

+

+
Pushes a new parser input on top of the input stack

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:an XML parser context
value:the parser input
Returns:-1 in case of error, the index in the stack otherwise

+

+

+

+

 xmlCurrentChar ()

 
int	xmlCurrentChar			(xmlParserCtxtPtr ctxt, 
					 int * len)

 

@@ -936,48 +814,6 @@ int	xmlSwitchToEncoding		(
 

-xmlDecodeEntities ()

-
xmlChar *	xmlDecodeEntities	(xmlParserCtxtPtr ctxt, 
					 int len, 
					 int what, 
					 xmlChar end, 
					 xmlChar end2, 
					 xmlChar end3)

-

-
This function is deprecated, we now always process entities content through xmlStringDecodeEntities TODO: remove it in next major release. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the parser context
len:the len to decode (in bytes !), -1 for no size limit
what:combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF
-
end:an end marker xmlChar, 0 if none
end2:an end marker xmlChar, 0 if none
end3:an end marker xmlChar, 0 if none
Returns:A newly allocated string with the substitution done. The caller must deallocate it !

-

-

-

-

 xmlFreeInputStream ()

 
void	xmlFreeInputStream		(xmlParserInputPtr input)

 

@@ -994,31 +830,10 @@ int	xmlSwitchToEncoding		(
 

-xmlHandleEntity ()

-
void	xmlHandleEntity			(xmlParserCtxtPtr ctxt, 
					 xmlEntityPtr entity)

-

-
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.

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
entity:an XML entity pointer.

-

-

-

-

 xmlIsLetter ()

 
int	xmlIsLetter			(int c)

 

-
Check whether the character is allowed by the production [84] Letter ::= BaseChar | Ideographic

+
DEPRECATED: Internal function, don't use. Check whether the character is allowed by the production [84] Letter ::= BaseChar | Ideographic

 

@@ -1036,73 +851,6 @@ int	xmlSwitchToEncoding		(
 

-xmlNamespaceParseNCName ()

-
xmlChar *	xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt)

-

-
parse an XML namespace name. TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input. [NS 3] NCName ::= (Letter | '_') (NCNameChar)* [NS 4] NCNameChar ::= Letter | Digit | '.' | '-' | '_' | CombiningChar | Extender

-

 
 

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the namespace name or NULL

-

-

-

-

-xmlNamespaceParseNSDef ()

-
xmlChar *	xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt)

-

-
parse a namespace prefix declaration TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input. [NS 1] NSDef ::= PrefixDef Eq SystemLiteral [NS 2] PrefixDef ::= 'xmlns' (':' NCName)?

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the namespace name

-

-

-

-

-xmlNamespaceParseQName ()

-
xmlChar *	xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** prefix)

-

-
TODO: this seems not in use anymore, the namespace handling is done on top of the SAX interfaces, i.e. not on raw input. parse an XML qualified name [NS 5] QName ::= (Prefix ':')? LocalPart [NS 6] Prefix ::= NCName [NS 7] LocalPart ::= NCName

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
prefix:a xmlChar **
Returns:the local part, and prefix is updated to get the Prefix if any.

-

-

-

-

 xmlNewEntityInputStream ()

 
xmlParserInputPtr	xmlNewEntityInputStream	(xmlParserCtxtPtr ctxt, 
						 xmlEntityPtr ent)

 

@@ -1131,7 +879,7 @@ int	xmlSwitchToEncoding		(xmlNewInputFromFile ()
 
xmlParserInputPtr	xmlNewInputFromFile	(xmlParserCtxtPtr ctxt, 
						 const char * filename)

 

-
Create a new input stream based on a file or an URL.

+
DEPRECATED: Use xmlNewInputFromUrl. Create a new input stream based on a file or an URL.

 

@@ -1156,7 +904,7 @@ int	xmlSwitchToEncoding		(xmlNewInputStream ()
xmlParserInputPtr	xmlNewInputStream	(xmlParserCtxtPtr ctxt)

 

-
Create a new input stream structure.

+
DEPRECATED: Use xmlNewInputFromUrl or similar functions. Create a new input stream structure.

 
 
 
 

@@ -1177,7 +925,7 @@ int	xmlSwitchToEncoding		(xmlNewStringInputStream ()
xmlParserInputPtr	xmlNewStringInputStream	(xmlParserCtxtPtr ctxt, 
						 const xmlChar * buffer)

 

-
Create a new input stream based on a memory buffer.

+
DEPRECATED: Use xmlNewInputFromString. Create a new input stream based on a memory buffer.

 
 
 
 

@@ -1217,7 +965,7 @@ int	xmlSwitchToEncoding		(xmlParseAttValue ()
xmlChar *	xmlParseAttValue	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. parse a value for an attribute Note: the parser won't do substitution of entities here, this will be handled later in xmlStringGetNodeList [10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" 3.3.3 Attribute-Value Normalization: Before the value of an attribute is passed to the application or checked for validity, the XML processor must normalize it as follows: - a character reference is processed by appending the referenced character to the attribute value - an entity reference is processed by recursively processing the replacement text of the entity - a whitespace character (#x20, #xD, #xA, #x9) is processed by appending #x20 to the normalized value, except that only a single #x20 is appended for a "#xD#xA" sequence that is part of an external parsed entity or the literal entity value of an internal parsed entity - other characters are processed by appending them to the normalized value If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by a single space (#x20) character. All attributes for which no declaration has been read should be treated by a non-validating parser as if declared CDATA.

+
DEPRECATED: Internal function, don't use. parse a value for an attribute Note: the parser won't do substitution of entities here, this will be handled later in xmlStringGetNodeList [10] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" 3.3.3 Attribute-Value Normalization: Before the value of an attribute is passed to the application or checked for validity, the XML processor must normalize it as follows: - a character reference is processed by appending the referenced character to the attribute value - an entity reference is processed by recursively processing the replacement text of the entity - a whitespace character (#x20, #xD, #xA, #x9) is processed by appending #x20 to the normalized value, except that only a single #x20 is appended for a "#xD#xA" sequence that is part of an external parsed entity or the literal entity value of an internal parsed entity - other characters are processed by appending them to the normalized value If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by a single space (#x20) character. All attributes for which no declaration has been read should be treated by a non-validating parser as if declared CDATA.

 
 
 
 

@@ -1238,7 +986,7 @@ int	xmlSwitchToEncoding		(xmlParseAttribute ()
const xmlChar *	xmlParseAttribute	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** value)

 

-
DEPRECATED: Internal function, don't use. parse an attribute [41] Attribute ::= Name Eq AttValue [ WFC: No External Entity References ] Attribute values cannot contain direct or indirect entity references to external entities. [ WFC: No < in Attribute Values ] The replacement text of any entity referred to directly or indirectly in an attribute value (other than "&lt;") must not contain a <. [ VC: Attribute Value Type ] The attribute must have been declared; the value must be of the type declared for it. [25] Eq ::= S? '=' S? With namespace: [NS 11] Attribute ::= QName Eq AttValue Also the case QName == xmlns:??? is handled independently as a namespace definition.

+
DEPRECATED: Internal function, don't use. parse an attribute [41] Attribute ::= Name Eq AttValue [ WFC: No External Entity References ] Attribute values cannot contain direct or indirect entity references to external entities. [ WFC: No < in Attribute Values ] The replacement text of any entity referred to directly or indirectly in an attribute value (other than "&lt;") must not contain a <. [ VC: Attribute Value Type ] The attribute must have been declared; the value must be of the type declared for it. [25] Eq ::= S? '=' S? With namespace: [NS 11] Attribute ::= QName Eq AttValue Also the case QName == xmlns:??? is handled independently as a namespace definition.

 
 
 
 

@@ -1248,12 +996,11 @@ int	xmlSwitchToEncoding		(value:
-
+
-
+

 
 
a xmlChar ** used to store the value of the attribute
-a xmlChar ** used to store the value of the attribute
 

 

 Returns:the attribute name, and the value in *value.the attribute name, and the value in *value.
 

 
 

@@ -1264,7 +1011,7 @@ int	xmlSwitchToEncoding		(xmlParseAttributeListDecl ()
 
void	xmlParseAttributeListDecl	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. Parse an attribute list declaration for an element. Always consumes '<!'. [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>' [53] AttDef ::= S Name S AttType S DefaultDecl

+
DEPRECATED: Internal function, don't use. Parse an attribute list declaration for an element. Always consumes '<!'. [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>' [53] AttDef ::= S Name S AttType S DefaultDecl

 

@@ -1279,7 +1026,7 @@ int	xmlSwitchToEncoding		(xmlParseAttributeType ()
int	xmlParseAttributeType		(xmlParserCtxtPtr ctxt, 
					 xmlEnumerationPtr * tree)

 

-
DEPRECATED: Internal function, don't use. parse the Attribute list def for an element [54] AttType ::= StringType | TokenizedType | EnumeratedType [55] StringType ::= 'CDATA' [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY' | 'ENTITIES' | 'NMTOKEN' | 'NMTOKENS' Validity constraints for attribute values syntax are checked in xmlValidateAttributeValue() [ VC: ID ] Values of type ID must match the Name production. A name must not appear more than once in an XML document as a value of this type; i.e., ID values must uniquely identify the elements which bear them. [ VC: One ID per Element Type ] No element type may have more than one ID attribute specified. [ VC: ID Attribute Default ] An ID attribute must have a declared default of #IMPLIED or #REQUIRED. [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names; each IDREF Name must match the value of an ID attribute on some element in the XML document; i.e. IDREF values must match the value of some ID attribute. [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names; each Entity Name must match the name of an unparsed entity declared in the DTD. [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.

+
DEPRECATED: Internal function, don't use. parse the Attribute list def for an element [54] AttType ::= StringType | TokenizedType | EnumeratedType [55] StringType ::= 'CDATA' [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY' | 'ENTITIES' | 'NMTOKEN' | 'NMTOKENS' Validity constraints for attribute values syntax are checked in xmlValidateAttributeValue() [ VC: ID ] Values of type ID must match the Name production. A name must not appear more than once in an XML document as a value of this type; i.e., ID values must uniquely identify the elements which bear them. [ VC: One ID per Element Type ] No element type may have more than one ID attribute specified. [ VC: ID Attribute Default ] An ID attribute must have a declared default of #IMPLIED or #REQUIRED. [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names; each IDREF Name must match the value of an ID attribute on some element in the XML document; i.e. IDREF values must match the value of some ID attribute. [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names; each Entity Name must match the name of an unparsed entity declared in the DTD. [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.

 
 

 
 

@@ -1293,7 +1040,7 @@ int	xmlSwitchToEncoding		(Returns:
-
+

 
 
the attribute typethe attribute type
 

 
 

@@ -1340,7 +1087,7 @@ int	xmlSwitchToEncoding		(xmlParseCharRef ()
 
int	xmlParseCharRef			(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. Parse a numeric character reference. Always consumes '&'. [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' [ WFC: Legal Character ] Characters referred to using character references must match the production for Char.

+
DEPRECATED: Internal function, don't use. Parse a numeric character reference. Always consumes '&'. [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' [ WFC: Legal Character ] Characters referred to using character references must match the production for Char.

 

@@ -1361,7 +1108,7 @@ int	xmlSwitchToEncoding		(xmlParseComment ()
void	xmlParseComment			(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. Parse an XML (SGML) comment. Always consumes '<!'. The spec says that "For compatibility, the string "--" (double-hyphen) must not occur within comments. " [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'

+
DEPRECATED: Internal function, don't use. Parse an XML (SGML) comment. Always consumes '<!'. The spec says that "For compatibility, the string "--" (double-hyphen) must not occur within comments. " [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'

 
 
 
 

@@ -1376,7 +1123,7 @@ int	xmlSwitchToEncoding		(xmlParseContent ()
void	xmlParseContent			(xmlParserCtxtPtr ctxt)

 

-
Parse XML element content. This is useful if you're only interested in custom SAX callbacks. If you want a node list, use xmlParseInNodeContext.

+
Parse XML element content. This is useful if you're only interested in custom SAX callbacks. If you want a node list, use xmlCtxtParseContent.

 
 

 
 

@@ -1391,7 +1138,7 @@ int	xmlSwitchToEncoding		(xmlParseDefaultDecl ()
int	xmlParseDefaultDecl		(xmlParserCtxtPtr ctxt, 
					 xmlChar ** value)

 

-
DEPRECATED: Internal function, don't use. Parse an attribute default declaration [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) [ VC: Required Attribute ] if the default declaration is the keyword #REQUIRED, then the attribute must be specified for all elements of the type in the attribute-list declaration. [ VC: Attribute Default Legal ] The declared default value must meet the lexical constraints of the declared attribute type c.f. xmlValidateAttributeDecl() [ VC: Fixed Attribute Default ] if an attribute has a default value declared with the #FIXED keyword, instances of that attribute must match the default value. [ WFC: No < in Attribute Values ] handled in xmlParseAttValue()

+
DEPRECATED: Internal function, don't use. Parse an attribute default declaration [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue) [ VC: Required Attribute ] if the default declaration is the keyword #REQUIRED, then the attribute must be specified for all elements of the type in the attribute-list declaration. [ VC: Attribute Default Legal ] The declared default value must meet the lexical constraints of the declared attribute type c.f. xmlValidateAttributeDecl() [ VC: Fixed Attribute Default ] if an attribute has a default value declared with the #FIXED keyword, instances of that attribute must match the default value. [ WFC: No < in Attribute Values ] handled in xmlParseAttValue()

 
 

 
 

@@ -1401,8 +1148,7 @@ int	xmlSwitchToEncoding		(value:
-
+
@@ -1447,7 +1193,7 @@ int	xmlSwitchToEncoding		(xmlParseElementChildrenContentDecl ()
xmlElementContentPtr	xmlParseElementChildrenContentDecl	(xmlParserCtxtPtr ctxt, 
							 int inputchk)

 

-
DEPRECATED: Internal function, don't use. parse the declaration for a Mixed Element content The leading '(' and spaces have been skipped in xmlParseElementContentDecl [47] children ::= (choice | seq) ('?' | '*' | '+')? [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' [ VC: Proper Group/PE Nesting ] applies to [49] and [50] TODO Parameter-entity replacement text must be properly nested with parenthesized groups. That is to say, if either of the opening or closing parentheses in a choice, seq, or Mixed construct is contained in the replacement text for a parameter entity, both must be contained in the same replacement text. For interoperability, if a parameter-entity reference appears in a choice, seq, or Mixed construct, its replacement text should not be empty, and neither the first nor last non-blank character of the replacement text should be a connector (| or ,).

+
DEPRECATED: Internal function, don't use. parse the declaration for a Mixed Element content The leading '(' and spaces have been skipped in xmlParseElementContentDecl [47] children ::= (choice | seq) ('?' | '*' | '+')? [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' [ VC: Proper Group/PE Nesting ] applies to [49] and [50] TODO Parameter-entity replacement text must be properly nested with parenthesized groups. That is to say, if either of the opening or closing parentheses in a choice, seq, or Mixed construct is contained in the replacement text for a parameter entity, both must be contained in the same replacement text. For interoperability, if a parameter-entity reference appears in a choice, seq, or Mixed construct, its replacement text should not be empty, and neither the first nor last non-blank character of the replacement text should be a connector (| or ,).

 
 
Receive a possible fixed default value for the attribute
-Receive a possible fixed default value for the attribute
 

 

 Returns:
 
 

@@ -1654,7 +1400,7 @@ int	xmlSwitchToEncoding		(Returns:
-
+

 
 
the EntityValue parsed with reference substituted or NULLthe EntityValue parsed with reference substituted or NULL
 

 
 

@@ -1665,7 +1411,7 @@ int	xmlSwitchToEncoding		(xmlParseEnumeratedType ()
 
int	xmlParseEnumeratedType		(xmlParserCtxtPtr ctxt, 
					 xmlEnumerationPtr * tree)

 

-
DEPRECATED: Internal function, don't use. parse an Enumerated attribute type. [57] EnumeratedType ::= NotationType | Enumeration [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'

+
DEPRECATED: Internal function, don't use. parse an Enumerated attribute type. [57] EnumeratedType ::= NotationType | Enumeration [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'

 

@@ -1692,7 +1438,7 @@ int	xmlSwitchToEncoding		(xmlParseEnumerationType ()
xmlEnumerationPtr	xmlParseEnumerationType	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. parse an Enumeration attribute type. [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' [ VC: Enumeration ] Values of this type must match one of the Nmtoken tokens in the declaration

+
DEPRECATED: Internal function, don't use. parse an Enumeration attribute type. [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' [ VC: Enumeration ] Values of this type must match one of the Nmtoken tokens in the declaration

 
 
 
 

@@ -1702,7 +1448,7 @@ int	xmlSwitchToEncoding		(Returns:
-
+

 
 
the enumeration attribute tree built while parsingthe enumeration attribute tree built while parsing
 

 
 

@@ -1742,7 +1488,7 @@ int	xmlSwitchToEncoding		(xmlParseExternalSubset ()
 
void	xmlParseExternalSubset		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID)

 

-
parse Markup declarations from an external subset [30] extSubset ::= textDecl? extSubsetDecl [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) *

+
DEPRECATED: Internal function, don't use. parse Markup declarations from an external subset [30] extSubset ::= textDecl? extSubsetDecl [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) *

 

@@ -1815,21 +1561,6 @@ int	xmlSwitchToEncoding		(
 

-xmlParseNamespace ()

-
void	xmlParseNamespace		(xmlParserCtxtPtr ctxt)

-

-
xmlParseNamespace: parse specific PI '<?namespace ...' constructs. This is what the older xml-name Working Draft specified, a bunch of other stuff may still rely on it, so support is still here as if it was declared on the root of the Tree:-( TODO: remove from library To be removed at next drop of binary compatibility

-

 
 

--
-
-
-
-


ctxt:an XML parser context

-

-

-

-

 xmlParseNmtoken ()

 
xmlChar *	xmlParseNmtoken		(xmlParserCtxtPtr ctxt)

 

@@ -1869,7 +1600,7 @@ int	xmlSwitchToEncoding		(xmlParseNotationType ()
 
xmlEnumerationPtr	xmlParseNotationType	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. parse an Notation attribute type. Note: the leading 'NOTATION' S part has already being parsed... [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')' [ VC: Notation Attributes ] Values of this type must match one of the notation names included in the declaration; all notation names in the declaration must be declared.

+
DEPRECATED: Internal function, don't use. parse an Notation attribute type. Note: the leading 'NOTATION' S part has already being parsed... [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')' [ VC: Notation Attributes ] Values of this type must match one of the notation names included in the declaration; all notation names in the declaration must be declared.

 

@@ -1879,7 +1610,7 @@ int	xmlSwitchToEncoding		(Returns:
-
+

 
 
the notation attribute tree built while parsingthe notation attribute tree built while parsing
 

 
 

@@ -1890,7 +1621,7 @@ int	xmlSwitchToEncoding		(xmlParsePEReference ()
 
void	xmlParsePEReference		(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. Parse a parameter entity reference. Always consumes '%'. The entity content is handled directly by pushing it's content as a new input stream. [69] PEReference ::= '%' Name ';' [ WFC: No Recursion ] A parsed entity must not contain a recursive reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it... [ VC: Entity Declared ] In a document with an external subset or external parameter entities with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it... [ WFC: In DTD ] Parameter-entity references may only appear in the DTD. NOTE: misleading but this is handled.

+
DEPRECATED: Internal function, don't use. Parse a parameter entity reference. Always consumes '%'. The entity content is handled directly by pushing it's content as a new input stream. [69] PEReference ::= '%' Name ';' [ WFC: No Recursion ] A parsed entity must not contain a recursive reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it... [ VC: Entity Declared ] In a document with an external subset or external parameter entities with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it... [ WFC: In DTD ] Parameter-entity references may only appear in the DTD. NOTE: misleading but this is handled.

 

@@ -1959,27 +1690,6 @@ int	xmlSwitchToEncoding		(
 

-xmlParseQuotedString ()

-
xmlChar *	xmlParseQuotedString	(xmlParserCtxtPtr ctxt)

-

-
Parse and return a string between quotes or doublequotes TODO: Deprecated, to be removed at next drop of binary compatibility

-

 
 

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the string parser or NULL.

-

-

-

-

 xmlParseReference ()

 
void	xmlParseReference		(xmlParserCtxtPtr ctxt)

 

@@ -1998,7 +1708,7 @@ int	xmlSwitchToEncoding		(xmlParseSDDecl ()
 
int	xmlParseSDDecl			(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. parse the XML standalone declaration [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) [ VC: Standalone Document Declaration ] TODO The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or - entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or - attributes with values subject to normalization, where the attribute appears in the document with a value which will change as a result of normalization, or - element types with element content, if white space occurs directly within any instance of those types.

+
DEPRECATED: Internal function, don't use. parse the XML standalone declaration [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) [ VC: Standalone Document Declaration ] TODO The standalone document declaration must have the value "no" if any external markup declarations contain declarations of: - attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or - entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or - attributes with values subject to normalization, where the attribute appears in the document with a value which will change as a result of normalization, or - element types with element content, if white space occurs directly within any instance of those types.

 

@@ -2008,7 +1718,7 @@ int	xmlSwitchToEncoding		(Returns:
-
+

 
 
1 if standalone="yes" 0 if standalone="no" -2 if standalone attribute is missing or invalid (A standalone value of -2 means that the XML declaration was found, but no value was specified for the standalone attribute).1 if standalone="yes" 0 if standalone="no" -2 if standalone attribute is missing or invalid (A standalone value of -2 means that the XML declaration was found, but no value was specified for the standalone attribute).
 

 
 

@@ -2019,7 +1729,7 @@ int	xmlSwitchToEncoding		(xmlParseStartTag ()
 
const xmlChar *	xmlParseStartTag	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, don't use. Parse a start tag. Always consumes '<'. [40] STag ::= '<' Name (S Attribute)* S? '>' [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag. [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>' [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag. With namespace: [NS 8] STag ::= '<' QName (S Attribute)* S? '>' [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'

+
DEPRECATED: Internal function, don't use. Parse a start tag. Always consumes '<'. [40] STag ::= '<' Name (S Attribute)* S? '>' [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag. [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>' [ WFC: Unique Att Spec ] No attribute name may appear more than once in the same start-tag or empty-element tag. With namespace: [NS 8] STag ::= '<' QName (S Attribute)* S? '>' [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'

 

@@ -2133,22 +1843,7 @@ int	xmlSwitchToEncoding		(xmlParserHandlePEReference ()
void	xmlParserHandlePEReference	(xmlParserCtxtPtr ctxt)

 

-
DEPRECATED: Internal function, do not use. [69] PEReference ::= '%' Name ';' [ WFC: No Recursion ] A parsed entity must not contain a recursive reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it... [ VC: Entity Declared ] In a document with an external subset or external parameter entities with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it... [ WFC: In DTD ] Parameter-entity references may only appear in the DTD. NOTE: misleading but this is handled. A PEReference may have been detected in the current input stream the handling is done accordingly to http://www.w3.org/TR/REC-xml#entproc i.e. - Included in literal in entity values - Included as Parameter Entity reference within DTDs

-

 
 
 

--
-
-
-
-


ctxt:the parser context

-

-

-

-

-xmlParserHandleReference ()

-
void	xmlParserHandleReference	(xmlParserCtxtPtr ctxt)

-

-
TODO: Remove, now deprecated ... the test is done directly in the content parsing routines. [67] Reference ::= EntityRef | CharRef [68] EntityRef ::= '&' Name ';' [ WFC: Entity Declared ] the Name given in the entity reference must match that in an entity declaration, except that well-formed documents need not declare any of the following entities: amp, lt, gt, apos, quot. [ WFC: Parsed Entity ] An entity reference must not contain the name of an unparsed entity [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' A PEReference may have been detected in the current input stream the handling is done accordingly to http://www.w3.org/TR/REC-xml#entproc

+
DEPRECATED: Internal function, do not use. [69] PEReference ::= '%' Name ';' [ WFC: No Recursion ] A parsed entity must not contain a recursive reference to itself, either directly or indirectly. [ WFC: Entity Declared ] In a document without any DTD, a document with only an internal DTD subset which contains no parameter entity references, or a document with "standalone='yes'", ... ... The declaration of a parameter entity must precede any reference to it... [ VC: Entity Declared ] In a document with an external subset or external parameter entities with "standalone='no'", ... ... The declaration of a parameter entity must precede any reference to it... [ WFC: In DTD ] Parameter-entity references may only appear in the DTD. NOTE: misleading but this is handled. A PEReference may have been detected in the current input stream the handling is done accordingly to http://www.w3.org/TR/REC-xml#entproc i.e. - Included in literal in entity values - Included as Parameter Entity reference within DTDs

 

@@ -2178,7 +1873,7 @@ int	xmlSwitchToEncoding		(xmlPopInput ()
xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt)

 

-
xmlPopInput: the current input pointed by ctxt->input came to an end pop it and return the next char.

+
DEPRECATED: Internal function, don't use.

 
 

 
 

@@ -2199,7 +1894,7 @@ int	xmlSwitchToEncoding		(xmlPushInput ()
int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

 

-
Push an input stream onto the stack. This makes the parser use an input returned from advanced functions like xmlNewInputURL or xmlNewInputMemory.

+
DEPRECATED: Internal function, don't use. Push an input stream onto the stack.

 
 
 
 

@@ -2221,42 +1916,6 @@ int	xmlSwitchToEncoding		(
 

-xmlScanName ()

-
xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

-

-
Trickery: parse an XML name but without consuming the input flow Needed for rollback cases. Used only when parsing entities references. TODO: seems deprecated now, only used in the default part of xmlParserHandleReference [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender [5] Name ::= (Letter | '_' | ':') (NameChar)* [6] Names ::= Name (S Name)*

-

 
 

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XML parser context
Returns:the Name parsed or NULL

-

-

-

-

-xmlSetEntityReferenceFunc ()

-
void	xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func)

-

-
Set the function to call call back when a xml reference has been made

-

--
-
-
-
-


func:A valid function

-

-

-

-

 xmlSkipBlankChars ()

 
int	xmlSkipBlankChars		(xmlParserCtxtPtr ctxt)

 

@@ -2281,7 +1940,7 @@ int	xmlSwitchToEncoding		(xmlSplitQName ()
 
xmlChar *	xmlSplitQName		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * name, 
					 xmlChar ** prefixOut)

 

-
parse an UTF8 encoded XML qualified name string [NS 5] QName ::= (Prefix ':')? LocalPart [NS 6] Prefix ::= NCName [NS 7] LocalPart ::= NCName

+
DEPRECATED: Don't use. parse an UTF8 encoded XML qualified name string [NS 5] QName ::= (Prefix ':')? LocalPart [NS 6] Prefix ::= NCName [NS 7] LocalPart ::= NCName

 

diff --git a/doc/devhelp/libxml2-pattern.html b/doc/devhelp/libxml2-pattern.html
index 332ca7b8..c4ddb148 100644
--- a/doc/devhelp/libxml2-pattern.html
+++ b/doc/devhelp/libxml2-pattern.html
@@ -400,7 +400,7 @@ The content of this structure is not made public by the API.
 xmlStreamPushAttr ()
int	xmlStreamPushAttr		(xmlStreamCtxtPtr stream, 
					 const xmlChar * name, 
					 const xmlChar * ns)

 

-
Push new attribute data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. Otherwise the function will act as if it has been given an attribute-node.

+
Push new attribute data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. Otherwise the function will act as if it has been given an attribute-node.

 
 
 
 

diff --git a/doc/devhelp/libxml2-relaxng.html b/doc/devhelp/libxml2-relaxng.html
index 7a01a4d2..e71e25be 100644
--- a/doc/devhelp/libxml2-relaxng.html
+++ b/doc/devhelp/libxml2-relaxng.html
@@ -46,6 +46,7 @@ int	xmlRelaxNGInitTypes		(void);
 xmlRelaxNGPtrxmlRelaxNGParse		(xmlRelaxNGParserCtxtPtr ctxt);
 void	xmlRelaxNGSetParserErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
xmlRelaxNGValidityErrorFunc err, 
xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx);
 void	xmlRelaxNGSetParserStructuredErrors	(xmlRelaxNGParserCtxtPtr ctxt, 
xmlStructuredErrorFunc serror, 
						 void * ctx);
+void	xmlRelaxNGSetResourceLoader	(xmlRelaxNGParserCtxtPtr ctxt, 
xmlResourceLoader loader, 
					 void * vctxt);
 void	xmlRelaxNGSetValidErrors	(xmlRelaxNGValidCtxtPtr ctxt, 
xmlRelaxNGValidityErrorFunc err, 
xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx);
 void	xmlRelaxNGSetValidStructuredErrors	(xmlRelaxNGValidCtxtPtr ctxt, 
xmlStructuredErrorFunc serror, 
						 void * ctx);
 int	xmlRelaxNGValidateDoc		(xmlRelaxNGValidCtxtPtr ctxt, 
xmlDocPtr doc);
@@ -568,6 +569,31 @@ The content of this structure is not made public by the API.
 

 

+xmlRelaxNGSetResourceLoader ()

+
void	xmlRelaxNGSetResourceLoader	(xmlRelaxNGParserCtxtPtr ctxt, 
					 xmlResourceLoader loader, 
					 void * vctxt)

+

+
Set the callback function used to load external resources.

+

 
 						 					 						 					 					 					 						 					 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:a Relax-NG parser context
loader:the callback
vctxt:contextual data for the callbacks

+

+

+

+

 xmlRelaxNGSetValidErrors ()

 
void	xmlRelaxNGSetValidErrors	(xmlRelaxNGValidCtxtPtr ctxt, 
					 xmlRelaxNGValidityErrorFunc err, 
					 xmlRelaxNGValidityWarningFunc warn, 
					 void * ctx)

 

diff --git a/doc/devhelp/libxml2-schemasInternals.html b/doc/devhelp/libxml2-schemasInternals.html
index 8c45bdf8..579b4b59 100644
--- a/doc/devhelp/libxml2-schemasInternals.html
+++ b/doc/devhelp/libxml2-schemasInternals.html
@@ -154,7 +154,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ANYATTR_SKIP
 
#define XML_SCHEMAS_ANYATTR_SKIP;
 

-
Skip unknown attribute from validation Obsolete, not used anymore.

+
Skip unknown attribute from validation Obsolete, not used anymore.

 

 

 

@@ -178,7 +178,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ANY_SKIP
 
#define XML_SCHEMAS_ANY_SKIP;
 

-
Skip unknown attribute from validation

+
Skip unknown attribute from validation

 

 

 

@@ -194,7 +194,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTRGROUP_GLOBAL
 
#define XML_SCHEMAS_ATTRGROUP_GLOBAL;
 

-
The attribute group has been defined.

+
The attribute group has been defined.

 

 

 

@@ -226,7 +226,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED
 
#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED;
 

-
The attribute wildcard has been built.

+
The attribute wildcard has been built.

 

 

 

@@ -234,7 +234,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTR_FIXED
 
#define XML_SCHEMAS_ATTR_FIXED;
 

-
the attribute has a fixed value

+
the attribute has a fixed value

 

 

 

@@ -266,7 +266,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTR_USE_OPTIONAL
 
#define XML_SCHEMAS_ATTR_USE_OPTIONAL;
 

-
The attribute is optional.

+
The attribute is optional.

 

 

 

@@ -274,7 +274,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTR_USE_PROHIBITED
 
#define XML_SCHEMAS_ATTR_USE_PROHIBITED;
 

-
Used by wildcards. The attribute is prohibited.

+
Used by wildcards. The attribute is prohibited.

 

 

 

@@ -282,7 +282,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ATTR_USE_REQUIRED
 
#define XML_SCHEMAS_ATTR_USE_REQUIRED;
 

-
The attribute is required.

+
The attribute is required.

 

 

 

@@ -322,7 +322,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ELEM_BLOCK_ABSENT
 
#define XML_SCHEMAS_ELEM_BLOCK_ABSENT;
 

-
the "block" attribute is absent

+
the "block" attribute is absent

 

 

 

@@ -442,7 +442,7 @@ void	xmlSchemaFreeWildcard		(Macro XML_SCHEMAS_ELEM_REF
 
#define XML_SCHEMAS_ELEM_REF;
 

-
the element is a reference to a type

+
the element is a reference to a type

 

 

 

@@ -722,7 +722,7 @@ void	xmlSchemaFreeWildcard		(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

+
the complexType owns an attribute wildcard, i.e. it can be freed by the complexType

 

 

 

@@ -802,7 +802,7 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaAnnot
 
struct _xmlSchemaAnnot {
     struct _xmlSchemaAnnot *	next
-    xmlNodePtr	content	: the annotation
+    xmlNodePtr	content
 } xmlSchemaAnnot;
 

 

@@ -821,24 +821,24 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaAttribute
 
struct _xmlSchemaAttribute {
     xmlSchemaTypeType	type
-    struct _xmlSchemaAttribute *	next	: the next attribute (not used?)
-    const xmlChar *	name	: the name of the declaration
-    const xmlChar *	id	: Deprecated; not used
-    const xmlChar *	ref	: Deprecated; not used
-    const xmlChar *	refNs	: Deprecated; not used
-    const xmlChar *	typeName	: the local name of the type definition
-    const xmlChar *	typeNs	: the ns URI of the type definition
+    struct _xmlSchemaAttribute *	next
+    const xmlChar *	name
+    const xmlChar *	id
+    const xmlChar *	ref
+    const xmlChar *	refNs
+    const xmlChar *	typeName
+    const xmlChar *	typeNs
     xmlSchemaAnnotPtr	annot
-    xmlSchemaTypePtr	base	: Deprecated; not used
-    int	occurs	: Deprecated; not used
-    const xmlChar *	defValue	: The initial value of the value constraint
-    xmlSchemaTypePtr	subtypes	: the type definition
+    xmlSchemaTypePtr	base
+    int	occurs
+    const xmlChar *	defValue
+    xmlSchemaTypePtr	subtypes
     xmlNodePtr	node
     const xmlChar *	targetNamespace
     int	flags
-    const xmlChar *	refPrefix	: Deprecated; not used
-    xmlSchemaValPtr	defVal	: The compiled value constraint
-    xmlSchemaAttributePtr	refDecl	: Deprecated; not used
+    const xmlChar *	refPrefix
+    xmlSchemaValPtr	defVal
+    xmlSchemaAttributePtr	refDecl
 } xmlSchemaAttribute;
 

 

@@ -848,19 +848,19 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaAttributeGroup
 
struct _xmlSchemaAttributeGroup {
-    xmlSchemaTypeType	type	: The kind of type
-    struct _xmlSchemaAttribute *	next	: the next attribute if in a group ...
+    xmlSchemaTypeType	type
+    struct _xmlSchemaAttribute *	next
     const xmlChar *	name
     const xmlChar *	id
-    const xmlChar *	ref	: Deprecated; not used
-    const xmlChar *	refNs	: Deprecated; not used
+    const xmlChar *	ref
+    const xmlChar *	refNs
     xmlSchemaAnnotPtr	annot
-    xmlSchemaAttributePtr	attributes	: Deprecated; not used
+    xmlSchemaAttributePtr	attributes
     xmlNodePtr	node
     int	flags
     xmlSchemaWildcardPtr	attributeWildcard
-    const xmlChar *	refPrefix	: Deprecated; not used
-    xmlSchemaAttributeGroupPtr	refItem	: Deprecated; not used
+    const xmlChar *	refPrefix
+    xmlSchemaAttributeGroupPtr	refItem
     const xmlChar *	targetNamespace
     void *	attrUses
 } xmlSchemaAttributeGroup;
@@ -880,8 +880,8 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaAttributeLink
 
struct _xmlSchemaAttributeLink {
-    struct _xmlSchemaAttributeLink *	next	: the next attribute link ...
-    struct _xmlSchemaAttribute *	attr	: the linked attribute
+    struct _xmlSchemaAttributeLink *	next
+    struct _xmlSchemaAttribute *	attr
 } xmlSchemaAttributeLink;
 

 

@@ -924,18 +924,18 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaElement
 
struct _xmlSchemaElement {
-    xmlSchemaTypeType	type	: The kind of type
-    struct _xmlSchemaType *	next	: Not used?
+    xmlSchemaTypeType	type
+    struct _xmlSchemaType *	next
     const xmlChar *	name
-    const xmlChar *	id	: Deprecated; not used
-    const xmlChar *	ref	: Deprecated; not used
-    const xmlChar *	refNs	: Deprecated; not used
+    const xmlChar *	id
+    const xmlChar *	ref
+    const xmlChar *	refNs
     xmlSchemaAnnotPtr	annot
-    xmlSchemaTypePtr	subtypes	: the type definition
+    xmlSchemaTypePtr	subtypes
     xmlSchemaAttributePtr	attributes
     xmlNodePtr	node
-    int	minOccurs	: Deprecated; not used
-    int	maxOccurs	: Deprecated; not used
+    int	minOccurs
+    int	maxOccurs
     int	flags
     const xmlChar *	targetNamespace
     const xmlChar *	namedType
@@ -943,13 +943,13 @@ void	xmlSchemaFreeWildcard		(xmlChar *	substGroup
     const xmlChar *	substGroupNs
     const xmlChar *	scope
-    const xmlChar *	value	: The original value of the value constraint.
-    struct _xmlSchemaElement *	refDecl	: This will now be used for the substitution group affiliation
-    xmlRegexpPtr	contModel	: Obsolete for WXS, maybe used for RelaxNG
+    const xmlChar *	value
+    struct _xmlSchemaElement *	refDecl
+    xmlRegexpPtr	contModel
     xmlSchemaContentType	contentType
-    const xmlChar *	refPrefix	: Deprecated; not used
-    xmlSchemaValPtr	defVal	: The compiled value constraint.
-    void *	idcs	: The identity-constraint defs
+    const xmlChar *	refPrefix
+    xmlSchemaValPtr	defVal
+    void *	idcs
 } xmlSchemaElement;
 

 

@@ -967,16 +967,16 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaFacet
 
struct _xmlSchemaFacet {
-    xmlSchemaTypeType	type	: The kind of type
-    struct _xmlSchemaFacet *	next	: the next type if in a sequence ...
-    const xmlChar *	value	: The original value
-    const xmlChar *	id	: Obsolete
+    xmlSchemaTypeType	type
+    struct _xmlSchemaFacet *	next
+    const xmlChar *	value
+    const xmlChar *	id
     xmlSchemaAnnotPtr	annot
     xmlNodePtr	node
-    int	fixed	: XML_SCHEMAS_FACET_PRESERVE, etc.
+    int	fixed
     int	whitespace
-    xmlSchemaValPtr	val	: The compiled value
-    xmlRegexpPtr	regexp	: The regex for patterns
+    xmlSchemaValPtr	val
+    xmlRegexpPtr	regexp
 } xmlSchemaFacet;
 

 

@@ -986,8 +986,8 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaFacetLink
 
struct _xmlSchemaFacetLink {
-    struct _xmlSchemaFacetLink *	next	: the next facet link ...
-    xmlSchemaFacetPtr	facet	: the linked facet
+    struct _xmlSchemaFacetLink *	next
+    xmlSchemaFacetPtr	facet
 } xmlSchemaFacetLink;
 

 

@@ -1013,7 +1013,7 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaNotation
 
struct _xmlSchemaNotation {
-    xmlSchemaTypeType	type	: The kind of type
+    xmlSchemaTypeType	type
     const xmlChar *	name
     xmlSchemaAnnotPtr	annot
     const xmlChar *	identifier
@@ -1035,34 +1035,34 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaType
 
struct _xmlSchemaType {
-    xmlSchemaTypeType	type	: The kind of type
-    struct _xmlSchemaType *	next	: the next type if in a sequence ...
+    xmlSchemaTypeType	type
+    struct _xmlSchemaType *	next
     const xmlChar *	name
-    const xmlChar *	id	: Deprecated; not used
-    const xmlChar *	ref	: Deprecated; not used
-    const xmlChar *	refNs	: Deprecated; not used
+    const xmlChar *	id
+    const xmlChar *	ref
+    const xmlChar *	refNs
     xmlSchemaAnnotPtr	annot
     xmlSchemaTypePtr	subtypes
-    xmlSchemaAttributePtr	attributes	: Deprecated; not used
+    xmlSchemaAttributePtr	attributes
     xmlNodePtr	node
-    int	minOccurs	: Deprecated; not used
-    int	maxOccurs	: Deprecated; not used
+    int	minOccurs
+    int	maxOccurs
     int	flags
     xmlSchemaContentType	contentType
-    const xmlChar *	base	: Base type's local name
-    const xmlChar *	baseNs	: Base type's target namespace
-    xmlSchemaTypePtr	baseType	: The base type component
-    xmlSchemaFacetPtr	facets	: Local facets
-    struct _xmlSchemaType *	redef	: Deprecated; not used
-    int	recurse	: Obsolete
-    xmlSchemaAttributeLinkPtr *	attributeUses	: Deprecated; not used
+    const xmlChar *	base
+    const xmlChar *	baseNs
+    xmlSchemaTypePtr	baseType
+    xmlSchemaFacetPtr	facets
+    struct _xmlSchemaType *	redef
+    int	recurse
+    xmlSchemaAttributeLinkPtr *	attributeUses
     xmlSchemaWildcardPtr	attributeWildcard
-    int	builtInType	: Type of built-in types.
-    xmlSchemaTypeLinkPtr	memberTypes	: member-types if a union type.
-    xmlSchemaFacetLinkPtr	facetSet	: All facets (incl. inherited)
-    const xmlChar *	refPrefix	: Deprecated; not used
-    xmlSchemaTypePtr	contentTypeDef	: Used for the simple content of complex types. Could we use @subtypes
-    xmlRegexpPtr	contModel	: Holds the automaton of the content model
+    int	builtInType
+    xmlSchemaTypeLinkPtr	memberTypes
+    xmlSchemaFacetLinkPtr	facetSet
+    const xmlChar *	refPrefix
+    xmlSchemaTypePtr	contentTypeDef
+    xmlRegexpPtr	contModel
     const xmlChar *	targetNamespace
     void *	attrUses
 } xmlSchemaType;
@@ -1074,8 +1074,8 @@ void	xmlSchemaFreeWildcard		(Structure xmlSchemaTypeLink
 
struct _xmlSchemaTypeLink {
-    struct _xmlSchemaTypeLink *	next	: the next type link ...
-    xmlSchemaTypePtr	type	: the linked type
+    struct _xmlSchemaTypeLink *	next
+    xmlSchemaTypePtr	type
 } xmlSchemaTypeLink;
 

 

@@ -1224,16 +1224,16 @@ The content of this structure is not made public by the API.
 

 Structure xmlSchemaWildcard

 
struct _xmlSchemaWildcard {
-    xmlSchemaTypeType	type	: The kind of type
-    const xmlChar *	id	: Deprecated; not used
+    xmlSchemaTypeType	type
+    const xmlChar *	id
     xmlSchemaAnnotPtr	annot
     xmlNodePtr	node
-    int	minOccurs	: Deprecated; not used
-    int	maxOccurs	: Deprecated; not used
+    int	minOccurs
+    int	maxOccurs
     int	processContents
-    int	any	: Indicates if the ns constraint is of ##any
-    xmlSchemaWildcardNsPtr	nsSet	: The list of allowed namespaces
-    xmlSchemaWildcardNsPtr	negNsSet	: The negated namespace
+    int	any
+    xmlSchemaWildcardNsPtr	nsSet
+    xmlSchemaWildcardNsPtr	negNsSet
     int	flags
 } xmlSchemaWildcard;
 

@@ -1244,8 +1244,8 @@ The content of this structure is not made public by the API.
 

 Structure xmlSchemaWildcardNs

 
struct _xmlSchemaWildcardNs {
-    struct _xmlSchemaWildcardNs *	next	: the next constraint link ...
-    const xmlChar *	value	: the value
+    struct _xmlSchemaWildcardNs *	next
+    const xmlChar *	value
 } xmlSchemaWildcardNs;
 

 

diff --git a/doc/devhelp/libxml2-threads.html b/doc/devhelp/libxml2-threads.html
index 6efceb7b..691d63d9 100644
--- a/doc/devhelp/libxml2-threads.html
+++ b/doc/devhelp/libxml2-threads.html
@@ -30,9 +30,7 @@ int	xmlCheckThreadLocalStorage	(void);
 void	xmlCleanupThreads		(void);
 void	xmlFreeMutex			(xmlMutexPtr tok);
 void	xmlFreeRMutex			(xmlRMutexPtr tok);
-int	xmlGetThreadId			(void);
 void	xmlInitThreads			(void);
-int	xmlIsMainThread			(void);
 void	xmlLockLibrary			(void);
 void	xmlMutexLock			(xmlMutexPtr tok);
 void	xmlMutexUnlock			(xmlMutexPtr tok);
@@ -93,7 +91,7 @@ The content of this structure is not made public by the API.
 
 
 Returns:
-0 on success or -1 if a memory allocation failed. A failed allocation signals a typically fatal and irrecoverable out-of-memory situation. Don't call any library functions in this case. This function never fails if the library is compiled with support for thread-local storage. This function never fails for the "main" thread which is the first thread calling xmlInitParser. Available since v2.12.0.
+0 on success or -1 if a memory allocation failed. A failed allocation signals a typically fatal and irrecoverable out-of-memory situation. Don't call any library functions in this case. Available since 2.12.0.
 
 

 

@@ -138,21 +136,6 @@ The content of this structure is not made public by the API.
 

 

 

-xmlGetThreadId ()

-
int	xmlGetThreadId			(void)

-

-
DEPRECATED: Internal function, do not use. xmlGetThreadId() find the current thread ID number Note that this is likely to be broken on some platforms using pthreads as the specification doesn't mandate pthread_t to be an integer type

-

--
-
-
-
-


Returns:the current thread ID number

-

-

-

-

 xmlInitThreads ()

 
void	xmlInitThreads			(void)

 

@@ -161,21 +144,6 @@ The content of this structure is not made public by the API.
 

 

 

-xmlIsMainThread ()

-
int	xmlIsMainThread			(void)

-

-
DEPRECATED: Internal function, do not use. Check whether the current thread is the main thread.

-

--
-
-
-
-


Returns:1 if the current thread is the main thread, 0 otherwise

-

-

-

-

 xmlLockLibrary ()

 
void	xmlLockLibrary			(void)

 

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index 814163a4..3400e1f6 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -22,14 +22,15 @@
 
Author(s): Daniel Veillard 

 

 
Synopsis

-
#define BASE_BUFFER_SIZE;
-#define LIBXML2_NEW_BUFFER;
+
#define LIBXML2_NEW_BUFFER;
 #define XML_GET_CONTENT;
 #define XML_GET_LINE;
 #define XML_LOCAL_NAMESPACE;
 #define XML_XML_ID;
 #define XML_XML_NAMESPACE;
+#define xmlBufferAllocScheme;
 #define xmlChildrenNode;
+#define xmlDefaultBufferSize;
 #define xmlRootNode;
 typedef struct _xmlAttr xmlAttr;
 typedef xmlAttr * xmlAttrPtr;
@@ -188,7 +189,6 @@ int	xmlIsXHTML			(const xmlNodePtr	xmlNewDocText		(const xmlDoc * doc, 
					 const xmlChar * content);
 xmlNodePtr	xmlNewDocTextLen	(xmlDocPtr doc, 
					 const xmlChar * content, 
					 int len);
 xmlDtdPtr	xmlNewDtd		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * ExternalID, 
					 const xmlChar * SystemID);
-xmlNsPtr	xmlNewGlobalNs		(xmlDocPtr doc, 
					 const xmlChar * href, 
					 const xmlChar * prefix);
 xmlNodePtr	xmlNewNode		(xmlNsPtr ns, 
					 const xmlChar * name);
 xmlNodePtr	xmlNewNodeEatName	(xmlNsPtr ns, 
					 xmlChar * name);
 xmlNsPtr	xmlNewNs		(xmlNodePtr node, 
					 const xmlChar * href, 
					 const xmlChar * prefix);
@@ -249,8 +249,6 @@ const xmlChar *	xmlNodePtr	xmlStringLenGetNodeList	(const xmlDoc * doc, 
					 const xmlChar * value, 
					 int len);
 int	xmlTextConcat			(xmlNodePtr node, 
					 const xmlChar * content, 
					 int len);
 xmlNodePtr	xmlTextMerge		(xmlNodePtr first, 
					 xmlNodePtr second);
-xmlBufferAllocationScheme	xmlThrDefBufferAllocScheme	(xmlBufferAllocationScheme v);
-int	xmlThrDefDefaultBufferSize	(int v);
 xmlDeregisterNodeFunc	xmlThrDefDeregisterNodeDefault	(xmlDeregisterNodeFunc func);
 xmlRegisterNodeFunc	xmlThrDefRegisterNodeDefault	(xmlRegisterNodeFunc func);
 void	xmlUnlinkNode			(xmlNodePtr cur);
@@ -268,14 +266,6 @@ int	xmlValidateQName		(const 
 

 

-Macro BASE_BUFFER_SIZE

-
#define BASE_BUFFER_SIZE;
-

-
default buffer size 4000.

-

-

-

-

 Macro LIBXML2_NEW_BUFFER

 
#define LIBXML2_NEW_BUFFER;
 

@@ -311,7 +301,7 @@ int	xmlValidateQName		(const Macro XML_XML_ID
 
#define XML_XML_ID;
 

-
This is the name for the special xml:id attribute

+
This is the name for the special xml:id attribute

 

 

 

@@ -324,6 +314,14 @@ int	xmlValidateQName		(const 
 

+Macro xmlBufferAllocScheme

+
#define xmlBufferAllocScheme;
+

+

+

+

+

+

 Macro xmlChildrenNode

 
#define xmlChildrenNode;
 

@@ -332,6 +330,14 @@ int	xmlValidateQName		(const 
 

+Macro xmlDefaultBufferSize

+
#define xmlDefaultBufferSize;
+

+

+

+

+

+

 Macro xmlRootNode

 
#define xmlRootNode;
 

@@ -342,19 +348,19 @@ int	xmlValidateQName		(const Structure xmlAttr
 
struct _xmlAttr {
-    void *	_private	: application data
-    xmlElementType	type	: XML_ATTRIBUTE_NODE, must be second !
-    const xmlChar *	name	: the name of the property
-    struct _xmlNode *	children	: the value of the property
-    struct _xmlNode *	last	: NULL
-    struct _xmlNode *	parent	: child->parent link
-    struct _xmlAttr *	next	: next sibling link
-    struct _xmlAttr *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document
-    xmlNs *	ns	: pointer to the associated namespace
-    xmlAttributeType	atype	: the attribute type if validating
-    void *	psvi	: for type/PSVI information
-    struct _xmlID *	id	: the ID struct
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlNode *	parent
+    struct _xmlAttr *	next
+    struct _xmlAttr *	prev
+    struct _xmlDoc *	doc
+    xmlNs *	ns
+    xmlAttributeType	atype
+    void *	psvi
+    struct _xmlID *	id
 } xmlAttr;
 

 

@@ -372,22 +378,22 @@ int	xmlValidateQName		(const Structure xmlAttribute
 
struct _xmlAttribute {
-    void *	_private	: application data
-    xmlElementType	type	: XML_ATTRIBUTE_DECL, must be second !
-    const xmlChar *	name	: Attribute name
-    struct _xmlNode *	children	: NULL
-    struct _xmlNode *	last	: NULL
-    struct _xmlDtd *	parent	: -> DTD
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document
-    struct _xmlAttribute *	nexth	: next in hash table
-    xmlAttributeType	atype	: The attribute type
-    xmlAttributeDefault	def	: the default
-    const xmlChar *	defaultValue	: or the default value
-    xmlEnumerationPtr	tree	: or the enumeration tree if any
-    const xmlChar *	prefix	: the namespace prefix if any
-    const xmlChar *	elem	: Element holding the attribute
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlDtd *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    struct _xmlAttribute *	nexth
+    xmlAttributeType	atype
+    xmlAttributeDefault	def
+    const xmlChar *	defaultValue
+    xmlEnumerationPtr	tree
+    const xmlChar *	prefix
+    const xmlChar *	elem
 } xmlAttribute;
 

 

@@ -455,11 +461,11 @@ The content of this structure is not made public by the API.
 

 Structure xmlBuffer

 
struct _xmlBuffer {
-    xmlChar *	content	: The buffer content UTF8
-    unsigned int	use	: The buffer size used
-    unsigned int	size	: The buffer size
-    xmlBufferAllocationScheme	alloc	: The realloc method
-    xmlChar *	contentIO	: in IO mode we may have a different base
+    xmlChar *	content
+    unsigned int	use
+    unsigned int	size
+    xmlBufferAllocationScheme	alloc
+    xmlChar *	contentIO
 } xmlBuffer;
 

 

@@ -492,9 +498,9 @@ The content of this structure is not made public by the API.
 

 Structure xmlDOMWrapCtxt

 
struct _xmlDOMWrapCtxt {
-    void *	_private	: * The type of this context, just in case we need specialized * context
-    int	type	: * Internal namespace map used for various operations. *
-    void *	namespaceMap	: * Use this one to acquire an xmlNsPtr intended for node->ns. * (Note t
+    void *	_private
+    int	type
+    void *	namespaceMap
     xmlDOMWrapAcquireNsFunction	getNsForNodeFunc
 } xmlDOMWrapCtxt;
 

@@ -513,30 +519,30 @@ The content of this structure is not made public by the API.
 

 Structure xmlDoc

 
struct _xmlDoc {
-    void *	_private	: application data
-    xmlElementType	type	: XML_DOCUMENT_NODE, must be second !
-    char *	name	: name/filename/URI of the document
-    struct _xmlNode *	children	: the document tree
-    struct _xmlNode *	last	: last child link
-    struct _xmlNode *	parent	: child->parent link
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: autoreference to itself End of common part
-    int	compression	: level of zlib compression
-    int	standalone	: standalone document (no external refs) 1 if standalone="yes" 0 if sta
-    struct _xmlDtd *	intSubset	: the document internal subset
-    struct _xmlDtd *	extSubset	: the document external subset
-    struct _xmlNs *	oldNs	: Global namespace, the old way
-    const xmlChar *	version	: the XML version string
-    const xmlChar *	encoding	: actual encoding, if any
-    void *	ids	: Hash table for ID attributes if any
-    void *	refs	: Hash table for IDREFs attributes if any
-    const xmlChar *	URL	: The URI for that document
-    int	charset	: unused
-    struct _xmlDict *	dict	: dict used to allocate names or NULL
-    void *	psvi	: for type/PSVI information
-    int	parseFlags	: set of xmlParserOption used to parse the document
-    int	properties	: set of xmlDocProperties for this document set at the end of parsing
+    void *	_private
+    xmlElementType	type
+    char *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlNode *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    int	compression
+    int	standalone
+    struct _xmlDtd *	intSubset
+    struct _xmlDtd *	extSubset
+    struct _xmlNs *	oldNs
+    const xmlChar *	version
+    const xmlChar *	encoding
+    void *	ids
+    void *	refs
+    const xmlChar *	URL
+    int	charset
+    struct _xmlDict *	dict
+    void *	psvi
+    int	parseFlags
+    int	properties
 } xmlDoc;
 

 

@@ -571,22 +577,22 @@ The content of this structure is not made public by the API.
 

 Structure xmlDtd

 
struct _xmlDtd {
-    void *	_private	: application data
-    xmlElementType	type	: XML_DTD_NODE, must be second !
-    const xmlChar *	name	: Name of the DTD
-    struct _xmlNode *	children	: the value of the property link
-    struct _xmlNode *	last	: last child link
-    struct _xmlDoc *	parent	: child->parent link
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document End of common part
-    void *	notations	: Hash table for notations if any
-    void *	elements	: Hash table for elements if any
-    void *	attributes	: Hash table for attributes if any
-    void *	entities	: Hash table for entities if any
-    const xmlChar *	ExternalID	: External identifier for PUBLIC DTD
-    const xmlChar *	SystemID	: URI for a SYSTEM or PUBLIC DTD
-    void *	pentities	: Hash table for param entities if any
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlDoc *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    void *	notations
+    void *	elements
+    void *	attributes
+    void *	entities
+    const xmlChar *	ExternalID
+    const xmlChar *	SystemID
+    void *	pentities
 } xmlDtd;
 

 

@@ -604,20 +610,20 @@ The content of this structure is not made public by the API.
 

 Structure xmlElement

 
struct _xmlElement {
-    void *	_private	: application data
-    xmlElementType	type	: XML_ELEMENT_DECL, must be second !
-    const xmlChar *	name	: Element name
-    struct _xmlNode *	children	: NULL
-    struct _xmlNode *	last	: NULL
-    struct _xmlDtd *	parent	: -> DTD
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document
-    xmlElementTypeVal	etype	: The type
-    xmlElementContentPtr	content	: the allowed element content
-    xmlAttributePtr	attributes	: List of the declared attributes
-    const xmlChar *	prefix	: the namespace prefix if any
-    xmlRegexpPtr	contModel	: the validating regexp
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlDtd *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    xmlElementTypeVal	etype
+    xmlElementContentPtr	content
+    xmlAttributePtr	attributes
+    const xmlChar *	prefix
+    xmlRegexpPtr	contModel
     void *	contModel
 } xmlElement;
 

@@ -628,13 +634,13 @@ The content of this structure is not made public by the API.
 

 Structure xmlElementContent

 
struct _xmlElementContent {
-    xmlElementContentType	type	: PCDATA, ELEMENT, SEQ or OR
-    xmlElementContentOccur	ocur	: ONCE, OPT, MULT or PLUS
-    const xmlChar *	name	: Element name
-    struct _xmlElementContent *	c1	: first child
-    struct _xmlElementContent *	c2	: second child
-    struct _xmlElementContent *	parent	: parent
-    const xmlChar *	prefix	: Namespace prefix
+    xmlElementContentType	type
+    xmlElementContentOccur	ocur
+    const xmlChar *	name
+    struct _xmlElementContent *	c1
+    struct _xmlElementContent *	c2
+    struct _xmlElementContent *	parent
+    const xmlChar *	prefix
 } xmlElementContent;
 

 

@@ -729,26 +735,26 @@ The content of this structure is not made public by the API.
 

 Structure xmlEntity

 
struct _xmlEntity {
-    void *	_private	: application data
-    xmlElementType	type	: XML_ENTITY_DECL, must be second !
-    const xmlChar *	name	: Entity name
-    struct _xmlNode *	children	: First child link
-    struct _xmlNode *	last	: Last child link
-    struct _xmlDtd *	parent	: -> DTD
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document
-    xmlChar *	orig	: content without ref substitution
-    xmlChar *	content	: content or ndata if unparsed
-    int	length	: the content length
-    xmlEntityType	etype	: The entity type
-    const xmlChar *	ExternalID	: External identifier for PUBLIC
-    const xmlChar *	SystemID	: URI for a SYSTEM or PUBLIC Entity
-    struct _xmlEntity *	nexte	: unused
-    const xmlChar *	URI	: the full URI as computed
-    int	owner	: unused
-    int	flags	: various flags
-    unsigned long	expandedSize	: expanded size
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlDtd *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    xmlChar *	orig
+    xmlChar *	content
+    int	length
+    xmlEntityType	etype
+    const xmlChar *	ExternalID
+    const xmlChar *	SystemID
+    struct _xmlEntity *	nexte
+    const xmlChar *	URI
+    int	owner
+    int	flags
+    unsigned long	expandedSize
 } xmlEntity;
 

 

@@ -766,8 +772,8 @@ The content of this structure is not made public by the API.
 

 Structure xmlEnumeration

 
struct _xmlEnumeration {
-    struct _xmlEnumeration *	next	: next one
-    const xmlChar *	name	: Enumeration name
+    struct _xmlEnumeration *	next
+    const xmlChar *	name
 } xmlEnumeration;
 

 

@@ -785,12 +791,12 @@ The content of this structure is not made public by the API.
 

 Structure xmlID

 
struct _xmlID {
-    struct _xmlID *	next	: next ID
-    const xmlChar *	value	: The ID name
-    xmlAttrPtr	attr	: The attribute holding it
-    const xmlChar *	name	: The attribute if attr is not available
-    int	lineno	: The line number if attr is not available
-    struct _xmlDoc *	doc	: The document holding the ID
+    struct _xmlID *	next
+    const xmlChar *	value
+    xmlAttrPtr	attr
+    const xmlChar *	name
+    int	lineno
+    struct _xmlDoc *	doc
 } xmlID;
 

 

@@ -808,22 +814,22 @@ The content of this structure is not made public by the API.
 

 Structure xmlNode

 
struct _xmlNode {
-    void *	_private	: application data
-    xmlElementType	type	: type number, must be second !
-    const xmlChar *	name	: the name of the node, or the entity
-    struct _xmlNode *	children	: parent->childs link
-    struct _xmlNode *	last	: last child link
-    struct _xmlNode *	parent	: child->parent link
-    struct _xmlNode *	next	: next sibling link
-    struct _xmlNode *	prev	: previous sibling link
-    struct _xmlDoc *	doc	: the containing document End of common part
-    xmlNs *	ns	: pointer to the associated namespace
-    xmlChar *	content	: the content
-    struct _xmlAttr *	properties	: properties list
-    xmlNs *	nsDef	: namespace definitions on this node
-    void *	psvi	: for type/PSVI information
-    unsigned short	line	: line number
-    unsigned short	extra	: extra data for XPath/XSLT
+    void *	_private
+    xmlElementType	type
+    const xmlChar *	name
+    struct _xmlNode *	children
+    struct _xmlNode *	last
+    struct _xmlNode *	parent
+    struct _xmlNode *	next
+    struct _xmlNode *	prev
+    struct _xmlDoc *	doc
+    xmlNs *	ns
+    xmlChar *	content
+    struct _xmlAttr *	properties
+    xmlNs *	nsDef
+    void *	psvi
+    unsigned short	line
+    unsigned short	extra
 } xmlNode;
 

 

@@ -841,9 +847,9 @@ The content of this structure is not made public by the API.
 

 Structure xmlNotation

 
struct _xmlNotation {
-    const xmlChar *	name	: Notation name
-    const xmlChar *	PublicID	: Public identifier, if any
-    const xmlChar *	SystemID	: System identifier, if any
+    const xmlChar *	name
+    const xmlChar *	PublicID
+    const xmlChar *	SystemID
 } xmlNotation;
 

 

@@ -861,12 +867,12 @@ The content of this structure is not made public by the API.
 

 Structure xmlNs

 
struct _xmlNs {
-    struct _xmlNs *	next	: next Ns link for this node
-    xmlNsType	type	: global or local
-    const xmlChar *	href	: URL for the namespace
-    const xmlChar *	prefix	: prefix for the namespace
-    void *	_private	: application data
-    struct _xmlDoc *	context	: normally an xmlDoc
+    struct _xmlNs *	next
+    xmlNsType	type
+    const xmlChar *	href
+    const xmlChar *	prefix
+    void *	_private
+    struct _xmlDoc *	context
 } xmlNs;
 

 

@@ -895,10 +901,10 @@ The content of this structure is not made public by the API.
     void *	context
     xmlOutputWriteCallback	writecallback
     xmlOutputCloseCallback	closecallback
-    xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufPtr	buffer	: Local buffer encoded in UTF-8 or ISOLatin
-    xmlBufPtr	conv	: if encoder != NULL buffer for output
-    int	written	: total number of byte written
+    xmlCharEncodingHandlerPtr	encoder
+    xmlBufPtr	buffer
+    xmlBufPtr	conv
+    int	written
     int	error
 } xmlOutputBuffer;
 

@@ -917,104 +923,108 @@ The content of this structure is not made public by the API.
 

 Structure xmlParserCtxt

 
struct _xmlParserCtxt {
-    struct _xmlSAXHandler *	sax	: The SAX handler
-    void *	userData	: For SAX interface only, used by DOM build
-    xmlDocPtr	myDoc	: the document being built
-    int	wellFormed	: is the document well formed
-    int	replaceEntities	: shall we replace entities ?
-    const xmlChar *	version	: the XML version string
-    const xmlChar *	encoding	: the declared encoding, if any
-    int	standalone	: standalone document
-    int	html	: an HTML(1) document * 3 is HTML after <head> * 10 is HTML after <body
-    xmlParserInputPtr	input	: Current input stream
-    int	inputNr	: Number of current input streams
-    int	inputMax	: Max number of input streams
-    xmlParserInputPtr *	inputTab	: stack of inputs Node analysis stack only used for DOM building
-    xmlNodePtr	node	: Current parsed Node
-    int	nodeNr	: Depth of the parsing stack
-    int	nodeMax	: Max depth of the parsing stack
-    xmlNodePtr *	nodeTab	: array of nodes
-    int	record_info	: Whether node info should be kept
-    xmlParserNodeInfoSeq	node_seq	: info about each node parsed
-    int	errNo	: error code
-    int	hasExternalSubset	: reference and external subset
-    int	hasPErefs	: the internal subset has PE refs
-    int	external	: unused
-    int	valid	: is the document valid
-    int	validate	: shall we try to validate ?
-    xmlValidCtxt	vctxt	: The validity context
-    xmlParserInputState	instate	: push parser state
-    int	token	: unused
-    char *	directory	: unused Node name stack
-    const xmlChar *	name	: Current parsed Node
-    int	nameNr	: Depth of the parsing stack
-    int	nameMax	: Max depth of the parsing stack
-    const xmlChar * *	nameTab	: array of nodes
-    long	nbChars	: unused
-    long	checkIndex	: used by progressive parsing lookup
-    int	keepBlanks	: ugly but ...
-    int	disableSAX	: SAX callbacks are disabled
-    int	inSubset	: Parsing is in int 1/ext 2 subset
-    const xmlChar *	intSubName	: name of subset
-    xmlChar *	extSubURI	: URI of external subset
-    xmlChar *	extSubSystem	: SYSTEM ID of external subset xml:space values
-    int *	space	: Should the parser preserve spaces
-    int	spaceNr	: Depth of the parsing stack
-    int	spaceMax	: Max depth of the parsing stack
-    int *	spaceTab	: array of space infos
-    int	depth	: to prevent entity substitution loops
-    xmlParserInputPtr	entity	: unused
-    int	charset	: unused
-    int	nodelen	: Those two fields are there to
-    int	nodemem	: Speed up large node parsing
-    int	pedantic	: signal pedantic warnings
-    void *	_private	: For user data, libxml won't touch it
-    int	loadsubset	: should the external subset be loaded
-    int	linenumbers	: set line number in element content
-    void *	catalogs	: document's own catalog
-    int	recovery	: run in recovery mode
-    int	progressive	: unused
-    xmlDictPtr	dict	: dictionary for the parser
-    const xmlChar * *	atts	: array for the attributes callbacks
-    int	maxatts	: the size of the array
-    int	docdict	: * pre-interned strings *
+    struct _xmlSAXHandler *	sax
+    void *	userData
+    xmlDocPtr	myDoc
+    int	wellFormed
+    int	replaceEntities
+    const xmlChar *	version
+    const xmlChar *	encoding
+    int	standalone
+    int	html
+    xmlParserInputPtr	input
+    int	inputNr
+    int	inputMax
+    xmlParserInputPtr *	inputTab
+    xmlNodePtr	node
+    int	nodeNr
+    int	nodeMax
+    xmlNodePtr *	nodeTab
+    int	record_info
+    xmlParserNodeInfoSeq	node_seq
+    int	errNo
+    int	hasExternalSubset
+    int	hasPErefs
+    int	external
+    int	valid
+    int	validate
+    xmlValidCtxt	vctxt
+    xmlParserInputState	instate
+    int	token
+    char *	directory
+    const xmlChar *	name
+    int	nameNr
+    int	nameMax
+    const xmlChar **	nameTab
+    long	nbChars
+    long	checkIndex
+    int	keepBlanks
+    int	disableSAX
+    int	inSubset
+    const xmlChar *	intSubName
+    xmlChar *	extSubURI
+    xmlChar *	extSubSystem
+    int *	space
+    int	spaceNr
+    int	spaceMax
+    int *	spaceTab
+    int	depth
+    xmlParserInputPtr	entity
+    int	charset
+    int	nodelen
+    int	nodemem
+    int	pedantic
+    void *	_private
+    int	loadsubset
+    int	linenumbers
+    void *	catalogs
+    int	recovery
+    int	progressive
+    xmlDictPtr	dict
+    const xmlChar **	atts
+    int	maxatts
+    int	docdict
     const xmlChar *	str_xml
     const xmlChar *	str_xmlns
-    const xmlChar *	str_xml_ns	: * Everything below is used only by the new SAX mode *
-    int	sax2	: operating in the new SAX mode
-    int	nsNr	: the number of inherited namespaces
-    int	nsMax	: the size of the arrays
-    const xmlChar * *	nsTab	: the array of prefix/namespace name
-    unsigned *	attallocs	: which attribute were allocated
-    xmlStartTag *	pushTab	: array of data for push
-    xmlHashTablePtr	attsDefault	: defaulted attributes if any
-    xmlHashTablePtr	attsSpecial	: non-CDATA attributes if any
-    int	nsWellFormed	: is the document XML Namespace okay
-    int	options	: * Those fields are needed only for streaming parsing so far *
-    int	dictNames	: Use dictionary names for the tree
-    int	freeElemsNr	: number of freed element nodes
-    xmlNodePtr	freeElems	: List of freed element nodes
-    int	freeAttrsNr	: number of freed attributes nodes
-    xmlAttrPtr	freeAttrs	: * the complete error information for the last error. *
+    const xmlChar *	str_xml_ns
+    int	sax2
+    int	nsNr
+    int	nsMax
+    const xmlChar **	nsTab
+    unsigned *	attallocs
+    xmlStartTag *	pushTab
+    xmlHashTablePtr	attsDefault
+    xmlHashTablePtr	attsSpecial
+    int	nsWellFormed
+    int	options
+    int	dictNames
+    int	freeElemsNr
+    xmlNodePtr	freeElems
+    int	freeAttrsNr
+    xmlAttrPtr	freeAttrs
     xmlError	lastError
-    xmlParserMode	parseMode	: the parser mode
-    unsigned long	nbentities	: unused
-    unsigned long	sizeentities	: size of external entities for use by HTML non-recursive parser
-    xmlParserNodeInfo *	nodeInfo	: Current NodeInfo
-    int	nodeInfoNr	: Depth of the parsing stack
-    int	nodeInfoMax	: Max depth of the parsing stack
-    xmlParserNodeInfo *	nodeInfoTab	: array of nodeInfos
-    int	input_id	: we need to label inputs
-    unsigned long	sizeentcopy	: volume of entity copy
-    int	endCheckState	: quote state for push parser
-    unsigned short	nbErrors	: number of errors
-    unsigned short	nbWarnings	: number of warnings
-    unsigned	maxAmpl	: maximum amplification factor
-    xmlParserNsData *	nsdb	: namespace database
-    unsigned	attrHashMax	: allocated size
-    xmlAttrHashBucket *	attrHash	: atttribute hash table
+    xmlParserMode	parseMode
+    unsigned long	nbentities
+    unsigned long	sizeentities
+    xmlParserNodeInfo *	nodeInfo
+    int	nodeInfoNr
+    int	nodeInfoMax
+    xmlParserNodeInfo *	nodeInfoTab
+    int	input_id
+    unsigned long	sizeentcopy
+    int	endCheckState
+    unsigned short	nbErrors
+    unsigned short	nbWarnings
+    unsigned	maxAmpl
+    xmlParserNsData *	nsdb
+    unsigned	attrHashMax
+    xmlAttrHashBucket *	attrHash
     xmlStructuredErrorFunc	errorHandler
     void *	errorCtxt
+    xmlResourceLoader	resourceLoader
+    void *	resourceCtxt
+    xmlCharEncConvImpl	convImpl
+    void *	convCtxt
 } xmlParserCtxt;
 

 

@@ -1032,23 +1042,23 @@ The content of this structure is not made public by the API.
 

 Structure xmlParserInput

 
struct _xmlParserInput {
-    xmlParserInputBufferPtr	buf	: UTF-8 encoded buffer
-    const char *	filename	: The file analyzed, if any
-    const char *	directory	: unused
-    const xmlChar *	base	: Base of the array to parse
-    const xmlChar *	cur	: Current char being parsed
-    const xmlChar *	end	: end of the array to parse
-    int	length	: unused
-    int	line	: Current line
-    int	col	: Current column
-    unsigned long	consumed	: How many xmlChars already consumed
-    xmlParserInputDeallocate	free	: function to deallocate the base
-    const xmlChar *	encoding	: unused
-    const xmlChar *	version	: the version string for entity
-    int	flags	: Flags
-    int	id	: an unique identifier for the entity
-    unsigned long	parentConsumed	: unused
-    xmlEntityPtr	entity	: entity, if any
+    xmlParserInputBufferPtr	buf
+    const char *	filename
+    const char *	directory
+    const xmlChar *	base
+    const xmlChar *	cur
+    const xmlChar *	end
+    int	length
+    int	line
+    int	col
+    unsigned long	consumed
+    xmlParserInputDeallocate	free
+    const xmlChar *	encoding
+    const xmlChar *	version
+    int	flags
+    int	id
+    unsigned long	parentConsumed
+    xmlEntityPtr	entity
 } xmlParserInput;
 

 

@@ -1061,12 +1071,12 @@ The content of this structure is not made public by the API.
     void *	context
     xmlInputReadCallback	readcallback
     xmlInputCloseCallback	closecallback
-    xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufPtr	buffer	: Local buffer encoded in UTF-8
-    xmlBufPtr	raw	: if encoder != NULL buffer for raw input
-    int	compressed	: -1=unknown, 0=not compressed, 1=compressed
+    xmlCharEncodingHandlerPtr	encoder
+    xmlBufPtr	buffer
+    xmlBufPtr	raw
+    int	compressed
     int	error
-    unsigned long	rawconsumed	: amount consumed from raw
+    unsigned long	rawconsumed
 } xmlParserInputBuffer;
 

 

@@ -1092,11 +1102,11 @@ The content of this structure is not made public by the API.
 

 Structure xmlRef

 
struct _xmlRef {
-    struct _xmlRef *	next	: next Ref
-    const xmlChar *	value	: The Ref name
-    xmlAttrPtr	attr	: The attribute holding it
-    const xmlChar *	name	: The attribute if attr is not available
-    int	lineno	: The line number if attr is not available
+    struct _xmlRef *	next
+    const xmlChar *	value
+    xmlAttrPtr	attr
+    const xmlChar *	name
+    int	lineno
 } xmlRef;
 

 

@@ -1127,7 +1137,7 @@ The content of this structure is not made public by the API.
     unparsedEntityDeclSAXFunc	unparsedEntityDecl
     setDocumentLocatorSAXFunc	setDocumentLocator
     startDocumentSAXFunc	startDocument
-    endDocumentSAXFunc	endDocument	: * `startElement` and `endElement` are only used by the legacy SAX1 * i
+    endDocumentSAXFunc	endDocument
     startElementSAXFunc	startElement
     endElementSAXFunc	endElement
     referenceSAXFunc	reference
@@ -1137,11 +1147,11 @@ The content of this structure is not made public by the API.
     commentSAXFunc	comment
     warningSAXFunc	warning
     errorSAXFunc	error
-    fatalErrorSAXFunc	fatalError	: unused error() get all the errors
+    fatalErrorSAXFunc	fatalError
     getParameterEntitySAXFunc	getParameterEntity
     cdataBlockSAXFunc	cdataBlock
-    externalSubsetSAXFunc	externalSubset	: * `initialized` should always be set to XML_SAX2_MAGIC to enable the *
-    unsigned int	initialized	: * The following members are only used by the SAX2 interface. *
+    externalSubsetSAXFunc	externalSubset
+    unsigned int	initialized
     void *	_private
     startElementNsSAX2Func	startElementNs
     endElementNsSAX2Func	endElementNs
@@ -1248,7 +1258,7 @@ The content of this structure is not made public by the API.
 xmlAddChild ()
 
xmlNodePtr	xmlAddChild		(xmlNodePtr parent, 
					 xmlNodePtr cur)

 

-
Unlink @cur and append it to the children of @parent. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attributes of @parent. If the attribute list contains an attribute with a name matching @elem, the old attribute is destroyed. General notes: Move operations like xmlAddChild can cause element or attribute nodes to reference namespaces that aren't declared in one of their ancestors. This can lead to use-after-free errors if the elements containing the declarations are freed later, especially when moving nodes from one document to another. You should consider calling xmlReconciliateNs after a move operation to normalize namespaces. Another option is to call xmlDOMWrapAdoptNode with the target parent before moving a node. For the most part, move operations don't check whether the resulting tree structure is valid. Users must make sure that parent nodes only receive children of valid types. Inserted child nodes must never be an ancestor of the parent node to avoid cycles in the tree structure. In general, only document, document fragments, elements and attributes should be used as parent nodes. When moving a node between documents and a memory allocation fails, the node's content will be corrupted and it will be unlinked. In this case, the node must be freed manually. Moving DTDs between documents isn't supported.

+
Unlink @cur and append it to the children of @parent. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attributes of @parent. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. General notes: Move operations like xmlAddChild can cause element or attribute nodes to reference namespaces that aren't declared in one of their ancestors. This can lead to use-after-free errors if the elements containing the declarations are freed later, especially when moving nodes from one document to another. You should consider calling xmlReconciliateNs after a move operation to normalize namespaces. Another option is to call xmlDOMWrapAdoptNode with the target parent before moving a node. For the most part, move operations don't check whether the resulting tree structure is valid. Users must make sure that parent nodes only receive children of valid types. Inserted child nodes must never be an ancestor of the parent node to avoid cycles in the tree structure. In general, only document, document fragments, elements and attributes should be used as parent nodes. When moving a node between documents and a memory allocation fails, the node's content will be corrupted and it will be unlinked. In this case, the node must be freed manually. Moving DTDs between documents isn't supported.

 

@@ -1262,7 +1272,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 Returns:@elem or a sibling if @elem was merged. Returns NULL if arguments are invalid or a memory allocation failed.@cur or a sibling if @cur was merged. Returns NULL if arguments are invalid or a memory allocation failed.
 

 
 

@@ -1298,7 +1308,7 @@ The content of this structure is not made public by the API.
 xmlAddNextSibling ()
 
xmlNodePtr	xmlAddNextSibling	(xmlNodePtr prev, 
					 xmlNodePtr cur)

 

-
Unlinks @cur and inserts it as next sibling after @prev. Unlike xmlAddChild this function does not merge text nodes. If @cur is an attribute node, it is inserted after attribute @prev. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

+
Unlinks @cur and inserts it as next sibling after @prev. Unlike xmlAddChild this function does not merge text nodes. If @cur is an attribute node, it is inserted after attribute @prev. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

 

@@ -1323,7 +1333,7 @@ The content of this structure is not made public by the API.
 xmlAddPrevSibling ()
xmlNodePtr	xmlAddPrevSibling	(xmlNodePtr next, 
					 xmlNodePtr cur)

 

-
Unlinks @cur and inserts it as previous sibling before @next. Unlike xmlAddChild this function does not merge text nodes. If @cur is an attribute node, it is inserted before attribute @next. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

+
Unlinks @cur and inserts it as previous sibling before @next. Unlike xmlAddChild this function does not merge text nodes. If @cur is an attribute node, it is inserted before attribute @next. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

 
 
 
 

@@ -1348,7 +1358,7 @@ The content of this structure is not made public by the API.
 xmlAddSibling ()
xmlNodePtr	xmlAddSibling		(xmlNodePtr node, 
					 xmlNodePtr cur)

 

-
Unlinks @cur and inserts it as last sibling of @node. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attribute list containing @node. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

+
Unlinks @cur and inserts it as last sibling of @node. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attribute list containing @node. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. See the notes in xmlAddChild.

 
 
 
 

@@ -1373,7 +1383,7 @@ The content of this structure is not made public by the API.
 xmlAttrSerializeTxtContent ()
void	xmlAttrSerializeTxtContent	(xmlBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlAttrPtr attr, 
					 const xmlChar * string)

 

-
Serialize text attribute values to an xml simple buffer

+
Serialize text attribute values to an xml simple buffer

 
 
 
 

@@ -1387,7 +1397,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1507,7 +1517,7 @@ The content of this structure is not made public by the API.
 xmlBufShrink ()
size_t	xmlBufShrink			(xmlBufPtr buf, 
					 size_t len)

 

-
Remove the beginning of an XML buffer. NOTE that this routine behaviour differs from xmlBufferShrink() as it will return 0 on error instead of -1 due to size_t being used as the return type.

+
DEPRECATED: Don't use. Remove the beginning of an XML buffer. NOTE that this routine behaviour differs from xmlBufferShrink() as it will return 0 on error instead of -1 due to size_t being used as the return type.

 
 
 

 attr:the attribute nodethe attribute node
 

 

 string:
 
 

@@ -1571,7 +1581,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 Returns:0 successful, a positive error code number otherwise and -1 in case of internal or API error.a xmlParserErrors code.
 

 
 

@@ -1600,7 +1610,7 @@ The content of this structure is not made public by the API.
 
 
 Returns:
-0 successful, a positive error code number otherwise and -1 in case of internal or API error.
+a xmlParserErrors code.
 
 
 

@@ -1819,7 +1829,7 @@ The content of this structure is not made public by the API.
 xmlBufferGrow ()
 
int	xmlBufferGrow			(xmlBufferPtr buf, 
					 unsigned int len)

 

-
Grow the available space of an XML buffer.

+
DEPRECATED: Don't use. Grow the available space of an XML buffer.

 

@@ -1865,7 +1875,7 @@ The content of this structure is not made public by the API.
 xmlBufferResize ()
int	xmlBufferResize			(xmlBufferPtr buf, 
					 unsigned int size)

 

-
Resize a buffer to accommodate minimum size of @size.

+
DEPRECATED: Don't use. Resize a buffer to accommodate minimum size of @size.

 
 
 
 

@@ -1890,7 +1900,7 @@ The content of this structure is not made public by the API.
 xmlBufferSetAllocationScheme ()
void	xmlBufferSetAllocationScheme	(xmlBufferPtr buf, 
					 xmlBufferAllocationScheme scheme)

 

-
Sets the allocation scheme for this buffer

+
Sets the allocation scheme for this buffer. For libxml2 before 2.14, it is recommended to set this to XML_BUFFER_ALLOC_DOUBLE_IT. Has no effect on 2.14 or later.

 
 
 
 

@@ -1911,7 +1921,7 @@ The content of this structure is not made public by the API.
 xmlBufferShrink ()
int	xmlBufferShrink			(xmlBufferPtr buf, 
					 unsigned int len)

 

-
Remove the beginning of an XML buffer.

+
DEPRECATED: Don't use. Remove the beginning of an XML buffer.

 
 
 
 

@@ -2187,22 +2197,21 @@ The content of this structure is not made public by the API.
 xmlCopyProp ()
xmlAttrPtr	xmlCopyProp		(xmlNodePtr target, 
					 xmlAttrPtr cur)

 

-
Create a copy of the attribute. This function sets the parent pointer of the copy to @target but doesn't set the attribute on the target element. Users should consider to set the attribute by calling xmlAddChild afterwards or reset the parent pointer to NULL.

+
Create a copy of the attribute. This function sets the parent pointer of the copy to @target but doesn't set the attribute on the target element. Users should consider to set the attribute by calling xmlAddChild afterwards or reset the parent pointer to NULL.

 
 
 
 

-
+
-
+
-
+

 
 
 

 target:the element where the attribute will be graftedthe element where the attribute will be grafted
 

 

 cur:the attribute
-the attribute
 

 

 Returns:the copied attribute or NULL if a memory allocation failed.the copied attribute or NULL if a memory allocation failed.
 

 
 

@@ -2213,7 +2222,7 @@ The content of this structure is not made public by the API.
 xmlCopyPropList ()
 
xmlAttrPtr	xmlCopyPropList		(xmlNodePtr target, 
					 xmlAttrPtr cur)

 

-
Create a copy of an attribute list. This function sets the parent pointers of the copied attributes to @target but doesn't set the attributes on the target element.

+
Create a copy of an attribute list. This function sets the parent pointers of the copied attributes to @target but doesn't set the attributes on the target element.

 

@@ -2223,8 +2232,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -2272,7 +2280,7 @@ The content of this structure is not made public by the API.
 xmlDOMWrapAdoptNode ()
int	xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int options)

 

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unlinked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used This is the case when you have an unlinked node and just want to move it to the context of If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

 
 
 

 cur:the first attribute
-the first attribute
 

 

 Returns:
 
 

@@ -2313,7 +2321,7 @@ The content of this structure is not made public by the API.
 xmlDOMWrapCloneNode ()
int	xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt, 
					 xmlDocPtr sourceDoc, 
					 xmlNodePtr node, 
					 xmlNodePtr * resNode, 
					 xmlDocPtr destDoc, 
					 xmlNodePtr destParent, 
					 int deep, 
					 int options)

 

-
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.

+
References of out-of scope ns-decls are remapped to point to @destDoc: 1) If @destParent is given, then nsDef entries on element-nodes are used 2) If *no* @destParent is given, then @destDoc->oldNs entries are used. This is the case when you don't know already where the cloned branch will be added to. If @destParent is given, it ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. TODO: 1) What to do with XInclude? Currently this returns an error for XInclude.

 
 
 
 

@@ -2392,7 +2400,7 @@ The content of this structure is not made public by the API.
 xmlDOMWrapReconcileNamespaces ()
int	xmlDOMWrapReconcileNamespaces	(xmlDOMWrapCtxtPtr ctxt, 
					 xmlNodePtr elem, 
					 int options)

 

-
Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

+
Ensures that ns-references point to ns-decls hold on element-nodes. Ensures that the tree is namespace wellformed by creating additional ns-decls where needed. Note that, since prefixes of already existent ns-decls can be shadowed by this process, it could break QNames in attribute values or element content. NOTE: This function was not intensively tested.

 
 
 
 

@@ -2881,13 +2889,12 @@ The content of this structure is not made public by the API.
 xmlFreeProp ()
void	xmlFreeProp			(xmlAttrPtr cur)

 

-
Free an attribute including all children.

+
Free an attribute including all children.

 
 
 
 

-
+

 
 

 cur:an attribute
-an attribute
 

 

 

@@ -2897,12 +2904,12 @@ The content of this structure is not made public by the API.
 xmlFreePropList ()
 
void	xmlFreePropList			(xmlAttrPtr cur)

 

-
Free an attribute list including all children.

+
Free an attribute list including all children.

 

-
+

 
 

 cur:the first attribute in the listthe first attribute in the list
 

 

 

@@ -2912,7 +2919,7 @@ The content of this structure is not made public by the API.
 xmlGetBufferAllocationScheme ()
 
xmlBufferAllocationScheme	xmlGetBufferAllocationScheme	(void)

 

-
Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance XML_BUFFER_ALLOC_HYBRID - use exact sizes on small strings to keep memory usage tight in normal usage, and doubleit on large strings to avoid pathological performance.

+
DEPRECATED: Use xmlBufferSetAllocationScheme. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance XML_BUFFER_ALLOC_HYBRID - use exact sizes on small strings to keep memory usage tight in normal usage, and doubleit on large strings to avoid pathological performance.

 

@@ -3026,7 +3033,7 @@ The content of this structure is not made public by the API.
 xmlGetNoNsProp ()
xmlChar *	xmlGetNoNsProp		(const xmlNode * node, 
					 const xmlChar * name)

 

-
Search and get the value of an attribute associated to a node This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. This function is similar to xmlGetProp except it will accept only an attribute in no namespace. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

+
Search and get the value of an attribute associated to a node This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. This function is similar to xmlGetProp except it will accept only an attribute in no namespace. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

 
 

 
 

@@ -3036,11 +3043,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().
 

 
 

@@ -3126,7 +3133,7 @@ The content of this structure is not made public by the API.
 xmlGetNsProp ()
 
xmlChar *	xmlGetNsProp		(const xmlNode * node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace)

 

-
Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

+
Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

 

@@ -3136,7 +3143,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -3144,7 +3151,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 nameSpace:

 

 Returns:the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().
 

 
 

@@ -3155,7 +3162,7 @@ The content of this structure is not made public by the API.
 xmlGetProp ()
 
xmlChar *	xmlGetProp		(const xmlNode * node, 
					 const xmlChar * name)

 

-
Search and get the value of an attribute associated to a node This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. NOTE: This function acts independently of namespaces associated to the attribute. Use xmlGetNsProp() or xmlGetNoNsProp() for namespace aware processing. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

+
Search and get the value of an attribute associated to a node This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. NOTE: This function acts independently of namespaces associated to the attribute. Use xmlGetNsProp() or xmlGetNoNsProp() for namespace aware processing. NOTE: This function doesn't allow to distinguish malloc failures from missing attributes. It's more robust to use xmlNodeGetAttrValue.

 

@@ -3165,11 +3172,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().the attribute value or NULL if not found or a memory allocation failed. It's up to the caller to free the memory with xmlFree().
 

 
 

@@ -3180,7 +3187,7 @@ The content of this structure is not made public by the API.
 xmlHasNsProp ()
 
xmlAttrPtr	xmlHasNsProp		(const xmlNode * node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace)

 

-
Search for an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. Note that a namespace of NULL indicates to use the default namespace.

+
Search for an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values. Note that a namespace of NULL indicates to use the default namespace.

 

@@ -3190,7 +3197,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -3198,7 +3205,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 nameSpace:

 

 Returns:the attribute or the attribute declaration or NULL if neither was found. Also returns NULL if a memory allocation failed making this function unreliable.the attribute or the attribute declaration or NULL if neither was found. Also returns NULL if a memory allocation failed making this function unreliable.
 

 
 

@@ -3209,7 +3216,7 @@ The content of this structure is not made public by the API.
 xmlHasProp ()
 
xmlAttrPtr	xmlHasProp		(const xmlNode * node, 
					 const xmlChar * name)

 

-
Search an attribute associated to a node This function also looks in DTD attribute declaration for #FIXED or default declaration values.

+
Search an attribute associated to a node This function also looks in DTD attribute declaration for #FIXED or default declaration values.

 

@@ -3219,11 +3226,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:the attribute or the attribute declaration or NULL if neither was found. Also returns NULL if a memory allocation failed making this function unreliable.the attribute or the attribute declaration or NULL if neither was found. Also returns NULL if a memory allocation failed making this function unreliable.
 

 
 

@@ -3330,7 +3337,7 @@ The content of this structure is not made public by the API.
 xmlNewCharRef ()
 
xmlNodePtr	xmlNewCharRef		(xmlDocPtr doc, 
					 const xmlChar * name)

 

-
This function is MISNAMED. It doesn't create a character reference but an entity reference. Create an empty entity reference node. This function doesn't attempt to look up the entity in @doc. Entity names like '&entity;' are handled as well.

+
This function is MISNAMED. It doesn't create a character reference but an entity reference. Create an empty entity reference node. This function doesn't attempt to look up the entity in @doc. Entity names like '&entity;' are handled as well.

 

@@ -3355,7 +3362,7 @@ The content of this structure is not made public by the API.
 xmlNewChild ()
xmlNodePtr	xmlNewChild		(xmlNodePtr parent, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * content)

 

-
Create a new child element and append it to a parent element. If @ns is NULL, the newly created element inherits the namespace of the parent. If provided, @content is expected to be a valid XML attribute value possibly containing character and entity references. Text and entity reference node will be added to the child element, see xmlNewDocNode.

+
Create a new child element and append it to a parent element. If @ns is NULL, the newly created element inherits the namespace of the parent. If provided, @content is expected to be a valid XML attribute value possibly containing character and entity references. Text and entity reference node will be added to the child element, see xmlNewDocNode.

 
 
 
 

@@ -3388,13 +3395,13 @@ The content of this structure is not made public by the API.
 xmlNewComment ()
xmlNodePtr	xmlNewComment		(const xmlChar * content)

 

-
Use of this function is DISCOURAGED in favor of xmlNewDocComment. Create a comment node.

+
Use of this function is DISCOURAGED in favor of xmlNewDocComment. Create a comment node.

 
 
 
 

-
+
@@ -3430,7 +3437,7 @@ The content of this structure is not made public by the API.
 xmlNewDocComment ()
xmlNodePtr	xmlNewDocComment	(xmlDocPtr doc, 
					 const xmlChar * content)

 

-
Create a comment node.

+
Create a comment node.

 
 
 

 content:the comment content (optional)the comment content (optional)
 

 

 Returns:
 
 

@@ -3440,7 +3447,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -3476,7 +3483,7 @@ The content of this structure is not made public by the API.
 xmlNewDocNode ()
xmlNodePtr	xmlNewDocNode		(xmlDocPtr doc, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * content)

 

-
Create an element node. If provided, @content is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. Only references are handled, nested elements, comments or PIs are not. See xmlNewDocRawNode for an alternative. General notes on object creation: Each node and all its children are associated with the same document. The document should be provided when creating nodes to avoid a performance penalty when adding the node to a document tree. Note that a document only owns nodes reachable from the root node. Unlinked subtrees must be freed manually.

+
Create an element node. If provided, @content is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. Only references are handled, nested elements, comments or PIs are not. See xmlNewDocRawNode for an alternative. General notes on object creation: Each node and all its children are associated with the same document. The document should be provided when creating nodes to avoid a performance penalty when adding the node to a document tree. Note that a document only owns nodes reachable from the root node. Unlinked subtrees must be freed manually.

 
 
 

 content:the comment contentthe comment content
 

 

 Returns:
 
 

@@ -3571,7 +3578,7 @@ The content of this structure is not made public by the API.
 xmlNewDocProp ()
xmlAttrPtr	xmlNewDocProp		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Create an attribute object. If provided, @value is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. If you want to pass a raw string, see xmlNewProp.

+
Create an attribute object. If provided, @value is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. If you want to pass a raw string, see xmlNewProp.

 
 
 
 

@@ -3581,17 +3588,15 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+

 
 
 

 name:the name of the attribute
-the name of the attribute
 

 

 value:
-attribute value with XML references (optional)attribute value with XML references (optional)
 

 

 Returns:a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.
 

 
 

@@ -3719,35 +3724,6 @@ The content of this structure is not made public by the API.
 

 

 

-xmlNewGlobalNs ()

-
xmlNsPtr	xmlNewGlobalNs		(xmlDocPtr doc, 
					 const xmlChar * href, 
					 const xmlChar * prefix)

-

-
Creation of a Namespace, the old way using PI and without scoping DEPRECATED !!!

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


doc:the document carrying the namespace
href:the URI associated
prefix:the prefix for the namespace
Returns:NULL this functionality had been removed

-

-

-

-

 xmlNewNode ()

 
xmlNodePtr	xmlNewNode		(xmlNsPtr ns, 
					 const xmlChar * name)

 

@@ -3830,7 +3806,7 @@ The content of this structure is not made public by the API.
 xmlNewNsProp ()
 
xmlAttrPtr	xmlNewNsProp		(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Create an attribute object. If provided, @value should be a raw, unescaped string. If @node is provided, the created attribute will be appended without checking for duplicate names. It is an error if @node is not an element.

+
Create an attribute object. If provided, @value should be a raw, unescaped string. If @node is provided, the created attribute will be appended without checking for duplicate names. It is an error if @node is not an element.

 

@@ -3844,16 +3820,15 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+

 
 
 

 name:the local name of the attribute
-the local name of the attribute
 

 

 value:the value of the attribute (optional)the value of the attribute (optional)
 

 

 Returns:a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.
 

 
 

@@ -3878,16 +3853,15 @@ The content of this structure is not made public by the API.
 
 
 name:
-the local name of the attribute
-
+the local name of the attribute
 
 
 value:
-the value of the attribute (optional)
+the value of the attribute (optional)
 
 
 Returns:
-a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.
+a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.
 
 
 

@@ -3923,7 +3897,7 @@ The content of this structure is not made public by the API.
 xmlNewProp ()
 
xmlAttrPtr	xmlNewProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Create an attribute node. If provided, @value should be a raw, unescaped string. If @node is provided, the created attribute will be appended without checking for duplicate names. It is an error if @node is not an element.

+
Create an attribute node. If provided, @value should be a raw, unescaped string. If @node is provided, the created attribute will be appended without checking for duplicate names. It is an error if @node is not an element.

 

@@ -3933,16 +3907,15 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+

 
 
 

 name:the name of the attribute
-the name of the attribute
 

 

 value:the value of the attribute (optional)the value of the attribute (optional)
 

 

 Returns:a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.a pointer to the attribute or NULL if arguments are invalid or a memory allocation failed.
 

 
 

@@ -3953,7 +3926,7 @@ The content of this structure is not made public by the API.
 xmlNewReference ()
 
xmlNodePtr	xmlNewReference		(const xmlDoc * doc, 
					 const xmlChar * name)

 

-
Create a new entity reference node, linking the result with the entity in @doc if found. Entity names like '&entity;' are handled as well.

+
Create a new entity reference node, linking the result with the entity in @doc if found. Entity names like '&entity;' are handled as well.

 

@@ -4231,7 +4204,7 @@ The content of this structure is not made public by the API.
 xmlNodeGetAttrValue ()
int	xmlNodeGetAttrValue		(const xmlNode * node, 
					 const xmlChar * name, 
					 const xmlChar * nsUri, 
					 xmlChar ** out)

 

-
Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. The returned value must be freed by the caller. Available since 2.13.0.

+
Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified. This does the entity substitution. The returned value must be freed by the caller. Available since 2.13.0.

 
 
 
 

@@ -4241,7 +4214,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -4253,7 +4226,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 nsUri:

 

 Returns:0 on success, 1 if no attribute was found, -1 if a memory allocation failed.0 on success, 1 if no attribute was found, -1 if a memory allocation failed.
 

 
 

@@ -4339,7 +4312,7 @@ The content of this structure is not made public by the API.
 xmlNodeGetLang ()
 
xmlChar *	xmlNodeGetLang		(const xmlNode * cur)

 

-
Searches the language of a node, i.e. the values of the xml:lang attribute or the one carried by the nearest ancestor.

+
Searches the language of a node, i.e. the values of the xml:lang attribute or the one carried by the nearest ancestor.

 

@@ -4360,7 +4333,7 @@ The content of this structure is not made public by the API.
 xmlNodeGetSpacePreserve ()
int	xmlNodeGetSpacePreserve		(const xmlNode * cur)

 

-
Searches the space preserving behaviour of a node, i.e. the values of the xml:space attribute or the one carried by the nearest ancestor.

+
Searches the space preserving behaviour of a node, i.e. the values of the xml:space attribute or the one carried by the nearest ancestor.

 
 
 
 

@@ -4402,7 +4375,7 @@ The content of this structure is not made public by the API.
 xmlNodeListGetRawString ()
xmlChar *	xmlNodeListGetRawString	(const xmlDoc * doc, 
					 const xmlNode * list, 
					 int inLine)

 

-
Serializes attribute children (text and entity reference nodes) into a string. An empty list produces an empty string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' will be escaped.

+
Serializes attribute children (text and entity reference nodes) into a string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' will be escaped.

 
 
 
 

@@ -4412,7 +4385,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -4431,7 +4404,7 @@ The content of this structure is not made public by the API.
 xmlNodeListGetString ()
xmlChar *	xmlNodeListGetString	(xmlDocPtr doc, 
					 const xmlNode * list, 
					 int inLine)

 

-
Serializes attribute children (text and entity reference nodes) into a string. An empty list produces an empty string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' as well as non-ASCII chars will be escaped. See xmlNodeListGetRawString for an alternative option.

+
Serializes attribute children (text and entity reference nodes) into a string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' as well as non-ASCII chars will be escaped. See xmlNodeListGetRawString for an alternative option.

 
 
 

 list:a node list of attribute children (optional)a node list of attribute children
 

 

 inLine:
 
 

@@ -4441,7 +4414,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -4460,7 +4433,7 @@ The content of this structure is not made public by the API.
 xmlNodeSetBase ()
int	xmlNodeSetBase			(xmlNodePtr cur, 
					 const xmlChar * uri)

 

-
Set (or reset) the base URI of a node, i.e. the value of the xml:base attribute.

+
Set (or reset) the base URI of a node, i.e. the value of the xml:base attribute.

 
 
 

 list:a node list of attribute children (optional)a node list of attribute children
 

 

 inLine:
 
 

@@ -4485,7 +4458,7 @@ The content of this structure is not made public by the API.
 xmlNodeSetContent ()
int	xmlNodeSetContent		(xmlNodePtr cur, 
					 const xmlChar * content)

 

-
Replace the text content of a node. Sets the raw text content of text, CDATA, comment or PI nodes. For element and attribute nodes, removes all children and replaces them by parsing @content which is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. Unfortunately, there isn't an API to pass raw content directly. An inefficient work-around is to escape the content with xmlEncodeSpecialChars before passing it. A better trick is clearing the old content with xmlNodeSetContent(node, NULL) first and then calling xmlNodeAddContent(node, content). Unlike this function, xmlNodeAddContent accepts raw text.

+
Replace the text content of a node. Sets the raw text content of text, CDATA, comment or PI nodes. For element and attribute nodes, removes all children and replaces them by parsing @content which is expected to be a valid XML attribute value possibly containing character and entity references. Syntax errors and references to undeclared entities are ignored silently. Unfortunately, there isn't an API to pass raw content directly. An inefficient work-around is to escape the content with xmlEncodeSpecialChars before passing it. A better trick is clearing the old content with xmlNodeSetContent(node, NULL) first and then calling xmlNodeAddContent(node, content). Unlike this function, xmlNodeAddContent accepts raw text.

 
 
 
 

@@ -4539,7 +4512,7 @@ The content of this structure is not made public by the API.
 xmlNodeSetLang ()
int	xmlNodeSetLang			(xmlNodePtr cur, 
					 const xmlChar * lang)

 

-
Set the language of a node, i.e. the values of the xml:lang attribute.

+
Set the language of a node, i.e. the values of the xml:lang attribute.

 
 
 
 

@@ -4585,7 +4558,7 @@ The content of this structure is not made public by the API.
 xmlNodeSetSpacePreserve ()
int	xmlNodeSetSpacePreserve		(xmlNodePtr cur, 
					 int val)

 

-
Set (or reset) the space preserving behaviour of a node, i.e. the value of the xml:space attribute.

+
Set (or reset) the space preserving behaviour of a node, i.e. the value of the xml:space attribute.

 
 
 
 

@@ -4677,18 +4650,17 @@ The content of this structure is not made public by the API.
 xmlRemoveProp ()
int	xmlRemoveProp			(xmlAttrPtr cur)

 

-
Unlink and free an attribute including all children. Note this doesn't work for namespace declarations. The attribute must have a non-NULL parent pointer.

+
Unlink and free an attribute including all children. Note this doesn't work for namespace declarations. The attribute must have a non-NULL parent pointer.

 
 
 
 

-
+
-
+

 
 
 

 cur:an attribute
-an attribute
 

 

 Returns:0 on success or -1 if the attribute was not found or arguments are invalid.0 on success or -1 if the attribute was not found or arguments are invalid.
 

 
 

@@ -4960,7 +4932,7 @@ The content of this structure is not made public by the API.
 xmlSetBufferAllocationScheme ()
 
void	xmlSetBufferAllocationScheme	(xmlBufferAllocationScheme scheme)

 

-
Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance

+
DEPRECATED: Use xmlBufferSetAllocationScheme. Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance

 

@@ -5036,7 +5008,7 @@ The content of this structure is not made public by the API.
 xmlSetNs ()
void	xmlSetNs			(xmlNodePtr node, 
					 xmlNsPtr ns)

 

-
Set the namespace of an element or attribute node. Passing a NULL namespace unsets the namespace.

+
Set the namespace of an element or attribute node. Passing a NULL namespace unsets the namespace.

 
 

 
 

@@ -5057,7 +5029,7 @@ The content of this structure is not made public by the API.
 xmlSetNsProp ()
xmlAttrPtr	xmlSetNsProp		(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Set (or reset) an attribute carried by a node. The ns structure must be in scope, this is not checked

+
Set (or reset) an attribute carried by a node. The ns structure must be in scope, this is not checked

 
 
 
 

@@ -5071,15 +5043,15 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 value:the attribute valuethe attribute value
 

 

 Returns:the attribute pointer.the attribute pointer.
 

 
 

@@ -5090,7 +5062,7 @@ The content of this structure is not made public by the API.
 xmlSetProp ()
 
xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value)

 

-
Set (or reset) an attribute carried by a node. If @name has a prefix, then the corresponding namespace-binding will be used, if in scope; it is an error it there's no such ns-binding for the prefix in scope.

+
Set (or reset) an attribute carried by a node. If @name has a prefix, then the corresponding namespace-binding will be used, if in scope; it is an error it there's no such ns-binding for the prefix in scope.

 

@@ -5100,15 +5072,15 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+

 
 
 

 name:the attribute name (a QName)the attribute name (a QName)
 

 

 value:the attribute valuethe attribute value
 

 

 Returns:the attribute pointer.the attribute pointer.
 

 
 

@@ -5194,7 +5166,7 @@ The content of this structure is not made public by the API.
 xmlStringGetNodeList ()
 
xmlNodePtr	xmlStringGetNodeList	(const xmlDoc * doc, 
					 const xmlChar * value)

 

-
DEPRECATED: Use xmlNodeSetContent. Parse an attribute value and build a node list containing only text and entity reference nodes. The resulting nodes will be associated with the document if provided. The document is also used to look up entities. The input is not validated. Syntax errors or references to undeclared entities will be ignored silently with unspecified results.

+
DEPRECATED: Use xmlNodeSetContent. Parse an attribute value and build a node list containing only text and entity reference nodes. The resulting nodes will be associated with the document if provided. The document is also used to look up entities. The input is not validated. Syntax errors or references to undeclared entities will be ignored silently with unspecified results.

 

@@ -5204,11 +5176,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+

 
 
 

 value:an attribute valuean attribute value
 

 

 Returns:a pointer to the first child or NULL if a memory allocation failed.a pointer to the first child or NULL if the value if empty or a memory allocation failed.
 

 
 

@@ -5229,15 +5201,15 @@ The content of this structure is not made public by the API.
 
 
 value:
-an attribute value
+an attribute value
 
 
 len:
-maximum length of the attribute value
+maximum length of the attribute value
 
 
 Returns:
-a pointer to the first child or NULL if a memory allocation failed.
+a pointer to the first child or NULL if the value if empty or a memory allocation failed.
 
 
 

@@ -5277,7 +5249,7 @@ The content of this structure is not made public by the API.
 xmlTextMerge ()
 
xmlNodePtr	xmlTextMerge		(xmlNodePtr first, 
					 xmlNodePtr second)

 

-
Merge the second text node into the first. The second node is unlinked and freed.

+
Merge the second text node into the first. If @first is NULL, @second is returned. Otherwise, the second node is unlinked and freed.

 

@@ -5299,48 +5271,6 @@ The content of this structure is not made public by the API.
 

 

-xmlThrDefBufferAllocScheme ()

-
xmlBufferAllocationScheme	xmlThrDefBufferAllocScheme	(xmlBufferAllocationScheme v)

-

-

-

 
 
 

--
-
-
-
-
-
-
-
-
-
-


v:
Returns:

-

-

-

-

-xmlThrDefDefaultBufferSize ()

-
int	xmlThrDefDefaultBufferSize	(int v)

-

-

-

--
-
-
-
-
-
-
-
-
-
-


v:
Returns:

-

-

-

-

 xmlThrDefDeregisterNodeDefault ()

 
xmlDeregisterNodeFunc	xmlThrDefDeregisterNodeDefault	(xmlDeregisterNodeFunc func)

 

@@ -5401,7 +5331,7 @@ The content of this structure is not made public by the API.
 xmlUnsetNsProp ()
 
int	xmlUnsetNsProp			(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name)

 

-
Remove an attribute carried by a node.

+
Remove an attribute carried by a node.

 

@@ -5415,7 +5345,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -5430,7 +5360,7 @@ The content of this structure is not made public by the API.
 xmlUnsetProp ()
int	xmlUnsetProp			(xmlNodePtr node, 
					 const xmlChar * name)

 

-
Remove an attribute carried by a node. This handles only attributes in no namespace.

+
Remove an attribute carried by a node. This handles only attributes in no namespace.

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:
 
 

@@ -5440,7 +5370,7 @@ The content of this structure is not made public by the API.
 
-
+
diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html
index 04f90899..f2a10057 100644
--- a/doc/devhelp/libxml2-uri.html
+++ b/doc/devhelp/libxml2-uri.html
@@ -52,17 +52,17 @@ char *	xmlURIUnescapeString		(const char * s
 

 Structure xmlURI
struct _xmlURI {
-    char *	scheme	: the URI scheme
-    char *	opaque	: opaque part
-    char *	authority	: the authority part
-    char *	server	: the server part
-    char *	user	: the user part
-    int	port	: the port number
-    char *	path	: the path string
-    char *	query	: the query string (deprecated - use with caution)
-    char *	fragment	: the fragment identifier
-    int	cleanup	: parsing potentially unclean URI
-    char *	query_raw	: the query string (as it appears in the URI)
+    char *	scheme
+    char *	opaque
+    char *	authority
+    char *	server
+    char *	user
+    int	port
+    char *	path
+    char *	query
+    char *	fragment
+    int	cleanup
+    char *	query_raw
 } xmlURI;
 

@@ -87,7 +87,7 @@ char *	xmlURIUnescapeString		(const char * s
 
-
+
@@ -106,13 +106,13 @@ char *	xmlURIUnescapeString		(const char * s
 xmlBuildRelativeURISafe ()
int	xmlBuildRelativeURISafe		(const xmlChar * URI, 
					 const xmlChar * base, 
					 xmlChar ** valPtr)

 

-
Expresses the URI of the reference in terms relative to the base. Some examples of this operation include: base = "http://site1.com/docs/book1.html" URI input URI returned docs/pic1.gif pic1.gif docs/img/pic1.gif img/pic1.gif img/pic1.gif ../img/pic1.gif http://site1.com/docs/pic1.gif pic1.gif http://site2.com/docs/pic1.gif http://site2.com/docs/pic1.gif base = "docs/book1.html" URI input URI returned docs/pic1.gif pic1.gif docs/img/pic1.gif img/pic1.gif img/pic1.gif ../img/pic1.gif http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif Note: if the URI reference is really weird or complicated, it may be worthwhile to first convert it into a "nice" one by calling xmlBuildURI (using 'base') before calling this routine, since this routine (for reasonable efficiency) assumes URI has already been through some validation. Available since 2.13.0.

+
Expresses the URI of the reference in terms relative to the base. Some examples of this operation include: base = "http://site1.com/docs/book1.html" URI input URI returned http://site1.com/docs/pic1.gif pic1.gif http://site2.com/docs/pic1.gif http://site2.com/docs/pic1.gif base = "docs/book1.html" URI input URI returned docs/pic1.gif pic1.gif docs/img/pic1.gif img/pic1.gif img/pic1.gif ../img/pic1.gif http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif Available since 2.13.0.

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:
 
 

 

 URI:the URI reference under considerationthe URI reference under consideration
 

 

 base:
 
 

-
+
@@ -135,7 +135,7 @@ char *	xmlURIUnescapeString		(const char * s
 xmlBuildURI ()
xmlChar *	xmlBuildURI		(const xmlChar * URI, 
					 const xmlChar * base)

 

-
Computes he final URI of the reference done by checking that the given URI is valid, and building the final URI using the base URI. This is processed according to section 5.2 of the RFC 2396 5.2. Resolving Relative References to Absolute Form

+
Computes he final URI of the reference done by checking that the given URI is valid, and building the final URI using the base URI. This is processed according to section 5.2 of the RFC 2396 5.2. Resolving Relative References to Absolute Form

 
 
 

 URI:the URI reference under considerationthe URI reference under consideration
 

 

 base:
 
 

@@ -160,7 +160,7 @@ char *	xmlURIUnescapeString		(const char * s
 xmlBuildURISafe ()
int	xmlBuildURISafe			(const xmlChar * URI, 
					 const xmlChar * base, 
					 xmlChar ** valPtr)

 

-
Computes he final URI of the reference done by checking that the given URI is valid, and building the final URI using the base URI. This is processed according to section 5.2 of the RFC 2396 5.2. Resolving Relative References to Absolute Form Available since 2.13.0.

+
Computes he final URI of the reference done by checking that the given URI is valid, and building the final URI using the base URI. This is processed according to section 5.2 of the RFC 2396 5.2. Resolving Relative References to Absolute Form Available since 2.13.0.

 
 
 
 

@@ -308,7 +308,7 @@ char *	xmlURIUnescapeString		(const char * s
 xmlParseURIReference ()
int	xmlParseURIReference		(xmlURIPtr uri, 
					 const char * str)

 

-
Parse an URI reference string based on RFC 3986 and fills in the appropriate fields of the @uri structure URI-reference = URI / relative-ref

+
Parse an URI reference string based on RFC 3986 and fills in the appropriate fields of the @uri structure URI-reference = URI / relative-ref

 
 
 
 

@@ -444,7 +444,7 @@ char *	xmlURIUnescapeString		(const char * s
 xmlURIEscapeStr ()
xmlChar *	xmlURIEscapeStr		(const xmlChar * str, 
					 const xmlChar * list)

 

-
This routine escapes a string to hex, ignoring unreserved characters a-z, A-Z, 0-9, "-._~", a few sub-delims "!*'()", the gen-delim "@" (why?) and the characters in the exception list.

+
This routine escapes a string to hex, ignoring unreserved characters a-z, A-Z, 0-9, "-._~", a few sub-delims "!*'()", the gen-delim "@" (why?) and the characters in the exception list.

 
 
 
 

diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html
index a66eb8f5..eeef7c94 100644
--- a/doc/devhelp/libxml2-valid.html
+++ b/doc/devhelp/libxml2-valid.html
@@ -88,7 +88,7 @@ int	xmlValidGetValidElements	(xmlChar *	xmlValidNormalizeAttributeValue	(xmlDocPtr doc, 
xmlNodePtr elem, 
						 const xmlChar * name, 
						 const xmlChar * value);
 int	xmlValidateAttributeDecl	(xmlValidCtxtPtr ctxt, 
xmlDocPtr doc, 
xmlAttributePtr attr);
 int	xmlValidateAttributeValue	(xmlAttributeType type, 
					 const xmlChar * value);
-int	xmlValidateDocument		(xmlValidCtxtPtr ctxt, 
xmlDocPtr doc);
+int	xmlValidateDocument		(xmlValidCtxtPtr vctxt, 
xmlDocPtr doc);
 int	xmlValidateDocumentFinal	(xmlValidCtxtPtr ctxt, 
xmlDocPtr doc);
 int	xmlValidateDtd			(xmlValidCtxtPtr ctxt, 
xmlDocPtr doc, 
xmlDtdPtr dtd);
 int	xmlValidateDtdFinal		(xmlValidCtxtPtr ctxt, 
xmlDocPtr doc);
@@ -209,22 +209,22 @@ The content of this structure is not made public by the API.
 

 Structure xmlValidCtxt
struct _xmlValidCtxt {
-    void *	userData	: user specific data block
-    xmlValidityErrorFunc	error	: the callback in case of errors
-    xmlValidityWarningFunc	warning	: the callback in case of warning Node analysis stack used when validat
-    xmlNodePtr	node	: Current parsed Node
-    int	nodeNr	: Depth of the parsing stack
-    int	nodeMax	: Max depth of the parsing stack
-    xmlNodePtr *	nodeTab	: array of nodes
-    unsigned int	flags	: internal flags
-    xmlDocPtr	doc	: the document
-    int	valid	: temporary validity check result state state used for non-determinist
-    xmlValidState *	vstate	: current state
-    int	vstateNr	: Depth of the validation stack
-    int	vstateMax	: Max depth of the validation stack
-    xmlValidState *	vstateTab	: array of validation states
-    xmlAutomataPtr	am	: the automata
-    xmlAutomataStatePtr	state	: used to build the automata
+    void *	userData
+    xmlValidityErrorFunc	error
+    xmlValidityWarningFunc	warning
+    xmlNodePtr	node
+    int	nodeNr
+    int	nodeMax
+    xmlNodePtr *	nodeTab
+    unsigned int	flags
+    xmlDocPtr	doc
+    int	valid
+    xmlValidState *	vstate
+    int	vstateNr
+    int	vstateMax
+    xmlValidState *	vstateTab
+    xmlAutomataPtr	am
+    xmlAutomataStatePtr	state
     void *	am
     void *	state
 } xmlValidCtxt;
@@ -313,7 +313,7 @@ The content of this structure is not made public by the API.
 xmlAddAttributeDecl ()
 
xmlAttributePtr	xmlAddAttributeDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * elem, 
					 const xmlChar * name, 
					 const xmlChar * ns, 
					 xmlAttributeType type, 
					 xmlAttributeDefault def, 
					 const xmlChar * defaultValue, 
					 xmlEnumerationPtr tree)

 

-
Register a new attribute declaration Note that @tree becomes the ownership of the DTD

+
DEPRECATED: Internal function, don't use. Register a new attribute declaration Note that @tree becomes the ownership of the DTD

 

 
 						 					 					 					 					 					 					 					 					 
 

@@ -331,23 +331,23 @@ The content of this structure is not made public by the API.
 
-
+
-
+
-
+
-
+
-
+
@@ -355,7 +355,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 name:the attribute namethe attribute name
 

 

 ns:the attribute namespace prefixthe attribute namespace prefix
 

 

 type:the attribute typethe attribute type
 

 

 def:the attribute default typethe attribute default type
 

 

 defaultValue:the attribute default valuethe attribute default value
 

 

 tree:

 

 Returns:NULL if not new, otherwise the attribute declNULL if not new, otherwise the attribute decl
 

 
 

@@ -366,7 +366,7 @@ The content of this structure is not made public by the API.
 xmlAddElementDecl ()
 
xmlElementPtr	xmlAddElementDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * name, 
					 xmlElementTypeVal type, 
					 xmlElementContentPtr content)

 

-
Register a new element declaration

+
DEPRECATED: Internal function, don't use. Register a new element declaration

 

@@ -421,7 +421,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -443,11 +443,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -462,7 +462,7 @@ The content of this structure is not made public by the API.
 xmlAddNotationDecl ()
xmlNotationPtr	xmlAddNotationDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDtdPtr dtd, 
					 const xmlChar * name, 
					 const xmlChar * PublicID, 
					 const xmlChar * SystemID)

 

-
Register a new notation declaration

+
DEPRECATED: Internal function, don't use. Register a new notation declaration

 
 
 

 attr:the attribute holding the IDthe attribute holding the ID
 

 

 Returns:

 

 attr:the attribute holding the IDthe attribute holding the ID
 

 

 value:the attribute (ID) valuethe attribute (ID) value
 

 

 Returns:
 
 

@@ -517,7 +517,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -533,13 +533,13 @@ The content of this structure is not made public by the API.
 xmlCopyAttributeTable ()
xmlAttributeTablePtr	xmlCopyAttributeTable	(xmlAttributeTablePtr table)

 

-
Build a copy of an attribute table.

+
DEPRECATED: Internal function, don't use. Build a copy of an attribute table.

 
 
 

 attr:the attribute holding the Refthe attribute holding the Ref
 

 

 Returns:
 
 

-
+
@@ -554,7 +554,7 @@ The content of this structure is not made public by the API.
 xmlCopyDocElementContent ()
xmlElementContentPtr	xmlCopyDocElementContent	(xmlDocPtr doc, 
							 xmlElementContentPtr cur)

 

-
Build a copy of an element content description.

+
DEPRECATED: Internal function, don't use. Build a copy of an element content description.

 
 
 

 table:An attribute tableAn attribute table
 

 

 Returns:
 
 

@@ -579,7 +579,7 @@ The content of this structure is not made public by the API.
 xmlCopyElementContent ()
xmlElementContentPtr	xmlCopyElementContent	(xmlElementContentPtr cur)

 

-
Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead

+
DEPRECATED: Internal function, don't use. Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead

 
 
 
 

@@ -600,7 +600,7 @@ The content of this structure is not made public by the API.
 xmlCopyElementTable ()
xmlElementTablePtr	xmlCopyElementTable	(xmlElementTablePtr table)

 

-
Build a copy of an element table.

+
DEPRECATED: Internal function, don't use. Build a copy of an element table.

 
 
 
 

@@ -621,7 +621,7 @@ The content of this structure is not made public by the API.
 xmlCopyEnumeration ()
xmlEnumerationPtr	xmlCopyEnumeration	(xmlEnumerationPtr cur)

 

-
Copy an enumeration attribute node (recursive).

+
DEPRECATED: Internal function, don't use. Copy an enumeration attribute node (recursive).

 
 
 
 

@@ -642,7 +642,7 @@ The content of this structure is not made public by the API.
 xmlCopyNotationTable ()
xmlNotationTablePtr	xmlCopyNotationTable	(xmlNotationTablePtr table)

 

-
Build a copy of a notation table.

+
DEPRECATED: Internal function, don't use. Build a copy of a notation table.

 
 
 
 

@@ -663,7 +663,7 @@ The content of this structure is not made public by the API.
 xmlCreateEnumeration ()
xmlEnumerationPtr	xmlCreateEnumeration	(const xmlChar * name)

 

-
create and initialize an enumeration attribute node.

+
DEPRECATED: Internal function, don't use. create and initialize an enumeration attribute node.

 
 
 
 

@@ -684,7 +684,7 @@ The content of this structure is not made public by the API.
 xmlDumpAttributeDecl ()
void	xmlDumpAttributeDecl		(xmlBufferPtr buf, 
					 xmlAttributePtr attr)

 

-
DEPRECATED: Use xmlSaveTree. This will dump the content of the attribute declaration as an XML DTD definition

+
DEPRECATED: Use xmlSaveTree. This will dump the content of the attribute declaration as an XML DTD definition

 
 
 
 

@@ -694,7 +694,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 attr:An attribute declarationAn attribute declaration
 

 
 

@@ -705,7 +705,7 @@ The content of this structure is not made public by the API.
 xmlDumpAttributeTable ()
 
void	xmlDumpAttributeTable		(xmlBufferPtr buf, 
					 xmlAttributeTablePtr table)

 

-
DEPRECATED: Don't use. This will dump the content of the attribute table as an XML DTD definition

+
DEPRECATED: Don't use. This will dump the content of the attribute table as an XML DTD definition

 

@@ -715,7 +715,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 table:An attribute tableAn attribute table
 

 
 

@@ -810,12 +810,12 @@ The content of this structure is not made public by the API.
 xmlFreeAttributeTable ()
 
void	xmlFreeAttributeTable		(xmlAttributeTablePtr table)

 

-
Deallocate the memory used by an entities hash table.

+
DEPRECATED: Internal function, don't use. Deallocate the memory used by an entities hash table.

 

-
+

 
 

 table:An attribute tableAn attribute table
 

 

 

@@ -825,7 +825,7 @@ The content of this structure is not made public by the API.
 xmlFreeDocElementContent ()
 
void	xmlFreeDocElementContent	(xmlDocPtr doc, 
					 xmlElementContentPtr cur)

 

-
Free an element content structure. The whole subtree is removed.

+
DEPRECATED: Internal function, don't use. Free an element content structure. The whole subtree is removed.

 

@@ -846,7 +846,7 @@ The content of this structure is not made public by the API.
 xmlFreeElementContent ()
void	xmlFreeElementContent		(xmlElementContentPtr cur)

 

-
Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead

+
DEPRECATED: Internal function, don't use. Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead

 
 
 
 

@@ -861,7 +861,7 @@ The content of this structure is not made public by the API.
 xmlFreeElementTable ()
void	xmlFreeElementTable		(xmlElementTablePtr table)

 

-
Deallocate the memory used by an element hash table.

+
DEPRECATED: Internal function, don't use. Deallocate the memory used by an element hash table.

 
 

 
 

@@ -876,7 +876,7 @@ The content of this structure is not made public by the API.
 xmlFreeEnumeration ()
void	xmlFreeEnumeration		(xmlEnumerationPtr cur)

 

-
free an enumeration attribute node (recursive).

+
free an enumeration attribute node (recursive).

 
 

 
 

@@ -906,7 +906,7 @@ The content of this structure is not made public by the API.
 xmlFreeNotationTable ()
void	xmlFreeNotationTable		(xmlNotationTablePtr table)

 

-
Deallocate the memory used by an entities hash table.

+
DEPRECATED: Internal function, don't use. Deallocate the memory used by an entities hash table.

 
 

 
 

@@ -951,7 +951,7 @@ The content of this structure is not made public by the API.
 xmlGetDtdAttrDesc ()
xmlAttributePtr	xmlGetDtdAttrDesc	(xmlDtdPtr dtd, 
					 const xmlChar * elem, 
					 const xmlChar * name)

 

-
Search the DTD for the description of this attribute on this element.

+
Search the DTD for the description of this attribute on this element.

 
 

 
 

@@ -965,7 +965,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1030,7 +1030,7 @@ The content of this structure is not made public by the API.
 xmlGetDtdQAttrDesc ()
xmlAttributePtr	xmlGetDtdQAttrDesc	(xmlDtdPtr dtd, 
					 const xmlChar * elem, 
					 const xmlChar * name, 
					 const xmlChar * prefix)

 

-
Search the DTD for the description of this qualified attribute on this element.

+
Search the DTD for the description of this qualified attribute on this element.

 
 
 

 name:the attribute namethe attribute name
 

 

 Returns:
 
 

@@ -1044,11 +1044,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1092,7 +1092,7 @@ The content of this structure is not made public by the API.
 xmlGetID ()
xmlAttrPtr	xmlGetID		(xmlDocPtr doc, 
					 const xmlChar * ID)

 

-
Search the attribute declaring the given ID

+
Search the attribute declaring the given ID

 
 
 

 name:the attribute namethe attribute name
 

 

 prefix:the attribute namespace prefixthe attribute namespace prefix
 

 

 Returns:
 
 

@@ -1142,7 +1142,7 @@ The content of this structure is not made public by the API.
 xmlIsID ()
int	xmlIsID			(xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr)

 

-
Determine whether an attribute is of type ID. In case we have DTD(s) then this is done if DTD loading has been requested. In the case of HTML documents parsed with the HTML parser, then ID detection is done systematically.

+
Determine whether an attribute is of type ID. In case we have DTD(s) then this is done if DTD loading has been requested. In the case of HTML documents parsed with the HTML parser, then ID detection is done systematically.

 
 
 
 

@@ -1152,13 +1152,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1198,7 +1196,7 @@ The content of this structure is not made public by the API.
 xmlIsRef ()
int	xmlIsRef			(xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr)

 

-
DEPRECATED, do not use. This function will be removed from the public API. Determine whether an attribute is of type Ref. In case we have DTD(s) then this is simple, otherwise we use an heuristic: name Ref (upper or lowercase).

+
DEPRECATED, do not use. This function will be removed from the public API. Determine whether an attribute is of type Ref. In case we have DTD(s) then this is simple, otherwise we use an heuristic: name Ref (upper or lowercase).

 
 
 

 elem:the element carrying the attribute
-the element carrying the attribute
 

 

 attr:the attribute
-the attribute
 

 

 Returns:
 
 

@@ -1208,13 +1206,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1229,7 +1225,7 @@ The content of this structure is not made public by the API.
 xmlNewDocElementContent ()
xmlElementContentPtr	xmlNewDocElementContent	(xmlDocPtr doc, 
						 const xmlChar * name, 
						 xmlElementContentType type)

 

-
Allocate an element content structure for the document.

+
DEPRECATED: Internal function, don't use. Allocate an element content structure for the document.

 
 
 

 elem:the element carrying the attribute
-the element carrying the attribute
 

 

 attr:the attribute
-the attribute
 

 

 Returns:
 
 

@@ -1258,7 +1254,7 @@ The content of this structure is not made public by the API.
 xmlNewElementContent ()
xmlElementContentPtr	xmlNewElementContent	(const xmlChar * name, 
						 xmlElementContentType type)

 

-
Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent

+
DEPRECATED: Internal function, don't use. Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent

 
 
 
 

@@ -1298,7 +1294,7 @@ The content of this structure is not made public by the API.
 xmlRemoveID ()
int	xmlRemoveID			(xmlDocPtr doc, 
					 xmlAttrPtr attr)

 

-
Remove the given attribute from the ID table maintained internally.

+
Remove the given attribute from the ID table maintained internally.

 
 
 
 

@@ -1308,8 +1304,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1324,7 +1319,7 @@ The content of this structure is not made public by the API.
 xmlRemoveRef ()
int	xmlRemoveRef			(xmlDocPtr doc, 
					 xmlAttrPtr attr)

 

-
DEPRECATED, do not use. This function will be removed from the public API. Remove the given attribute from the Ref table maintained internally.

+
DEPRECATED, do not use. This function will be removed from the public API. Remove the given attribute from the Ref table maintained internally.

 
 
 

 attr:the attribute
-the attribute
 

 

 Returns:
 
 

@@ -1334,8 +1329,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1350,7 +1344,7 @@ The content of this structure is not made public by the API.
 xmlSnprintfElementContent ()
void	xmlSnprintfElementContent	(char * buf, 
					 int size, 
					 xmlElementContentPtr content, 
					 int englob)

 

-
This will dump the content of the element content definition Intended just for the debug routine

+
DEPRECATED: Internal function, don't use. This will dump the content of the element content definition Intended just for the debug routine

 
 
 

 attr:the attribute
-the attribute
 

 

 Returns:
 
 

@@ -1379,7 +1373,7 @@ The content of this structure is not made public by the API.
 xmlSprintfElementContent ()
void	xmlSprintfElementContent	(char * buf, 
					 xmlElementContentPtr content, 
					 int englob)

 

-
Deprecated, unsafe, use xmlSnprintfElementContent

+
DEPRECATED: Internal function, don't use. Deprecated, unsafe, use xmlSnprintfElementContent

 
 
 
 

@@ -1429,7 +1423,7 @@ The content of this structure is not made public by the API.
 xmlValidCtxtNormalizeAttributeValue ()
xmlChar *	xmlValidCtxtNormalizeAttributeValue	(xmlValidCtxtPtr ctxt, 
							 xmlDocPtr doc, 
							 xmlNodePtr elem, 
							 const xmlChar * name, 
							 const xmlChar * value)

 

-
DEPRECATED: Internal function, don't use. Does the validation related extra step of the normalization of attribute values: If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character. Also check VC: Standalone Document Declaration in P32, and update ctxt->valid accordingly

+
DEPRECATED: Internal function, don't use. Does the validation related extra step of the normalization of attribute values: If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character. Also check VC: Standalone Document Declaration in P32, and update ctxt->valid accordingly

 
 
 
 

@@ -1447,11 +1441,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1532,7 +1526,7 @@ The content of this structure is not made public by the API.
 xmlValidNormalizeAttributeValue ()
xmlChar *	xmlValidNormalizeAttributeValue	(xmlDocPtr doc, 
						 xmlNodePtr elem, 
						 const xmlChar * name, 
						 const xmlChar * value)

 

-
DEPRECATED: Internal function, don't use. Does the validation related extra step of the normalization of attribute values: If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character.

+
DEPRECATED: Internal function, don't use. Does the validation related extra step of the normalization of attribute values: If the declared value is not CDATA, then the XML processor must further process the normalized attribute value by discarding any leading and trailing space (#x20) characters, and by replacing sequences of space (#x20) characters by single space (#x20) character.

 
 
 

 name:the attribute namethe attribute name
 

 

 value:the attribute valuethe attribute value
 

 

 Returns:
 
 

@@ -1546,11 +1540,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1565,7 +1559,7 @@ The content of this structure is not made public by the API.
 xmlValidateAttributeDecl ()
int	xmlValidateAttributeDecl	(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlAttributePtr attr)

 

-
DEPRECATED: Internal function, don't use. Try to validate a single attribute definition basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Default Legal ] - [ VC: Enumeration ] - [ VC: ID Attribute Default ] The ID/IDREF uniqueness and matching are done separately

+
DEPRECATED: Internal function, don't use. Try to validate a single attribute definition basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Default Legal ] - [ VC: Enumeration ] - [ VC: ID Attribute Default ] The ID/IDREF uniqueness and matching are done separately

 
 
 

 name:the attribute namethe attribute name
 

 

 value:the attribute valuethe attribute value
 

 

 Returns:
 
 

@@ -1579,7 +1573,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1594,17 +1588,17 @@ The content of this structure is not made public by the API.
 xmlValidateAttributeValue ()
int	xmlValidateAttributeValue	(xmlAttributeType type, 
					 const xmlChar * value)

 

-
DEPRECATED: Internal function, don't use. Validate that the given attribute value match the proper production [ VC: ID ] Values of type ID must match the Name production.... [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names ... [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names ... [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.

+
DEPRECATED: Internal function, don't use. Validate that the given attribute value match the proper production [ VC: ID ] Values of type ID must match the Name production.... [ VC: IDREF ] Values of type IDREF must match the Name production, and values of type IDREFS must match Names ... [ VC: Entity Name ] Values of type ENTITY must match the Name production, values of type ENTITIES must match Names ... [ VC: Name Token ] Values of type NMTOKEN must match the Nmtoken production; values of type NMTOKENS must match Nmtokens.

 
 
 

 attr:an attribute definitionan attribute definition
 

 

 Returns:
 
 

-
+
-
+
@@ -1617,14 +1611,14 @@ The content of this structure is not made public by the API.
 

 

 xmlValidateDocument ()

-
int	xmlValidateDocument		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

+
int	xmlValidateDocument		(xmlValidCtxtPtr vctxt, 
					 xmlDocPtr doc)

 

-
Try to validate the document instance basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree.

+
DEPRECATED: This function can't report malloc or other failures. Use xmlCtxtValidateDocument. Try to validate the document instance basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree.

 

 
 
 

 type:an attribute typean attribute type
 

 

 value:an attribute valuean attribute value
 

 

 Returns:

-
+
@@ -1923,7 +1917,7 @@ The content of this structure is not made public by the API.
 xmlValidateOneAttribute ()
int	xmlValidateOneAttribute		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem, 
					 xmlAttrPtr attr, 
					 const xmlChar * value)

 

-
DEPRECATED: Internal function, don't use. Try to validate a single attribute for an element basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Value Type ] - [ VC: Fixed Attribute Default ] - [ VC: Entity Name ] - [ VC: Name Token ] - [ VC: ID ] - [ VC: IDREF ] - [ VC: Entity Name ] - [ VC: Notation Attributes ] The ID/IDREF uniqueness and matching are done separately

+
DEPRECATED: Internal function, don't use. Try to validate a single attribute for an element basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Attribute Value Type ] - [ VC: Fixed Attribute Default ] - [ VC: Entity Name ] - [ VC: Name Token ] - [ VC: ID ] - [ VC: IDREF ] - [ VC: Entity Name ] - [ VC: Notation Attributes ] The ID/IDREF uniqueness and matching are done separately

 
 
 
ctxt:vctxt:
 the validation context
 

 

 
 

@@ -1941,11 +1935,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1960,7 +1954,7 @@ The content of this structure is not made public by the API.
 xmlValidateOneElement ()
int	xmlValidateOneElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem)

 

-
DEPRECATED: Internal function, don't use. Try to validate a single element and it's attributes, basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Element Valid ] - [ VC: Required Attribute ] Then call xmlValidateOneAttribute() for each attribute present. The ID/IDREF checkings are done separately

+
DEPRECATED: Internal function, don't use. Try to validate a single element and it's attributes, basically it does the following checks as described by the XML-1.0 recommendation: - [ VC: Element Valid ] - [ VC: Required Attribute ] Then call xmlValidateOneAttribute() for each attribute present. The ID/IDREF checkings are done separately

 
 
 

 attr:an attribute instancean attribute instance
 

 

 value:the attribute value (without entities processing)the attribute value (without entities processing)
 

 

 Returns:
 
 

@@ -2015,7 +2009,7 @@ The content of this structure is not made public by the API.
 
-
+
diff --git a/doc/devhelp/libxml2-xinclude.html b/doc/devhelp/libxml2-xinclude.html
index eba01b74..6bdf768c 100644
--- a/doc/devhelp/libxml2-xinclude.html
+++ b/doc/devhelp/libxml2-xinclude.html
@@ -46,6 +46,7 @@ int	xmlXIncludeProcessTreeFlags	(xmlXIncludeProcessTreeFlagsData	(xmlNodePtr tree, 
					 int flags, 
					 void * data);
 void	xmlXIncludeSetErrorHandler	(xmlXIncludeCtxtPtr ctxt, 
xmlStructuredErrorFunc handler, 
					 void * data);
 int	xmlXIncludeSetFlags		(xmlXIncludeCtxtPtr ctxt, 
					 int flags);
+void	xmlXIncludeSetResourceLoader	(xmlXIncludeCtxtPtr ctxt, 
xmlResourceLoader loader, 
					 void * data);
 
Description

@@ -432,6 +433,31 @@ The content of this structure is not made public by the API.
 

 
 
 

 value:the attribute value (without entities processing)the attribute value (without entities processing)
 

 

 Returns:					 					 
 
 

 

 

+

+

+xmlXIncludeSetResourceLoader ()

+
void	xmlXIncludeSetResourceLoader	(xmlXIncludeCtxtPtr ctxt, 
					 xmlResourceLoader loader, 
					 void * data)

+

+
Register a callback function that will be called to load included documents. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:an XInclude processing context
loader:resource loader
data:user data which will be passed to the loader

+

+

 

 
 
diff --git a/doc/devhelp/libxml2-xlink.html b/doc/devhelp/libxml2-xlink.html
index 4162a9ad..35796d02 100644
--- a/doc/devhelp/libxml2-xlink.html
+++ b/doc/devhelp/libxml2-xlink.html
@@ -296,7 +296,7 @@ typedef void xlinkSimpleLinkFunk		(void * ctx
 xlinkGetDefaultDetect ()
 
xlinkNodeDetectFunc	xlinkGetDefaultDetect	(void)

 

-
Get the default xlink detection routine

+
DEPRECATED: Don't use. Get the default xlink detection routine

 

@@ -311,7 +311,7 @@ typedef void xlinkSimpleLinkFunk		(void * ctx
 xlinkGetDefaultHandler ()
xlinkHandlerPtr	xlinkGetDefaultHandler	(void)

 

-
Get the default xlink handler.

+
DEPRECATED: Don't use. Get the default xlink handler.

 
 

 
 

@@ -351,7 +351,7 @@ typedef void xlinkSimpleLinkFunk		(void * ctx
 xlinkSetDefaultDetect ()
void	xlinkSetDefaultDetect		(xlinkNodeDetectFunc func)

 

-
Set the default xlink detection routine

+
DEPRECATED: Don't use. Set the default xlink detection routine

 
 

 
 

@@ -366,7 +366,7 @@ typedef void xlinkSimpleLinkFunk		(void * ctx
 xlinkSetDefaultHandler ()
void	xlinkSetDefaultHandler		(xlinkHandlerPtr handler)

 

-
Set the default xlink handlers

+
DEPRECATED: Don't use. Set the default xlink handlers

 
 

 
 

diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html
index cd8424f3..223c43cf 100644
--- a/doc/devhelp/libxml2-xmlIO.html
+++ b/doc/devhelp/libxml2-xmlIO.html
@@ -33,10 +33,6 @@ int	xmlFileMatch			(const char * filename);
 void *	xmlFileOpen			(const char * filename);
 int	xmlFileRead			(void * context, 
					 char * buffer, 
					 int len);
 void	xmlFreeParserInputBuffer	(xmlParserInputBufferPtr in);
-int	xmlIOFTPClose			(void * context);
-int	xmlIOFTPMatch			(const char * filename);
-void *	xmlIOFTPOpen			(const char * filename);
-int	xmlIOFTPRead			(void * context, 
					 char * buffer, 
					 int len);
 int	xmlIOHTTPClose			(void * context);
 int	xmlIOHTTPMatch			(const char * filename);
 void *	xmlIOHTTPOpen			(const char * filename);
@@ -59,7 +55,7 @@ typedef xmlOutputBufferPtrxmlOutputBufferFlush		(xmlOutputBufferPtr out);
 const xmlChar *	xmlOutputBufferGetContent	(xmlOutputBufferPtr out);
 size_t	xmlOutputBufferGetSize		(xmlOutputBufferPtr out);
-int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * buf);
+int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * data);
 int	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out, 
					 const xmlChar * str, 
xmlCharEncodingOutputFunc escaping);
 int	xmlOutputBufferWriteString	(xmlOutputBufferPtr out, 
					 const char * str);
 typedef int xmlOutputCloseCallback		(void * context);
@@ -336,7 +332,7 @@ int	xmlRegisterOutputCallbacks	(xmlAllocOutputBuffer ()
xmlOutputBufferPtr	xmlAllocOutputBuffer	(xmlCharEncodingHandlerPtr encoder)

 

-
Create a buffered parser output

+
Create a buffered parser output Consumes @encoder even in error case.

 
 
 					 
 
 

@@ -357,7 +353,7 @@ int	xmlRegisterOutputCallbacks	(xmlAllocParserInputBuffer ()
xmlParserInputBufferPtr	xmlAllocParserInputBuffer	(xmlCharEncoding enc)

 

-
Create a buffered parser input for progressive parsing. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Use xmlNewInputFrom*. Create a buffered parser input for progressive parsing. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -544,98 +540,6 @@ int	xmlRegisterOutputCallbacks	(
 

 

-xmlIOFTPClose ()

-
int	xmlIOFTPClose			(void * context)

-

-
DEPRECATED: Internal function, don't use. Close an FTP I/O channel

-

 
 

--
-
-
-
-
-
-
-
-
-
-


context:the I/O context
Returns:0

-
-

-

-

-xmlIOFTPMatch ()

-
int	xmlIOFTPMatch			(const char * filename)

-

-
DEPRECATED: Internal function, don't use. check if the URI matches an FTP one

-

--
-
-
-
-
-
-
-
-
-
-


filename:the URI for matching
Returns:1 if matches, 0 otherwise

-

-

-

-

-xmlIOFTPOpen ()

-
void *	xmlIOFTPOpen			(const char * filename)

-

-
DEPRECATED: Internal function, don't use. open an FTP I/O channel

-

--
-
-
-
-
-
-
-
-
-
-


filename:the URI for matching
Returns:an I/O context or NULL in case of error

-

-

-

-

-xmlIOFTPRead ()

-
int	xmlIOFTPRead			(void * context, 
					 char * buffer, 
					 int len)

-

-
DEPRECATED: Internal function, don't use. Read @len bytes to @buffer from the I/O channel.

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


context:the I/O context
buffer:where to drop data
len:number of bytes to write
Returns:the number of bytes written

-

-

-

-

 xmlIOHTTPClose ()

 
int	xmlIOHTTPClose			(void * context)

 

@@ -756,7 +660,7 @@ int	xmlRegisterOutputCallbacks	(xmlNoNetExternalEntityLoader ()
 
xmlParserInputPtr	xmlNoNetExternalEntityLoader	(const char * URL, 
							 const char * ID, 
							 xmlParserCtxtPtr ctxt)

 

-
A specific entity loader disabling network accesses, though still allowing local catalog accesses for resolution.

+
DEPRECATED: Use XML_PARSE_NONET. A specific entity loader disabling network accesses, though still allowing local catalog accesses for resolution.

 

@@ -827,7 +731,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferCreateBuffer ()
xmlOutputBufferPtr	xmlOutputBufferCreateBuffer	(xmlBufferPtr buffer, 
							 xmlCharEncodingHandlerPtr encoder)

 

-
Create a buffered output for the progressive saving to a xmlBuffer

+
Create a buffered output for the progressive saving to a xmlBuffer Consumes @encoder even in error case.

 
 
 
 

@@ -853,7 +757,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferCreateFd ()
xmlOutputBufferPtr	xmlOutputBufferCreateFd	(int fd, 
						 xmlCharEncodingHandlerPtr encoder)

 

-
Create a buffered output for the progressive saving to a file descriptor

+
Create a buffered output for the progressive saving to a file descriptor Consumes @encoder even in error case.

 
 
 
 

@@ -878,7 +782,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferCreateFile ()
xmlOutputBufferPtr	xmlOutputBufferCreateFile	(FILE * file, 
							 xmlCharEncodingHandlerPtr encoder)

 

-
Create a buffered output for the progressive saving to a FILE * buffered C I/O

+
Create a buffered output for the progressive saving to a FILE * buffered C I/O Consumes @encoder even in error case.

 
 
 
 

@@ -903,7 +807,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferCreateFilename ()
xmlOutputBufferPtr	xmlOutputBufferCreateFilename	(const char * URI, 
							 xmlCharEncodingHandlerPtr encoder, 
							 int compression)

 

-
Create a buffered output for the progressive saving of a file If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support writing to a local file.

+
Create a buffered output for the progressive saving of a file If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support writing to a local file. Consumes @encoder even in error case.

 
 
 
 

@@ -953,7 +857,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferCreateIO ()
xmlOutputBufferPtr	xmlOutputBufferCreateIO	(xmlOutputWriteCallback iowrite, 
						 xmlOutputCloseCallback ioclose, 
						 void * ioctx, 
						 xmlCharEncodingHandlerPtr encoder)

 

-
Create a buffered output for the progressive saving to an I/O handler

+
Create a buffered output for the progressive saving to an I/O handler Consumes @encoder even in error case.

 
 
 
 

@@ -1049,7 +953,7 @@ int	xmlRegisterOutputCallbacks	(
 

 xmlOutputBufferWrite ()

-
int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * buf)

+
int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * data)

 

 
Write the content of the array in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.

 

 
 

@@ -1064,7 +968,7 @@ int	xmlRegisterOutputCallbacks	(the size in bytes of the array.
 
 
-
+
@@ -1080,7 +984,7 @@ int	xmlRegisterOutputCallbacks	(xmlOutputBufferWriteEscape ()
int	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out, 
					 const xmlChar * str, 
					 xmlCharEncodingOutputFunc escaping)

 

-
Write the content of the string in the output I/O buffer This routine escapes the characters and then handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.

+
Write the content of the string in the output I/O buffer This routine escapes the characters and then handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.
buf:data:
 an char array
 

 

 
 

@@ -1155,7 +1059,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateFd ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateFd	(int fd, 
							 xmlCharEncoding enc)

 

-
Create a buffered parser input for the progressive parsing for the input from a file descriptor The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Use xmlNewInputFromFd. Create a buffered parser input for the progressive parsing for the input from a file descriptor The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -1180,7 +1084,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateFile ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateFile	(FILE * file, 
							 xmlCharEncoding enc)

 

-
Create a buffered parser input for the progressive parsing of a FILE * buffered C I/O The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Don't use. Create a buffered parser input for the progressive parsing of a FILE * buffered C I/O The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -1205,7 +1109,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateFilename ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateFilename	(const char * URI, 
							 xmlCharEncoding enc)

 

-
Create a buffered parser input for the progressive parsing of a file Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. Do an encoding check if enc == XML_CHAR_ENCODING_NONE

+
DEPRECATED: Use xmlNewInputFromUrl. Create a buffered parser input for the progressive parsing of a file Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. Do an encoding check if enc == XML_CHAR_ENCODING_NONE

 
 
 
 

@@ -1230,7 +1134,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateFilenameDefault ()
xmlParserInputBufferCreateFilenameFunc	xmlParserInputBufferCreateFilenameDefault	(xmlParserInputBufferCreateFilenameFunc func)

 

-
Registers a callback for URI input file handling

+
DEPRECATED: Use xmlCtxtSetResourceLoader or similar functions. Registers a callback for URI input file handling

 
 
 
 

@@ -1251,7 +1155,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateIO ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateIO	(xmlInputReadCallback ioread, 
							 xmlInputCloseCallback ioclose, 
							 void * ioctx, 
							 xmlCharEncoding enc)

 

-
Create a buffered parser input for the progressive parsing for the input from an I/O handler The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Use xmlNewInputFromIO. Create a buffered parser input for the progressive parsing for the input from an I/O handler The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -1284,7 +1188,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateMem ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateMem	(const char * mem, 
							 int size, 
							 xmlCharEncoding enc)

 

-
Create a parser input buffer for parsing from a memory area. This function makes a copy of the whole input buffer. If you are sure that the contents of the buffer will remain valid until the document was parsed, you can avoid the copy by using xmlParserInputBufferCreateStatic. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Use xmlNewInputFromMemory. Create a parser input buffer for parsing from a memory area. This function makes a copy of the whole input buffer. If you are sure that the contents of the buffer will remain valid until the document was parsed, you can avoid the copy by using xmlParserInputBufferCreateStatic. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -1313,7 +1217,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferCreateStatic ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateStatic	(const char * mem, 
							 int size, 
							 xmlCharEncoding enc)

 

-
Create a parser input buffer for parsing from a memory area. This functions assumes that the contents of the input buffer remain valid until the document was parsed. Use xmlParserInputBufferCreateMem otherwise. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

+
DEPRECATED: Use xmlNewInputFromMemory. Create a parser input buffer for parsing from a memory area. This functions assumes that the contents of the input buffer remain valid until the document was parsed. Use xmlParserInputBufferCreateMem otherwise. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on.

 
 
 
 

@@ -1342,7 +1246,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferGrow ()
int	xmlParserInputBufferGrow	(xmlParserInputBufferPtr in, 
					 int len)

 

-
Grow up the content of the input buffer, the old data are preserved This routine handle the I18N transcoding to internal UTF-8 This routine is used when operating the parser in normal (pull) mode TODO: one should be able to remove one extra copy by copying directly onto in->buffer or in->raw

+
DEPRECATED: Internal function, don't use. Grow up the content of the input buffer, the old data are preserved This routine handle the I18N transcoding to internal UTF-8 This routine is used when operating the parser in normal (pull) mode

 
 
 
 

@@ -1367,7 +1271,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferPush ()
int	xmlParserInputBufferPush	(xmlParserInputBufferPtr in, 
					 int len, 
					 const char * buf)

 

-
Push the content of the arry in the input buffer This routine handle the I18N transcoding to internal UTF-8 This is used when operating the parser in progressive (push) mode.

+
DEPRECATED: Internal function, don't use. Push the content of the arry in the input buffer This routine handle the I18N transcoding to internal UTF-8 This is used when operating the parser in progressive (push) mode.

 
 
 
 

@@ -1396,7 +1300,7 @@ int	xmlRegisterOutputCallbacks	(xmlParserInputBufferRead ()
int	xmlParserInputBufferRead	(xmlParserInputBufferPtr in, 
					 int len)

 

-
Refresh the content of the input buffer, the old data are considered consumed This routine handle the I18N transcoding to internal UTF-8

+
DEPRECATED: Internal function, don't use. Same as xmlParserInputBufferGrow.

 
 
 
 

@@ -1475,7 +1379,7 @@ int	xmlRegisterOutputCallbacks	(xmlRegisterInputCallbacks ()
int	xmlRegisterInputCallbacks	(xmlInputMatchCallback matchFunc, 
					 xmlInputOpenCallback openFunc, 
					 xmlInputReadCallback readFunc, 
					 xmlInputCloseCallback closeFunc)

 

-
Register a new set of I/O callback for handling parser input.

+
DEPRECATED: Use xmlCtxtSetResourceLoader or similar functions. Register a new set of I/O callback for handling parser input.

 
 
 
 

diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html
index 173f026c..69e1a031 100644
--- a/doc/devhelp/libxml2-xmlerror.html
+++ b/doc/devhelp/libxml2-xmlerror.html
@@ -22,12 +22,12 @@
 
Author(s): Daniel Veillard 

 
Synopsis

-
typedef struct _xmlError xmlError;
+
#define initGenericErrorDefaultFunc;
+typedef struct _xmlError xmlError;
 typedef enum xmlErrorDomain;
 typedef enum xmlErrorLevel;
 typedef xmlError * xmlErrorPtr;
 typedef enum xmlParserErrors;
-void	initGenericErrorDefaultFunc	(xmlGenericErrorFunc * handler);
 int	xmlCopyError			(const xmlError * from, 
					 xmlErrorPtr to);
 const xmlError *	xmlCtxtGetLastError	(void * ctx);
 void	xmlCtxtResetLastError		(void * ctx);
@@ -55,21 +55,29 @@ void	xmlThrDefSetStructuredErrorFunc<
 

 

 

+Macro initGenericErrorDefaultFunc

+
#define initGenericErrorDefaultFunc;
+

+

+

+

+

+

 Structure xmlError

 
struct _xmlError {
-    int	domain	: What part of the library raised this error
-    int	code	: The error code, e.g. an xmlParserError
-    char *	message	: human-readable informative error message
-    xmlErrorLevel	level	: how consequent is the error
-    char *	file	: the filename
-    int	line	: the line number if available
-    char *	str1	: extra string information
-    char *	str2	: extra string information
-    char *	str3	: extra string information
-    int	int1	: extra number information
-    int	int2	: error column # or 0 if N/A (todo: rename field when we would brk ABI)
-    void *	ctxt	: the parser context if available
-    void *	node	: the node in the tree
+    int	domain
+    int	code
+    char *	message
+    xmlErrorLevel	level
+    char *	file
+    int	line
+    char *	str1
+    char *	str2
+    char *	str3
+    int	int1
+    int	int2
+    void *	ctxt
+    void *	node
 } xmlError;
 

 

@@ -936,21 +944,6 @@ void	xmlThrDefSetStructuredErrorFunc<
 

 

 

-initGenericErrorDefaultFunc ()

-
void	initGenericErrorDefaultFunc	(xmlGenericErrorFunc * handler)

-

-
DEPRECATED: Use xmlSetGenericErrorFunc. Set or reset (if NULL) the default handler for generic errors to the builtin error function.

-

 
 
 

--
-
-
-
-


handler:the handler

-

-

-

-

 xmlCopyError ()

 
int	xmlCopyError			(const xmlError * from, 
					 xmlErrorPtr to)

 

diff --git a/doc/devhelp/libxml2-xmlmemory.html b/doc/devhelp/libxml2-xmlmemory.html
index 57457aad..c26a88ba 100644
--- a/doc/devhelp/libxml2-xmlmemory.html
+++ b/doc/devhelp/libxml2-xmlmemory.html
@@ -188,7 +188,7 @@ typedef char * xmlStrdupFunc			(const char * str);
 xmlGcMemGet ()
 
int	xmlGcMemGet			(xmlFreeFunc * freeFunc, 
					 xmlMallocFunc * mallocFunc, 
					 xmlMallocFunc * mallocAtomicFunc, 
					 xmlReallocFunc * reallocFunc, 
					 xmlStrdupFunc * strdupFunc)

 

-
Provides the memory access functions set currently in use The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators

+
DEPRECATED: xmlMemGet. Provides the memory access functions set currently in use The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators

 

@@ -225,7 +225,7 @@ typedef char * xmlStrdupFunc			(const char * str);
 xmlGcMemSetup ()
int	xmlGcMemSetup			(xmlFreeFunc freeFunc, 
					 xmlMallocFunc mallocFunc, 
					 xmlMallocFunc mallocAtomicFunc, 
					 xmlReallocFunc reallocFunc, 
					 xmlStrdupFunc strdupFunc)

 

-
Override the default memory access functions with a new set This has to be called before any other libxml routines ! The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators Should this be blocked if there was already some allocations done ?

+
DEPRECATED: Use xmlMemSetup. Override the default memory access functions with a new set This has to be called before any other libxml routines ! The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators Should this be blocked if there was already some allocations done ?

 
 
 
 

diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html
index e3be7242..50c8ceb5 100644
--- a/doc/devhelp/libxml2-xmlreader.html
+++ b/doc/devhelp/libxml2-xmlreader.html
@@ -112,6 +112,7 @@ int	xmlTextReaderSchemaValidateCtxtxmlTextReaderSetErrorHandler	(xmlTextReaderPtr reader, 
xmlTextReaderErrorFunc f, 
					 void * arg);
 void	xmlTextReaderSetMaxAmplification	(xmlTextReaderPtr reader, 
						 unsigned maxAmpl);
 int	xmlTextReaderSetParserProp	(xmlTextReaderPtr reader, 
					 int prop, 
					 int value);
+void	xmlTextReaderSetResourceLoader	(xmlTextReaderPtr reader, 
xmlResourceLoader loader, 
					 void * data);
 int	xmlTextReaderSetSchema		(xmlTextReaderPtr reader, 
xmlSchemaPtr schema);
 void	xmlTextReaderSetStructuredErrorHandler	(xmlTextReaderPtr reader, 
xmlStructuredErrorFunc f, 
						 void * arg);
 int	xmlTextReaderSetup		(xmlTextReaderPtr reader, 
xmlParserInputBufferPtr input, 
					 const char * URL, 
					 const char * encoding, 
					 int options);
@@ -746,7 +747,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 					 					 					 						 					 
 

 Returns:0 i no attributes, -1 in case of error or the attribute count0 i no attributes, -1 in case of error or the attribute count
 

 
 

@@ -778,7 +779,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderByteConsumed ()
 
long	xmlTextReaderByteConsumed	(xmlTextReaderPtr reader)

 

-
This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information.

+
DEPRECATED: The returned value is mostly random and useless. It reflects the parser reading ahead and is in no way related to the current node. This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information.

 

@@ -925,7 +926,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderConstPrefix ()
const xmlChar *	xmlTextReaderConstPrefix	(xmlTextReaderPtr reader)

 

-
A shorthand reference to the namespace associated with the node.

+
A shorthand reference to the namespace associated with the node.

 
 
 
 

@@ -1118,7 +1119,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderGetAttribute ()
xmlChar *	xmlTextReaderGetAttribute	(xmlTextReaderPtr reader, 
						 const xmlChar * name)

 

-
Provides the value of the attribute with the specified qualified name.

+
Provides the value of the attribute with the specified qualified name.

 
 
 
 

@@ -1128,7 +1129,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1143,7 +1144,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderGetAttributeNo ()
xmlChar *	xmlTextReaderGetAttributeNo	(xmlTextReaderPtr reader, 
						 int no)

 

-
Provides the value of the attribute with the specified index relative to the containing element.

+
Provides the value of the attribute with the specified index relative to the containing element.

 
 
 

 name:the qualified name of the attribute.the qualified name of the attribute.
 

 

 Returns:
 
 

@@ -1153,7 +1154,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1168,7 +1169,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderGetAttributeNs ()
xmlChar *	xmlTextReaderGetAttributeNs	(xmlTextReaderPtr reader, 
						 const xmlChar * localName, 
						 const xmlChar * namespaceURI)

 

-
Provides the value of the specified attribute

+
Provides the value of the specified attribute

 
 
 

 no:the zero-based index of the attribute relative to the containing elementthe zero-based index of the attribute relative to the containing element
 

 

 Returns:
 
 

@@ -1178,11 +1179,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1415,7 +1416,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderIsNamespaceDecl ()
int	xmlTextReaderIsNamespaceDecl	(xmlTextReaderPtr reader)

 

-
Determine whether the current node is a namespace declaration rather than a regular attribute.

+
Determine whether the current node is a namespace declaration rather than a regular attribute.

 
 
 

 localName:the local name of the attribute.the local name of the attribute.
 

 

 namespaceURI:the namespace URI of the attribute.the namespace URI of the attribute.
 

 

 Returns:
 
 

@@ -1425,7 +1426,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 Returns:1 if the current node is a namespace declaration, 0 if it is a regular attribute or other type of node, or -1 in case of error.1 if the current node is a namespace declaration, 0 if it is a regular attribute or other type of node, or -1 in case of error.
 

 
 

@@ -1545,7 +1546,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderMoveToAttribute ()
 
int	xmlTextReaderMoveToAttribute	(xmlTextReaderPtr reader, 
					 const xmlChar * name)

 

-
Moves the position of the current instance to the attribute with the specified qualified name.

+
Moves the position of the current instance to the attribute with the specified qualified name.

 

@@ -1555,7 +1556,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1570,7 +1571,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderMoveToAttributeNo ()
int	xmlTextReaderMoveToAttributeNo	(xmlTextReaderPtr reader, 
					 int no)

 

-
Moves the position of the current instance to the attribute with the specified index relative to the containing element.

+
Moves the position of the current instance to the attribute with the specified index relative to the containing element.

 
 
 

 name:the qualified name of the attribute.the qualified name of the attribute.
 

 

 Returns:
 
 

@@ -1580,7 +1581,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1595,7 +1596,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderMoveToAttributeNs ()
int	xmlTextReaderMoveToAttributeNs	(xmlTextReaderPtr reader, 
					 const xmlChar * localName, 
					 const xmlChar * namespaceURI)

 

-
Moves the position of the current instance to the attribute with the specified local name and namespace URI.

+
Moves the position of the current instance to the attribute with the specified local name and namespace URI.

 
 
 

 no:the zero-based index of the attribute relative to the containing element.the zero-based index of the attribute relative to the containing element.
 

 

 Returns:
 
 

@@ -1605,11 +1606,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1645,7 +1646,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderMoveToFirstAttribute ()
int	xmlTextReaderMoveToFirstAttribute	(xmlTextReaderPtr reader)

 

-
Moves the position of the current instance to the first attribute associated with the current node.

+
Moves the position of the current instance to the first attribute associated with the current node.

 
 
 

 localName:the local name of the attribute.the local name of the attribute.
 

 

 namespaceURI:the namespace URI of the attribute.the namespace URI of the attribute.
 

 

 Returns:
 
 

@@ -1666,7 +1667,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderMoveToNextAttribute ()
int	xmlTextReaderMoveToNextAttribute	(xmlTextReaderPtr reader)

 

-
Moves the position of the current instance to the next attribute associated with the current node.

+
Moves the position of the current instance to the next attribute associated with the current node.

 
 
 
 

@@ -1792,7 +1793,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderNormalization ()
int	xmlTextReaderNormalization	(xmlTextReaderPtr reader)

 

-
The value indicating whether to normalize white space and attribute values. Since attribute value and end of line normalizations are a MUST in the XML specification only the value true is accepted. The broken behaviour of accepting out of range character entities like &#0; is of course not supported either.

+
The value indicating whether to normalize white space and attribute values. Since attribute value and end of line normalizations are a MUST in the XML specification only the value true is accepted. The broken behaviour of accepting out of range character entities like &#0; is of course not supported either.

 
 
 
 

@@ -1813,7 +1814,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderPrefix ()
xmlChar *	xmlTextReaderPrefix	(xmlTextReaderPtr reader)

 

-
A shorthand reference to the namespace associated with the node.

+
A shorthand reference to the namespace associated with the node.

 
 
 
 

@@ -1884,7 +1885,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderQuoteChar ()
int	xmlTextReaderQuoteChar		(xmlTextReaderPtr reader)

 

-
The quotation mark character used to enclose the value of an attribute.

+
The quotation mark character used to enclose the value of an attribute.

 
 
 
 

@@ -1926,7 +1927,7 @@ The content of this structure is not made public by the API.
 xmlTextReaderReadAttributeValue ()
int	xmlTextReaderReadAttributeValue	(xmlTextReaderPtr reader)

 

-
Parses an attribute value into one or more Text and EntityReference nodes.

+
Parses an attribute value into one or more Text and EntityReference nodes.

 
 
 
 

@@ -1936,7 +1937,7 @@ The content of this structure is not made public by the API.
 
-
+

 
 
 

 Returns:1 in case of success, 0 if the reader was not positioned on an attribute node or all the attribute values have been read, or -1 in case of error.1 in case of success, 0 if the reader was not positioned on an attribute node or all the attribute values have been read, or -1 in case of error.
 

 
 

@@ -2020,7 +2021,7 @@ The content of this structure is not made public by the API.
 
 
 Returns:
-a string containing the contents of the Element or Text node, or NULL if the reader is positioned on any other type of node. The string must be deallocated by the caller.
+a string containing the contents of the non-empty Element or Text node (including CDATA sections), or NULL if the reader is positioned on any other type of node. The string must be deallocated by the caller.
 
 
 

@@ -2236,6 +2237,31 @@ The content of this structure is not made public by the API.
 

 

 

+xmlTextReaderSetResourceLoader ()

+
void	xmlTextReaderSetResourceLoader	(xmlTextReaderPtr reader, 
					 xmlResourceLoader loader, 
					 void * data)

+

+
Register a callback function that will be called to load external resources like entities. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


reader:thr reader
loader:resource loader
data:user data which will be passed to the loader

+

+

+

+

 xmlTextReaderSetSchema ()

 
int	xmlTextReaderSetSchema		(xmlTextReaderPtr reader, 
					 xmlSchemaPtr schema)

 

diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html
index 12866925..14b6eea9 100644
--- a/doc/devhelp/libxml2-xmlregexp.html
+++ b/doc/devhelp/libxml2-xmlregexp.html
@@ -22,34 +22,10 @@
 
Author(s): Daniel Veillard 

 

 
Synopsis

-
typedef struct _xmlExpCtxt xmlExpCtxt;
-typedef xmlExpCtxt * xmlExpCtxtPtr;
-typedef struct _xmlExpNode xmlExpNode;
-typedef xmlExpNode * xmlExpNodePtr;
-typedef enum xmlExpNodeType;
-typedef struct _xmlRegExecCtxt xmlRegExecCtxt;
+
typedef struct _xmlRegExecCtxt xmlRegExecCtxt;
 typedef xmlRegExecCtxt * xmlRegExecCtxtPtr;
 typedef struct _xmlRegexp xmlRegexp;
 typedef xmlRegexp * xmlRegexpPtr;
-int	xmlExpCtxtNbCons		(xmlExpCtxtPtr ctxt);
-int	xmlExpCtxtNbNodes		(xmlExpCtxtPtr ctxt);
-void	xmlExpDump			(xmlBufferPtr buf, 
					 xmlExpNodePtr expr);
-xmlExpNodePtr	xmlExpExpDerive		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 xmlExpNodePtr sub);
-void	xmlExpFree			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp);
-void	xmlExpFreeCtxt			(xmlExpCtxtPtr ctxt);
-int	xmlExpGetLanguage		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** langList, 
					 int len);
-int	xmlExpGetStart			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** tokList, 
					 int len);
-int	xmlExpIsNillable		(xmlExpNodePtr exp);
-int	xmlExpMaxToken			(xmlExpNodePtr expr);
-xmlExpNodePtr	xmlExpNewAtom		(xmlExpCtxtPtr ctxt, 
					 const xmlChar * name, 
					 int len);
-xmlExpCtxtPtr	xmlExpNewCtxt		(int maxNodes, 
					 xmlDictPtr dict);
-xmlExpNodePtr	xmlExpNewOr		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr left, 
					 xmlExpNodePtr right);
-xmlExpNodePtr	xmlExpNewRange		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr subset, 
					 int min, 
					 int max);
-xmlExpNodePtr	xmlExpNewSeq		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr left, 
					 xmlExpNodePtr right);
-xmlExpNodePtr	xmlExpParse		(xmlExpCtxtPtr ctxt, 
					 const char * expr);
-void	xmlExpRef			(xmlExpNodePtr exp);
-xmlExpNodePtr	xmlExpStringDerive	(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar * str, 
					 int len);
-int	xmlExpSubsume			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 xmlExpNodePtr sub);
 typedef void xmlRegExecCallbacks		(xmlRegExecCtxtPtr exec, 
					 const xmlChar * token, 
					 void * transdata, 
					 void * inputdata);
 int	xmlRegExecErrInfo		(xmlRegExecCtxtPtr exec, 
					 const xmlChar ** string, 
					 int * nbval, 
					 int * nbneg, 
					 xmlChar ** values, 
					 int * terminal);
 int	xmlRegExecNextValues		(xmlRegExecCtxtPtr exec, 
					 int * nbval, 
					 int * nbneg, 
					 xmlChar ** values, 
					 int * terminal);
@@ -70,57 +46,6 @@ void	xmlRegexpPrint			(FILE * output, 
					 
 

 

-Structure xmlExpCtxt

-
struct _xmlExpCtxt {
-The content of this structure is not made public by the API.
-} xmlExpCtxt;
-

-

-

-

-

-

-Typedef xmlExpCtxtPtr

-
xmlExpCtxt * xmlExpCtxtPtr;
-

-

-

-

-

-

-Structure xmlExpNode

-
struct _xmlExpNode {
-The content of this structure is not made public by the API.
-} xmlExpNode;
-

-

-

-

-

-

-Typedef xmlExpNodePtr

-
xmlExpNode * xmlExpNodePtr;
-

-

-

-

-

-

-Enum xmlExpNodeType

-
enum xmlExpNodeType {
-    XML_EXP_EMPTY = 0
-    XML_EXP_FORBID = 1
-    XML_EXP_ATOM = 2
-    XML_EXP_SEQ = 3
-    XML_EXP_OR = 4
-    XML_EXP_COUNT = 5
-};
-

-

-

-

-

-

 Structure xmlRegExecCtxt

 
struct _xmlRegExecCtxt {
 The content of this structure is not made public by the API.
@@ -186,505 +111,6 @@ The content of this structure is not made public by the API.
 

 

 

-Variable emptyExp

-
xmlExpNodePtr emptyExp;
-

-

-

-

-

-

-Variable forbiddenExp

-
xmlExpNodePtr forbiddenExp;
-

-

-

-

-

-

-xmlExpCtxtNbCons ()

-
int	xmlExpCtxtNbCons		(xmlExpCtxtPtr ctxt)

-

-
Debugging facility provides the number of allocated nodes over lifetime

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an expression context
Returns:the number of nodes ever allocated or -1 in case of error

-

-

-

-

-xmlExpCtxtNbNodes ()

-
int	xmlExpCtxtNbNodes		(xmlExpCtxtPtr ctxt)

-

-
Debugging facility provides the number of allocated nodes at a that point

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:an expression context
Returns:the number of nodes in use or -1 in case of error

-

-

-

-

-xmlExpDump ()

-
void	xmlExpDump			(xmlBufferPtr buf, 
					 xmlExpNodePtr expr)

-

-
Serialize the expression as compiled to the buffer

-

--
-
-
-
-
-
-
-
-
-
-


buf:a buffer to receive the output
expr:the compiled expression

-

-

-

-

-xmlExpExpDerive ()

-
xmlExpNodePtr	xmlExpExpDerive		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 xmlExpNodePtr sub)

-

-
Evaluates the expression resulting from @exp consuming a sub expression @sub Based on algebraic derivation and sometimes direct Brzozowski derivation it usually takes less than linear time and can handle expressions generating infinite languages.

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expressions context
exp:the englobing expression
sub:the subexpression
Returns:the resulting expression or NULL in case of internal error, the result must be freed

-

-

-

-

-xmlExpFree ()

-
void	xmlExpFree			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp)

-

-
Dereference the expression

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
exp:the expression

-

-

-

-

-xmlExpFreeCtxt ()

-
void	xmlExpFreeCtxt			(xmlExpCtxtPtr ctxt)

-

-
Free an expression context

-

--
-
-
-
-


ctxt:an expression context

-

-

-

-

-xmlExpGetLanguage ()

-
int	xmlExpGetLanguage		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** langList, 
					 int len)

-

-
Find all the strings used in @exp and store them in @list

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
exp:the expression
langList:where to store the tokens
len:the allocated length of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

-

-

-

-

-xmlExpGetStart ()

-
int	xmlExpGetStart			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar ** tokList, 
					 int len)

-

-
Find all the strings that appears at the start of the languages accepted by @exp and store them in @list. E.g. for (a, b) | c it will return the list [a, c]

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
exp:the expression
tokList:where to store the tokens
len:the allocated length of @list
Returns:the number of unique strings found, -1 in case of errors and -2 if there is more than @len strings

-

-

-

-

-xmlExpIsNillable ()

-
int	xmlExpIsNillable		(xmlExpNodePtr exp)

-

-
Finds if the expression is nillable, i.e. if it accepts the empty sequence

-

--
-
-
-
-
-
-
-
-
-
-


exp:the expression
Returns:1 if nillable, 0 if not and -1 in case of error

-

-

-

-

-xmlExpMaxToken ()

-
int	xmlExpMaxToken			(xmlExpNodePtr expr)

-

-
Indicate the maximum number of input a expression can accept

-

--
-
-
-
-
-
-
-
-
-
-


expr:a compiled expression
Returns:the maximum length or -1 in case of error

-

-

-

-

-xmlExpNewAtom ()

-
xmlExpNodePtr	xmlExpNewAtom		(xmlExpCtxtPtr ctxt, 
					 const xmlChar * name, 
					 int len)

-

-
Get the atom associated to this name from that context

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
name:the atom name
len:the atom name length in byte (or -1);
Returns:the node or NULL in case of error

-

-

-

-

-xmlExpNewCtxt ()

-
xmlExpCtxtPtr	xmlExpNewCtxt		(int maxNodes, 
					 xmlDictPtr dict)

-

-
Creates a new context for manipulating expressions

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


maxNodes:the maximum number of nodes
dict:optional dictionary to use internally
Returns:the context or NULL in case of error

-

-

-

-

-xmlExpNewOr ()

-
xmlExpNodePtr	xmlExpNewOr		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr left, 
					 xmlExpNodePtr right)

-

-
Get the atom associated to the choice @left | @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
left:left expression
right:right expression
Returns:the node or NULL in case of error

-

-

-

-

-xmlExpNewRange ()

-
xmlExpNodePtr	xmlExpNewRange		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr subset, 
					 int min, 
					 int max)

-

-
Get the atom associated to the range (@subset){@min, @max} Note that @subset is consumed in the operation, to keep an handle on it use xmlExpRef() and use xmlExpFree() to release it, this is true even in case of failure (unless ctxt == NULL).

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
subset:the expression to be repeated
min:the lower bound for the repetition
max:the upper bound for the repetition, -1 means infinite
Returns:the node or NULL in case of error

-

-

-

-

-xmlExpNewSeq ()

-
xmlExpNodePtr	xmlExpNewSeq		(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr left, 
					 xmlExpNodePtr right)

-

-
Get the atom associated to the sequence @left , @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
left:left expression
right:right expression
Returns:the node or NULL in case of error

-

-

-

-

-xmlExpParse ()

-
xmlExpNodePtr	xmlExpParse		(xmlExpCtxtPtr ctxt, 
					 const char * expr)

-

-
Minimal parser for regexps, it understand the following constructs - string terminals - choice operator | - sequence operator , - subexpressions (...) - usual cardinality operators + * and ? - finite sequences { min, max } - infinite sequences { min, * } There is minimal checkings made especially no checking on strings values

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expressions context
expr:the 0 terminated string
Returns:a new expression or NULL in case of failure

-

-

-

-

-xmlExpRef ()

-
void	xmlExpRef			(xmlExpNodePtr exp)

-

-
Increase the reference count of the expression

-

--
-
-
-
-


exp:the expression

-

-

-

-

-xmlExpStringDerive ()

-
xmlExpNodePtr	xmlExpStringDerive	(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 const xmlChar * str, 
					 int len)

-

-
Do one step of Brzozowski derivation of the expression @exp with respect to the input string

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expression context
exp:the expression
str:the string
len:the string len in bytes if available
Returns:the resulting expression or NULL in case of internal error

-

-

-

-

-xmlExpSubsume ()

-
int	xmlExpSubsume			(xmlExpCtxtPtr ctxt, 
					 xmlExpNodePtr exp, 
					 xmlExpNodePtr sub)

-

-
Check whether @exp accepts all the languages accepted by @sub the input being a subexpression.

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:the expressions context
exp:the englobing expression
sub:the subexpression
Returns:1 if true 0 if false and -1 in case of failure.

-

-

-

-

 xmlRegExecErrInfo ()

 
int	xmlRegExecErrInfo		(xmlRegExecCtxtPtr exec, 
					 const xmlChar ** string, 
					 int * nbval, 
					 int * nbneg, 
					 xmlChar ** values, 
					 int * terminal)

 

@@ -954,7 +380,7 @@ The content of this structure is not made public by the API.
 xmlRegexpPrint ()
 
void	xmlRegexpPrint			(FILE * output, 
					 xmlRegexpPtr regexp)

 

-
Print the content of the compiled regular expression

+
DEPRECATED: Don't use. No-op since 2.14.0.

 

diff --git a/doc/devhelp/libxml2-xmlsave.html b/doc/devhelp/libxml2-xmlsave.html
index 083d0be4..d4c4ce88 100644
--- a/doc/devhelp/libxml2-xmlsave.html
+++ b/doc/devhelp/libxml2-xmlsave.html
@@ -27,10 +27,11 @@ typedef xmlSaveCtxt * xmlSaveOption;
 int	xmlSaveClose			(xmlSaveCtxtPtr ctxt);
 long	xmlSaveDoc			(xmlSaveCtxtPtr ctxt, 
xmlDocPtr doc);
-int	xmlSaveFinish			(xmlSaveCtxtPtr ctxt);
+xmlParserErrorsxmlSaveFinish		(xmlSaveCtxtPtr ctxt);
 int	xmlSaveFlush			(xmlSaveCtxtPtr ctxt);
 int	xmlSaveSetAttrEscape		(xmlSaveCtxtPtr ctxt, 
xmlCharEncodingOutputFunc escape);
 int	xmlSaveSetEscape		(xmlSaveCtxtPtr ctxt, 
xmlCharEncodingOutputFunc escape);
+int	xmlSaveSetIndentString		(xmlSaveCtxtPtr ctxt, 
					 const char * indent);
 xmlSaveCtxtPtrxmlSaveToBuffer		(xmlBufferPtr buffer, 
					 const char * encoding, 
					 int options);
 xmlSaveCtxtPtrxmlSaveToFd		(int fd, 
					 const char * encoding, 
					 int options);
 xmlSaveCtxtPtrxmlSaveToFilename	(const char * filename, 
					 const char * encoding, 
					 int options);
@@ -74,7 +75,10 @@ The content of this structure is not made public by the API.
     XML_SAVE_XHTML = 16 /* force XHTML1 specific rules */
     XML_SAVE_AS_XML = 32 /* force XML serialization on HTML doc */
     XML_SAVE_AS_HTML = 64 /* force HTML serialization on XML doc */
-    XML_SAVE_WSNONSIG = 128 /*  format with non-significant whitespace */
+    XML_SAVE_WSNONSIG = 128 /* format with non-significant whitespace Available since 2.14.0 */
+    XML_SAVE_EMPTY = 256 /* force empty tags, overriding global */
+    XML_SAVE_NO_INDENT = 512 /* disable indenting */
+    XML_SAVE_INDENT = 1024 /*  force indenting, overriding global */
 };
 

@@ -129,7 +133,7 @@ The content of this structure is not made public by the API.
 

 

 xmlSaveFinish ()

-
int	xmlSaveFinish			(xmlSaveCtxtPtr ctxt)

+
xmlParserErrors	xmlSaveFinish		(xmlSaveCtxtPtr ctxt)

 

 
Close a document saving context, i.e. make sure that all bytes have been output and free the associated data. Available since 2.13.0.

 

 
 					 						 					 			
 

@@ -173,7 +177,7 @@ The content of this structure is not made public by the API.
 xmlSaveSetAttrEscape ()
int	xmlSaveSetAttrEscape		(xmlSaveCtxtPtr ctxt, 
					 xmlCharEncodingOutputFunc escape)

 

-
Set a custom escaping function to be used for text in attribute content

+
DEPRECATED: Don't use. Has no effect.

 
 

@@ -198,7 +202,7 @@ The content of this structure is not made public by the API.
 xmlSaveSetEscape ()
int	xmlSaveSetEscape		(xmlSaveCtxtPtr ctxt, 
					 xmlCharEncodingOutputFunc escape)

 

-
Set a custom escaping function to be used for text in element content

+
DEPRECATED: Don't use. Set a custom escaping function to be used for text in element content

 
 
 
 

@@ -220,6 +224,31 @@ The content of this structure is not made public by the API.
 

 

+xmlSaveSetIndentString ()

+
int	xmlSaveSetIndentString		(xmlSaveCtxtPtr ctxt, 
					 const char * indent)

+

+
Sets the indent string. Available since 2.14.0.

+

 
 
 

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:save context
indent:indent string
Returns:0 on success, -1 if the string is NULL, empty or too long.

+

+

+

+

 xmlSaveToBuffer ()

 
xmlSaveCtxtPtr	xmlSaveToBuffer		(xmlBufferPtr buffer, 
					 const char * encoding, 
					 int options)

 

diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html
index 77f1cfc7..92e0e070 100644
--- a/doc/devhelp/libxml2-xmlschemas.html
+++ b/doc/devhelp/libxml2-xmlschemas.html
@@ -48,6 +48,7 @@ int	xmlSchemaIsValid		(xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug);
 void	xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx);
 void	xmlSchemaSetParserStructuredErrors	(xmlSchemaParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx);
+void	xmlSchemaSetResourceLoader	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlResourceLoader loader, 
					 void * data);
 void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx);
 int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options);
 void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx);
@@ -58,7 +59,7 @@ int	xmlSchemaValidateFile		(xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem);
 void	xmlSchemaValidateSetFilename	(xmlSchemaValidCtxtPtr vctxt, 
					 const char * filename);
 void	xmlSchemaValidateSetLocator	(xmlSchemaValidCtxtPtr vctxt, 
					 xmlSchemaValidityLocatorFunc f, 
					 void * ctxt);
-int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data);
+int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 const xmlSAXHandler * sax, 
					 void * user_data);
 typedef void xmlSchemaValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...);
 typedef int xmlSchemaValidityLocatorFunc	(void * ctx, 
					 const char ** file, 
					 unsigned long * line);
 typedef void xmlSchemaValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...);
@@ -72,10 +73,10 @@ typedef void xmlSchemaValidityWarningFun
 

 Structure xmlSchema

 
struct _xmlSchema {
-    const xmlChar *	name	: schema name
-    const xmlChar *	targetNamespace	: the target namespace
+    const xmlChar *	name
+    const xmlChar *	targetNamespace
     const xmlChar *	version
-    const xmlChar *	id	: Obsolete
+    const xmlChar *	id
     xmlDocPtr	doc
     xmlSchemaAnnotPtr	annot
     int	flags
@@ -85,14 +86,14 @@ typedef void xmlSchemaValidityWarningFun
     xmlHashTablePtr	elemDecl
     xmlHashTablePtr	notaDecl
     xmlHashTablePtr	schemasImports
-    void *	_private	: unused by the library for users or bindings
+    void *	_private
     xmlHashTablePtr	groupDecl
     xmlDictPtr	dict
-    void *	includes	: the includes, this is opaque for now
-    int	preserve	: whether to free the document
-    int	counter	: used to give anonymous components unique names
-    xmlHashTablePtr	idcDef	: All identity-constraint defs.
-    void *	volatiles	: Obsolete
+    void *	includes
+    int	preserve
+    int	counter
+    xmlHashTablePtr	idcDef
+    void *	volatiles
 } xmlSchema;
 

 

@@ -654,6 +655,31 @@ The content of this structure is not made public by the API.
 

 

 

+xmlSchemaSetResourceLoader ()

+
void	xmlSchemaSetResourceLoader	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlResourceLoader loader, 
					 void * data)

+

+
Register a callback function that will be called to load documents or external entities. Available since 2.14.0.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:schema parser
loader:resource loader
data:user data which will be passed to the loader

+

+

+

+

 xmlSchemaSetValidErrors ()

 
void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

 

@@ -902,7 +928,7 @@ The content of this structure is not made public by the API.
 

 

 xmlSchemaValidateStream ()

-
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

+
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 const xmlSAXHandler * sax, 
					 void * user_data)

 

 
Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one.

 

diff --git a/doc/devhelp/libxml2-xmlstring.html b/doc/devhelp/libxml2-xmlstring.html
index 1476ed23..2636a517 100644
--- a/doc/devhelp/libxml2-xmlstring.html
+++ b/doc/devhelp/libxml2-xmlstring.html
@@ -13,7 +13,7 @@
 
-
+
Prev
 Up
 HomeNextNext
 libxml2 Reference Manual
 

 
xmlstring

@@ -220,7 +220,7 @@ int	xmlUTF8Strsize			(const Returns:
-the number of characters written to @buf or -1 if an error occurs.
+the number of characters written to @buf or -1 if an error occurs.
 
 
 

@@ -282,7 +282,7 @@ int	xmlUTF8Strsize			(const Returns:
-the number of characters written to @buf or -1 if an error occurs.
+the number of characters written to @buf or -1 if an error occurs.
 
 
 

@@ -712,7 +712,7 @@ int	xmlUTF8Strsize			(const Returns:
-the number of characters in the string or -1 in case of error
+the number of characters in the string or -1 in case of error
 
 
 

@@ -808,11 +808,11 @@ int	xmlUTF8Strsize			(const len:
-the number of characters in the array
+the number of characters in the array
 
 
 Returns:
-the storage size of the first 'len' characters of ARRAY
+the storage size of the first 'len' characters of ARRAY
 
 
 

diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html
index 73a0208a..8cb1963d 100644
--- a/doc/devhelp/libxml2-xmlversion.html
+++ b/doc/devhelp/libxml2-xmlversion.html
@@ -10,7 +10,7 @@
 
 
 
-
+
@@ -27,13 +27,11 @@
 #define LIBXML_CATALOG_ENABLED;
 #define LIBXML_DEBUG_ENABLED;
 #define LIBXML_DOTTED_VERSION;
-#define LIBXML_FTP_ENABLED;
 #define LIBXML_HTML_ENABLED;
 #define LIBXML_HTTP_ENABLED;
 #define LIBXML_ICONV_ENABLED;
 #define LIBXML_ICU_ENABLED;
 #define LIBXML_ISO8859X_ENABLED;
-#define LIBXML_LEGACY_ENABLED;
 #define LIBXML_LZMA_ENABLED;
 #define LIBXML_MODULES_ENABLED;
 #define LIBXML_MODULE_EXTENSION;
@@ -42,6 +40,7 @@
 #define LIBXML_PUSH_ENABLED;
 #define LIBXML_READER_ENABLED;
 #define LIBXML_REGEXP_ENABLED;
+#define LIBXML_RELAXNG_ENABLED;
 #define LIBXML_SAX1_ENABLED;
 #define LIBXML_SCHEMAS_ENABLED;
 #define LIBXML_SCHEMATRON_ENABLED;
@@ -49,7 +48,6 @@
 #define LIBXML_THREAD_ALLOC_ENABLED;
 #define LIBXML_THREAD_ENABLED;
 #define LIBXML_TREE_ENABLED;
-#define LIBXML_UNICODE_ENABLED;
 #define LIBXML_VALID_ENABLED;
 #define LIBXML_VERSION;
 #define LIBXML_VERSION_EXTRA;
@@ -58,7 +56,6 @@
 #define LIBXML_XINCLUDE_ENABLED;
 #define LIBXML_XPATH_ENABLED;
 #define LIBXML_XPTR_ENABLED;
-#define LIBXML_XPTR_LOCS_ENABLED;
 #define LIBXML_ZLIB_ENABLED;
 
@@ -108,14 +105,6 @@
 

 

-Macro LIBXML_FTP_ENABLED

-
#define LIBXML_FTP_ENABLED;
-

-
Whether the FTP support is configured in

-

-

-

-

 Macro LIBXML_HTML_ENABLED

 
#define LIBXML_HTML_ENABLED;
 

@@ -156,14 +145,6 @@
 

 

 

-Macro LIBXML_LEGACY_ENABLED

-
#define LIBXML_LEGACY_ENABLED;
-

-
Whether the deprecated APIs are compiled in for compatibility

-

-

-

-

 Macro LIBXML_LZMA_ENABLED

 
#define LIBXML_LZMA_ENABLED;
 

@@ -228,6 +209,14 @@
 

 

 

+Macro LIBXML_RELAXNG_ENABLED

+
#define LIBXML_RELAXNG_ENABLED;
+

+
Whether the RelaxNG validation interfaces are compiled in

+

+

+

+

 Macro LIBXML_SAX1_ENABLED

 
#define LIBXML_SAX1_ENABLED;
 

@@ -279,15 +268,7 @@
 Macro LIBXML_TREE_ENABLED
 
#define LIBXML_TREE_ENABLED;
 

-
Whether the DOM like tree manipulation API support is configured in

-

-

-

-

-Macro LIBXML_UNICODE_ENABLED

-
#define LIBXML_UNICODE_ENABLED;
-

-
Whether the Unicode related interfaces are compiled in

+
Always enabled since 2.14.0

 

 

 

@@ -356,14 +337,6 @@
 

 

 

-Macro LIBXML_XPTR_LOCS_ENABLED

-
#define LIBXML_XPTR_LOCS_ENABLED;
-

-
Whether support for XPointer locations is configured in

-

-

-

-

 Macro LIBXML_ZLIB_ENABLED

 
#define LIBXML_ZLIB_ENABLED;
 

diff --git a/doc/devhelp/libxml2-xmlwriter.html b/doc/devhelp/libxml2-xmlwriter.html
index 833c99a7..cc39b648 100644
--- a/doc/devhelp/libxml2-xmlwriter.html
+++ b/doc/devhelp/libxml2-xmlwriter.html
@@ -387,7 +387,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterEndComment ()
 
int	xmlTextWriterEndComment		(xmlTextWriterPtr writer)

 

-
End the current xml comment.

+
End the current xml comment.

 
PrevPrev
 Up
 Home
 Next
 
 

@@ -431,7 +431,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterEndDTDAttlist ()
int	xmlTextWriterEndDTDAttlist	(xmlTextWriterPtr writer)

 

-
End an xml DTD attribute list.

+
End an xml DTD attribute list.

 
 
 
 

@@ -685,7 +685,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterStartAttribute ()
int	xmlTextWriterStartAttribute	(xmlTextWriterPtr writer, 
					 const xmlChar * name)

 

-
Start an xml attribute.

+
Start an xml attribute.

 
 
 
 

@@ -711,7 +711,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterStartAttributeNS ()
int	xmlTextWriterStartAttributeNS	(xmlTextWriterPtr writer, 
					 const xmlChar * prefix, 
					 const xmlChar * name, 
					 const xmlChar * namespaceURI)

 

-
Start an xml attribute with namespace support.

+
Start an xml attribute with namespace support.

 
 
 
 

@@ -767,7 +767,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterStartComment ()
int	xmlTextWriterStartComment	(xmlTextWriterPtr writer)

 

-
Start an xml comment.

+
Start an xml comment.

 
 
 
 

@@ -1025,7 +1025,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteAttribute ()
int	xmlTextWriterWriteAttribute	(xmlTextWriterPtr writer, 
					 const xmlChar * name, 
					 const xmlChar * content)

 

-
Write an xml attribute.

+
Write an xml attribute.

 
 
 
 

@@ -1036,13 +1036,11 @@ The content of this structure is not made public by the API.
 
-
+
-
+
@@ -1057,7 +1055,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteAttributeNS ()
int	xmlTextWriterWriteAttributeNS	(xmlTextWriterPtr writer, 
					 const xmlChar * prefix, 
					 const xmlChar * name, 
					 const xmlChar * namespaceURI, 
					 const xmlChar * content)

 

-
Write an xml attribute.

+
Write an xml attribute.

 
 
 

 name:
-attribute nameattribute name
 

 

 content:
-attribute contentattribute content
 

 

 Returns:
 
 

@@ -1072,8 +1070,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1081,8 +1078,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1191,7 +1187,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteComment ()
int	xmlTextWriterWriteComment	(xmlTextWriterPtr writer, 
					 const xmlChar * content)

 

-
Write an xml comment.

+
Write an xml comment.

 
 
 

 name:
-attribute local nameattribute local name
 

 

 namespaceURI:

 

 content:
-attribute contentattribute content
 

 

 Returns:
 
 

@@ -1202,8 +1198,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1574,7 +1569,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteFormatAttribute ()
int	xmlTextWriterWriteFormatAttribute	(xmlTextWriterPtr writer, 
						 const xmlChar * name, 
						 const char * format, 
						 ... ...)

 

-
Write a formatted xml attribute.

+
Write a formatted xml attribute.

 
 
 

 content:
-comment stringcomment string
 

 

 Returns:
 
 

@@ -1585,8 +1580,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1624,8 +1618,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -1682,7 +1675,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteFormatComment ()
int	xmlTextWriterWriteFormatComment	(xmlTextWriterPtr writer, 
					 const char * format, 
					 ... ...)

 

-
Write an xml comment.

+
Write an xml comment.

 
 
 

 name:
-attribute nameattribute name
 

 

 format:

 

 name:
-attribute local nameattribute local name
 

 

 namespaceURI:
 
 

@@ -2142,7 +2135,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteVFormatAttribute ()
int	xmlTextWriterWriteVFormatAttribute	(xmlTextWriterPtr writer, 
						 const xmlChar * name, 
						 const char * format, 
						 va_list argptr)

 

-
Write a formatted xml attribute.

+
Write a formatted xml attribute.

 
 
 
 

@@ -2153,8 +2146,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -2192,8 +2184,7 @@ The content of this structure is not made public by the API.
 
-
+
@@ -2250,7 +2241,7 @@ The content of this structure is not made public by the API.
 xmlTextWriterWriteVFormatComment ()
int	xmlTextWriterWriteVFormatComment	(xmlTextWriterPtr writer, 
						 const char * format, 
						 va_list argptr)

 

-
Write an xml comment.

+
Write an xml comment.

 
 
 

 name:
-attribute nameattribute name
 

 

 format:

 

 name:
-attribute local nameattribute local name
 

 

 namespaceURI:
 
 

diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html
index fcc42734..d4f0eaf8 100644
--- a/doc/devhelp/libxml2-xpath.html
+++ b/doc/devhelp/libxml2-xpath.html
@@ -171,9 +171,9 @@ typedef xmlXPathObjectPtr
 Structure xmlNodeSet
struct _xmlNodeSet {
-    int	nodeNr	: number of nodes in the set
-    int	nodeMax	: size of the array as allocated
-    xmlNodePtr *	nodeTab	: array of nodes in no particular order @@ with_ns to check whether nam
+    int	nodeNr
+    int	nodeMax
+    xmlNodePtr *	nodeTab
 } xmlNodeSet;
 

@@ -191,8 +191,8 @@ typedef xmlXPathObjectPtr
 Structure xmlXPathAxis
struct _xmlXPathAxis {
-    const xmlChar *	name	: the axis name
-    xmlXPathAxisFunc	func	: the search function
+    const xmlChar *	name
+    xmlXPathAxisFunc	func
 } xmlXPathAxis;
 

@@ -228,45 +228,45 @@ The content of this structure is not made public by the API.
 

 Structure xmlXPathContext
struct _xmlXPathContext {
-    xmlDocPtr	doc	: The current document
-    xmlNodePtr	node	: The current node
-    int	nb_variables_unused	: unused (hash table)
-    int	max_variables_unused	: unused (hash table)
-    xmlHashTablePtr	varHash	: Hash table of defined variables
-    int	nb_types	: number of defined types
-    int	max_types	: max number of types
-    xmlXPathTypePtr	types	: Array of defined types
-    int	nb_funcs_unused	: unused (hash table)
-    int	max_funcs_unused	: unused (hash table)
-    xmlHashTablePtr	funcHash	: Hash table of defined funcs
-    int	nb_axis	: number of defined axis
-    int	max_axis	: max number of axis
-    xmlXPathAxisPtr	axis	: Array of defined axis the namespace nodes of the context node
-    xmlNsPtr *	namespaces	: Array of namespaces
-    int	nsNr	: number of namespace in scope
-    void *	user	: function to free extra variables
-    int	contextSize	: the context size
-    int	proximityPosition	: the proximity position extra stuff for XPointer
-    int	xptr	: is this an XPointer context?
-    xmlNodePtr	here	: for here()
-    xmlNodePtr	origin	: for origin() the set of namespace declarations in scope for the expre
-    xmlHashTablePtr	nsHash	: The namespaces hash table
-    xmlXPathVariableLookupFunc	varLookupFunc	: variable lookup func
-    void *	varLookupData	: variable lookup data Possibility to link in an extra item
-    void *	extra	: needed for XSLT The function name and URI when calling a function
+    xmlDocPtr	doc
+    xmlNodePtr	node
+    int	nb_variables_unused
+    int	max_variables_unused
+    xmlHashTablePtr	varHash
+    int	nb_types
+    int	max_types
+    xmlXPathTypePtr	types
+    int	nb_funcs_unused
+    int	max_funcs_unused
+    xmlHashTablePtr	funcHash
+    int	nb_axis
+    int	max_axis
+    xmlXPathAxisPtr	axis
+    xmlNsPtr *	namespaces
+    int	nsNr
+    void *	user
+    int	contextSize
+    int	proximityPosition
+    int	xptr
+    xmlNodePtr	here
+    xmlNodePtr	origin
+    xmlHashTablePtr	nsHash
+    xmlXPathVariableLookupFunc	varLookupFunc
+    void *	varLookupData
+    void *	extra
     const xmlChar *	function
-    const xmlChar *	functionURI	: function lookup function and data
-    xmlXPathFuncLookupFunc	funcLookupFunc	: function lookup func
-    void *	funcLookupData	: function lookup data temporary namespace lists kept for walking the n
-    xmlNsPtr *	tmpNsList	: Array of namespaces
-    int	tmpNsNr	: number of namespaces in scope error reporting mechanism
-    void *	userData	: user specific data block
-    xmlStructuredErrorFunc	error	: the callback in case of errors
-    xmlError	lastError	: the last error
-    xmlNodePtr	debugNode	: the source node XSLT dictionary
-    xmlDictPtr	dict	: dictionary if any
-    int	flags	: flags to control compilation Cache for reusal of XPath objects
-    void *	cache	: Resource limits
+    const xmlChar *	functionURI
+    xmlXPathFuncLookupFunc	funcLookupFunc
+    void *	funcLookupData
+    xmlNsPtr *	tmpNsList
+    int	tmpNsNr
+    void *	userData
+    xmlStructuredErrorFunc	error
+    xmlError	lastError
+    xmlNodePtr	debugNode
+    xmlDictPtr	dict
+    int	flags
+    void *	cache
     unsigned long	opLimit
     unsigned long	opCount
     int	depth
@@ -331,8 +331,8 @@ The content of this structure is not made public by the API.
 

 Structure xmlXPathFunct

 
struct _xmlXPathFunct {
-    const xmlChar *	name	: the function name
-    xmlXPathEvalFunc	func	: the evaluation function
+    const xmlChar *	name
+    xmlXPathEvalFunc	func
 } xmlXPathFunct;
 

 

@@ -373,9 +373,6 @@ The content of this structure is not made public by the API.
     XPATH_BOOLEAN = 2
     XPATH_NUMBER = 3
     XPATH_STRING = 4
-    XPATH_POINT = 5
-    XPATH_RANGE = 6
-    XPATH_LOCATIONSET = 7
     XPATH_USERS = 8
     XPATH_XSLT_TREE = 9 /*  An XSLT value tree, non modifiable */
 };
@@ -387,18 +384,18 @@ The content of this structure is not made public by the API.
 

 Structure xmlXPathParserContext

 
struct _xmlXPathParserContext {
-    const xmlChar *	cur	: the current char being parsed
-    const xmlChar *	base	: the full expression
-    int	error	: error code
-    xmlXPathContextPtr	context	: the evaluation context
-    xmlXPathObjectPtr	value	: the current value
-    int	valueNr	: number of values stacked
-    int	valueMax	: max number of values stacked
-    xmlXPathObjectPtr *	valueTab	: stack of values
-    xmlXPathCompExprPtr	comp	: the precompiled expression
-    int	xptr	: it this an XPointer expression
-    xmlNodePtr	ancestor	: used for walking preceding axis
-    int	valueFrame	: always zero for compatibility
+    const xmlChar *	cur
+    const xmlChar *	base
+    int	error
+    xmlXPathContextPtr	context
+    xmlXPathObjectPtr	value
+    int	valueNr
+    int	valueMax
+    xmlXPathObjectPtr *	valueTab
+    xmlXPathCompExprPtr	comp
+    int	xptr
+    xmlNodePtr	ancestor
+    int	valueFrame
 } xmlXPathParserContext;
 

 

@@ -416,8 +413,8 @@ The content of this structure is not made public by the API.
 

 Structure xmlXPathType

 
struct _xmlXPathType {
-    const xmlChar *	name	: the type name
-    xmlXPathConvertFunc	func	: the conversion function
+    const xmlChar *	name
+    xmlXPathConvertFunc	func
 } xmlXPathType;
 

 

@@ -435,8 +432,8 @@ The content of this structure is not made public by the API.
 

 Structure xmlXPathVariable

 
struct _xmlXPathVariable {
-    const xmlChar *	name	: the variable name
-    xmlXPathObjectPtr	value	: the value
+    const xmlChar *	name
+    xmlXPathObjectPtr	value
 } xmlXPathVariable;
 

 

diff --git a/doc/devhelp/libxml2-xpathInternals.html b/doc/devhelp/libxml2-xpathInternals.html
index 079f9b5c..8a793678 100644
--- a/doc/devhelp/libxml2-xpathInternals.html
+++ b/doc/devhelp/libxml2-xpathInternals.html
@@ -32,6 +32,8 @@
 #define CHECK_TYPE0(typeval);
 #define XP_ERROR(X);
 #define XP_ERROR0(X);
+#define valuePop;
+#define valuePush;
 #define xmlXPathCheckError(ctxt);
 #define xmlXPathEmptyNodeSet(ns);
 #define xmlXPathGetContextNode(ctxt);
@@ -51,8 +53,6 @@
 #define xmlXPathSetTypeError(ctxt);
 #define xmlXPathStackIsExternal(ctxt);
 #define xmlXPathStackIsNodeSet(ctxt);
-xmlXPathObjectPtr	valuePop	(xmlXPathParserContextPtr ctxt);
-int	valuePush			(xmlXPathParserContextPtr ctxt, 
					 xmlXPathObjectPtr value);
 void	xmlXPathAddValues		(xmlXPathParserContextPtr ctxt);
 void	xmlXPathBooleanFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 void	xmlXPathCeilingFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
@@ -161,6 +161,8 @@ void	xmlXPathSumFunction		(xmlXPathTranslateFunction	(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 void	xmlXPathTrueFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
 void	xmlXPathValueFlipSign		(xmlXPathParserContextPtr ctxt);
+xmlXPathObjectPtr	xmlXPathValuePop	(xmlXPathParserContextPtr ctxt);
+int	xmlXPathValuePush		(xmlXPathParserContextPtr ctxt, 
					 xmlXPathObjectPtr value);
 xmlXPathObjectPtr	xmlXPathVariableLookup	(xmlXPathContextPtr ctxt, 
						 const xmlChar * name);
 xmlXPathObjectPtr	xmlXPathVariableLookupNS	(xmlXPathContextPtr ctxt, 
							 const xmlChar * name, 
							 const xmlChar * ns_uri);
 xmlXPathObjectPtr	xmlXPathWrapCString	(char * val);
@@ -291,6 +293,22 @@ void	xmlXPatherror			(
 

+Macro valuePop

+
#define valuePop;
+

+

+
+

+

+

+Macro valuePush

+
#define valuePush;
+

+

+

+

+

+

 Macro xmlXPathCheckError

 
#define xmlXPathCheckError(ctxt);
 

@@ -612,52 +630,6 @@ void	xmlXPatherror			(
 

-valuePop ()

-
xmlXPathObjectPtr	valuePop	(xmlXPathParserContextPtr ctxt)

-

-
Pops the top XPath object from the value stack

-

 
  
 
  
 
 
 

--
-
-
-
-
-
-
-
-
-
-


ctxt:an XPath evaluation context
Returns:the XPath object just removed

-

-

-

-

-valuePush ()

-
int	valuePush			(xmlXPathParserContextPtr ctxt, 
					 xmlXPathObjectPtr value)

-

-
Pushes a new XPath object on top of the value stack. If value is NULL, a memory error is recorded in the parser context.

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


ctxt:an XPath evaluation context
value:the XPath object
Returns:the number of items on the value stack, or -1 in case of error. The object is destroyed in case of error.

-

-

-

-

 xmlXPathAddValues ()

 
void	xmlXPathAddValues		(xmlXPathParserContextPtr ctxt)

 

@@ -984,7 +956,7 @@ void	xmlXPatherror			(xmlXPathEvalExpr ()
 
void	xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt)

 

-
Parse and evaluate an XPath expression in the given context, then push the result on the context stack

+
DEPRECATED: Internal function, don't use. Parse and evaluate an XPath expression in the given context, then push the result on the context stack

 

@@ -1160,7 +1132,7 @@ void	xmlXPatherror			(xmlXPathIdFunction ()
void	xmlXPathIdFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the id() XPath function node-set id(object) The id function selects elements by their unique ID (see [5.2.1 Unique IDs]). When the argument to id is of type node-set, then the result is the union of the result of applying id to the string value of each of the nodes in the argument node-set. When the argument to id is of any other type, the argument is converted to a string as if by a call to the string function; the string is split into a whitespace-separated list of tokens (whitespace is any sequence of characters matching the production S); the result is a node-set containing the elements in the same document as the context node that have a unique ID equal to any of the tokens in the list.

+
Implement the id() XPath function node-set id(object) The id function selects elements by their unique ID (see [5.2.1 Unique IDs]). When the argument to id is of type node-set, then the result is the union of the result of applying id to the string value of each of the nodes in the argument node-set. When the argument to id is of any other type, the argument is converted to a string as if by a call to the string function; the string is split into a whitespace-separated list of tokens (whitespace is any sequence of characters matching the production S); the result is a node-set containing the elements in the same document as the context node that have a unique ID equal to any of the tokens in the list.

 
 

 
 

@@ -1227,7 +1199,7 @@ void	xmlXPatherror			(xmlXPathLangFunction ()
void	xmlXPathLangFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the lang() XPath function boolean lang(string) The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang

+
Implement the lang() XPath function boolean lang(string) The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang

 
 
 
 

@@ -1623,7 +1595,7 @@ void	xmlXPatherror			(cur:
-
+
@@ -1713,7 +1685,7 @@ void	xmlXPatherror			(xmlXPathNextFollowing ()
xmlNodePtr	xmlXPathNextFollowing	(xmlXPathParserContextPtr ctxt, 
					 xmlNodePtr cur)

 

-
Traversal function for the "following" direction The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes; the nodes are ordered in document order

+
Traversal function for the "following" direction The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes; the nodes are ordered in document order

 
 
the current attribute in the traversalthe current attribute in the traversal
 

 

 Returns:
 
 

@@ -1773,7 +1745,7 @@ void	xmlXPatherror			(cur:
-
+
@@ -1813,7 +1785,7 @@ void	xmlXPatherror			(xmlXPathNextPreceding ()
xmlNodePtr	xmlXPathNextPreceding	(xmlXPathParserContextPtr ctxt, 
					 xmlNodePtr cur)

 

-
Traversal function for the "preceding" direction the preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes; the nodes are ordered in reverse document order

+
Traversal function for the "preceding" direction the preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes; the nodes are ordered in reverse document order

 
 
the current attribute in the traversalthe current attribute in the traversal
 

 

 Returns:
 
 

@@ -2192,7 +2164,7 @@ void	xmlXPatherror			(xmlXPathNormalizeFunction ()
void	xmlXPathNormalizeFunction	(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the normalize-space() XPath function string normalize-space(string?) The normalize-space function returns the argument string with white space normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.

+
Implement the normalize-space() XPath function string normalize-space(string?) The normalize-space function returns the argument string with white space normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.

 
 
 
 

@@ -2469,7 +2441,7 @@ void	xmlXPatherror			(xmlXPathRegisterAllFunctions ()
void	xmlXPathRegisterAllFunctions	(xmlXPathContextPtr ctxt)

 

-
Registers all default XPath functions in this context

+
DEPRECATED: No-op since 2.14.0. Registers all default XPath functions in this context

 
 
 
 

@@ -2831,7 +2803,7 @@ void	xmlXPatherror			(xmlXPathStringLengthFunction ()
void	xmlXPathStringLengthFunction	(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the string-length() XPath function number string-length(string?) The string-length returns the number of characters in the string (see [3.6 Strings]). If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.

+
Implement the string-length() XPath function number string-length(string?) The string-length returns the number of characters in the string (see [3.6 Strings]). If the argument is omitted, it defaults to the context node converted to a string, in other words the value of the context node.

 
 

 
 

@@ -2909,7 +2881,7 @@ void	xmlXPatherror			(xmlXPathSubstringFunction ()
void	xmlXPathSubstringFunction	(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the substring() XPath function string substring(string, number, number?) The substring function returns the substring of the first argument starting at the position specified in the second argument with length specified in the third argument. For example, substring("12345",2,3) returns "234". If the third argument is not specified, it returns the substring starting at the position specified in the second argument and continuing to the end of the string. For example, substring("12345",2) returns "2345". More precisely, each character in the string (see [3.6 Strings]) is considered to have a numeric position: the position of the first character is 1, the position of the second character is 2 and so on. The returned substring contains those characters for which the position of the character is greater than or equal to the second argument and, if the third argument is specified, less than the sum of the second and third arguments; the comparisons and addition used for the above follow the standard IEEE 754 rules. Thus: - substring("12345", 1.5, 2.6) returns "234" - substring("12345", 0, 3) returns "12" - substring("12345", 0 div 0, 3) returns "" - substring("12345", 1, 0 div 0) returns "" - substring("12345", -42, 1 div 0) returns "12345" - substring("12345", -1 div 0, 1 div 0) returns ""

+
Implement the substring() XPath function string substring(string, number, number?) The substring function returns the substring of the first argument starting at the position specified in the second argument with length specified in the third argument. For example, substring("12345",2,3) returns "234". If the third argument is not specified, it returns the substring starting at the position specified in the second argument and continuing to the end of the string. For example, substring("12345",2) returns "2345". More precisely, each character in the string (see [3.6 Strings]) is considered to have a numeric position: the position of the first character is 1, the position of the second character is 2 and so on. The returned substring contains those characters for which the position of the character is greater than or equal to the second argument and, if the third argument is specified, less than the sum of the second and third arguments; the comparisons and addition used for the above follow the standard IEEE 754 rules. Thus: - substring("12345", 1.5, 2.6) returns "234" - substring("12345", 0, 3) returns "12" - substring("12345", 0 div 0, 3) returns "" - substring("12345", 1, 0 div 0) returns "" - substring("12345", -42, 1 div 0) returns "12345" - substring("12345", -1 div 0, 1 div 0) returns ""

 
 
 
 

@@ -3001,7 +2973,7 @@ void	xmlXPatherror			(xmlXPathTranslateFunction ()
void	xmlXPathTranslateFunction	(xmlXPathParserContextPtr ctxt, 
					 int nargs)

 

-
Implement the translate() XPath function string translate(string, string, string) The translate function returns the first argument string with occurrences of characters in the second argument string replaced by the character at the corresponding position in the third argument string. For example, translate("bar","abc","ABC") returns the string BAr. If there is a character in the second argument string with no character at a corresponding position in the third argument string (because the second argument string is longer than the third argument string), then occurrences of that character in the first argument string are removed. For example, translate("--aaa--","abc-","ABC")

+
Implement the translate() XPath function string translate(string, string, string) The translate function returns the first argument string with occurrences of characters in the second argument string replaced by the character at the corresponding position in the third argument string. For example, translate("bar","abc","ABC") returns the string BAr. If there is a character in the second argument string with no character at a corresponding position in the third argument string (because the second argument string is longer than the third argument string), then occurrences of that character in the first argument string are removed. For example, translate("--aaa--","abc-","ABC")

 
 
 
 

@@ -3055,6 +3027,52 @@ void	xmlXPatherror			(
 

+xmlXPathValuePop ()

+
xmlXPathObjectPtr	xmlXPathValuePop	(xmlXPathParserContextPtr ctxt)

+

+
Pops the top XPath object from the value stack

+

 
 

++
+
+
+
+
+
+
+
+
+
+


ctxt:an XPath evaluation context
Returns:the XPath object just removed

+

+

+

+

+xmlXPathValuePush ()

+
int	xmlXPathValuePush		(xmlXPathParserContextPtr ctxt, 
					 xmlXPathObjectPtr value)

+

+
Pushes a new XPath object on top of the value stack. If value is NULL, a memory error is recorded in the parser context.

+

++
+
+
+
+
+
+
+
+
+
+
+
+
+
+


ctxt:an XPath evaluation context
value:the XPath object
Returns:the number of items on the value stack, or -1 in case of error. The object is destroyed in case of error.

+

+

+

+

 xmlXPathVariableLookup ()

 
xmlXPathObjectPtr	xmlXPathVariableLookup	(xmlXPathContextPtr ctxt, 
						 const xmlChar * name)

 

diff --git a/doc/devhelp/libxml2-xpointer.html b/doc/devhelp/libxml2-xpointer.html
index 7f0595f0..50f1ce71 100644
--- a/doc/devhelp/libxml2-xpointer.html
+++ b/doc/devhelp/libxml2-xpointer.html
@@ -21,29 +21,8 @@
 
Author(s): Daniel Veillard 

 

 
Synopsis

-
typedef struct _xmlLocationSet xmlLocationSet;
-typedef xmlLocationSet * xmlLocationSetPtr;
-xmlNodePtr	xmlXPtrBuildNodeList	(xmlXPathObjectPtr obj);
-xmlXPathObjectPtr	xmlXPtrEval	(const xmlChar * str, 
					 xmlXPathContextPtr ctx);
-void	xmlXPtrEvalRangePredicate	(xmlXPathParserContextPtr ctxt);
-void	xmlXPtrFreeLocationSet		(xmlLocationSetPtr obj);
-void	xmlXPtrLocationSetAdd		(xmlLocationSetPtr cur, 
					 xmlXPathObjectPtr val);
-xmlLocationSetPtr	xmlXPtrLocationSetCreate	(xmlXPathObjectPtr val);
-void	xmlXPtrLocationSetDel		(xmlLocationSetPtr cur, 
					 xmlXPathObjectPtr val);
-xmlLocationSetPtr	xmlXPtrLocationSetMerge	(xmlLocationSetPtr val1, 
						 xmlLocationSetPtr val2);
-void	xmlXPtrLocationSetRemove	(xmlLocationSetPtr cur, 
					 int val);
-xmlXPathObjectPtr	xmlXPtrNewCollapsedRange	(xmlNodePtr start);
+
xmlXPathObjectPtr	xmlXPtrEval	(const xmlChar * str, 
					 xmlXPathContextPtr ctx);
 xmlXPathContextPtr	xmlXPtrNewContext	(xmlDocPtr doc, 
						 xmlNodePtr here, 
						 xmlNodePtr origin);
-xmlXPathObjectPtr	xmlXPtrNewLocationSetNodeSet	(xmlNodeSetPtr set);
-xmlXPathObjectPtr	xmlXPtrNewLocationSetNodes	(xmlNodePtr start, 
							 xmlNodePtr end);
-xmlXPathObjectPtr	xmlXPtrNewRange	(xmlNodePtr start, 
					 int startindex, 
					 xmlNodePtr end, 
					 int endindex);
-xmlXPathObjectPtr	xmlXPtrNewRangeNodeObject	(xmlNodePtr start, 
							 xmlXPathObjectPtr end);
-xmlXPathObjectPtr	xmlXPtrNewRangeNodePoint	(xmlNodePtr start, 
							 xmlXPathObjectPtr end);
-xmlXPathObjectPtr	xmlXPtrNewRangeNodes	(xmlNodePtr start, 
						 xmlNodePtr end);
-xmlXPathObjectPtr	xmlXPtrNewRangePointNode	(xmlXPathObjectPtr start, 
							 xmlNodePtr end);
-xmlXPathObjectPtr	xmlXPtrNewRangePoints	(xmlXPathObjectPtr start, 
						 xmlXPathObjectPtr end);
-void	xmlXPtrRangeToFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs);
-xmlXPathObjectPtr	xmlXPtrWrapLocationSet	(xmlLocationSetPtr val);
 

 

 
Description

@@ -52,47 +31,6 @@ void	xmlXPtrRangeToFunction		(
 

 

-Structure xmlLocationSet

-
struct _xmlLocationSet {
-    int	locNr	: number of locations in the set
-    int	locMax	: size of the array as allocated
-    xmlXPathObjectPtr *	locTab	: array of locations
-} xmlLocationSet;
-

-

-

-

-

-

-Typedef xmlLocationSetPtr

-
xmlLocationSet * xmlLocationSetPtr;
-

-

-

-

-

-

-xmlXPtrBuildNodeList ()

-
xmlNodePtr	xmlXPtrBuildNodeList	(xmlXPathObjectPtr obj)

-

-
Build a node list tree copy of the XPointer result. This will drop Attributes and Namespace declarations.

-

--
-
-
-
-
-
-
-
-
-
-


obj:the XPointer result from the evaluation.
Returns:an xmlNodePtr list or NULL. the caller has to free the node tree.

-

-

-

-

 xmlXPtrEval ()

 
xmlXPathObjectPtr	xmlXPtrEval	(const xmlChar * str, 
					 xmlXPathContextPtr ctx)

 

@@ -118,168 +56,6 @@ void	xmlXPtrRangeToFunction		(
 

-xmlXPtrEvalRangePredicate ()

-
void	xmlXPtrEvalRangePredicate	(xmlXPathParserContextPtr ctxt)

-

-
[8] Predicate ::= '[' PredicateExpr ']' [9] PredicateExpr ::= Expr Evaluate a predicate as in xmlXPathEvalPredicate() but for a Location Set instead of a node set

-

--
-
-
-
-


ctxt:the XPointer Parser context

-

-

-

-

-xmlXPtrFreeLocationSet ()

-
void	xmlXPtrFreeLocationSet		(xmlLocationSetPtr obj)

-

-
Free the LocationSet compound (not the actual ranges !).

-

--
-
-
-
-


obj:the xmlLocationSetPtr to free

-

-

-

-

-xmlXPtrLocationSetAdd ()

-
void	xmlXPtrLocationSetAdd		(xmlLocationSetPtr cur, 
					 xmlXPathObjectPtr val)

-

-
add a new xmlXPathObjectPtr to an existing LocationSet If the location already exist in the set @val is freed.

-

--
-
-
-
-
-
-
-
-
-
-


cur:the initial range set
val:a new xmlXPathObjectPtr
-

-

-

-

-

-xmlXPtrLocationSetCreate ()

-
xmlLocationSetPtr	xmlXPtrLocationSetCreate	(xmlXPathObjectPtr val)

-

-
Create a new xmlLocationSetPtr of type double and of value @val

-

--
-
-
-
-
-
-
-
-
-
-


val:an initial xmlXPathObjectPtr, or NULL
Returns:the newly created object.

-

-

-

-

-xmlXPtrLocationSetDel ()

-
void	xmlXPtrLocationSetDel		(xmlLocationSetPtr cur, 
					 xmlXPathObjectPtr val)

-

-
Removes an xmlXPathObjectPtr from an existing LocationSet

-

--
-
-
-
-
-
-
-
-
-
-


cur:the initial range set
val:an xmlXPathObjectPtr
-

-

-

-

-

-xmlXPtrLocationSetMerge ()

-
xmlLocationSetPtr	xmlXPtrLocationSetMerge	(xmlLocationSetPtr val1, 
						 xmlLocationSetPtr val2)

-

-
Merges two rangesets, all ranges from @val2 are added to @val1

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


val1:the first LocationSet
val2:the second LocationSet
Returns:val1 once extended or NULL in case of error.

-

-

-

-

-xmlXPtrLocationSetRemove ()

-
void	xmlXPtrLocationSetRemove	(xmlLocationSetPtr cur, 
					 int val)

-

-
Removes an entry from an existing LocationSet list.

-

--
-
-
-
-
-
-
-
-
-
-


cur:the initial range set
val:the index to remove

-

-

-

-

-xmlXPtrNewCollapsedRange ()

-
xmlXPathObjectPtr	xmlXPtrNewCollapsedRange	(xmlNodePtr start)

-

-
Create a new xmlXPathObjectPtr of type range using a single nodes

-

--
-
-
-
-
-
-
-
-
-
-


start:the starting and ending node
Returns:the newly created object.

-

-

-

-

 xmlXPtrNewContext ()

 
xmlXPathContextPtr	xmlXPtrNewContext	(xmlDocPtr doc, 
						 xmlNodePtr here, 
						 xmlNodePtr origin)

 

@@ -307,252 +83,6 @@ void	xmlXPtrRangeToFunction		(
-

-xmlXPtrNewLocationSetNodeSet ()

-
xmlXPathObjectPtr	xmlXPtrNewLocationSetNodeSet	(xmlNodeSetPtr set)

-

-
Create a new xmlXPathObjectPtr of type LocationSet and initialize it with all the nodes from @set

-

--
-
-
-
-
-
-
-
-
-
-


set:a node set
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewLocationSetNodes ()

-
xmlXPathObjectPtr	xmlXPtrNewLocationSetNodes	(xmlNodePtr start, 
							 xmlNodePtr end)

-

-
Create a new xmlXPathObjectPtr of type LocationSet and initialize it with the single range made of the two nodes @start and @end

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the start NodePtr value
end:the end NodePtr value or NULL
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRange ()

-
xmlXPathObjectPtr	xmlXPtrNewRange	(xmlNodePtr start, 
					 int startindex, 
					 xmlNodePtr end, 
					 int endindex)

-

-
Create a new xmlXPathObjectPtr of type range

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting node
startindex:the start index
end:the ending point
endindex:the ending index
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRangeNodeObject ()

-
xmlXPathObjectPtr	xmlXPtrNewRangeNodeObject	(xmlNodePtr start, 
							 xmlXPathObjectPtr end)

-

-
Create a new xmlXPathObjectPtr of type range from a not to an object

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting node
end:the ending object
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRangeNodePoint ()

-
xmlXPathObjectPtr	xmlXPtrNewRangeNodePoint	(xmlNodePtr start, 
							 xmlXPathObjectPtr end)

-

-
Create a new xmlXPathObjectPtr of type range from a node to a point

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting node
end:the ending point
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRangeNodes ()

-
xmlXPathObjectPtr	xmlXPtrNewRangeNodes	(xmlNodePtr start, 
						 xmlNodePtr end)

-

-
Create a new xmlXPathObjectPtr of type range using 2 nodes

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting node
end:the ending node
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRangePointNode ()

-
xmlXPathObjectPtr	xmlXPtrNewRangePointNode	(xmlXPathObjectPtr start, 
							 xmlNodePtr end)

-

-
Create a new xmlXPathObjectPtr of type range from a point to a node

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting point
end:the ending node
Returns:the newly created object.

-

-

-

-

-xmlXPtrNewRangePoints ()

-
xmlXPathObjectPtr	xmlXPtrNewRangePoints	(xmlXPathObjectPtr start, 
						 xmlXPathObjectPtr end)

-

-
Create a new xmlXPathObjectPtr of type range using 2 Points

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


start:the starting point
end:the ending point
Returns:the newly created object.

-

-

-

-

-xmlXPtrRangeToFunction ()

-
void	xmlXPtrRangeToFunction		(xmlXPathParserContextPtr ctxt, 
					 int nargs)

-

-
Implement the range-to() XPointer function Obsolete. range-to is not a real function but a special type of location step which is handled in xpath.c.

-

--
-
-
-
-
-
-
-
-
-
-


ctxt:the XPointer Parser context
nargs:the number of args

-

-

-

-

-xmlXPtrWrapLocationSet ()

-
xmlXPathObjectPtr	xmlXPtrWrapLocationSet	(xmlLocationSetPtr val)

-

-
Wrap the LocationSet @val in a new xmlXPathObjectPtr

-

--
-
-
-
-
-
-
-
-
-
-


val:the LocationSet value
Returns:the newly created object.

-

-

 

 

 
diff --git a/doc/devhelp/libxml2.devhelp2 b/doc/devhelp/libxml2.devhelp2
index 4076f965..b28dfd23 100644
--- a/doc/devhelp/libxml2.devhelp2
+++ b/doc/devhelp/libxml2.devhelp2
@@ -4,7 +4,6 @@
     
       
       
-      
       
       
       
@@ -16,7 +15,6 @@
       
       
       
-      
       
       
       
@@ -42,7 +40,6 @@
       
       
       
-      
       
       
       
@@ -52,7 +49,6 @@
   
   
     
-    
     
     
     
@@ -66,8 +62,6 @@
     
     
     
-    
-    
     
     
     
@@ -93,13 +87,11 @@
     
     
     
-    
     
     
     
     
     
-    
     
     
     
@@ -108,6 +100,7 @@
     
     
     
+    
     
     
     
@@ -115,7 +108,6 @@
     
     
     
-    
     
     
     
@@ -124,9 +116,9 @@
     
     
     
-    
     
-    
+    
+    
     
     
     
@@ -246,7 +238,15 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
     
@@ -261,6 +261,7 @@
     
     
     
+    
     
     
     
@@ -289,7 +290,10 @@
     
     
     
+    
     
+    
+    
     
     
     
@@ -359,6 +363,12 @@
     
     
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -371,6 +381,7 @@
     
     
     
+    
     
     
     
@@ -378,6 +389,7 @@
     
     
     
+    
     
     
     
@@ -492,9 +504,10 @@
     
     
     
-    
     
     
+    
+    
     
     
     
@@ -611,12 +624,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
     
     
     
@@ -667,6 +674,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -768,6 +779,7 @@
     
     
     
+    
     
     
     
@@ -784,6 +796,7 @@
     
     
     
+    
     
     
     
@@ -796,6 +809,7 @@
     
     
     
+    
     
     
     
@@ -864,6 +878,13 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -990,11 +1011,14 @@
     
     
     
+    
     
+    
     
     
     
     
+    
     
     
     
@@ -1406,6 +1430,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -1449,6 +1477,7 @@
     
     
     
+    
     
     
     
@@ -1521,14 +1550,11 @@
     
     
     
-    
     
     
     
     
     
-    
-    
     
     
     
@@ -1584,6 +1610,7 @@
     
     
     
+    
     
     
     
@@ -1605,17 +1632,12 @@
     
     
     
-    
-    
-    
     
-    
     
     
     
     
     
-    
     
     
     
@@ -1629,6 +1651,7 @@
     
     
     
+    
     
     
     
@@ -1637,6 +1660,7 @@
     
     
     
+    
     
     
     
@@ -1650,6 +1674,7 @@
     
     
     
+    
     
     
     
@@ -1682,7 +1707,6 @@
     
     
     
-    
     
     
     
@@ -1729,15 +1753,11 @@
     
     
     
-    
-    
-    
     
     
     
     
     
-    
     
     
     
@@ -1785,7 +1805,6 @@
     
     
     
-    
     
     
     
@@ -1815,8 +1834,6 @@
     
     
     
-    
-    
     
     
     
@@ -1839,11 +1856,13 @@
     
     
     
+    
+    
+    
     
     
     
     
-    
     
     
     
@@ -1871,13 +1890,12 @@
     
     
     
+    
     
     
     
     
     
-    
-    
     
     
     
@@ -1889,12 +1907,7 @@
     
     
     
-    
-    
     
-    
-    
-    
     
     
     
@@ -1906,8 +1919,6 @@
     
     
     
-    
-    
     
     
     
@@ -1916,29 +1927,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -1951,6 +1939,7 @@
     
     
     
+    
     
     
     
@@ -1999,31 +1988,7 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
     
     
@@ -2071,7 +2036,6 @@
     
     
     
-    
     
     
     
@@ -2132,6 +2096,7 @@
     
     
     
+    
     
     
     
@@ -2149,7 +2114,6 @@
     
     
     
-    
     
     
     
@@ -2172,6 +2136,7 @@
     
     
     
+    
     
     
     
@@ -2184,8 +2149,25 @@
     
     
     
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
@@ -2194,10 +2176,18 @@
     
     
     
+    
+    
+    
     
     
     
+    
+    
+    
     
+    
+    
     
     
     
@@ -2216,7 +2206,6 @@
     
     
     
-    
     
     
     
@@ -2252,28 +2241,8 @@
     
     
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -2329,9 +2298,6 @@
     
     
     
-    
-    
-    
     
     
     
@@ -2346,9 +2312,7 @@
     
     
     
-    
     
-    
     
     
     
@@ -2381,10 +2345,6 @@
     
     
     
-    
-    
-    
-    
     
     
     
@@ -2400,8 +2360,7 @@
     
     
     
-    
-    
+    
     
     
     
@@ -2412,11 +2371,11 @@
     
     
     
-    
     
     
     
     
+    
     
     
     
@@ -2453,8 +2412,6 @@
     
     
     
-    
-    
     
     
     
@@ -2477,31 +2434,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -2541,9 +2473,13 @@
     
     
     
-    
     
+    
     
+    
+    
+    
+    
     
     
     
@@ -2653,7 +2589,6 @@
     
     
     
-    
     
     
     
@@ -2661,7 +2596,6 @@
     
     
     
-    
     
     
     
@@ -2680,7 +2614,6 @@
     
     
     
-    
     
     
     
@@ -2773,6 +2706,7 @@
     
     
     
+    
     
     
     
@@ -2842,13 +2776,13 @@
     
     
     
+    
     
     
     
     
     
     
-    
     
     
     
@@ -2888,6 +2822,7 @@
     
     
     
+    
     
     
     
@@ -2927,9 +2862,7 @@
     
     
     
-    
     
-    
     
     
     
@@ -2938,20 +2871,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -3061,6 +2980,7 @@
     
     
     
+    
     
     
     
@@ -3141,8 +3061,6 @@
     
     
     
-    
-    
     
     
     
@@ -3151,7 +3069,6 @@
     
     
     
-    
     
     
     
@@ -3160,172 +3077,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -3337,6 +3088,7 @@
     
     
     
+    
     
     
     
@@ -3383,6 +3135,7 @@
     
     
     
+    
     
     
     
@@ -3532,6 +3285,8 @@
     
     
     
+    
+    
     
     
     
@@ -3539,26 +3294,7 @@
     
     
     
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
   
 
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index cd6294cd..adc6e9e7 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -13670,7 +13670,7 @@ crash if you try to modify the tree)'/>
       
     
     
-      Merge the second text node into the first. The second node is unlinked and freed.
+      Merge the second text node into the first. If @first is NULL, @second is returned. Otherwise, the second node is unlinked and freed.
       
       
       
diff --git a/doc/xmllint.1 b/doc/xmllint.1
index 2e69cffb..267ff151 100644
--- a/doc/xmllint.1
+++ b/doc/xmllint.1
@@ -2,12 +2,12 @@
 .\"     Title: xmllint
 .\"    Author: John Fleck 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 12/26/2024
+.\"      Date: 03/27/2025
 .\"    Manual: xmllint Manual
 .\"    Source: libxml2
 .\"  Language: English
 .\"
-.TH "XMLLINT" "1" "12/26/2024" "libxml2" "xmllint Manual"
+.TH "XMLLINT" "1" "03/27/2025" "libxml2" "xmllint Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -147,6 +147,8 @@ Output in the given encoding\&. Note that this works for full document not fragm
 Reformat and reindent the output\&. The
 \fBXMLLINT_INDENT\fR
 environment variable controls the indentation\&. The default value is two spaces " ")\&.
+.sp
+Especially in the absence of a DTD, this feature has never worked reliably and is fundamentally broken\&.
 .RE
 .PP
 \fB\-\-html\fR
diff --git a/doc/xmllint.html b/doc/xmllint.html
index f106ddf8..d15528ae 100644
--- a/doc/xmllint.html
+++ b/doc/xmllint.html
@@ -36,6 +36,9 @@
                     Reformat and reindent the output. The XMLLINT_INDENT
                     environment variable controls the indentation. The default value is two
                     spaces "  ").
+                

+                    Especially in the absence of a DTD, this feature has never worked reliably
+                    and is fundamentally broken.
                 
--html
Use the HTML parser.
--htmlout

                     Output results as an HTML file. This
                     causes xmllint to output the necessary HTML