diff options
| -rw-r--r-- | doc/APIchunk10.html | 1 | ||||
| -rw-r--r-- | doc/APIchunk11.html | 1 | ||||
| -rw-r--r-- | doc/APIchunk16.html | 1 | ||||
| -rw-r--r-- | doc/APIfiles.html | 1 | ||||
| -rw-r--r-- | doc/APIsymbols.html | 1 | ||||
| -rw-r--r-- | doc/checkapisym.xsl | 4 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-globals.html | 5 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-parser.html | 4 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-tree.html | 2 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-xmlreader.html | 14 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-xmlstring.html | 4 | ||||
| -rw-r--r-- | doc/devhelp/libxml2.devhelp | 1 | ||||
| -rw-r--r-- | doc/html/libxml-globals.html | 1 | ||||
| -rw-r--r-- | doc/html/libxml-tree.html | 2 | ||||
| -rw-r--r-- | doc/libxml2-api.xml | 8 | ||||
| -rw-r--r-- | doc/libxml2-refs.xml | 8 | ||||
| -rw-r--r-- | doc/symbols.xml | 3 | ||||
| -rw-r--r-- | libxml2.syms | 7 | ||||
| -rw-r--r-- | win32/libxml2.def.src | 1 |
19 files changed, 53 insertions, 16 deletions
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 591b5e17..cfab238a 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -253,6 +253,7 @@ A:link, A:visited, A:active { text-decoration: underline } </dd><dt>afraid</dt><dd><a href="html/libxml-entities.html#xmlEncodeEntities">xmlEncodeEntities</a><br /> </dd><dt>after</dt><dd><a href="html/libxml-HTMLparser.html#UTF8ToHtml">UTF8ToHtml</a><br /> <a href="html/libxml-encoding.html#UTF8Toisolat1">UTF8Toisolat1</a><br /> +<a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br /> <a href="html/libxml-DOCBparser.html#docbEncodeEntities">docbEncodeEntities</a><br /> <a href="html/libxml-HTMLparser.html#htmlEncodeEntities">htmlEncodeEntities</a><br /> <a href="html/libxml-encoding.html#isolat1ToUTF8">isolat1ToUTF8</a><br /> diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 781d7cc9..99fce804 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -187,6 +187,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlmemory.html#xmlMemBlocks">xmlMemBlocks</a><br /> <a href="html/libxml-xmlmemory.html#xmlMemDisplay">xmlMemDisplay</a><br /> <a href="html/libxml-xmlmemory.html#xmlMemoryDump">xmlMemoryDump</a><br /> +</dd><dt>body</dt><dd><a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br /> </dd><dt>book1</dt><dd><a href="html/libxml-uri.html#xmlBuildRelativeURI">xmlBuildRelativeURI</a><br /> </dd><dt>bool</dt><dd><a href="html/libxml-debugXML.html#xmlBoolToText">xmlBoolToText</a><br /> </dd><dt>both</dt><dd><a href="html/libxml-tree.html#xmlBufferFree">xmlBufferFree</a><br /> diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index c794e34a..ea2d9483 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -234,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlstring.html#xmlStrstr">xmlStrstr</a><br /> <a href="html/libxml-xmlstring.html#xmlStrsub">xmlStrsub</a><br /> </dd><dt>head</dt><dd><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD">XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD</a><br /> +<a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br /> </dd><dt>header</dt><dd><a href="html/libxml-nanohttp.html#xmlNanoHTTPAuthHeader">xmlNanoHTTPAuthHeader</a><br /> <a href="html/libxml-nanohttp.html#xmlNanoHTTPContentLength">xmlNanoHTTPContentLength</a><br /> <a href="html/libxml-nanohttp.html#xmlNanoHTTPRedir">xmlNanoHTTPRedir</a><br /> diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 5049153b..d8bd3589 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -454,6 +454,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-globals.html#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a><br /> <a href="html/libxml-globals.html#xmlSaveNoEmptyTags">xmlSaveNoEmptyTags</a><br /> <a href="html/libxml-globals.html#xmlStructuredError">xmlStructuredError</a><br /> +<a href="html/libxml-globals.html#xmlStructuredErrorContext">xmlStructuredErrorContext</a><br /> <a href="html/libxml-globals.html#xmlSubstituteEntitiesDefaultValue">xmlSubstituteEntitiesDefaultValue</a><br /> <a href="html/libxml-globals.html#xmlThrDefBufferAllocScheme">xmlThrDefBufferAllocScheme</a><br /> <a href="html/libxml-globals.html#xmlThrDefDefaultBufferSize">xmlThrDefDefaultBufferSize</a><br /> diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index f47d68ba..8769ec9b 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -2903,6 +2903,7 @@ A:link, A:visited, A:active { text-decoration: underline } <a href="html/libxml-xmlstring.html#xmlStrstr">xmlStrstr</a><br /> <a href="html/libxml-xmlstring.html#xmlStrsub">xmlStrsub</a><br /> <a href="html/libxml-globals.html#xmlStructuredError">xmlStructuredError</a><br /> +<a href="html/libxml-globals.html#xmlStructuredErrorContext">xmlStructuredErrorContext</a><br /> <a href="html/libxml-xmlerror.html#xmlStructuredErrorFunc">xmlStructuredErrorFunc</a><br /> <a href="html/libxml-parser.html#xmlSubstituteEntitiesDefault">xmlSubstituteEntitiesDefault</a><br /> <a href="html/libxml-globals.html#xmlSubstituteEntitiesDefaultValue">xmlSubstituteEntitiesDefaultValue</a><br /> diff --git a/doc/checkapisym.xsl b/doc/checkapisym.xsl index 31a050d7..85913932 100644 --- a/doc/checkapisym.xsl +++ b/doc/checkapisym.xsl @@ -19,7 +19,7 @@ <xsl:message terminate="no"> <xsl:text>Found </xsl:text> <xsl:value-of select="count(/api/symbols/function)"/> - <xsl:text>functions</xsl:text> + <xsl:text> functions</xsl:text> </xsl:message> <xsl:message terminate="no"> <xsl:text>Looking for variables in symbols.xml</xsl:text> @@ -28,7 +28,7 @@ <xsl:message terminate="no"> <xsl:text>Found </xsl:text> <xsl:value-of select="count(/api/symbols/variable)"/> - <xsl:text>variables</xsl:text> + <xsl:text> variables</xsl:text> </xsl:message> </xsl:template> diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html index 449049ef..415492b1 100644 --- a/doc/devhelp/libxml2-globals.html +++ b/doc/devhelp/libxml2-globals.html @@ -116,6 +116,7 @@ const char * <a href="#xmlThrDefTreeIndentString">xmlThrDefTreeIndentString</a> <a href="libxml2-xmlerror.html#xmlError">xmlError</a> xmlLastError <a href="libxml2-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> xmlParserInputBufferCreateFilenameValue <a href="libxml2-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> xmlOutputBufferCreateFilenameValue + void * xmlStructuredErrorContext } xmlGlobalState; </pre><p/> </div> @@ -260,6 +261,10 @@ const char * <a href="#xmlThrDefTreeIndentString">xmlThrDefTreeIndentString</a> </pre><p/> </div> <hr/> + <div class="refsect2" lang="en"><h3><a name="xmlStructuredErrorContext">Variable </a>xmlStructuredErrorContext</h3><pre class="programlisting">void * xmlStructuredErrorContext; +</pre><p/> +</div> + <hr/> <div class="refsect2" lang="en"><h3><a name="xmlSubstituteEntitiesDefaultValue">Variable </a>xmlSubstituteEntitiesDefaultValue</h3><pre class="programlisting">int xmlSubstituteEntitiesDefaultValue; </pre><p/> </div> diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index 3effee76..e4e2d764 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -97,7 +97,7 @@ int <a href="#xmlGetFeature">xmlGetFeature</a> (<a href="libxml2-tree.html#xml <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> <a href="#xmlIOParseDTD">xmlIOParseDTD</a> (<a href="libxml2-tree.html#xmlSAXHandlerPtr">xmlSAXHandlerPtr</a> sax, <br/> <a href="libxml2-tree.html#xmlParserInputBufferPtr">xmlParserInputBufferPtr</a> input, <br/> <a href="libxml2-encoding.html#xmlCharEncoding">xmlCharEncoding</a> enc); void <a href="#xmlFreeParserCtxt">xmlFreeParserCtxt</a> (<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt); <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> <a href="#xmlParseDTD">xmlParseDTD</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * ExternalID, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * SystemID); -<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> <a href="#xmlRecoverDoc">xmlRecoverDoc</a> (<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur); +<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> <a href="#xmlRecoverDoc">xmlRecoverDoc</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur); typedef void <a href="#commentSAXFunc">commentSAXFunc</a> (void * ctx, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value); int <a href="#xmlInitParserCtxt">xmlInitParserCtxt</a> (<a href="libxml2-tree.html#xmlParserCtxtPtr">xmlParserCtxtPtr</a> ctxt); typedef void <a href="#attributeSAXFunc">attributeSAXFunc</a> (void * ctx, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value); @@ -688,7 +688,7 @@ void <a href="#xmlSetExternalEntityLoader">xmlSetExternalEntityLoader</a> (<a hr </pre><p>parse an XML in-memory document and build a tree.</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>buffer</tt></i>:</span></td><td>a pointer to a char array</td></tr><tr><td><span class="term"><i><tt>size</tt></i>:</span></td><td>the size of the array</td></tr><tr><td><span class="term"><i><tt>URL</tt></i>:</span></td><td>the base URL to use for the document</td></tr><tr><td><span class="term"><i><tt>encoding</tt></i>:</span></td><td>the document encoding, or NULL</td></tr><tr><td><span class="term"><i><tt>options</tt></i>:</span></td><td>a combination of <a href="libxml2-parser.html#xmlParserOption">xmlParserOption</a></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resulting document tree</td></tr></tbody></table></div></div> <hr/> - <div class="refsect2" lang="en"><h3><a name="xmlRecoverDoc"/>xmlRecoverDoc ()</h3><pre class="programlisting"><a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> xmlRecoverDoc (<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur)<br/> + <div class="refsect2" lang="en"><h3><a name="xmlRecoverDoc"/>xmlRecoverDoc ()</h3><pre class="programlisting"><a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> xmlRecoverDoc (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur)<br/> </pre><p>parse an XML in-memory document and build a tree. In the case the document is not Well Formed, a attempt to build a tree is tried anyway</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>cur</tt></i>:</span></td><td>a pointer to an array of <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resulting document tree or NULL in case of failure</td></tr></tbody></table></div></div> <hr/> diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index 6e709900..c3702036 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -707,7 +707,7 @@ void <a href="#xmlFreeNsList">xmlFreeNsList</a> (<a href="libxml2-tree.html#xm const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * version : the XML version string const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * encoding : the declared encoding, if any int standalone : standalone document - int html : an HTML(1)/Docbook(2) document Input stream stack + int html : an HTML(1)/Docbook(2) document * 3 is HTML after <head> * 10 is HTML <a href="libxml2-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input : Current input stream int inputNr : Number of current input streams int inputMax : Max number of input streams diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html index 2466e752..0ecf704b 100644 --- a/doc/devhelp/libxml2-xmlreader.html +++ b/doc/devhelp/libxml2-xmlreader.html @@ -280,7 +280,7 @@ The content of this structure is not made public by the API. <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderBaseUri"/>xmlTextReaderBaseUri ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderBaseUri (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>The base URI of the node.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the base URI or NULL if not available</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the base URI or NULL if not available, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderByteConsumed"/>xmlTextReaderByteConsumed ()</h3><pre class="programlisting">long xmlTextReaderByteConsumed (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information.</p> @@ -404,11 +404,11 @@ The content of this structure is not made public by the API. <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderLocalName"/>xmlTextReaderLocalName ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderLocalName (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>The local name of the node.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the local name or NULL if not available</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the local name or NULL if not available, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderLocatorBaseURI"/>xmlTextReaderLocatorBaseURI ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderLocatorBaseURI (<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator)<br/> </pre><p>Obtain the base URI for the given locator.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>locator</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the base URI or NULL in case of error.</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>locator</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the base URI or NULL in case of error, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderLocatorLineNumber"/>xmlTextReaderLocatorLineNumber ()</h3><pre class="programlisting">int xmlTextReaderLocatorLineNumber (<a href="libxml2-xmlreader.html#xmlTextReaderLocatorPtr">xmlTextReaderLocatorPtr</a> locator)<br/> </pre><p>Obtain the line number for the given locator.</p> @@ -444,11 +444,11 @@ The content of this structure is not made public by the API. <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderName"/>xmlTextReaderName ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderName (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>The qualified name of the node, equal to Prefix :LocalName.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the local name or NULL if not available</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the local name or NULL if not available, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderNamespaceUri"/>xmlTextReaderNamespaceUri ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderNamespaceUri (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>The URI defining the namespace associated with the node.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the namespace URI or NULL if not available</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the namespace URI or NULL if not available, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderNext"/>xmlTextReaderNext ()</h3><pre class="programlisting">int xmlTextReaderNext (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>Skip to the node following the current one in document order while avoiding the subtree if any.</p> @@ -468,7 +468,7 @@ The content of this structure is not made public by the API. <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderPrefix"/>xmlTextReaderPrefix ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderPrefix (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>A shorthand <a href="libxml2-SAX.html#reference">reference</a> to the namespace associated with the node.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the prefix or NULL if not available</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the prefix or NULL if not available, if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderPreserve"/>xmlTextReaderPreserve ()</h3><pre class="programlisting"><a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> xmlTextReaderPreserve (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>This tells the XML Reader to preserve the current node. The caller must also use xmlTextReaderCurrentDoc() to keep an handle on the resulting document once parsing has finished</p> @@ -552,7 +552,7 @@ The content of this structure is not made public by the API. <hr/> <div class="refsect2" lang="en"><h3><a name="xmlTextReaderXmlLang"/>xmlTextReaderXmlLang ()</h3><pre class="programlisting"><a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlTextReaderXmlLang (<a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> reader)<br/> </pre><p>The xml:lang scope within which the node resides.</p> -<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the xml:lang value or NULL if none exists.</td></tr></tbody></table></div></div> +<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>reader</tt></i>:</span></td><td>the <a href="libxml2-xmlreader.html#xmlTextReaderPtr">xmlTextReaderPtr</a> used</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the xml:lang value or NULL if none exists., if non NULL it need to be freed by the caller.</td></tr></tbody></table></div></div> <hr/> </div> </div> diff --git a/doc/devhelp/libxml2-xmlstring.html b/doc/devhelp/libxml2-xmlstring.html index 43da9a40..6dfc70b4 100644 --- a/doc/devhelp/libxml2-xmlstring.html +++ b/doc/devhelp/libxml2-xmlstring.html @@ -47,7 +47,7 @@ typedef unsigned char <a href="#xmlChar">xmlChar</a>; int <a href="#xmlStrcmp">xmlStrcmp</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str1, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str2); <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlCharStrndup">xmlCharStrndup</a> (const char * cur, <br/> int len); -const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlStrcasestr">xmlStrcasestr</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/> <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val); +const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlStrcasestr">xmlStrcasestr</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val); <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlStrcat">xmlStrcat</a> (<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * cur, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * add); int <a href="#xmlStrPrintf">xmlStrPrintf</a> (<a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * buf, <br/> int len, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * msg, <br/> ... ...); const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * <a href="#xmlStrstr">xmlStrstr</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val); @@ -127,7 +127,7 @@ int <a href="#xmlUTF8Strloc">xmlUTF8Strloc</a> (const <a href="libxml2-xmlstri </pre><p>a strcasecmp for xmlChar's</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>str1</tt></i>:</span></td><td>the first <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *</td></tr><tr><td><span class="term"><i><tt>str2</tt></i>:</span></td><td>the second <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> *</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the integer result of the comparison</td></tr></tbody></table></div></div> <hr/> - <div class="refsect2" lang="en"><h3><a name="xmlStrcasestr"/>xmlStrcasestr ()</h3><pre class="programlisting">const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlStrcasestr (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/> <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val)<br/> + <div class="refsect2" lang="en"><h3><a name="xmlStrcasestr"/>xmlStrcasestr ()</h3><pre class="programlisting">const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * xmlStrcasestr (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * str, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * val)<br/> </pre><p>a case-ignoring strstr for xmlChar's</p> <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td>the <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * array (haystack)</td></tr><tr><td><span class="term"><i><tt>val</tt></i>:</span></td><td>the <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> to search (needle)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * for the first occurrence or NULL.</td></tr></tbody></table></div></div> <hr/> diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index 9690218a..a98ed75d 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -1913,6 +1913,7 @@ <function name="xmlStringText" link="libxml2-parserInternals.html#xmlStringText"/> <function name="xmlStringTextNoenc" link="libxml2-parserInternals.html#xmlStringTextNoenc"/> <function name="xmlStructuredError" link="libxml2-globals.html#xmlStructuredError"/> + <function name="xmlStructuredErrorContext" link="libxml2-globals.html#xmlStructuredErrorContext"/> <function name="xmlSubstituteEntitiesDefaultValue" link="libxml2-globals.html#xmlSubstituteEntitiesDefaultValue"/> <function name="xmlTreeIndentString" link="libxml2-globals.html#xmlTreeIndentString"/> <function name="xmlXPathNAN" link="libxml2-xpath.html#xmlXPathNAN"/> diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html index 37845fb3..7dfa7869 100644 --- a/doc/html/libxml-globals.html +++ b/doc/html/libxml-globals.html @@ -84,6 +84,7 @@ void <a href="#xmlRegisterNodeFunc">xmlRegisterNodeFunc</a> (<a href="libxml-tr <a href="libxml-xmlerror.html#xmlError">xmlError</a> xmlLastError <a href="libxml-globals.html#xmlParserInputBufferCreateFilenameFunc">xmlParserInputBufferCreateFilenameFunc</a> xmlParserInputBufferCreateFilenameValue <a href="libxml-globals.html#xmlOutputBufferCreateFilenameFunc">xmlOutputBufferCreateFilenameFunc</a> xmlOutputBufferCreateFilenameValue + void * xmlStructuredErrorContext }</pre><h3><a name="xmlCleanupGlobals" id="xmlCleanupGlobals"></a>Function: xmlCleanupGlobals</h3><pre class="programlisting">void xmlCleanupGlobals (void)<br /> </pre><p>Additional cleanup for multi-threading</p> <h3><a name="xmlDeregisterNodeDefault" id="xmlDeregisterNodeDefault"></a>Function: xmlDeregisterNodeDefault</h3><pre class="programlisting"><a href="libxml-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> xmlDeregisterNodeDefault (<a href="libxml-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> func)<br /> diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html index 71202ba3..6f916056 100644 --- a/doc/html/libxml-tree.html +++ b/doc/html/libxml-tree.html @@ -489,7 +489,7 @@ A:link, A:visited, A:active { text-decoration: underline } const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * version : the XML version string const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * encoding : the declared encoding, if any int standalone : standalone document - int html : an HTML(1)/Docbook(2) document Input st + int html : an HTML(1)/Docbook(2) document * 3 is H <a href="libxml-tree.html#xmlParserInputPtr">xmlParserInputPtr</a> input : Current input stream int inputNr : Number of current input streams int inputMax : Max number of input streams diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 8c8f6c2d..0adb9ae5 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -485,6 +485,7 @@ <exports symbol='xmlMalloc' type='variable'/> <exports symbol='xmlParserVersion' type='variable'/> <exports symbol='xmlStructuredError' type='variable'/> + <exports symbol='xmlStructuredErrorContext' type='variable'/> <exports symbol='xmlDoValidityCheckingDefaultValue' type='variable'/> <exports symbol='xmlOutputBufferCreateFilenameValue' type='variable'/> <exports symbol='xmlPedanticParserDefaultValue' type='variable'/> @@ -6159,6 +6160,7 @@ set at the end of parsing'/> <field name='xmlLastError' type='xmlError' info=''/> <field name='xmlParserInputBufferCreateFilenameValue' type='xmlParserInputBufferCreateFilenameFunc' info=''/> <field name='xmlOutputBufferCreateFilenameValue' type='xmlOutputBufferCreateFilenameFunc' info=''/> + <field name='xmlStructuredErrorContext' type='void *' info=''/> </struct> <typedef name='xmlGlobalStatePtr' file='globals' type='xmlGlobalState *'/> <struct name='xmlHashTable' file='hash' type='struct _xmlHashTable'/> @@ -6254,7 +6256,10 @@ set at the end of parsing'/> <field name='version' type='const xmlChar *' info=' the XML version string'/> <field name='encoding' type='const xmlChar *' info=' the declared encoding, if any'/> <field name='standalone' type='int' info=' standalone document'/> - <field name='html' type='int' info=' an HTML(1)/Docbook(2) document Input stream stack'/> + <field name='html' type='int' info=' an HTML(1)/Docbook(2) document +* 3 is HTML after <head> +* 10 is HTML after <body> +* Input stream stack'/> <field name='input' type='xmlParserInputPtr' info=' Current input stream'/> <field name='inputNr' type='int' info=' Number of current input streams'/> <field name='inputMax' type='int' info=' Max number of input streams'/> @@ -6900,6 +6905,7 @@ Could we use @subtypes for this?'/> <variable name='xmlStringText' file='parserInternals' type='const xmlCharxmlStringText[]'/> <variable name='xmlStringTextNoenc' file='parserInternals' type='const xmlCharxmlStringTextNoenc[]'/> <variable name='xmlStructuredError' file='globals' type='xmlStructuredErrorFunc'/> + <variable name='xmlStructuredErrorContext' file='globals' type='void *'/> <variable name='xmlSubstituteEntitiesDefaultValue' file='globals' type='int'/> <variable name='xmlTreeIndentString' file='globals' type='const char *'/> <variable name='xmlXPathNAN' file='xpath' type='double'/> diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index a5b497ce..11d8e441 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -2897,6 +2897,7 @@ <reference name='xmlStrstr' href='html/libxml-xmlstring.html#xmlStrstr'/> <reference name='xmlStrsub' href='html/libxml-xmlstring.html#xmlStrsub'/> <reference name='xmlStructuredError' href='html/libxml-globals.html#xmlStructuredError'/> + <reference name='xmlStructuredErrorContext' href='html/libxml-globals.html#xmlStructuredErrorContext'/> <reference name='xmlStructuredErrorFunc' href='html/libxml-xmlerror.html#xmlStructuredErrorFunc'/> <reference name='xmlSubstituteEntitiesDefault' href='html/libxml-parser.html#xmlSubstituteEntitiesDefault'/> <reference name='xmlSubstituteEntitiesDefaultValue' href='html/libxml-globals.html#xmlSubstituteEntitiesDefaultValue'/> @@ -6486,6 +6487,7 @@ <ref name='xmlStrstr'/> <ref name='xmlStrsub'/> <ref name='xmlStructuredError'/> + <ref name='xmlStructuredErrorContext'/> <ref name='xmlStructuredErrorFunc'/> <ref name='xmlSubstituteEntitiesDefault'/> <ref name='xmlSubstituteEntitiesDefaultValue'/> @@ -11062,6 +11064,7 @@ <ref name='xmlRegisterNodeFunc'/> <ref name='xmlSaveNoEmptyTags'/> <ref name='xmlStructuredError'/> + <ref name='xmlStructuredErrorContext'/> <ref name='xmlSubstituteEntitiesDefaultValue'/> <ref name='xmlThrDefBufferAllocScheme'/> <ref name='xmlThrDefDefaultBufferSize'/> @@ -18810,6 +18813,7 @@ <word name='after'> <ref name='UTF8ToHtml'/> <ref name='UTF8Toisolat1'/> + <ref name='_xmlParserCtxt'/> <ref name='docbEncodeEntities'/> <ref name='htmlEncodeEntities'/> <ref name='isolat1ToUTF8'/> @@ -19584,6 +19588,9 @@ <ref name='xmlMemDisplay'/> <ref name='xmlMemoryDump'/> </word> + <word name='body'> + <ref name='_xmlParserCtxt'/> + </word> <word name='book1'> <ref name='xmlBuildRelativeURI'/> </word> @@ -23280,6 +23287,7 @@ </word> <word name='head'> <ref name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/> + <ref name='_xmlParserCtxt'/> </word> <word name='header'> <ref name='xmlNanoHTTPAuthHeader'/> diff --git a/doc/symbols.xml b/doc/symbols.xml index 042833f5..be221175 100644 --- a/doc/symbols.xml +++ b/doc/symbols.xml @@ -1737,4 +1737,7 @@ <symbol file="tree">xmlNextElementSibling</symbol> <symbol file="tree">xmlPreviousElementSibling</symbol> </release> + <release version="2.7.4"> + <symbol file="globals">xmlStructuredErrorContext</symbol> + </release> </symbols> diff --git a/libxml2.syms b/libxml2.syms index d106c3a5..95294771 100644 --- a/libxml2.syms +++ b/libxml2.syms @@ -2221,3 +2221,10 @@ LIBXML2_2.7.3 { xmlPreviousElementSibling; } LIBXML2_2.7.0; +LIBXML2_2.7.4 { + global: + +# globals + xmlStructuredErrorContext; # variable +} LIBXML2_2.7.3; + diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src index 995b790f..df195920 100644 --- a/win32/libxml2.def.src +++ b/win32/libxml2.def.src @@ -161,6 +161,7 @@ xmlStringComment DATA xmlStringText DATA xmlStringTextNoenc DATA xmlStructuredError DATA +xmlStructuredErrorContext DATA #ifdef LIBXML_THREAD_ENABLED __xmlSubstituteEntitiesDefaultValue #else |