From 6e12409b33c01da2c4823628c6ec2c50482fe3d9 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Wed, 26 Apr 2023 21:21:31 +0200 Subject: [PATCH] Regenerate docs and testapi.c --- doc/devhelp/libxml2-HTMLparser.html | 18 +- doc/devhelp/libxml2-SAX2.html | 4 +- doc/devhelp/libxml2-dict.html | 6 +- doc/devhelp/libxml2-encoding.html | 8 +- doc/devhelp/libxml2-globals.html | 4 +- doc/devhelp/libxml2-parser.html | 8 +- doc/devhelp/libxml2-parserInternals.html | 195 +++++--------- doc/devhelp/libxml2-threads.html | 42 +-- doc/devhelp/libxml2-tree.html | 18 +- doc/devhelp/libxml2-uri.html | 2 +- doc/devhelp/libxml2-valid.html | 28 +- doc/devhelp/libxml2-xmlIO.html | 2 +- doc/devhelp/libxml2-xmlerror.html | 2 +- doc/devhelp/libxml2-xmlexports.html | 29 +- doc/devhelp/libxml2-xmlmemory.html | 28 +- doc/devhelp/libxml2-xmlschemastypes.html | 13 +- doc/devhelp/libxml2-xmlversion.html | 11 +- doc/devhelp/libxml2-xpath.html | 4 +- doc/devhelp/libxml2-xpathInternals.html | 8 +- doc/devhelp/libxml2.devhelp2 | 13 +- doc/libxml2-api.xml | 76 +++--- doc/xmlcatalog.1 | 18 +- doc/xmlcatalog.html | 284 ++++++++++---------- doc/xmllint.1 | 33 ++- doc/xmllint.html | 326 ++++++++++++----------- testapi.c | 18 +- 26 files changed, 559 insertions(+), 639 deletions(-) diff --git a/doc/devhelp/libxml2-HTMLparser.html b/doc/devhelp/libxml2-HTMLparser.html index 778753c6..a25e40bb 100644 --- a/doc/devhelp/libxml2-HTMLparser.html +++ b/doc/devhelp/libxml2-HTMLparser.html @@ -63,7 +63,7 @@ void htmlInitAutoClose (void); int htmlIsAutoClosed (htmlDocPtr doc,
htmlNodePtr elem); int htmlIsScriptAttribute (const xmlChar * name); htmlParserCtxtPtr htmlNewParserCtxt (void); -htmlParserCtxtPtr htmlNewSAXParserCtxt (htmlSAXHandlerPtr sax,
void * userData); +htmlParserCtxtPtr htmlNewSAXParserCtxt (const htmlSAXHandler * sax,
void * userData); htmlStatus htmlNodeStatus (const htmlNodePtr node,
int legacy); int htmlParseCharRef (htmlParserCtxtPtr ctxt); int htmlParseChunk (htmlParserCtxtPtr ctxt,
const char * chunk,
int size,
int terminate); @@ -881,7 +881,7 @@ const htmlElemDesc * htmlInitAutoClose () 
void	htmlInitAutoClose		(void)
-

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. This is a no-op now.

+

DEPRECATED: This is a no-op.

@@ -948,9 +948,9 @@ const htmlElemDesc *

htmlNewSAXParserCtxt ()

-
htmlParserCtxtPtr	htmlNewSAXParserCtxt	(htmlSAXHandlerPtr sax, 
						 void * userData)

+
htmlParserCtxtPtr	htmlNewSAXParserCtxt	(const htmlSAXHandler * sax, 
						 void * userData)

 

-
Allocate and initialize a new parser context.

+
Allocate and initialize a new SAX parser context. If userData is NULL, the parser context will be passed as user data.

 

@@ -1000,7 +1000,7 @@ const htmlElemDesc *	htmlParseCharRef ()
int	htmlParseCharRef		(htmlParserCtxtPtr ctxt)

 

-
parse Reference declarations [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';'

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

 
 
 
 

@@ -1101,7 +1101,7 @@ const htmlElemDesc *	htmlParseElement ()
void	htmlParseElement		(htmlParserCtxtPtr ctxt)

 

-
parse an HTML element, this is highly recursive this is kept for compatibility with previous code versions [39] element ::= EmptyElemTag | STag content ETag [41] Attribute ::= Name Eq AttValue

+
DEPRECATED: Internal function, don't use. parse an HTML element, this is highly recursive this is kept for compatibility with previous code versions [39] element ::= EmptyElemTag | STag content ETag [41] Attribute ::= Name Eq AttValue

 
 
 
 

@@ -1116,7 +1116,7 @@ const htmlElemDesc *	htmlParseEntityRef ()
const htmlEntityDesc *	htmlParseEntityRef	(htmlParserCtxtPtr ctxt, 
						 const xmlChar ** str)

 

-
parse an HTML ENTITY references [68] EntityRef ::= '&' Name ';'

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

 
 

 
 

@@ -1339,7 +1339,7 @@ const htmlElemDesc *	htmlSAXParseDoc ()
htmlDocPtr	htmlSAXParseDoc		(const xmlChar * cur, 
					 const char * encoding, 
					 htmlSAXHandlerPtr sax, 
					 void * userData)

 

-
Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks to handle parse events. If sax is NULL, fallback to the default DOM behavior and return a tree.

+
DEPRECATED: Use htmlNewSAXParserCtxt and htmlCtxtReadDoc. Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks to handle parse events. If sax is NULL, fallback to the default DOM behavior and return a tree.

 
 
 
 

@@ -1373,7 +1373,7 @@ const htmlElemDesc *	htmlSAXParseFile ()
htmlDocPtr	htmlSAXParseFile	(const char * filename, 
					 const char * encoding, 
					 htmlSAXHandlerPtr sax, 
					 void * userData)

 

-
parse an HTML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

+
DEPRECATED: Use htmlNewSAXParserCtxt and htmlCtxtReadFile. parse an HTML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines.

 
 
 
 

diff --git a/doc/devhelp/libxml2-SAX2.html b/doc/devhelp/libxml2-SAX2.html
index 4a463b17..b0bb2c79 100644
--- a/doc/devhelp/libxml2-SAX2.html
+++ b/doc/devhelp/libxml2-SAX2.html
@@ -69,7 +69,7 @@ int	xmlSAXVersion			(htmlDefaultSAXHandlerInit ()
void	htmlDefaultSAXHandlerInit	(void)

 

-
DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the default SAX handler

+
DEPRECATED: This function is a no-op. Call xmlInitParser to initialize the library.

@@ -77,7 +77,7 @@ int	xmlSAXVersion			(xmlDefaultSAXHandlerInit ()
 
void	xmlDefaultSAXHandlerInit	(void)

 

-
DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the default SAX2 handler

+
DEPRECATED: This function is a no-op. Call xmlInitParser to initialize the library. Initialize the default SAX2 handler

 

diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html
index 5a2c8835..08e914d1 100644
--- a/doc/devhelp/libxml2-dict.html
+++ b/doc/devhelp/libxml2-dict.html
@@ -66,7 +66,7 @@ The content of this structure is not made public by the API.
 xmlDictCleanup ()
 
void	xmlDictCleanup			(void)

 

-
DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Free the dictionary mutex. Do not call unless sure the library is not in use anymore !

+
DEPRECATED: This function is a no-op. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all.

 

@@ -325,12 +325,12 @@ The content of this structure is not made public by the API.
 xmlInitializeDict ()
 
int	xmlInitializeDict		(void)

 

-
DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Do the dictionary mutex initialization.

+
DEPRECATED: Alias for xmlInitParser.

 

 
 
 
 
 
 
 
 
 
 

-
+

 
 

 Returns:0 if initialization was already done, and 1 if that call led to the initialization
diff --git a/doc/devhelp/libxml2-encoding.html b/doc/devhelp/libxml2-encoding.html index cc9e2fb6..2eb52b3d 100644 --- a/doc/devhelp/libxml2-encoding.html +++ b/doc/devhelp/libxml2-encoding.html @@ -292,7 +292,7 @@ void xmlRegisterCharEncodingHandlerxmlCharEncFirstLine () 
int	xmlCharEncFirstLine		(xmlCharEncodingHandler * handler, 
					 xmlBufferPtr out, 
					 xmlBufferPtr in)
-

Front-end for the encoding handler input function, but handle only the very first line, i.e. limit itself to 45 chars.

+

DEPERECATED: Don't use.

@@ -310,7 +310,7 @@ void xmlRegisterCharEncodingHandler - +
Returns:the number of byte written if success, or -1 general error -2 if the transcoding fails (for *in is not valid utf8 string or the result of transformation can't fit into the encoding we want), or
@@ -441,7 +441,7 @@ void xmlRegisterCharEncodingHandlerxmlFindCharEncodingHandler () 
xmlCharEncodingHandlerPtr	xmlFindCharEncodingHandler	(const char * name)
-

Search in the registered set the handler able to read/write that encoding.

+

Search in the registered set the handler able to read/write that encoding or create a new one.

@@ -525,7 +525,7 @@ void xmlRegisterCharEncodingHandlerxmlInitCharEncodingHandlers ()
void	xmlInitCharEncodingHandlers	(void)
-

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the char encoding support, it registers the default encoding supported. NOTE: while public, this function usually doesn't need to be called in normal processing.

+

DEPRECATED: Alias for xmlInitParser.

diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html index ea7696de..0c1eb574 100644 --- a/doc/devhelp/libxml2-globals.html +++ b/doc/devhelp/libxml2-globals.html @@ -455,7 +455,7 @@ const char * xmlThrDefTreeIndentString xmlCleanupGlobals () 
void	xmlCleanupGlobals		(void)
-

DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Additional cleanup for multi-threading

+

DEPRECATED: This function is a no-op. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all.

@@ -484,7 +484,7 @@ const char * xmlThrDefTreeIndentString xmlInitGlobals () 
void	xmlInitGlobals			(void)
-

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Additional initialisation for multi-threading

+

DEPRECATED: Alias for xmlInitParser.

diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index bc37b594..07410f11 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -98,7 +98,7 @@ int xmlLineNumbersDefault (int val); xmlParserInputPtr xmlLoadExternalEntity (const char * URL,
const char * ID,
xmlParserCtxtPtr ctxt); xmlParserInputPtr xmlNewIOInputStream (xmlParserCtxtPtr ctxt,
xmlParserInputBufferPtr input,
xmlCharEncoding enc); xmlParserCtxtPtr xmlNewParserCtxt (void); -xmlParserCtxtPtr xmlNewSAXParserCtxt (xmlSAXHandlerPtr sax,
void * userData); +xmlParserCtxtPtr xmlNewSAXParserCtxt (const xmlSAXHandler * sax,
void * userData); int xmlParseBalancedChunkMemory (xmlDocPtr doc,
xmlSAXHandlerPtr sax,
void * user_data,
int depth,
const xmlChar * string,
xmlNodePtr * lst); int xmlParseBalancedChunkMemoryRecover (xmlDocPtr doc,
xmlSAXHandlerPtr sax,
void * user_data,
int depth,
const xmlChar * string,
xmlNodePtr * lst,
int recover); int xmlParseChunk (xmlParserCtxtPtr ctxt,
const char * chunk,
int size,
int terminate); @@ -1964,9 +1964,9 @@ The content of this structure is not made public by the API.

xmlNewSAXParserCtxt ()

-
xmlParserCtxtPtr	xmlNewSAXParserCtxt	(xmlSAXHandlerPtr sax, 
						 void * userData)

+
xmlParserCtxtPtr	xmlNewSAXParserCtxt	(const xmlSAXHandler * sax, 
						 void * userData)

 

-
Allocate and initialize a new SAX parser context.

+
Allocate and initialize a new SAX parser context. If userData is NULL, the parser context will be passed as user data.
@@ -1980,7 +1980,7 @@ The content of this structure is not made public by the API. - +
Returns:the xmlParserCtxtPtr or NULLthe xmlParserCtxtPtr or NULL if memory allocation failed.
diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html index b119aa46..2a0d6d5b 100644 --- a/doc/devhelp/libxml2-parserInternals.html +++ b/doc/devhelp/libxml2-parserInternals.html @@ -42,10 +42,8 @@ #define IS_LETTER_CH(c); #define IS_PUBIDCHAR(c); #define IS_PUBIDCHAR_CH(c); -#define MOVETO_ENDTAG(p); -#define MOVETO_STARTTAG(p); -#define SKIP_EOL(p); #define XML_MAX_DICTIONARY_LIMIT; +#define XML_MAX_HUGE_LENGTH; #define XML_MAX_LOOKUP_LIMIT; #define XML_MAX_NAMELEN; #define XML_MAX_NAME_LENGTH; @@ -70,7 +68,6 @@ int xmlCopyCharMultiByte (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 xmlErrMemory (xmlParserCtxtPtr ctxt,
const char * extra); void xmlFreeInputStream (xmlParserInputPtr input); void xmlHandleEntity (xmlParserCtxtPtr ctxt,
xmlEntityPtr entity); int xmlIsLetter (int c); @@ -444,51 +441,6 @@ int xmlSwitchToEncoding (

-Macro MOVETO_ENDTAG

-
#define MOVETO_ENDTAG(p);
-
-

Skips to the next '>' char.

-
-- - - - -
p:and UTF8 string pointer
- -
-
-

-Macro MOVETO_STARTTAG

-
#define MOVETO_STARTTAG(p);
-
-

Skips to the next '<' char.

-
-- - - - -
p:and UTF8 string pointer
-
-
-
-

-Macro SKIP_EOL

-
#define SKIP_EOL(p);
-
-

Skips the end of line chars.

-
-- - - - -
p:and UTF8 string pointer
-
-
-
-

Macro XML_MAX_DICTIONARY_LIMIT

#define XML_MAX_DICTIONARY_LIMIT;
@@ -497,6 +449,14 @@ int xmlSwitchToEncoding (

+Macro XML_MAX_HUGE_LENGTH

+
#define XML_MAX_HUGE_LENGTH;
+
+

Maximum size allowed when XML_PARSE_HUGE is set.

+
+
+
+

Macro XML_MAX_LOOKUP_LIMIT

#define XML_MAX_LOOKUP_LIMIT;
@@ -667,7 +627,7 @@ int xmlSwitchToEncoding (namePop () 
const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)
-

Pops the top element name from the name stack

+

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

@@ -688,7 +648,7 @@ int xmlSwitchToEncoding (namePush ()
int	namePush			(xmlParserCtxtPtr ctxt, 
					 const xmlChar * value)
-

Pushes a new element name on top of the name stack

+

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

@@ -713,7 +673,7 @@ int xmlSwitchToEncoding (nodePop ()
xmlNodePtr	nodePop			(xmlParserCtxtPtr ctxt)
-

Pops the top element node from the node stack

+

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

@@ -734,7 +694,7 @@ int xmlSwitchToEncoding (nodePush ()
int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value)
-

Pushes a new element node on top of the node stack

+

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

@@ -759,7 +719,7 @@ int xmlSwitchToEncoding (xmlCheckLanguageID ()
int	xmlCheckLanguageID		(const xmlChar * lang)
-

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

@@ -937,7 +897,7 @@ int xmlSwitchToEncoding (xmlCurrentChar ()
int	xmlCurrentChar			(xmlParserCtxtPtr ctxt, 
					 int * len)
-

The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.)

+

DEPRECATED: Internal function, do not use. The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.)

@@ -1001,27 +961,6 @@ int xmlSwitchToEncoding (

-xmlErrMemory ()

-
void	xmlErrMemory			(xmlParserCtxtPtr ctxt, 
					 const char * extra)

-
-

Handle a redefinition of attribute error

-
-- - - - - - - - - - -
ctxt:an XML parser context
extra:extra information
-
-
-
-

xmlFreeInputStream ()

void	xmlFreeInputStream		(xmlParserInputPtr input)
@@ -1150,7 +1089,7 @@ int xmlSwitchToEncoding (xmlNewEntityInputStream () 
xmlParserInputPtr	xmlNewEntityInputStream	(xmlParserCtxtPtr ctxt, 
						 xmlEntityPtr entity)
-

Create a new input stream based on an xmlEntityPtr

+

DEPRECATED: Internal function, do not use. Create a new input stream based on an xmlEntityPtr

@@ -1246,7 +1185,7 @@ int xmlSwitchToEncoding (xmlNextChar ()
void	xmlNextChar			(xmlParserCtxtPtr ctxt)
-

Skip to the next char input char.

+

DEPRECATED: Internal function, do not use. Skip to the next char input char.

@@ -1261,7 +1200,7 @@ int xmlSwitchToEncoding (xmlParseAttValue ()
xmlChar *	xmlParseAttValue	(xmlParserCtxtPtr ctxt)
-

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.

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

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

@@ -1308,7 +1247,7 @@ int xmlSwitchToEncoding (xmlParseAttributeListDecl ()
void	xmlParseAttributeListDecl	(xmlParserCtxtPtr ctxt)
-

: parse the Attribute list def for an element [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

@@ -1323,7 +1262,7 @@ int xmlSwitchToEncoding (xmlParseAttributeType ()
int	xmlParseAttributeType		(xmlParserCtxtPtr ctxt, 
					 xmlEnumerationPtr * tree)
-

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.

@@ -1348,7 +1287,7 @@ int xmlSwitchToEncoding (xmlParseCDSect ()
void	xmlParseCDSect			(xmlParserCtxtPtr ctxt)
-

Parse escaped pure raw content. [18] CDSect ::= CDStart CData CDEnd [19] CDStart ::= '<![CDATA[' [20] Data ::= (Char* - (Char* ']]>' Char*)) [21] CDEnd ::= ']]>'

+

DEPRECATED: Internal function, don't use. Parse escaped pure raw content. Always consumes '<!['. [18] CDSect ::= CDStart CData CDEnd [19] CDStart ::= '<![CDATA[' [20] Data ::= (Char* - (Char* ']]>' Char*)) [21] CDEnd ::= ']]>'

@@ -1363,7 +1302,7 @@ int xmlSwitchToEncoding (xmlParseCharData ()
void	xmlParseCharData		(xmlParserCtxtPtr ctxt, 
					 int cdata)
-

parse a CharData section. if we are within a CDATA section ']]>' marks an end of section. The right angle bracket (>) may be represented using the string "&gt;", and must, for compatibility, be escaped using "&gt;" or a character reference when it appears in the string "]]>" in content, when that string is not marking the end of a CDATA section. [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)

+

DEPRECATED: Internal function, don't use. Parse character data. Always makes progress if the first char isn't '<' or '&'. if we are within a CDATA section ']]>' marks an end of section. The right angle bracket (>) may be represented using the string "&gt;", and must, for compatibility, be escaped using "&gt;" or a character reference when it appears in the string "]]>" in content, when that string is not marking the end of a CDATA section. [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)

@@ -1373,7 +1312,7 @@ int xmlSwitchToEncoding (cdata: - +
int indicating whether we are within a CDATA sectionunused
@@ -1384,7 +1323,7 @@ int xmlSwitchToEncoding (xmlParseCharRef () 
int	xmlParseCharRef			(xmlParserCtxtPtr ctxt)
-

parse Reference declarations [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.

@@ -1405,7 +1344,7 @@ int xmlSwitchToEncoding (xmlParseComment ()
void	xmlParseComment			(xmlParserCtxtPtr ctxt)
-

Skip an XML (SGML) comment <!-- .... --> 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 - '-')))* '-->'

@@ -1435,7 +1374,7 @@ int xmlSwitchToEncoding (xmlParseDefaultDecl ()
int	xmlParseDefaultDecl		(xmlParserCtxtPtr ctxt, 
					 xmlChar ** value)
-

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()

@@ -1461,7 +1400,7 @@ int xmlSwitchToEncoding (xmlParseDocTypeDecl ()
void	xmlParseDocTypeDecl		(xmlParserCtxtPtr ctxt)
-

parse a DOCTYPE declaration [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' (markupdecl | PEReference | S)* ']' S?)? '>' [ VC: Root Element Type ] The Name in the document type declaration must match the element type of the root element.

+

DEPRECATED: Internal function, don't use. parse a DOCTYPE declaration [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' (markupdecl | PEReference | S)* ']' S?)? '>' [ VC: Root Element Type ] The Name in the document type declaration must match the element type of the root element.

@@ -1476,7 +1415,7 @@ int xmlSwitchToEncoding (xmlParseElement ()
void	xmlParseElement			(xmlParserCtxtPtr ctxt)
-

parse an XML element [39] element ::= EmptyElemTag | STag content ETag [ WFC: Element Type Match ] The Name in an element's end-tag must match the element type in the start-tag.

+

DEPRECATED: Internal function, don't use. parse an XML element [39] element ::= EmptyElemTag | STag content ETag [ WFC: Element Type Match ] The Name in an element's end-tag must match the element type in the start-tag.

@@ -1491,7 +1430,7 @@ int xmlSwitchToEncoding (xmlParseElementChildrenContentDecl ()
xmlElementContentPtr	xmlParseElementChildrenContentDecl	(xmlParserCtxtPtr ctxt, 
							 int inputchk)
-

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

@@ -1516,7 +1455,7 @@ int xmlSwitchToEncoding (xmlParseElementContentDecl ()
int	xmlParseElementContentDecl	(xmlParserCtxtPtr ctxt, 
					 const xmlChar * name, 
					 xmlElementContentPtr * result)
-

parse the declaration for an Element content either Mixed or Children, the cases EMPTY and ANY are handled directly in xmlParseElementDecl [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children

+

DEPRECATED: Internal function, don't use. parse the declaration for an Element content either Mixed or Children, the cases EMPTY and ANY are handled directly in xmlParseElementDecl [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children

@@ -1545,7 +1484,7 @@ int xmlSwitchToEncoding (xmlParseElementDecl ()
int	xmlParseElementDecl		(xmlParserCtxtPtr ctxt)
-

parse an Element declaration. [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>' [ VC: Unique Element Type Declaration ] No element type may be declared more than once

+

DEPRECATED: Internal function, don't use. Parse an element declaration. Always consumes '<!'. [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>' [ VC: Unique Element Type Declaration ] No element type may be declared more than once

@@ -1566,7 +1505,7 @@ int xmlSwitchToEncoding (xmlParseElementMixedContentDecl ()
xmlElementContentPtr	xmlParseElementMixedContentDecl	(xmlParserCtxtPtr ctxt, 
							 int inputchk)
-

parse the declaration for a Mixed Element content The leading '(' and spaces have been skipped in xmlParseElementContentDecl [51] Mixed ::= '(' S? '#PCDATA' (S? '|' S? Name)* S? ')*' | '(' S? '#PCDATA' S? ')' [ VC: Proper Group/PE Nesting ] applies to [51] too (see [49]) [ VC: No Duplicate Types ] The same name must not appear more than once in a single mixed-content declaration.

+

DEPRECATED: Internal function, don't use. parse the declaration for a Mixed Element content The leading '(' and spaces have been skipped in xmlParseElementContentDecl [51] Mixed ::= '(' S? '#PCDATA' (S? '|' S? Name)* S? ')*' | '(' S? '#PCDATA' S? ')' [ VC: Proper Group/PE Nesting ] applies to [51] too (see [49]) [ VC: No Duplicate Types ] The same name must not appear more than once in a single mixed-content declaration.

@@ -1591,7 +1530,7 @@ int xmlSwitchToEncoding (xmlParseEncName ()
xmlChar *	xmlParseEncName		(xmlParserCtxtPtr ctxt)
-

parse the XML encoding name [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*

+

DEPRECATED: Internal function, don't use. parse the XML encoding name [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*

@@ -1612,7 +1551,7 @@ int xmlSwitchToEncoding (xmlParseEncodingDecl ()
const xmlChar *	xmlParseEncodingDecl	(xmlParserCtxtPtr ctxt)
-

parse the XML encoding declaration [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'") this setups the conversion filters.

+

DEPRECATED: Internal function, don't use. parse the XML encoding declaration [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'") this setups the conversion filters.

@@ -1633,7 +1572,7 @@ int xmlSwitchToEncoding (xmlParseEndTag ()
void	xmlParseEndTag			(xmlParserCtxtPtr ctxt)
-

parse an end of tag [42] ETag ::= '</' Name S? '>' With namespace [NS 9] ETag ::= '</' QName S? '>'

+

DEPRECATED: Internal function, don't use. parse an end of tag [42] ETag ::= '</' Name S? '>' With namespace [NS 9] ETag ::= '</' QName S? '>'

@@ -1648,7 +1587,7 @@ int xmlSwitchToEncoding (xmlParseEntityDecl ()
void	xmlParseEntityDecl		(xmlParserCtxtPtr ctxt)
-

parse <!ENTITY declarations [70] EntityDecl ::= GEDecl | PEDecl [71] GEDecl ::= '<!ENTITY' S Name S EntityDef S? '>' [72] PEDecl ::= '<!ENTITY' S '%' S Name S PEDef S? '>' [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?) [74] PEDef ::= EntityValue | ExternalID [76] NDataDecl ::= S 'NDATA' S Name [ VC: Notation Declared ] The Name must match the declared name of a notation.

+

DEPRECATED: Internal function, don't use. Parse an entity declaration. Always consumes '<!'. [70] EntityDecl ::= GEDecl | PEDecl [71] GEDecl ::= '<!ENTITY' S Name S EntityDef S? '>' [72] PEDecl ::= '<!ENTITY' S '%' S Name S PEDef S? '>' [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?) [74] PEDef ::= EntityValue | ExternalID [76] NDataDecl ::= S 'NDATA' S Name [ VC: Notation Declared ] The Name must match the declared name of a notation.

@@ -1663,7 +1602,7 @@ int xmlSwitchToEncoding (xmlParseEntityRef ()
xmlEntityPtr	xmlParseEntityRef	(xmlParserCtxtPtr ctxt)
-

parse ENTITY references declarations [68] EntityRef ::= '&' Name ';' [ 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 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. The declaration of a parameter entity must precede any reference to it. Similarly, the declaration of a general entity must precede any reference to it which appears in a default value in an attribute-list declaration. Note that if entities are declared in the external subset or in external parameter entities, a non-validating processor is not obligated to read and process their declarations; for such documents, the rule that an entity must be declared is a well-formedness constraint only if standalone='yes'. [ WFC: Parsed Entity ] An entity reference must not contain the name of an unparsed entity

+

DEPRECATED: Internal function, don't use. Parse an entitiy reference. Always consumes '&'. [68] EntityRef ::= '&' Name ';' [ 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 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. The declaration of a parameter entity must precede any reference to it. Similarly, the declaration of a general entity must precede any reference to it which appears in a default value in an attribute-list declaration. Note that if entities are declared in the external subset or in external parameter entities, a non-validating processor is not obligated to read and process their declarations; for such documents, the rule that an entity must be declared is a well-formedness constraint only if standalone='yes'. [ WFC: Parsed Entity ] An entity reference must not contain the name of an unparsed entity

@@ -1684,7 +1623,7 @@ int xmlSwitchToEncoding (xmlParseEntityValue ()
xmlChar *	xmlParseEntityValue	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** orig)
-

parse a value for ENTITY declarations [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | "'" ([^%&'] | PEReference | Reference)* "'"

+

DEPRECATED: Internal function, don't use. parse a value for ENTITY declarations [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | "'" ([^%&'] | PEReference | Reference)* "'"

@@ -1709,7 +1648,7 @@ int xmlSwitchToEncoding (xmlParseEnumeratedType ()
int	xmlParseEnumeratedType		(xmlParserCtxtPtr ctxt, 
					 xmlEnumerationPtr * tree)
-

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? ')'

@@ -1736,7 +1675,7 @@ int xmlSwitchToEncoding (xmlParseEnumerationType ()
xmlEnumerationPtr	xmlParseEnumerationType	(xmlParserCtxtPtr ctxt)
-

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

@@ -1757,7 +1696,7 @@ int xmlSwitchToEncoding (xmlParseExternalID ()
xmlChar *	xmlParseExternalID	(xmlParserCtxtPtr ctxt, 
					 xmlChar ** publicID, 
					 int strict)
-

Parse an External ID or a Public ID NOTE: Productions [75] and [83] interact badly since [75] can generate 'PUBLIC' S PubidLiteral S SystemLiteral [75] ExternalID ::= 'SYSTEM' S SystemLiteral | 'PUBLIC' S PubidLiteral S SystemLiteral [83] PublicID ::= 'PUBLIC' S PubidLiteral

+

DEPRECATED: Internal function, don't use. Parse an External ID or a Public ID NOTE: Productions [75] and [83] interact badly since [75] can generate 'PUBLIC' S PubidLiteral S SystemLiteral [75] ExternalID ::= 'SYSTEM' S SystemLiteral | 'PUBLIC' S PubidLiteral S SystemLiteral [83] PublicID ::= 'PUBLIC' S PubidLiteral

@@ -1811,7 +1750,7 @@ int xmlSwitchToEncoding (xmlParseMarkupDecl ()
void	xmlParseMarkupDecl		(xmlParserCtxtPtr ctxt)
-

parse Markup declarations [29] markupdecl ::= elementdecl | AttlistDecl | EntityDecl | NotationDecl | PI | Comment [ VC: Proper Declaration/PE Nesting ] Parameter-entity replacement text must be properly nested with markup declarations. That is to say, if either the first character or the last character of a markup declaration (markupdecl above) is contained in the replacement text for a parameter-entity reference, both must be contained in the same replacement text. [ WFC: PEs in Internal Subset ] In the internal DTD subset, parameter-entity references can occur only where markup declarations can occur, not within markup declarations. (This does not apply to references that occur in external parameter entities or to the external subset.)

+

DEPRECATED: Internal function, don't use. Parse markup declarations. Always consumes '<!' or '<?'. [29] markupdecl ::= elementdecl | AttlistDecl | EntityDecl | NotationDecl | PI | Comment [ VC: Proper Declaration/PE Nesting ] Parameter-entity replacement text must be properly nested with markup declarations. That is to say, if either the first character or the last character of a markup declaration (markupdecl above) is contained in the replacement text for a parameter-entity reference, both must be contained in the same replacement text. [ WFC: PEs in Internal Subset ] In the internal DTD subset, parameter-entity references can occur only where markup declarations can occur, not within markup declarations. (This does not apply to references that occur in external parameter entities or to the external subset.)

@@ -1826,7 +1765,7 @@ int xmlSwitchToEncoding (xmlParseMisc ()
void	xmlParseMisc			(xmlParserCtxtPtr ctxt)
-

parse an XML Misc* optional field. [27] Misc ::= Comment | PI | S

+

DEPRECATED: Internal function, don't use. parse an XML Misc* optional field. [27] Misc ::= Comment | PI | S

@@ -1841,7 +1780,7 @@ int xmlSwitchToEncoding (xmlParseName ()
const xmlChar *	xmlParseName		(xmlParserCtxtPtr ctxt)
-

parse an XML name. [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender [5] Name ::= (Letter | '_' | ':') (NameChar)* [6] Names ::= Name (#x20 Name)*

+

DEPRECATED: Internal function, don't use. parse an XML name. [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender [5] Name ::= (Letter | '_' | ':') (NameChar)* [6] Names ::= Name (#x20 Name)*

@@ -1877,7 +1816,7 @@ int xmlSwitchToEncoding (xmlParseNmtoken ()
xmlChar *	xmlParseNmtoken		(xmlParserCtxtPtr ctxt)
-

parse an XML Nmtoken. [7] Nmtoken ::= (NameChar)+ [8] Nmtokens ::= Nmtoken (#x20 Nmtoken)*

+

DEPRECATED: Internal function, don't use. parse an XML Nmtoken. [7] Nmtoken ::= (NameChar)+ [8] Nmtokens ::= Nmtoken (#x20 Nmtoken)*

@@ -1898,7 +1837,7 @@ int xmlSwitchToEncoding (xmlParseNotationDecl ()
void	xmlParseNotationDecl		(xmlParserCtxtPtr ctxt)
-

parse a notation declaration [82] NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID) S? '>' Hence there is actually 3 choices: 'PUBLIC' S PubidLiteral 'PUBLIC' S PubidLiteral S SystemLiteral and 'SYSTEM' S SystemLiteral See the NOTE on xmlParseExternalID().

+

DEPRECATED: Internal function, don't use. Parse a notation declaration. Always consumes '<!'. [82] NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID) S? '>' Hence there is actually 3 choices: 'PUBLIC' S PubidLiteral 'PUBLIC' S PubidLiteral S SystemLiteral and 'SYSTEM' S SystemLiteral See the NOTE on xmlParseExternalID().

@@ -1913,7 +1852,7 @@ int xmlSwitchToEncoding (xmlParseNotationType ()
xmlEnumerationPtr	xmlParseNotationType	(xmlParserCtxtPtr ctxt)
-

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.

@@ -1934,7 +1873,7 @@ int xmlSwitchToEncoding (xmlParsePEReference ()
void	xmlParsePEReference		(xmlParserCtxtPtr ctxt)
-

parse PEReference declarations 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.

@@ -1949,7 +1888,7 @@ int xmlSwitchToEncoding (xmlParsePI ()
void	xmlParsePI			(xmlParserCtxtPtr ctxt)
-

parse an XML Processing Instruction. [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' The processing is transferred to SAX once parsed.

+

DEPRECATED: Internal function, don't use. parse an XML Processing Instruction. [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' The processing is transferred to SAX once parsed.

@@ -1964,7 +1903,7 @@ int xmlSwitchToEncoding (xmlParsePITarget ()
const xmlChar *	xmlParsePITarget	(xmlParserCtxtPtr ctxt)
-

parse the name of a PI [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))

+

DEPRECATED: Internal function, don't use. parse the name of a PI [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))

@@ -1985,7 +1924,7 @@ int xmlSwitchToEncoding (xmlParsePubidLiteral ()
xmlChar *	xmlParsePubidLiteral	(xmlParserCtxtPtr ctxt)
-

parse an XML public literal [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"

+

DEPRECATED: Internal function, don't use. parse an XML public literal [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"

@@ -2027,7 +1966,7 @@ int xmlSwitchToEncoding (xmlParseReference ()
void	xmlParseReference		(xmlParserCtxtPtr ctxt)
-

parse and handle entity references in content, depending on the SAX interface, this may end-up in a call to character() if this is a CharRef, a predefined entity, if there is no reference() callback. or if the parser was asked to switch to that mode. [67] Reference ::= EntityRef | CharRef

+

DEPRECATED: Internal function, don't use. parse and handle entity references in content, depending on the SAX interface, this may end-up in a call to character() if this is a CharRef, a predefined entity, if there is no reference() callback. or if the parser was asked to switch to that mode. Always consumes '&'. [67] Reference ::= EntityRef | CharRef

@@ -2042,7 +1981,7 @@ int xmlSwitchToEncoding (xmlParseSDDecl ()
int	xmlParseSDDecl			(xmlParserCtxtPtr ctxt)
-

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.

@@ -2063,7 +2002,7 @@ int xmlSwitchToEncoding (xmlParseStartTag ()
const xmlChar *	xmlParseStartTag	(xmlParserCtxtPtr ctxt)
-

DEPRECATED: Don't use. parse a start of tag either for rule element or EmptyElement. In both case we don't parse the tag closing chars. [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? '/>'

@@ -2084,7 +2023,7 @@ int xmlSwitchToEncoding (xmlParseSystemLiteral ()
xmlChar *	xmlParseSystemLiteral	(xmlParserCtxtPtr ctxt)
-

parse an XML Literal [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")

+

DEPRECATED: Internal function, don't use. parse an XML Literal [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")

@@ -2105,7 +2044,7 @@ int xmlSwitchToEncoding (xmlParseTextDecl ()
void	xmlParseTextDecl		(xmlParserCtxtPtr ctxt)
-

parse an XML declaration header for external entities [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>'

+

DEPRECATED: Internal function, don't use. parse an XML declaration header for external entities [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>'

@@ -2120,7 +2059,7 @@ int xmlSwitchToEncoding (xmlParseVersionInfo ()
xmlChar *	xmlParseVersionInfo	(xmlParserCtxtPtr ctxt)
-

parse the XML version. [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ") [25] Eq ::= S? '=' S?

+

DEPRECATED: Internal function, don't use. parse the XML version. [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ") [25] Eq ::= S? '=' S?

@@ -2141,7 +2080,7 @@ int xmlSwitchToEncoding (xmlParseVersionNum ()
xmlChar *	xmlParseVersionNum	(xmlParserCtxtPtr ctxt)
-

parse the XML version value. [26] VersionNum ::= '1.' [0-9]+ In practice allow [0-9].[0-9]+ at that level

+

DEPRECATED: Internal function, don't use. parse the XML version value. [26] VersionNum ::= '1.' [0-9]+ In practice allow [0-9].[0-9]+ at that level

@@ -2162,7 +2101,7 @@ int xmlSwitchToEncoding (xmlParseXMLDecl ()
void	xmlParseXMLDecl			(xmlParserCtxtPtr ctxt)
-

parse an XML declaration header [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'

+

DEPRECATED: Internal function, don't use. parse an XML declaration header [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'

@@ -2177,7 +2116,7 @@ int xmlSwitchToEncoding (xmlParserHandlePEReference ()
void	xmlParserHandlePEReference	(xmlParserCtxtPtr ctxt)
-

[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

+

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

@@ -2207,7 +2146,7 @@ int xmlSwitchToEncoding (xmlParserInputShrink ()
void	xmlParserInputShrink		(xmlParserInputPtr in)
-

This function removes used input for the parser.

+

DEPRECATED: Don't use. This function removes used input for the parser.

@@ -2304,7 +2243,7 @@ int xmlSwitchToEncoding (xmlSkipBlankChars ()
int	xmlSkipBlankChars		(xmlParserCtxtPtr ctxt)
-

skip all blanks character found at that point in the input streams. It pops up finished entities in the process if allowable at that point.

+

DEPRECATED: Internal function, do not use. skip all blanks character found at that point in the input streams. It pops up finished entities in the process if allowable at that point.

@@ -2354,7 +2293,7 @@ int xmlSwitchToEncoding (xmlStringCurrentChar ()
int	xmlStringCurrentChar		(xmlParserCtxtPtr ctxt, 
					 const xmlChar * cur, 
					 int * len)
-

The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer.

+

DEPRECATED: Internal function, do not use. The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer.

@@ -2383,7 +2322,7 @@ int xmlSwitchToEncoding (xmlStringDecodeEntities ()
xmlChar *	xmlStringDecodeEntities	(xmlParserCtxtPtr ctxt, 
					 const xmlChar * str, 
					 int what, 
					 xmlChar end, 
					 xmlChar end2, 
					 xmlChar end3)
-

Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'

+

DEPRECATED: Internal function, don't use. Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'

@@ -2425,7 +2364,7 @@ int xmlSwitchToEncoding (xmlStringLenDecodeEntities ()
xmlChar *	xmlStringLenDecodeEntities	(xmlParserCtxtPtr ctxt, 
						 const xmlChar * str, 
						 int len, 
						 int what, 
						 xmlChar end, 
						 xmlChar end2, 
						 xmlChar end3)
-

Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'

+

DEPRECATED: Internal function, don't use. Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';'

@@ -2496,7 +2435,7 @@ int xmlSwitchToEncoding (xmlSwitchInputEncoding ()
int	xmlSwitchInputEncoding		(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input, 
					 xmlCharEncodingHandlerPtr handler)
-

DEPRECATED: Use xmlSwitchToEncoding change the input functions when discovering the character encoding of a given entity.

+

change the input functions when discovering the character encoding of a given entity.

diff --git a/doc/devhelp/libxml2-threads.html b/doc/devhelp/libxml2-threads.html index 4ab52dc2..2dcd5b05 100644 --- a/doc/devhelp/libxml2-threads.html +++ b/doc/devhelp/libxml2-threads.html @@ -27,7 +27,6 @@ typedef xmlMutex * xmlRMutex; typedef xmlRMutex * xmlRMutexPtr; void xmlCleanupThreads (void); -int xmlDllMain (void * hinstDLL,
unsigned long fdwReason,
void * lpvReserved); void xmlFreeMutex (xmlMutexPtr tok); void xmlFreeRMutex (xmlRMutexPtr tok); xmlGlobalStatePtrxmlGetGlobalState (void); @@ -89,36 +88,7 @@ The content of this structure is not made public by the API. xmlCleanupThreads ()
void	xmlCleanupThreads		(void)
-

DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. xmlCleanupThreads() is used to to cleanup all the thread related data of the libxml2 library once processing has ended. 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 !

- -
-
-

-xmlDllMain ()

-
int	xmlDllMain			(void * hinstDLL, 
					 unsigned long fdwReason, 
					 void * lpvReserved)

-
-

-
-- - - - - - - - - - - - - - - - - - -
hinstDLL:
fdwReason:
lpvReserved:
Returns:
+

DEPRECATED: This function is a no-op. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all.

@@ -126,7 +96,7 @@ The content of this structure is not made public by the API. xmlFreeMutex () 
void	xmlFreeMutex			(xmlMutexPtr tok)
-

xmlFreeMutex() is used to reclaim resources associated with a libxml2 token struct.

+

Free a mutex.

@@ -156,7 +126,7 @@ The content of this structure is not made public by the API. xmlGetGlobalState ()
xmlGlobalStatePtr	xmlGetGlobalState	(void)
-

xmlGetGlobalState() is called to retrieve the global state for a thread.

+

DEPRECATED: Internal function, do not use. xmlGetGlobalState() is called to retrieve the global state for a thread.

@@ -171,7 +141,7 @@ The content of this structure is not made public by the API. xmlGetThreadId ()
int	xmlGetThreadId			(void)
-

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

+

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

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

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. xmlInitThreads() is used to to initialize all the thread related data of the libxml2 library.

+

DEPRECATED: Alias for xmlInitParser.

@@ -194,7 +164,7 @@ The content of this structure is not made public by the API. xmlIsMainThread () 
int	xmlIsMainThread			(void)
-

xmlIsMainThread() check whether the current thread is the main thread.

+

DEPRECATED: Internal function, do not use. xmlIsMainThread() check whether the current thread is the main thread.

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index e4987c13..4d4e1ebd 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -459,7 +459,7 @@ The content of this structure is not made public by the API. 
enum xmlBufferAllocationScheme {
     XML_BUFFER_ALLOC_DOUBLEIT = 1 /* double each time one need to grow */
     XML_BUFFER_ALLOC_EXACT = 2 /* grow only to the minimal size */
-    XML_BUFFER_ALLOC_IMMUTABLE = 3 /* immutable buffer */
+    XML_BUFFER_ALLOC_IMMUTABLE = 3 /* immutable buffer, deprecated */
     XML_BUFFER_ALLOC_IO = 4 /* special allocation scheme used for I/O */
     XML_BUFFER_ALLOC_HYBRID = 5 /* exact up to a threshold, and doubleit thereafter */
     XML_BUFFER_ALLOC_BOUNDED = 6 /*  limit the upper size of the buffer */
@@ -735,7 +735,8 @@ The content of this structure is not made public by the API.
     struct _xmlEntity *	nexte	: unused
     const xmlChar *	URI	: the full URI as computed
     int	owner	: does the entity own the childrens
-    int	checked	: was the entity content checked this is also used to count entities *
+    int	flags	: various flags
+    unsigned long	expandedSize	: expanded size
 } xmlEntity;

@@ -985,7 +986,7 @@ The content of this structure is not made public by the API. xmlAttrPtr freeAttrs : * the complete error information for the last error. * xmlError lastError xmlParserMode parseMode : the parser mode - unsigned long nbentities : number of entities references + unsigned long nbentities : unused unsigned long sizeentities : size of parsed entities for use by HTML non-recursive parser xmlParserNodeInfo * nodeInfo : Current NodeInfo int nodeInfoNr : Depth of the parsing stack @@ -993,6 +994,9 @@ The content of this structure is not made public by the API. 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 } xmlParserCtxt;

@@ -1018,13 +1022,15 @@ The content of this structure is not made public by the API. const xmlChar * end : end of the array to parse int length : length if known int line : Current line - int col : * NOTE: consumed is only tested for equality in the parser code, * + int col : Current column unsigned long consumed : How many xmlChars already consumed xmlParserInputDeallocate free : function to deallocate the base const xmlChar * encoding : the encoding string for entity const xmlChar * version : the version string for entity int standalone : Was that entity marked standalone int id : an unique identifier for the entity + unsigned long parentConsumed : consumed bytes from parents + xmlEntityPtr entity : entity, if any } xmlParserInput;

@@ -1664,7 +1670,7 @@ The content of this structure is not made public by the API. xmlBufferCreateStatic ()
xmlBufferPtr	xmlBufferCreateStatic	(void * mem, 
					 size_t size)
-

routine to create an XML buffer from an immutable memory area. The area won't be modified nor copied, and is expected to be present until the end of the buffer lifetime.

+

Create an XML buffer initialized with bytes.

@@ -1678,7 +1684,7 @@ The content of this structure is not made public by the API. - +
Returns:the new structure.
diff --git a/doc/devhelp/libxml2-uri.html b/doc/devhelp/libxml2-uri.html index 755e78da..de7a0aa4 100644 --- a/doc/devhelp/libxml2-uri.html +++ b/doc/devhelp/libxml2-uri.html @@ -358,7 +358,7 @@ char * xmlURIUnescapeString (const char * s xmlURIEscapeStr () 
xmlChar *	xmlURIEscapeStr		(const xmlChar * str, 
					 const xmlChar * list)
-

This routine escapes a string to hex, ignoring reserved characters (a-z) and the characters in the exception list.

+

This routine escapes a string to hex, ignoring reserved characters (a-z, A-Z, 0-9, "@-_.!~*'()") and the characters in the exception list.

diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html index 3ea0bb80..821d3fa6 100644 --- a/doc/devhelp/libxml2-valid.html +++ b/doc/devhelp/libxml2-valid.html @@ -22,9 +22,7 @@

Author(s): Daniel Veillard

Synopsis

-
#define XML_VCTXT_DTD_VALIDATED;
-#define XML_VCTXT_USE_PCTXT;
-typedef struct _xmlHashTable xmlAttributeTable;
+
typedef struct _xmlHashTable xmlAttributeTable;
 typedef xmlAttributeTable * xmlAttributeTablePtr;
 typedef struct _xmlHashTable xmlElementTable;
 typedef xmlElementTable * xmlElementTablePtr;
@@ -93,7 +91,7 @@ int	xmlValidateDocument		(xmlValidateDocumentFinal	(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc);
 int	xmlValidateDtd			(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlDtdPtr dtd);
 int	xmlValidateDtdFinal		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc);
-int	xmlValidateElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem);
+int	xmlValidateElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr root);
 int	xmlValidateElementDecl		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlElementPtr elem);
 int	xmlValidateNameValue		(const xmlChar * value);
 int	xmlValidateNamesValue		(const xmlChar * value);
@@ -118,22 +116,6 @@ typedef void xmlValidityWarningFunc		(void
 

 

 

-Macro XML_VCTXT_DTD_VALIDATED

-
#define XML_VCTXT_DTD_VALIDATED;
-

-
Set after xmlValidateDtdFinal was called.

-

-

-

-

-Macro XML_VCTXT_USE_PCTXT

-
#define XML_VCTXT_USE_PCTXT;
-

-
Set if the validation context is part of a parser context.

-

-

-

-

 Structure xmlAttributeTable

 
struct _xmlHashTable {
 The content of this structure is not made public by the API.
@@ -1713,7 +1695,7 @@ The content of this structure is not made public by the API.
 

 

 xmlValidateElement ()

-
int	xmlValidateElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr elem)

+
int	xmlValidateElement		(xmlValidCtxtPtr ctxt, 
					 xmlDocPtr doc, 
					 xmlNodePtr root)

 

 
Try to validate the subtree under an element
@@ -1728,8 +1710,8 @@ The content of this structure is not made public by the API. - - + + diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html index e25ee025..1210a2f5 100644 --- a/doc/devhelp/libxml2-xmlIO.html +++ b/doc/devhelp/libxml2-xmlIO.html @@ -1211,7 +1211,7 @@ int xmlRegisterOutputCallbacks (xmlParserInputBufferCreateStatic ()
xmlParserInputBufferPtr	xmlParserInputBufferCreateStatic	(const char * mem, 
							 int size, 
							 xmlCharEncoding enc)
-

Create a buffered parser input for the progressive parsing for the input from an immutable memory area. This will not copy the memory area to the buffer, but the memory is expected to be available until the end of the parsing, this is useful for example when using mmap'ed file.

+

DEPRECATED: Use xmlParserInputBufferCreateMem.

a document instance
elem:an element instanceroot:
Returns:
diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index f97c8e14..b4d3a26b 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -929,7 +929,7 @@ typedef void xmlStructuredErrorFunc (void initGenericErrorDefaultFunc ()
void	initGenericErrorDefaultFunc	(xmlGenericErrorFunc * handler)
-

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

+

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

diff --git a/doc/devhelp/libxml2-xmlexports.html b/doc/devhelp/libxml2-xmlexports.html index 422affc1..937d7cb9 100644 --- a/doc/devhelp/libxml2-xmlexports.html +++ b/doc/devhelp/libxml2-xmlexports.html @@ -22,10 +22,7 @@

Author(s):

Synopsis

-
#define XMLCALL;
-#define XMLCDECL;
-#define XMLPUBFUN;
-#define XMLPUBLIC;
+
#define XMLPUBFUN;
 #define XMLPUBVAR;
@@ -35,22 +32,6 @@

-Macro XMLCALL

-
#define XMLCALL;
-
-

Macro which declares the calling convention for exported functions

-
-
-
-

-Macro XMLCDECL

-
#define XMLCDECL;
-
-

Macro which declares the calling convention for exported functions that use '...'.

-
-
-
-

Macro XMLPUBFUN

#define XMLPUBFUN;
@@ -59,14 +40,6 @@

-Macro XMLPUBLIC

-
#define XMLPUBLIC;
-
-

Macro which declares a public symbol

-
-
-
-

Macro XMLPUBVAR

#define XMLPUBVAR;
diff --git a/doc/devhelp/libxml2-xmlmemory.html b/doc/devhelp/libxml2-xmlmemory.html index e1aef9db..f663bb69 100644 --- a/doc/devhelp/libxml2-xmlmemory.html +++ b/doc/devhelp/libxml2-xmlmemory.html @@ -44,6 +44,7 @@ void * xmlMemMalloc (size_t size); void * xmlMemRealloc (void * ptr,
size_t size); int xmlMemSetup (xmlFreeFunc freeFunc,
xmlMallocFunc mallocFunc,
xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc); void xmlMemShow (FILE * fp,
int nr); +size_t xmlMemSize (void * ptr); char * xmlMemStrdupLoc (const char * str,
const char * file,
int line); int xmlMemUsed (void); void xmlMemoryDump (void); @@ -152,7 +153,7 @@ typedef char * xmlStrdupFunc (const char * str); xmlCleanupMemory () 
void	xmlCleanupMemory		(void)
-

DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Free up all the memory allocated by the library for its own use. This should not be called by user level code.

+

DEPRECATED: This function is a no-op. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all.

@@ -234,12 +235,12 @@ typedef char * xmlStrdupFunc (const char * str); xmlInitMemory () 
int	xmlInitMemory			(void)
-

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the memory layer.

+

DEPRECATED: Alias for xmlInitParser.

- +
Returns:0 on success
@@ -503,6 +504,27 @@ typedef char * xmlStrdupFunc (const char * str);

+xmlMemSize ()

+
size_t	xmlMemSize			(void * ptr)

+
+

+
++ + + + + + + + + + +
ptr:pointer to the memory allocation
Returns:the size of a memory allocation.
+
+
+
+

xmlMemStrdupLoc ()

char *	xmlMemStrdupLoc			(const char * str, 
					 const char * file, 
					 int line)
diff --git a/doc/devhelp/libxml2-xmlschemastypes.html b/doc/devhelp/libxml2-xmlschemastypes.html index 8d4459ab..011da789 100644 --- a/doc/devhelp/libxml2-xmlschemastypes.html +++ b/doc/devhelp/libxml2-xmlschemastypes.html @@ -38,7 +38,7 @@ int xmlSchemaGetCanonValueWhtsp (xmlSchemaGetFacetValueAsULong (xmlSchemaFacetPtr facet); xmlSchemaTypePtr xmlSchemaGetPredefinedType (const xmlChar * name,
const xmlChar * ns); xmlSchemaValType xmlSchemaGetValType (xmlSchemaValPtr val); -void xmlSchemaInitTypes (void); +int xmlSchemaInitTypes (void); int xmlSchemaIsBuiltInTypeFacet (xmlSchemaTypePtr type,
int facetType); xmlSchemaFacetPtr xmlSchemaNewFacet (void); xmlSchemaValPtr xmlSchemaNewNOTATIONValue (const xmlChar * name,
const xmlChar * ns); @@ -114,7 +114,7 @@ const xmlChar * xmlSchemaCleanupTypes () 
void	xmlSchemaCleanupTypes		(void)
-

DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Cleanup the default XML Schemas type library

+

DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have to call cleanup functions at all. Cleanup the default XML Schemas type library

@@ -413,9 +413,16 @@ const xmlChar *

xmlSchemaInitTypes ()

-
void	xmlSchemaInitTypes		(void)

+
int	xmlSchemaInitTypes		(void)

 

 
Initialize the default XML Schemas type library

+

++
+
+
+
+


Returns:0 on success, -1 on error.
diff --git a/doc/devhelp/libxml2-xmlversion.html b/doc/devhelp/libxml2-xmlversion.html index 98b08196..7e202ac2 100644 --- a/doc/devhelp/libxml2-xmlversion.html +++ b/doc/devhelp/libxml2-xmlversion.html @@ -68,7 +68,6 @@ #define LIBXML_ZLIB_ENABLED; #define WITHOUT_TRIO; #define WITH_TRIO; -#define XML_DEPRECATED; void xmlCheckVersion (int version);
@@ -145,7 +144,7 @@ void xmlCheckVersion (int version); Macro LIBXML_DEBUG_RUNTIME 
#define LIBXML_DEBUG_RUNTIME;
-

Whether the runtime debugging is configured in

+

Removed

@@ -446,14 +445,6 @@ void xmlCheckVersion (int version);

-Macro XML_DEPRECATED

-
#define XML_DEPRECATED;
-
-

Macro used to indicate that a function, variable, type or struct member is deprecated.

-
-
-
-

xmlCheckVersion ()

void	xmlCheckVersion			(int version)
diff --git a/doc/devhelp/libxml2-xpath.html b/doc/devhelp/libxml2-xpath.html index a5970ac0..9a4c3069 100644 --- a/doc/devhelp/libxml2-xpath.html +++ b/doc/devhelp/libxml2-xpath.html @@ -397,7 +397,7 @@ The content of this structure is not made public by the API. xmlXPathCompExprPtr comp : the precompiled expression int xptr : it this an XPointer expression xmlNodePtr ancestor : used for walking preceding axis - int valueFrame : used to limit Pop on the stack + int valueFrame : unused } xmlXPathParserContext;

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

DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the XPath environment

+

DEPRECATED: Alias for xmlInitParser.

diff --git a/doc/devhelp/libxml2-xpathInternals.html b/doc/devhelp/libxml2-xpathInternals.html index 750dade3..3a1f3ba7 100644 --- a/doc/devhelp/libxml2-xpathInternals.html +++ b/doc/devhelp/libxml2-xpathInternals.html @@ -650,7 +650,7 @@ void xmlXPatherror (Returns: -the number of items on the value stack, or -1 in case of error. +the number of items on the value stack, or -1 in case of error. The object is destroyed in case of error.
@@ -2095,7 +2095,7 @@ void xmlXPatherror (Returns: -@val1 once extended or NULL in case of error. +@val1 once extended or NULL in case of error. Frees @val1 in case of error.
@@ -3164,7 +3164,7 @@ void xmlXPatherror (Returns: -the newly created object. +the newly created object. In case of error the node set is destroyed and NULL is returned. @@ -3185,7 +3185,7 @@ void xmlXPatherror (Returns: -the newly created object. +the newly created object. Frees @val in case of error. diff --git a/doc/devhelp/libxml2.devhelp2 b/doc/devhelp/libxml2.devhelp2 index 3f6459e9..1d9ec80b 100644 --- a/doc/devhelp/libxml2.devhelp2 +++ b/doc/devhelp/libxml2.devhelp2 @@ -133,9 +133,6 @@ - - - @@ -149,22 +146,19 @@ - - - - + @@ -257,8 +251,6 @@ - - @@ -2248,7 +2240,6 @@ - @@ -2271,7 +2262,6 @@ - @@ -2475,6 +2465,7 @@ + diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index b36fea54..303da576 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -885,6 +885,7 @@ + @@ -2786,6 +2787,7 @@ + @@ -4133,6 +4135,9 @@ Maximum size allowed by the parser for a dictionary by default This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0 + + Maximum size allowed when XML_PARSE_HUGE is set. + Maximum size allowed by the parser for ahead lookup This is an upper boundary enforced by the parser to avoid bad behaviour on "unfriendly' content Introduced in 2.9.0 @@ -6129,9 +6134,8 @@ set at the end of parsing'/> - + + @@ -6374,7 +6378,7 @@ actually an xmlCharEncoding'/> *'/> - + @@ -6383,6 +6387,8 @@ actually an xmlCharEncoding'/> + + @@ -6395,16 +6401,15 @@ actually an xmlCharEncoding'/> - + + + @@ -6898,7 +6903,7 @@ Could we use @subtypes for this?'/> - + @@ -7880,12 +7885,12 @@ Could we use @subtypes for this?'/> - Pops the top element name from the name stack + DEPRECATED: Internal function, do not use. Pops the top element name from the name stack - Pushes a new element name on top of the name stack + DEPRECATED: Internal function, do not use. Pushes a new element name on top of the name stack @@ -7899,12 +7904,12 @@ Could we use @subtypes for this?'/> - Pops the top element node from the node stack + DEPRECATED: Internal function, do not use. Pops the top element node from the node stack - Pushes a new element node on top of the node stack + DEPRECATED: Internal function, do not use. Pushes a new element node on top of the node stack @@ -8056,7 +8061,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_XPATH_ENABLED) Pushes a new XPath object on top of the value stack. If value is NULL, a memory error is recorded in the parser context. - + @@ -8847,8 +8852,8 @@ Could we use @subtypes for this?'/> - Front-end for the encoding handler input function, but handle only the very first line, i.e. limit itself to 45 chars. - + DEPERECATED: Don't use. + @@ -8912,7 +8917,7 @@ Could we use @subtypes for this?'/> - 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 @@ -9240,7 +9245,7 @@ Could we use @subtypes for this?'/> - The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.) + DEPRECATED: Internal function, do not use. The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.) @@ -10966,6 +10971,11 @@ Could we use @subtypes for this?'/> + + + + + a strdup() equivalent, with logging of the allocation info. @@ -11454,7 +11464,7 @@ Could we use @subtypes for this?'/> - Create a new input stream based on an xmlEntityPtr + DEPRECATED: Internal function, do not use. Create a new input stream based on an xmlEntityPtr @@ -11645,7 +11655,7 @@ Could we use @subtypes for this?'/> - Skip to the next char input char. + DEPRECATED: Internal function, do not use. Skip to the next char input char. @@ -12329,7 +12339,7 @@ Could we use @subtypes for this?'/> - [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 + 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 @@ -12427,7 +12437,7 @@ Could we use @subtypes for this?'/> - This function removes used input for the parser. + DEPRECATED: Don't use. This function removes used input for the parser. @@ -13566,7 +13576,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_SCHEMAS_ENABLED) - DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Cleanup the default XML Schemas type library + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have to call cleanup functions at all. Cleanup the default XML Schemas type library @@ -13713,7 +13723,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_SCHEMAS_ENABLED) Initialize the default XML Schemas type library - + defined(LIBXML_SCHEMAS_ENABLED) @@ -14349,7 +14359,7 @@ Could we use @subtypes for this?'/> - skip all blanks character found at that point in the input streams. It pops up finished entities in the process if allowable at that point. + DEPRECATED: Internal function, do not use. skip all blanks character found at that point in the input streams. It pops up finished entities in the process if allowable at that point. @@ -14500,14 +14510,14 @@ Could we use @subtypes for this?'/> - The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. + DEPRECATED: Internal function, do not use. The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. - Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';' + DEPRECATED: Internal function, don't use. Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';' @@ -14523,7 +14533,7 @@ Could we use @subtypes for this?'/> - Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';' + DEPRECATED: Internal function, don't use. Takes a entity string content and process to do the adequate substitutions. [67] Reference ::= EntityRef | CharRef [69] PEReference ::= '%' Name ';' @@ -14610,7 +14620,7 @@ Could we use @subtypes for this?'/> - DEPRECATED: Use xmlSwitchToEncoding change the input functions when discovering the character encoding of a given entity. + change the input functions when discovering the character encoding of a given entity. @@ -16979,7 +16989,7 @@ Could we use @subtypes for this?'/> - + defined(LIBXML_VALID_ENABLED) @@ -17901,7 +17911,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_XPATH_ENABLED) Merges two nodesets, all nodes from @val2 are added to @val1 if @val1 is NULL, a new set is created and copied from @val2 - + @@ -18262,13 +18272,13 @@ Could we use @subtypes for this?'/> defined(LIBXML_XPATH_ENABLED) Wrap the Nodeset @val in a new xmlXPathObjectPtr - + defined(LIBXML_XPATH_ENABLED) Wraps the @val string into an XPath object. - + diff --git a/doc/xmlcatalog.1 b/doc/xmlcatalog.1 index 5605bea8..15ab9f73 100644 --- a/doc/xmlcatalog.1 +++ b/doc/xmlcatalog.1 @@ -1,13 +1,13 @@ '\" t .\" Title: xmlcatalog .\" Author: John Fleck -.\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/17/2022 +.\" Generator: DocBook XSL Stylesheets vsnapshot +.\" Date: 04/26/2023 .\" Manual: xmlcatalog Manual .\" Source: libxml2 .\" Language: English .\" -.TH "XMLCATALOG" "1" "08/17/2022" "libxml2" "xmlcatalog Manual" +.TH "XMLCATALOG" "1" "04/26/2023" "libxml2" "xmlcatalog Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ xmlcatalog \- Command line tool to parse and manipulate XML or SGML catalog files\&. .SH "SYNOPSIS" .HP \w'\fBxmlcatalog\fR\ 'u -\fBxmlcatalog\fR [\fB\-\-sgml\fR | \fB\-\-shell\fR | \fB\-\-create\fR | \fB\-\-del\ \fR\fB\fIVALUE(S)\fR\fR | [\ \fB\-\-add\ \fR\fB\fITYPE\fR\fR\fB\ \fR\fB\fIORIG\fR\fR\fB\ \fR\fB\fIREPLACE\fR\fR\fB\ \fR\ |\ \fB\-\-add\ \fR\fB\fIFILENAME\fR\fR] | \fB\-\-noout\fR | \fB\-\-no\-super\-update\fR | [\fB\-v\fR\ |\ \fB\-\-verbose\fR]] {\fICATALOGFILE\fR} {\fIENTITIES\fR...} +\fBxmlcatalog\fR [\fB\-\-sgml\fR | \fB\-\-shell\fR | \fB\-\-convert\fR | \fB\-\-create\fR | \fB\-\-del\ \fR\fB\fIVALUE(S)\fR\fR | [\ \fB\-\-add\ \fR\fB\fITYPE\fR\fR\fB\ \fR\fB\fIORIG\fR\fR\fB\ \fR\fB\fIREPLACE\fR\fR\fB\ \fR\ |\ \fB\-\-add\ \fR\fB\fIFILENAME\fR\fR] | \fB\-\-noout\fR | \fB\-\-no\-super\-update\fR | [\fB\-v\fR\ |\ \fB\-\-verbose\fR]] {\fICATALOGFILE\fR} {\fIENTITIES\fR...} .SH "DESCRIPTION" .PP \fBxmlcatalog\fR @@ -91,6 +91,11 @@ SGML catalog files\&. .RE .PP +\fB\-\-convert\fR +.RS 4 +Convert SGML catalog to XML\&. +.RE +.PP \fB\-\-create\fR .RS 4 Create a new @@ -245,9 +250,10 @@ Execute a Formal Public Identifier lookup of the catalog entry for XML catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the \fBXML_CATALOG_FILES\fR -environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default +environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default catalog from /etc/xml/catalog -catalog\&. +or, more specifically, +${sysconfdir}/xml/catalog\&. .RE .SH "DIAGNOSTICS" .PP diff --git a/doc/xmlcatalog.html b/doc/xmlcatalog.html index ae2ebabd..01ff8640 100644 --- a/doc/xmlcatalog.html +++ b/doc/xmlcatalog.html @@ -1,140 +1,144 @@ -xmlcatalog

Name

xmlcatalog — - Command line tool to parse and manipulate XML - or SGML catalog files. -

Synopsis

xmlcatalog [ --sgml | --shell | --create | --del VALUE(S) | - [ - --add - TYPE - ORIG - REPLACE - - | --add FILENAME ] - | --noout | --no-super-update | - [ -v | --verbose ] - ] {CATALOGFILE} {ENTITIES...}

DESCRIPTION

- xmlcatalog is a command line application allowing users to monitor and - manipulate XML and SGML catalogs. It - is included in libxml(3). -

- Its functions can be invoked from a single command from the command line, - or it can perform multiple functions in interactive mode. It can operate - on both XML and SGML files. -

OPTIONS

- xmlcatalog accepts the following options (in alphabetical order): -

- --add - TYPE - ORIG - REPLACE - -

- Add an entry to CATALOGFILE. TYPE - indicates the type of entry. Possible types are: public, system, uri, rewriteSystem, rewriteURI, delegatePublic, delegateSystem, delegateURI, nextCatalog. ORIG is the original - reference to be replaced, and REPLACE - is the URI of the replacement entity to be - used. The --add option will not overwrite - CATALOGFILE, outputting - to stdout, unless - --noout is used. The --add will - always take three parameters even if some of the XML - catalog constructs will have only a single argument. -

--add FILENAME

- If the --add option is used following - the --sgml option, only a single argument, - a FILENAME, is used. This is used to add - the name of a catalog file to an SGML supercatalog, - a file that contains references to other included SGML - catalog files. -

--create

- Create a new XML catalog. Outputs - to stdout, - ignoring filename unless --noout is - used, in which case it creates a new catalog - file filename. -

--del VALUE(S)

- Remove entries from CATALOGFILE - matching VALUE(S). The --del - option will not overwrite CATALOGFILE, - outputting to stdout, - unless --noout is used. -

--noout

- Save output to the named file rather than outputting - to stdout. -

--no-super-update

- Do not update the SGML super catalog. -

--shell

- Run a shell allowing interactive queries on catalog - file CATALOGFILE. For the set of available - commands see the section called “SHELL COMMANDS”. -

--sgml

- Uses SGML super catalogs for --add - and --del options. -

-v, --verbose

Output debugging information.

- Invoking xmlcatalog non-interactively without a designated action - (imposed with options like --add) will result in a lookup - of the catalog entry for ENTITIES in the - catalog denoted with CATALOGFILE. The - corresponding entries will be output to the command line. This mode of - operation, together with --shell mode and non-modifying - (i.e. without --noout) direct actions, allows for - a special shortcut of the void CATALOGFILE - specification (possibly expressed as "" in the shell - environment) appointing the default system catalog. That simplifies the - handling when its exact location is irrelevant but the respective built-in - still needs to be consulted. -

SHELL COMMANDS

- Invoking xmlcatalog with - the --shell CATALOGFILE option opens - a command line shell allowing interactive access to the catalog file - identified by CATALOGFILE. Invoking the shell - provides a command line prompt after which the following commands (described in - alphabetical order) can be entered. -

- add - TYPE - ORIG - REPLACE - -

- Add an entry to the catalog file. TYPE - indicates the type of entry. Possible types are: public, system, uri, rewriteSystem, rewriteURI, delegatePublic, delegateSystem, delegateURI, nextCatalog. ORIG is the original - reference to be replaced, and REPLACE - is the URI of the replacement entity to be - used. The --add option will not overwrite - CATALOGFILE, outputting - to stdout, unless - --noout is used. The --add will - always take three parameters even if some of the XML - catalog constructs will have only a single argument. -

debug

- Print debugging statements showing the steps xmlcatalog is executing. -

del VALUE(S)

- Remove the catalog entry corresponding to VALUE(S). -

dump

Print the current catalog.

exit

Quit the shell.

public PUBLIC-ID

- Execute a Formal Public Identifier lookup of the catalog entry - for PUBLIC-ID. The corresponding entry will be - output to the command line. -

quiet

Stop printing debugging statements.

system SYSTEM-ID

- Execute a Formal Public Identifier lookup of the catalog entry - for SYSTEM-ID. The corresponding entry will be - output to the command line. -

ENVIRONMENT

XML_CATALOG_FILES

XML catalog behavior can be changed by redirecting - queries to the user's own set of catalogs. This can be done by setting - the XML_CATALOG_FILES environment variable to a space-separated - list of catalogs. Use percent-encoding to escape spaces or other characters. - An empty variable should deactivate loading the default /etc/xml/catalog catalog. -

DIAGNOSTICS

- xmlcatalog return codes provide information that can be used when - calling it from scripts. -

0

No error

1

Failed to remove an entry from the catalog

2

Failed to save to the catalog, check file permissions

3

Failed to add an entry to the catalog

4

Failed to look up an entry in the catalog

SEE ALSO

libxml(3) -

- More information can be found at -

-

+xmlcatalog

Name

xmlcatalog — + Command line tool to parse and manipulate XML + or SGML catalog files. +

Synopsis

xmlcatalog [ --sgml | --shell | --convert | --create | --del VALUE(S) | + [ + --add + TYPE + ORIG + REPLACE + + | --add FILENAME ] + | --noout | --no-super-update | + [ -v | --verbose ] + ] {CATALOGFILE} {ENTITIES...}

DESCRIPTION

+ xmlcatalog is a command line application allowing users to monitor and + manipulate XML and SGML catalogs. It + is included in libxml(3). +

+ Its functions can be invoked from a single command from the command line, + or it can perform multiple functions in interactive mode. It can operate + on both XML and SGML files. +

OPTIONS

+ xmlcatalog accepts the following options (in alphabetical order): +

+ --add + TYPE + ORIG + REPLACE + +

+ Add an entry to CATALOGFILE. TYPE + indicates the type of entry. Possible types are: public, system, uri, rewriteSystem, rewriteURI, delegatePublic, delegateSystem, delegateURI, nextCatalog. ORIG is the original + reference to be replaced, and REPLACE + is the URI of the replacement entity to be + used. The --add option will not overwrite + CATALOGFILE, outputting + to stdout, unless + --noout is used. The --add will + always take three parameters even if some of the XML + catalog constructs will have only a single argument. +

--add FILENAME

+ If the --add option is used following + the --sgml option, only a single argument, + a FILENAME, is used. This is used to add + the name of a catalog file to an SGML supercatalog, + a file that contains references to other included SGML + catalog files. +

--convert

+ Convert SGML catalog to XML. +

--create

+ Create a new XML catalog. Outputs + to stdout, + ignoring filename unless --noout is + used, in which case it creates a new catalog + file filename. +

--del VALUE(S)

+ Remove entries from CATALOGFILE + matching VALUE(S). The --del + option will not overwrite CATALOGFILE, + outputting to stdout, + unless --noout is used. +

--noout

+ Save output to the named file rather than outputting + to stdout. +

--no-super-update

+ Do not update the SGML super catalog. +

--shell

+ Run a shell allowing interactive queries on catalog + file CATALOGFILE. For the set of available + commands see the section called “SHELL COMMANDS”. +

--sgml

+ Uses SGML super catalogs for --add + and --del options. +

-v, --verbose

Output debugging information.

+ Invoking xmlcatalog non-interactively without a designated action + (imposed with options like --add) will result in a lookup + of the catalog entry for ENTITIES in the + catalog denoted with CATALOGFILE. The + corresponding entries will be output to the command line. This mode of + operation, together with --shell mode and non-modifying + (i.e. without --noout) direct actions, allows for + a special shortcut of the void CATALOGFILE + specification (possibly expressed as "" in the shell + environment) appointing the default system catalog. That simplifies the + handling when its exact location is irrelevant but the respective built-in + still needs to be consulted. +

SHELL COMMANDS

+ Invoking xmlcatalog with + the --shell CATALOGFILE option opens + a command line shell allowing interactive access to the catalog file + identified by CATALOGFILE. Invoking the shell + provides a command line prompt after which the following commands (described in + alphabetical order) can be entered. +

+ add + TYPE + ORIG + REPLACE + +

+ Add an entry to the catalog file. TYPE + indicates the type of entry. Possible types are: public, system, uri, rewriteSystem, rewriteURI, delegatePublic, delegateSystem, delegateURI, nextCatalog. ORIG is the original + reference to be replaced, and REPLACE + is the URI of the replacement entity to be + used. The --add option will not overwrite + CATALOGFILE, outputting + to stdout, unless + --noout is used. The --add will + always take three parameters even if some of the XML + catalog constructs will have only a single argument. +

debug

+ Print debugging statements showing the steps xmlcatalog is executing. +

del VALUE(S)

+ Remove the catalog entry corresponding to VALUE(S). +

dump

Print the current catalog.

exit

Quit the shell.

public PUBLIC-ID

+ Execute a Formal Public Identifier lookup of the catalog entry + for PUBLIC-ID. The corresponding entry will be + output to the command line. +

quiet

Stop printing debugging statements.

system SYSTEM-ID

+ Execute a Formal Public Identifier lookup of the catalog entry + for SYSTEM-ID. The corresponding entry will be + output to the command line. +

ENVIRONMENT

XML_CATALOG_FILES

XML catalog behavior can be changed by redirecting + queries to the user's own set of catalogs. This can be done by setting + the XML_CATALOG_FILES environment variable to a space-separated + list of catalogs. Use percent-encoding to escape spaces or other characters. + An empty variable should deactivate loading the default catalog from + /etc/xml/catalog or, more specifically, + ${sysconfdir}/xml/catalog. +

DIAGNOSTICS

+ xmlcatalog return codes provide information that can be used when + calling it from scripts. +

0

No error

1

Failed to remove an entry from the catalog

2

Failed to save to the catalog, check file permissions

3

Failed to add an entry to the catalog

4

Failed to look up an entry in the catalog

SEE ALSO

libxml(3) +

+ More information can be found at +

+

diff --git a/doc/xmllint.1 b/doc/xmllint.1 index 512dfd6b..a6b9ba6e 100644 --- a/doc/xmllint.1 +++ b/doc/xmllint.1 @@ -1,13 +1,13 @@ '\" t .\" Title: xmllint .\" Author: John Fleck -.\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 08/17/2022 +.\" Generator: DocBook XSL Stylesheets vsnapshot +.\" Date: 04/26/2023 .\" Manual: xmllint Manual .\" Source: libxml2 .\" Language: English .\" -.TH "XMLLINT" "1" "08/17/2022" "libxml2" "xmllint Manual" +.TH "XMLLINT" "1" "04/26/2023" "libxml2" "xmllint Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ xmllint \- command line XML tool .SH "SYNOPSIS" .HP \w'\fBxmllint\fR\ 'u -\fBxmllint\fR [\fB\-\-version\fR | \fB\-\-debug\fR | \fB\-\-shell\fR | \fB\-\-xpath\ "\fR\fB\fIXPath_expression\fR\fR\fB"\fR | \fB\-\-debugent\fR | \fB\-\-copy\fR | \fB\-\-recover\fR | \fB\-\-noent\fR | \fB\-\-noout\fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-htmlout\fR | \fB\-\-nowrap\fR | \fB\-\-valid\fR | \fB\-\-postvalid\fR | \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR | \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR | \fB\-\-timing\fR | \fB\-\-output\ \fR\fB\fIFILE\fR\fR | \fB\-\-repeat\fR | \fB\-\-insert\fR | \fB\-\-compress\fR | \fB\-\-html\fR | \fB\-\-xmlout\fR | \fB\-\-push\fR | \fB\-\-memory\fR | \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR | \fB\-\-nowarning\fR | \fB\-\-noblanks\fR | \fB\-\-nocdata\fR | \fB\-\-format\fR | \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR | \fB\-\-dropdtd\fR | \fB\-\-nsclean\fR | \fB\-\-testIO\fR | \fB\-\-catalogs\fR | \fB\-\-nocatalogs\fR | \fB\-\-auto\fR | \fB\-\-xinclude\fR | \fB\-\-noxincludenode\fR | \fB\-\-loaddtd\fR | \fB\-\-dtdattr\fR | \fB\-\-stream\fR | \fB\-\-walker\fR | \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR | \fB\-\-chkregister\fR | \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-c14n\fR] {\fIXML\-FILE(S)\fR... | \-} +\fBxmllint\fR [\fB\-\-version\fR | \fB\-\-debug\fR | \fB\-\-quiet\fR | \fB\-\-shell\fR | \fB\-\-xpath\ "\fR\fB\fIXPath_expression\fR\fR\fB"\fR | \fB\-\-debugent\fR | \fB\-\-copy\fR | \fB\-\-recover\fR | \fB\-\-nodict\fR | \fB\-\-noent\fR | \fB\-\-noout\fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-htmlout\fR | \fB\-\-nowrap\fR | \fB\-\-valid\fR | \fB\-\-postvalid\fR | \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR | \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR | \fB\-\-timing\fR | \fB\-\-output\ \fR\fB\fIFILE\fR\fR | \fB\-\-repeat\fR | \fB\-\-insert\fR | \fB\-\-compress\fR | \fB\-\-html\fR | \fB\-\-xmlout\fR | \fB\-\-push\fR | \fB\-\-memory\fR | \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR | \fB\-\-nowarning\fR | \fB\-\-noblanks\fR | \fB\-\-nocdata\fR | \fB\-\-format\fR | \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR | \fB\-\-dropdtd\fR | \fB\-\-nsclean\fR | \fB\-\-testIO\fR | \fB\-\-catalogs\fR | \fB\-\-nocatalogs\fR | \fB\-\-auto\fR | \fB\-\-xinclude\fR | \fB\-\-noxincludenode\fR | \fB\-\-loaddtd\fR | \fB\-\-dtdattr\fR | \fB\-\-stream\fR | \fB\-\-walker\fR | \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR | \fB\-\-chkregister\fR | \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-c14n\fR | \fB\-\-pedantic\fR] {\fIXML\-FILE(S)\fR... | \-} .HP \w'\fBxmllint\fR\ 'u \fBxmllint\fR \fB\-\-help\fR .SH "DESCRIPTION" @@ -72,6 +72,8 @@ catalog(s) from XML catalogs starting from /etc/xml/catalog +or, more specifically, +${sysconfdir}/xml/catalog are used by default\&. .RE .PP @@ -226,6 +228,11 @@ Do not use any catalogs\&. Substitute CDATA section by equivalent text nodes\&. .RE .PP +\fB\-\-nodict\fR +.RS 4 +Don\*(Aqt use dictionaries (parser option XML_PARSE_NODICT)\&. Only for debugging\&. +.RE +.PP \fB\-\-noent\fR .RS 4 Substitute entity values for entity references\&. By default, @@ -291,6 +298,11 @@ DTDs or entities\&. Enclose space\-separated lists by quotation marks\&. Used to exercise the pattern recognition engine, which can be used with the reader interface to the parser\&. It allows to select some nodes in the document based on an XPath (subset) expression\&. Used for debugging\&. .RE .PP +\fB\-\-pedantic\fR +.RS 4 +Enable additional warnings\&. +.RE +.PP \fB\-\-postvalid\fR .RS 4 Validate after parsing has completed\&. @@ -301,6 +313,11 @@ Validate after parsing has completed\&. Use the push mode of the parser\&. .RE .PP +\fB\-\-quiet\fR +.RS 4 +Don\*(Aqt print informational messages to stderr\&. +.RE +.PP \fB\-\-recover\fR .RS 4 Output any parsable portions of an invalid document\&. @@ -501,9 +518,7 @@ Write the current node to the given filename\&. SGML catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the \fBSGML_CATALOG_FILES\fR -environment variable to a list of catalogs\&. An empty one should deactivate loading the default -/etc/sgml/catalog -catalog\&. +environment variable to a list of catalogs\&. An empty one should deactivate loading the default catalog\&. .RE .PP \fBXML_CATALOG_FILES\fR @@ -511,9 +526,7 @@ catalog\&. XML catalog behavior can be changed by redirecting queries to the user\*(Aqs own set of catalogs\&. This can be done by setting the \fBXML_CATALOG_FILES\fR -environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default -/etc/xml/catalog -catalog\&. +environment variable to a space\-separated list of catalogs\&. Use percent\-encoding to escape spaces or other characters\&. An empty variable should deactivate loading the default catalog\&. .RE .PP \fBXML_DEBUG_CATALOG\fR diff --git a/doc/xmllint.html b/doc/xmllint.html index 8d4400fe..9e2e7ce6 100644 --- a/doc/xmllint.html +++ b/doc/xmllint.html @@ -1,161 +1,165 @@ -xmllint

Name

xmllint — command line XML tool

Synopsis

xmllint [ --version | --debug | --shell | --xpath "XPath_expression" | --debugent | --copy | --recover | --noent | --noout | --nonet | --path "PATH(S)" | --load-trace | --htmlout | --nowrap | --valid | --postvalid | --dtdvalid URL | --dtdvalidfpi FPI | --timing | --output FILE | --repeat | --insert | --compress | --html | --xmlout | --push | --memory | --maxmem NBBYTES | --nowarning | --noblanks | --nocdata | --format | --encode ENCODING | --dropdtd | --nsclean | --testIO | --catalogs | --nocatalogs | --auto | --xinclude | --noxincludenode | --loaddtd | --dtdattr | --stream | --walker | --pattern PATTERNVALUE | --chkregister | --relaxng SCHEMA | --schema SCHEMA | --c14n ] { XML-FILE(S)... | - }

xmllint --help

DESCRIPTION

- The xmllint program parses one or more XML files, - specified on the command line as XML-FILE - (or the standard input if the filename provided - is - ). It prints various types of - output, depending upon the options selected. It is useful for detecting - errors both in XML code and in - the XML parser itself. -

xmllint is included in libxml(3).

OPTIONS

- xmllint accepts the following options (in alphabetical order): -

--auto

Generate a small document for testing purposes.

--catalogs

- Use the SGML catalog(s) from SGML_CATALOG_FILES. - Otherwise XML catalogs starting - from /etc/xml/catalog are used by default. -

--chkregister

- Turn on node registration. Useful for developers testing libxml(3) node tracking code. -

--compress

- Turn on gzip(1) compression of output. -

--copy

Test the internal copy implementation.

--c14n

- Use the W3C XML Canonicalisation (C14N) to - serialize the result of parsing to stdout. - It keeps comments in the result. -

--dtdvalid URL

- Use the DTD specified by - an URL for validation. -

--dtdvalidfpi FPI

- Use the DTD specified by a Formal Public - Identifier FPI for validation, note that this - will require a catalog exporting that Formal Public Identifier to work. -

--debug

- Parse a file and output an annotated tree of the - in-memory version of the document. -

--debugent

Debug the entities defined in the document.

--dropdtd

Remove DTD from output.

--dtdattr

- Fetch external DTD and populate the tree with - inherited attributes. -

--encode ENCODING

Output in the given encoding. Note that this works for full document not fragments or result from XPath queries.

--format

- Reformat and reindent the output. The XMLLINT_INDENT - environment variable controls the indentation. The default value is two - spaces " "). -

--help

Print out a short usage summary for xmllint.

--html

Use the HTML parser.

--htmlout

- Output results as an HTML file. This - causes xmllint to output the necessary HTML - tags surrounding the result tree output so the results can be - displayed/viewed in a browser. -

--insert

Test for valid insertions.

--loaddtd

Fetch an external DTD.

--load-trace

- Display all the documents loaded during the processing - to stderr. -

--maxmem NNBYTES

- Test the parser memory support. NNBYTES - is the maximum number of bytes the library is allowed to allocate. - This can also be used to make sure batch processing - of XML files will not exhaust the virtual memory - of the server running them. -

--memory

Parse from memory.

--noblanks

Drop ignorable blank spaces.

--nocatalogs

Do not use any catalogs.

--nocdata

Substitute CDATA section by equivalent text nodes.

--noent

- Substitute entity values for entity references. By default, xmllint - leaves entity references in place. -

--nonet

- Do not use the Internet to fetch DTDs or entities. -

--noout

- Suppress output. By default, xmllint outputs the result tree. -

--nowarning

Do not emit warnings from the parser and/or validator.

--nowrap

Do not output HTML doc wrapper.

--noxincludenode

- Do XInclude processing but do not generate XInclude start and end nodes. -

--nsclean

Remove redundant namespace declarations.

--output FILE

- Define a file path where xmllint will save the result of parsing. - Usually the programs build a tree and save it - on stdout, with this option - the result XML instance will be saved onto a file. -

--path "PATH(S)"

- Use the (space- or colon-separated) list of filesystem paths specified - by PATHS to load DTDs or - entities. Enclose space-separated lists by quotation marks. -

--pattern PATTERNVALUE

- Used to exercise the pattern recognition engine, which can be used - with the reader interface to the parser. It allows to select some - nodes in the document based on an XPath (subset) expression. Used - for debugging. -

--postvalid

Validate after parsing has completed.

--push

Use the push mode of the parser.

--recover

Output any parsable portions of an invalid document.

--relaxng SCHEMA

- Use RelaxNG file named SCHEMA - for validation. -

--repeat

Repeat 100 times, for timing or profiling.

--schema SCHEMA

- Use a W3C XML Schema file - named SCHEMA for validation. -

--shell

- Run a navigating shell. Details on available commands in shell mode - are below (see the section called “SHELL COMMANDS”). -

--xpath "XPath_expression"

- Run an XPath expression given as argument and print the - result. In case of a nodeset result, each node in the - node set is serialized in full in the output. In case - of an empty node set the "XPath set is empty" result - will be shown and an error exit code will be returned. -

--stream

- Use streaming API - useful when used in combination - with --relaxng or --valid options - for validation of files that are too large to be held in memory. -

--testIO

Test user input/output support.

--timing

- Output information about the time it takes xmllint to perform the - various steps. -

--valid

- Determine if the document is a valid instance of the included - Document Type Definition (DTD). - A DTD to be validated against also can be - specified at the command line using the --dtdvalid - option. By default, xmllint also checks to determine if the - document is well-formed. -

--version

- Display the version of libxml(3) used. -

--walker

- Test the walker module, which is a reader interface but for a - document tree, instead of using the reader API on - an unparsed document it works on an existing in-memory tree. Used for - debugging. -

--xinclude

Do XInclude processing.

--xmlout

- Used in conjunction with --html. Usually - when HTML is parsed the document is saved with - the HTML serializer. But with this option the - resulting document is saved with the XML - serializer. This is primarily used to - generate XHTML from HTML input. -

SHELL COMMANDS

- xmllint offers an interactive shell mode invoked with - the --shell command. Available commands in shell mode - include (in alphabetical order): -

base

Display XML base of the node.

bye

Leave the shell.

cat NODE

Display the given node or the current one.

cd PATH

- Change the current node to the given path (if unique) or root if no - argument is given. -

dir PATH

- Dumps information about the node (namespace, attributes, content). -

du PATH

- Show the structure of the subtree under the given path or the current node. -

exit

Leave the shell.

help

Show this help.

free

Display memory usage.

load FILENAME

Load a new document with the given filename.

ls PATH

List contents of the given path or the current directory.

pwd

Display the path to the current node.

quit

Leave the shell.

save FILENAME

- Save the current document to the given filename or to the original name. -

validate

Check the document for errors.

write FILENAME

Write the current node to the given filename.

ENVIRONMENT

SGML_CATALOG_FILES

SGML catalog behavior can be changed by redirecting - queries to the user's own set of catalogs. This can be done by setting - the SGML_CATALOG_FILES environment variable to a list - of catalogs. An empty one should deactivate loading the - default /etc/sgml/catalog catalog. -

XML_CATALOG_FILES

XML catalog behavior can be changed by redirecting - queries to the user's own set of catalogs. This can be done by setting - the XML_CATALOG_FILES environment variable to a space-separated - list of catalogs. Use percent-encoding to escape spaces or other characters. - An empty variable should deactivate loading the default /etc/xml/catalog catalog. -

XML_DEBUG_CATALOG

Setting the environment variable XML_DEBUG_CATALOG - to non-zero using the export - command outputs debugging information related to catalog operations. -

XMLLINT_INDENT

Setting the environment variable XMLLINT_INDENT - controls the indentation. The default value is two spaces " ". -

DIAGNOSTICS

- xmllint return codes provide information that can be used when - calling it from scripts. -

0

No error

1

Unclassified

2

Error in DTD

3

Validation error

4

Validation error

5

Error in schema compilation

6

Error writing output

7

- Error in pattern (generated when --pattern option is used) -

8

- Error in Reader registration (generated - when --chkregister option is used) -

9

Out of memory error

10

XPath evaluation error

SEE ALSO

libxml(3) -

- More information can be found at -

-

+xmllint

Name

xmllint — command line XML tool

Synopsis

xmllint [ --version | --debug | --quiet | --shell | --xpath "XPath_expression" | --debugent | --copy | --recover | --nodict | --noent | --noout | --nonet | --path "PATH(S)" | --load-trace | --htmlout | --nowrap | --valid | --postvalid | --dtdvalid URL | --dtdvalidfpi FPI | --timing | --output FILE | --repeat | --insert | --compress | --html | --xmlout | --push | --memory | --maxmem NBBYTES | --nowarning | --noblanks | --nocdata | --format | --encode ENCODING | --dropdtd | --nsclean | --testIO | --catalogs | --nocatalogs | --auto | --xinclude | --noxincludenode | --loaddtd | --dtdattr | --stream | --walker | --pattern PATTERNVALUE | --chkregister | --relaxng SCHEMA | --schema SCHEMA | --c14n | --pedantic ] { XML-FILE(S)... | - }

xmllint --help

DESCRIPTION

+ The xmllint program parses one or more XML files, + specified on the command line as XML-FILE + (or the standard input if the filename provided + is - ). It prints various types of + output, depending upon the options selected. It is useful for detecting + errors both in XML code and in + the XML parser itself. +

xmllint is included in libxml(3).

OPTIONS

+ xmllint accepts the following options (in alphabetical order): +

--auto

Generate a small document for testing purposes.

--catalogs

+ Use the SGML catalog(s) from SGML_CATALOG_FILES. + Otherwise XML catalogs starting + from /etc/xml/catalog or, more specifically, + ${sysconfdir}/xml/catalog are used by default. +

--chkregister

+ Turn on node registration. Useful for developers testing libxml(3) node tracking code. +

--compress

+ Turn on gzip(1) compression of output. +

--copy

Test the internal copy implementation.

--c14n

+ Use the W3C XML Canonicalisation (C14N) to + serialize the result of parsing to stdout. + It keeps comments in the result. +

--dtdvalid URL

+ Use the DTD specified by + an URL for validation. +

--dtdvalidfpi FPI

+ Use the DTD specified by a Formal Public + Identifier FPI for validation, note that this + will require a catalog exporting that Formal Public Identifier to work. +

--debug

+ Parse a file and output an annotated tree of the + in-memory version of the document. +

--debugent

Debug the entities defined in the document.

--dropdtd

Remove DTD from output.

--dtdattr

+ Fetch external DTD and populate the tree with + inherited attributes. +

--encode ENCODING

Output in the given encoding. Note that this works for full document not fragments or result from XPath queries.

--format

+ Reformat and reindent the output. The XMLLINT_INDENT + environment variable controls the indentation. The default value is two + spaces " "). +

--help

Print out a short usage summary for xmllint.

--html

Use the HTML parser.

--htmlout

+ Output results as an HTML file. This + causes xmllint to output the necessary HTML + tags surrounding the result tree output so the results can be + displayed/viewed in a browser. +

--insert

Test for valid insertions.

--loaddtd

Fetch an external DTD.

--load-trace

+ Display all the documents loaded during the processing + to stderr. +

--maxmem NNBYTES

+ Test the parser memory support. NNBYTES + is the maximum number of bytes the library is allowed to allocate. + This can also be used to make sure batch processing + of XML files will not exhaust the virtual memory + of the server running them. +

--memory

Parse from memory.

--noblanks

Drop ignorable blank spaces.

--nocatalogs

Do not use any catalogs.

--nocdata

Substitute CDATA section by equivalent text nodes.

--nodict

+ Don't use dictionaries (parser option XML_PARSE_NODICT). + Only for debugging. +

--noent

+ Substitute entity values for entity references. By default, xmllint + leaves entity references in place. +

--nonet

+ Do not use the Internet to fetch DTDs or entities. +

--noout

+ Suppress output. By default, xmllint outputs the result tree. +

--nowarning

Do not emit warnings from the parser and/or validator.

--nowrap

Do not output HTML doc wrapper.

--noxincludenode

+ Do XInclude processing but do not generate XInclude start and end nodes. +

--nsclean

Remove redundant namespace declarations.

--output FILE

+ Define a file path where xmllint will save the result of parsing. + Usually the programs build a tree and save it + on stdout, with this option + the result XML instance will be saved onto a file. +

--path "PATH(S)"

+ Use the (space- or colon-separated) list of filesystem paths specified + by PATHS to load DTDs or + entities. Enclose space-separated lists by quotation marks. +

--pattern PATTERNVALUE

+ Used to exercise the pattern recognition engine, which can be used + with the reader interface to the parser. It allows to select some + nodes in the document based on an XPath (subset) expression. Used + for debugging. +

--pedantic

Enable additional warnings.

--postvalid

Validate after parsing has completed.

--push

Use the push mode of the parser.

--quiet

Don't print informational messages to stderr.

--recover

Output any parsable portions of an invalid document.

--relaxng SCHEMA

+ Use RelaxNG file named SCHEMA + for validation. +

--repeat

Repeat 100 times, for timing or profiling.

--schema SCHEMA

+ Use a W3C XML Schema file + named SCHEMA for validation. +

--shell

+ Run a navigating shell. Details on available commands in shell mode + are below (see the section called “SHELL COMMANDS”). +

--xpath "XPath_expression"

+ Run an XPath expression given as argument and print the + result. In case of a nodeset result, each node in the + node set is serialized in full in the output. In case + of an empty node set the "XPath set is empty" result + will be shown and an error exit code will be returned. +

--stream

+ Use streaming API - useful when used in combination + with --relaxng or --valid options + for validation of files that are too large to be held in memory. +

--testIO

Test user input/output support.

--timing

+ Output information about the time it takes xmllint to perform the + various steps. +

--valid

+ Determine if the document is a valid instance of the included + Document Type Definition (DTD). + A DTD to be validated against also can be + specified at the command line using the --dtdvalid + option. By default, xmllint also checks to determine if the + document is well-formed. +

--version

+ Display the version of libxml(3) used. +

--walker

+ Test the walker module, which is a reader interface but for a + document tree, instead of using the reader API on + an unparsed document it works on an existing in-memory tree. Used for + debugging. +

--xinclude

Do XInclude processing.

--xmlout

+ Used in conjunction with --html. Usually + when HTML is parsed the document is saved with + the HTML serializer. But with this option the + resulting document is saved with the XML + serializer. This is primarily used to + generate XHTML from HTML input. +

SHELL COMMANDS

+ xmllint offers an interactive shell mode invoked with + the --shell command. Available commands in shell mode + include (in alphabetical order): +

base

Display XML base of the node.

bye

Leave the shell.

cat NODE

Display the given node or the current one.

cd PATH

+ Change the current node to the given path (if unique) or root if no + argument is given. +

dir PATH

+ Dumps information about the node (namespace, attributes, content). +

du PATH

+ Show the structure of the subtree under the given path or the current node. +

exit

Leave the shell.

help

Show this help.

free

Display memory usage.

load FILENAME

Load a new document with the given filename.

ls PATH

List contents of the given path or the current directory.

pwd

Display the path to the current node.

quit

Leave the shell.

save FILENAME

+ Save the current document to the given filename or to the original name. +

validate

Check the document for errors.

write FILENAME

Write the current node to the given filename.

ENVIRONMENT

SGML_CATALOG_FILES

SGML catalog behavior can be changed by redirecting + queries to the user's own set of catalogs. This can be done by setting + the SGML_CATALOG_FILES environment variable to a list + of catalogs. An empty one should deactivate loading the + default catalog. +

XML_CATALOG_FILES

XML catalog behavior can be changed by redirecting + queries to the user's own set of catalogs. This can be done by setting + the XML_CATALOG_FILES environment variable to a space-separated + list of catalogs. Use percent-encoding to escape spaces or other characters. + An empty variable should deactivate loading the default catalog. +

XML_DEBUG_CATALOG

Setting the environment variable XML_DEBUG_CATALOG + to non-zero using the export + command outputs debugging information related to catalog operations. +

XMLLINT_INDENT

Setting the environment variable XMLLINT_INDENT + controls the indentation. The default value is two spaces " ". +

DIAGNOSTICS

+ xmllint return codes provide information that can be used when + calling it from scripts. +

0

No error

1

Unclassified

2

Error in DTD

3

Validation error

4

Validation error

5

Error in schema compilation

6

Error writing output

7

+ Error in pattern (generated when --pattern option is used) +

8

+ Error in Reader registration (generated + when --chkregister option is used) +

9

Out of memory error

10

XPath evaluation error

SEE ALSO

libxml(3) +

+ More information can be found at +

+

diff --git a/testapi.c b/testapi.c index 12c887f1..ab22e726 100644 --- a/testapi.c +++ b/testapi.c @@ -25770,23 +25770,23 @@ test_xmlValidateElement(void) { int n_ctxt; xmlDocPtr doc; /* a document instance */ int n_doc; - xmlNodePtr elem; /* an element instance */ - int n_elem; + xmlNodePtr root; /* */ + int n_root; for (n_ctxt = 0;n_ctxt < gen_nb_xmlValidCtxtPtr;n_ctxt++) { for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) { - for (n_elem = 0;n_elem < gen_nb_xmlNodePtr;n_elem++) { + for (n_root = 0;n_root < gen_nb_xmlNodePtr;n_root++) { mem_base = xmlMemBlocks(); ctxt = gen_xmlValidCtxtPtr(n_ctxt, 0); doc = gen_xmlDocPtr(n_doc, 1); - elem = gen_xmlNodePtr(n_elem, 2); + root = gen_xmlNodePtr(n_root, 2); - ret_val = xmlValidateElement(ctxt, doc, elem); + ret_val = xmlValidateElement(ctxt, doc, root); desret_int(ret_val); call_tests++; des_xmlValidCtxtPtr(n_ctxt, ctxt, 0); des_xmlDocPtr(n_doc, doc, 1); - des_xmlNodePtr(n_elem, elem, 2); + des_xmlNodePtr(n_root, root, 2); xmlResetLastError(); if (mem_base != xmlMemBlocks()) { printf("Leak of %d blocks found in xmlValidateElement", @@ -25794,7 +25794,7 @@ test_xmlValidateElement(void) { test_ret++; printf(" %d", n_ctxt); printf(" %d", n_doc); - printf(" %d", n_elem); + printf(" %d", n_root); printf("\n"); } } @@ -34695,9 +34695,11 @@ test_xmlSchemaInitTypes(void) { int test_ret = 0; #if defined(LIBXML_SCHEMAS_ENABLED) + int ret_val; - xmlSchemaInitTypes(); + ret_val = xmlSchemaInitTypes(); + desret_int(ret_val); call_tests++; xmlResetLastError(); function_tests++;