From 28b7b4bd80e0c4b9b04e0f68f0cff563c6560cc3 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 30 Aug 2008 08:19:02 +0000 Subject: regenerated Daniel * doc/* testapi.c: regenerated Daniel svn path=/trunk/; revision=3786 --- doc/APIchunk17.html | 1 + doc/APIfiles.html | 1 + doc/APIsymbols.html | 1 + doc/apibuild.py | 1 + doc/devhelp/libxml2-parserInternals.html | 10 +++++----- doc/devhelp/libxml2-tree.html | 1 + doc/devhelp/libxml2-xmlerror.html | 1 + doc/devhelp/libxml2.devhelp | 1 + doc/examples/examples.xml | 14 +++++++------- doc/html/libxml-parserInternals.html | 10 +++++----- doc/html/libxml-tree.html | 1 + doc/html/libxml-xmlerror.html | 1 + doc/libxml2-api.xml | 13 ++++++++----- doc/libxml2-refs.xml | 4 ++++ 14 files changed, 38 insertions(+), 22 deletions(-) (limited to 'doc') diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index b0b80aaa..633240ee 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -202,6 +202,7 @@ A:link, A:visited, A:active { text-decoration: underline } nodePush
xmlByteConsumed
xmlParserFindNodeInfoIndex
+xmlPushInput
xmlStrsub
xmlTextReaderByteConsumed
xmlTextReaderGetAttributeNo
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 3bbc1646..4dfc3b73 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -1848,6 +1848,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_DTD_CONTENT_MODEL
XML_DTD_CONTENT_NOT_DETERMINIST
XML_DTD_DIFFERENT_PREFIX
+XML_DTD_DUP_TOKEN
XML_DTD_ELEM_DEFAULT_NAMESPACE
XML_DTD_ELEM_NAMESPACE
XML_DTD_ELEM_REDEFINED
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 7963ef13..ab0c8b64 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -257,6 +257,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_DTD_CONTENT_MODEL
XML_DTD_CONTENT_NOT_DETERMINIST
XML_DTD_DIFFERENT_PREFIX
+XML_DTD_DUP_TOKEN
XML_DTD_ELEM_DEFAULT_NAMESPACE
XML_DTD_ELEM_NAMESPACE
XML_DTD_ELEM_REDEFINED
diff --git a/doc/apibuild.py b/doc/apibuild.py index 505a0bc3..3c380618 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -51,6 +51,7 @@ ignored_files = { "tst.c": "not part of the library", "test.c": "not part of the library", "testdso.c": "test for dynamid shared libraries", + "testrecurse.c": "test for entities recursions", } ignored_words = { diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html index 14584275..cdae32e4 100644 --- a/doc/devhelp/libxml2-parserInternals.html +++ b/doc/devhelp/libxml2-parserInternals.html @@ -139,7 +139,7 @@ int xmlParseElementContentDecl (xmlParserInputPtr inputPop (xmlParserCtxtPtr ctxt); xmlChar xmlPopInput (xmlParserCtxtPtr ctxt); xmlChar * xmlParsePubidLiteral (xmlParserCtxtPtr ctxt); -void xmlPushInput (xmlParserCtxtPtr ctxt,
xmlParserInputPtr input); +int xmlPushInput (xmlParserCtxtPtr ctxt,
xmlParserInputPtr input); xmlChar * xmlParseEntityValue (xmlParserCtxtPtr ctxt,
xmlChar ** orig); xmlChar * xmlDecodeEntities (xmlParserCtxtPtr ctxt,
int len,
int what,
xmlChar end,
xmlChar end2,
xmlChar end3); xmlChar * xmlParseVersionNum (xmlParserCtxtPtr ctxt); @@ -316,7 +316,7 @@ void xmlParseEntityDecl (

inputPush ()

int	inputPush			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value)

Pushes a new parser input on top of the input stack

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

namePop ()

const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)

Pops the top element name from the name stack

@@ -332,7 +332,7 @@ void xmlParseEntityDecl (

nodePush ()

int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value)

Pushes a new element node on top of the node stack

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

xmlCheckLanguageID ()

int	xmlCheckLanguageID		(const xmlChar * lang)

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])+

@@ -618,9 +618,9 @@ void xmlParseEntityDecl (
ctxt:an XML parser context
Returns:the current xmlChar in the parser context
-

xmlPushInput ()

void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

+        
xmlPushInput ()
int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

 
xmlPushInput: switch to a new input stream which is stacked on top of the previous one(s).

-
ctxt:an XML parser context
input:an XML parser input fragment (entity, XML fragment ...).

+
ctxt:an XML parser context
input:an XML parser input fragment (entity, XML fragment ...).
Returns:-1 in case of error or the index in the input stack

xmlScanName ()

xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

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

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index f822935b..162c1ed2 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -774,6 +774,7 @@ void xmlFreeNsList (xmlError lastError xmlParserMode parseMode : the parser mode unsigned long nbentities : number of entities references + unsigned long sizeentities : size of parsed entities } xmlParserCtxt;

diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index 95b6ca8d..cf445dd0 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -296,6 +296,7 @@ void xmlResetError (XML_DTD_STANDALONE_DEFAULTED = 538 /* 538 */ XML_DTD_XMLID_VALUE = 539 /* 539 */ XML_DTD_XMLID_TYPE = 540 /* 540 */ + XML_DTD_DUP_TOKEN = 541 /* 541 */ XML_HTML_STRUCURE_ERROR = 800 XML_HTML_UNKNOWN_TAG = 801 /* 801 */ XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000 diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index 880f1250..fcb510a0 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -442,6 +442,7 @@ + diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml index 5f730943..a237a0ee 100644 --- a/doc/examples/examples.xml +++ b/doc/examples/examples.xml @@ -280,13 +280,13 @@ <libxml/xmlreader.h> - - - - - - - + + + + + + + diff --git a/doc/html/libxml-parserInternals.html b/doc/html/libxml-parserInternals.html index d26d52f3..ad1fb8e5 100644 --- a/doc/html/libxml-parserInternals.html +++ b/doc/html/libxml-parserInternals.html @@ -92,7 +92,7 @@ void xmlEntityReferenceFunc (void xmlParserHandleReference (xmlParserCtxtPtr ctxt) 
void	xmlParserInputShrink		(xmlParserInputPtr in)
xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt)
-
void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)
+
int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)
xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)
void	xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func)
int	xmlSkipBlankChars		(xmlParserCtxtPtr ctxt)
@@ -140,7 +140,7 @@ void xmlEntityReferenceFunc (
ctxt:an XML parser context
Returns:the input just removed

Function: inputPush

int	inputPush			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr value)

Pushes a new parser input on top of the input stack

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

Function: namePop

const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)

+
ctxt:an XML parser context
value:the parser input
Returns:-1 in case of error, the index in the stack otherwise
Function: namePop
const xmlChar *	namePop			(xmlParserCtxtPtr ctxt)

 
Pops the top element name from the name stack

 
ctxt:an XML parser context
Returns:the name just removed
Function: namePush
int	namePush			(xmlParserCtxtPtr ctxt, 
					 const xmlChar * value)

 
Pushes a new element name on top of the name stack

@@ -148,7 +148,7 @@ void	xmlEntityReferenceFunc		(
ctxt:an XML parser context
Returns:the node just removed
Function: nodePush
int	nodePush			(xmlParserCtxtPtr ctxt, 
					 xmlNodePtr value)

 
Pushes a new element node on top of the node stack

-
ctxt:an XML parser context
value:the element node
Returns:0 in case of error, the index in the stack otherwise
Function: xmlCheckLanguageID
int	xmlCheckLanguageID		(const xmlChar * lang)

+
ctxt:an XML parser context
value:the element node
Returns:-1 in case of error, the index in the stack otherwise
Function: 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])+

 
lang:pointer to the string value
Returns:1 if correct 0 otherwise
Function: xmlCopyChar
int	xmlCopyChar			(int len, 
					 xmlChar * out, 
					 int val)

 
append the char value in the array

@@ -293,9 +293,9 @@ void	xmlEntityReferenceFunc		(xmlEntityP
 
This function removes used input for the parser.

 
in:an XML parser input
Function: xmlPopInput
xmlChar	xmlPopInput			(xmlParserCtxtPtr ctxt)

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

-
ctxt:an XML parser context
Returns:the current xmlChar in the parser context
Function: xmlPushInput
void	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

+
ctxt:an XML parser context
Returns:the current xmlChar in the parser context
Function: xmlPushInput
int	xmlPushInput			(xmlParserCtxtPtr ctxt, 
					 xmlParserInputPtr input)

 
xmlPushInput: switch to a new input stream which is stacked on top of the previous one(s).

-
ctxt:an XML parser context
input:an XML parser input fragment (entity, XML fragment ...).
Function: xmlScanName
xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

+
ctxt:an XML parser context
input:an XML parser input fragment (entity, XML fragment ...).
Returns:-1 in case of error or the index in the input stack
Function: xmlScanName
xmlChar *	xmlScanName		(xmlParserCtxtPtr ctxt)

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

 
ctxt:an XML parser context
Returns:the Name parsed or NULL
Function: xmlSetEntityReferenceFunc
void	xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func)

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

diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 3b69077b..9e85690c 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -556,6 +556,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     xmlError	lastError
     xmlParserMode	parseMode	: the parser mode
     unsigned long	nbentities	: number of entities references
+    unsigned long	sizeentities	: size of parsed entities
 }
Structure xmlParserInput
Structure xmlParserInput
struct _xmlParserInput {
     xmlParserInputBufferPtr	buf	: UTF-8 encoded buffer
     const char *	filename	: The file analyzed, if any
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index 8cdd73ab..74af5ed4 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -246,6 +246,7 @@ void	xmlStructuredErrorFunc		(void * userD
     XML_DTD_STANDALONE_DEFAULTED = 538 : 538
     XML_DTD_XMLID_VALUE = 539 : 539
     XML_DTD_XMLID_TYPE = 540 : 540
+    XML_DTD_DUP_TOKEN = 541 : 541
     XML_HTML_STRUCURE_ERROR = 800
     XML_HTML_UNKNOWN_TAG = 801 : 801
     XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 81974e79..14526bb8 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -2035,7 +2035,7 @@
      
      
      
-     
+     
      
      
      
@@ -2536,6 +2536,7 @@
      
      
      
+     
      
      
      
@@ -2572,7 +2573,7 @@
      
      
      
-     
+     
      
      
      
@@ -4704,6 +4705,7 @@ and not by parsing an instance'/>
     
     
     
+    
     
     
     
@@ -6295,6 +6297,7 @@ actually an xmlCharEncoding'/>
       
       
       
+      
     
     
     
@@ -7767,7 +7770,7 @@ Could we use @subtypes for this?'/>
     
     
       Pushes a new parser input on top of the input stack
-      
+      
       
       
     
@@ -7833,7 +7836,7 @@ Could we use @subtypes for this?'/>
     
     
       Pushes a new element node on top of the node stack
-      
+      
       
       
     
@@ -12371,7 +12374,7 @@ Could we use @subtypes for this?'/>
     
     
       xmlPushInput: switch to a new input stream which is stacked on top of the previous one(s).
-      
+      
       
       
     
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index a8b58f72..170e1b19 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -251,6 +251,7 @@
     
     
     
+    
     
     
     
@@ -3786,6 +3787,7 @@
       
       
       
+      
       
       
       
@@ -12449,6 +12451,7 @@
       
       
       
+      
       
       
       
@@ -23557,6 +23560,7 @@
           
           
           
+          
           
           
           
-- 
cgit v1.2.3