diff --git a/doc/apibuild.py b/doc/apibuild.py index 8cd9e5c4ce5e0e561797742b04df412549cc586e_ZG9jL2FwaWJ1aWxkLnB5..33d6c5a87e3e03d2e4fa2942babdbf2124c0029d_ZG9jL2FwaWJ1aWxkLnB5 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -1117,7 +1117,6 @@ token = self.token() token = self.parseBlock(token) elif token[0] == "sep" and token[1] == "}": - self.comment = None token = self.token() return token else: @@ -1561,9 +1560,10 @@ ((type, None), self.signature), 1) self.index_add(self.name, self.filename, static, "function", d) + self.comment = None token = self.token() elif token[0] == "sep" and token[1] == "{": d = self.mergeFunctionComment(self.name, ((type, None), self.signature), static) self.index_add(self.name, self.filename, static, "function", d) @@ -1564,11 +1564,12 @@ token = self.token() elif token[0] == "sep" and token[1] == "{": d = self.mergeFunctionComment(self.name, ((type, None), self.signature), static) self.index_add(self.name, self.filename, static, "function", d) + self.comment = None token = self.token() token = self.parseBlock(token); elif token[1] == ',': self.index_add(self.name, self.filename, static, "variable", type) @@ -1570,8 +1571,9 @@ token = self.token() token = self.parseBlock(token); elif token[1] == ',': self.index_add(self.name, self.filename, static, "variable", type) + self.comment = None type = type_orig token = self.token() while token != None and token[0] == "sep": @@ -1580,7 +1582,6 @@ if token != None and token[0] == "name": self.name = token[1] token = self.token() - self.comment = None else: break diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html index 8cd9e5c4ce5e0e561797742b04df412549cc586e_ZG9jL2RldmhlbHAvbGlieG1sMi1nbG9iYWxzLmh0bWw=..33d6c5a87e3e03d2e4fa2942babdbf2124c0029d_ZG9jL2RldmhlbHAvbGlieG1sMi1nbG9iYWxzLmh0bWw= 100644 --- a/doc/devhelp/libxml2-globals.html +++ b/doc/devhelp/libxml2-globals.html @@ -142,7 +142,7 @@ <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>node</tt></i>:</span></td><td>the current node</td></tr></tbody></table></div></div> <hr/> <div class="refsect2" lang="en"><h3><a name="htmlDefaultSAXHandler">Variable </a>htmlDefaultSAXHandler</h3><pre class="programlisting"><a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> htmlDefaultSAXHandler; -</pre><p/> +</pre><p>DEPRECATED: This handler is unused and will be removed from future versions. Default old SAX v1 handler for HTML, builds the DOM tree</p> </div> <hr/> <div class="refsect2" lang="en"><h3><a name="oldXMLWDcompatibility">Variable </a>oldXMLWDcompatibility</h3><pre class="programlisting">int oldXMLWDcompatibility; @@ -158,7 +158,7 @@ </div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlDefaultSAXHandler">Variable </a>xmlDefaultSAXHandler</h3><pre class="programlisting"><a href="libxml2-parser.html#xmlSAXHandlerV1">xmlSAXHandlerV1</a> xmlDefaultSAXHandler; -</pre><p/> +</pre><p>DEPRECATED: This handler is unused and will be removed from future versions. Default SAX version1 handler for XML, builds the DOM tree</p> </div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlDefaultSAXLocator">Variable </a>xmlDefaultSAXLocator</h3><pre class="programlisting"><a href="libxml2-tree.html#xmlSAXLocator">xmlSAXLocator</a> xmlDefaultSAXLocator; @@ -162,7 +162,7 @@ </div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlDefaultSAXLocator">Variable </a>xmlDefaultSAXLocator</h3><pre class="programlisting"><a href="libxml2-tree.html#xmlSAXLocator">xmlSAXLocator</a> xmlDefaultSAXLocator; -</pre><p/> +</pre><p>DEPRECATED: Don't use The default SAX Locator { getPublicId, getSystemId, getLineNumber, getColumnNumber}</p> </div> <hr/> <div class="refsect2" lang="en"><h3><a name="xmlDeregisterNodeDefaultValue">Variable </a>xmlDeregisterNodeDefaultValue</h3><pre class="programlisting"><a href="libxml2-globals.html#xmlDeregisterNodeFunc">xmlDeregisterNodeFunc</a> xmlDeregisterNodeDefaultValue; diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 8cd9e5c4ce5e0e561797742b04df412549cc586e_ZG9jL2xpYnhtbDItYXBpLnhtbA==..33d6c5a87e3e03d2e4fa2942babdbf2124c0029d_ZG9jL2xpYnhtbDItYXBpLnhtbA== 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -6951,7 +6951,9 @@ <typedef name='xmlXPathVariablePtr' file='xpath' type='xmlXPathVariable *'/> <variable name='emptyExp' file='xmlregexp' type='xmlExpNodePtr'/> <variable name='forbiddenExp' file='xmlregexp' type='xmlExpNodePtr'/> - <variable name='htmlDefaultSAXHandler' file='globals' type='xmlSAXHandlerV1'/> + <variable name='htmlDefaultSAXHandler' file='globals' type='xmlSAXHandlerV1'> + <info>DEPRECATED: This handler is unused and will be removed from future versions. Default old SAX v1 handler for HTML, builds the DOM tree</info> + </variable> <variable name='oldXMLWDcompatibility' file='globals' type='int'> <info>Global setting, DEPRECATED.</info> </variable> @@ -6961,8 +6963,12 @@ <variable name='xmlDefaultBufferSize' file='globals' type='int'> <info>DEPRECATED: Don't use. Global setting, default buffer size. Default value is BASE_BUFFER_SIZE</info> </variable> - <variable name='xmlDefaultSAXHandler' file='globals' type='xmlSAXHandlerV1'/> - <variable name='xmlDefaultSAXLocator' file='globals' type='xmlSAXLocator'/> + <variable name='xmlDefaultSAXHandler' file='globals' type='xmlSAXHandlerV1'> + <info>DEPRECATED: This handler is unused and will be removed from future versions. Default SAX version1 handler for XML, builds the DOM tree</info> + </variable> + <variable name='xmlDefaultSAXLocator' file='globals' type='xmlSAXLocator'> + <info>DEPRECATED: Don't use The default SAX Locator { getPublicId, getSystemId, getLineNumber, getColumnNumber}</info> + </variable> <variable name='xmlDeregisterNodeDefaultValue' file='globals' type='xmlDeregisterNodeFunc'/> <variable name='xmlDoValidityCheckingDefaultValue' file='globals' type='int'> <info>Global setting, indicate that the parser should work in validating mode. Disabled by default.</info>