fixups to the api builder, gives enum values, fix functype return type

* doc/apibuild.py doc/libxml2-api.xml: fixups to the api builder,
  gives enum values, fix functype return type
Daniel
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 2e415af..9cefcb1 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -468,6 +468,7 @@
      <exports symbol='htmlNodeDumpFile'/>
      <exports symbol='htmlNodeDumpFileFormat'/>
      <exports symbol='htmlNodeDumpFormatOutput'/>
+     <exports symbol='htmlNodeDumpOutput'/>
      <exports symbol='htmlSaveFile'/>
      <exports symbol='htmlSaveFileEnc'/>
      <exports symbol='htmlSaveFileFormat'/>
@@ -2148,42 +2149,42 @@
       <info>Check if the current value on the XPath stack is a node set or an XSLT value tree.  Returns true if the current object on the stack is a node-set.</info>
       <arg name='ctxt' info='an XPath parser context'/>
     </macro>
-    <enum name='XLINK_ACTUATE_AUTO' file='xlink' type='xlinkActuate'/>
+    <enum name='XLINK_ACTUATE_AUTO' file='xlink' value='1' type='xlinkActuate'/>
     <enum name='XLINK_ACTUATE_NONE' file='xlink' value='0' type='xlinkActuate'/>
-    <enum name='XLINK_ACTUATE_ONREQUEST' file='xlink' type='xlinkActuate'/>
-    <enum name='XLINK_SHOW_EMBED' file='xlink' type='xlinkShow'/>
-    <enum name='XLINK_SHOW_NEW' file='xlink' type='xlinkShow'/>
+    <enum name='XLINK_ACTUATE_ONREQUEST' file='xlink' value='2' type='xlinkActuate'/>
+    <enum name='XLINK_SHOW_EMBED' file='xlink' value='2' type='xlinkShow'/>
+    <enum name='XLINK_SHOW_NEW' file='xlink' value='1' type='xlinkShow'/>
     <enum name='XLINK_SHOW_NONE' file='xlink' value='0' type='xlinkShow'/>
-    <enum name='XLINK_SHOW_REPLACE' file='xlink' type='xlinkShow'/>
-    <enum name='XLINK_TYPE_EXTENDED' file='xlink' type='xlinkType'/>
-    <enum name='XLINK_TYPE_EXTENDED_SET' file='xlink' type='xlinkType'/>
+    <enum name='XLINK_SHOW_REPLACE' file='xlink' value='3' type='xlinkShow'/>
+    <enum name='XLINK_TYPE_EXTENDED' file='xlink' value='2' type='xlinkType'/>
+    <enum name='XLINK_TYPE_EXTENDED_SET' file='xlink' value='3' type='xlinkType'/>
     <enum name='XLINK_TYPE_NONE' file='xlink' value='0' type='xlinkType'/>
-    <enum name='XLINK_TYPE_SIMPLE' file='xlink' type='xlinkType'/>
+    <enum name='XLINK_TYPE_SIMPLE' file='xlink' value='1' type='xlinkType'/>
     <enum name='XML_ATTRIBUTE_CDATA' file='tree' value='1' type='xmlAttributeType'/>
     <enum name='XML_ATTRIBUTE_DECL' file='tree' value='16' type='xmlElementType'/>
-    <enum name='XML_ATTRIBUTE_ENTITIES' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_ENTITY' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_ENUMERATION' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_FIXED' file='tree' type='xmlAttributeDefault'/>
-    <enum name='XML_ATTRIBUTE_ID' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_IDREF' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_IDREFS' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_IMPLIED' file='tree' type='xmlAttributeDefault'/>
-    <enum name='XML_ATTRIBUTE_NMTOKEN' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_NMTOKENS' file='tree' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_ENTITIES' file='tree' value='6' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_ENTITY' file='tree' value='5' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_ENUMERATION' file='tree' value='9' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_FIXED' file='tree' value='4' type='xmlAttributeDefault'/>
+    <enum name='XML_ATTRIBUTE_ID' file='tree' value='2' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_IDREF' file='tree' value='3' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_IDREFS' file='tree' value='4' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_IMPLIED' file='tree' value='3' type='xmlAttributeDefault'/>
+    <enum name='XML_ATTRIBUTE_NMTOKEN' file='tree' value='7' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_NMTOKENS' file='tree' value='8' type='xmlAttributeType'/>
     <enum name='XML_ATTRIBUTE_NODE' file='tree' value='2' type='xmlElementType'/>
     <enum name='XML_ATTRIBUTE_NONE' file='tree' value='1' type='xmlAttributeDefault'/>
-    <enum name='XML_ATTRIBUTE_NOTATION' file='tree' type='xmlAttributeType'/>
-    <enum name='XML_ATTRIBUTE_REQUIRED' file='tree' type='xmlAttributeDefault'/>
-    <enum name='XML_BUFFER_ALLOC_DOUBLEIT' file='tree' type='xmlBufferAllocationScheme'/>
-    <enum name='XML_BUFFER_ALLOC_EXACT' file='tree' type='xmlBufferAllocationScheme'/>
+    <enum name='XML_ATTRIBUTE_NOTATION' file='tree' value='10' type='xmlAttributeType'/>
+    <enum name='XML_ATTRIBUTE_REQUIRED' file='tree' value='2' type='xmlAttributeDefault'/>
+    <enum name='XML_BUFFER_ALLOC_DOUBLEIT' file='tree' value='1' type='xmlBufferAllocationScheme'/>
+    <enum name='XML_BUFFER_ALLOC_EXACT' file='tree' value='2' type='xmlBufferAllocationScheme'/>
     <enum name='XML_CATA_ALLOW_ALL' file='catalog' value='3' type='xmlCatalogAllow'/>
     <enum name='XML_CATA_ALLOW_DOCUMENT' file='catalog' value='2' type='xmlCatalogAllow'/>
     <enum name='XML_CATA_ALLOW_GLOBAL' file='catalog' value='1' type='xmlCatalogAllow'/>
     <enum name='XML_CATA_ALLOW_NONE' file='catalog' value='0' type='xmlCatalogAllow'/>
     <enum name='XML_CATA_PREFER_NONE' file='catalog' value='0' type='xmlCatalogPrefer'/>
     <enum name='XML_CATA_PREFER_PUBLIC' file='catalog' value='1' type='xmlCatalogPrefer'/>
-    <enum name='XML_CATA_PREFER_SYSTEM' file='catalog' type='xmlCatalogPrefer'/>
+    <enum name='XML_CATA_PREFER_SYSTEM' file='catalog' value='2' type='xmlCatalogPrefer'/>
     <enum name='XML_CDATA_SECTION_NODE' file='tree' value='4' type='xmlElementType'/>
     <enum name='XML_CHAR_ENCODING_2022_JP' file='encoding' value='19' type='xmlCharEncoding' info='ISO-2022-JP'/>
     <enum name='XML_CHAR_ENCODING_8859_1' file='encoding' value='10' type='xmlCharEncoding' info='ISO-8859-1 ISO Latin 1'/>
@@ -2215,117 +2216,117 @@
     <enum name='XML_DOCUMENT_NODE' file='tree' value='9' type='xmlElementType'/>
     <enum name='XML_DOCUMENT_TYPE_NODE' file='tree' value='10' type='xmlElementType'/>
     <enum name='XML_DTD_NODE' file='tree' value='14' type='xmlElementType'/>
-    <enum name='XML_ELEMENT_CONTENT_ELEMENT' file='tree' type='xmlElementContentType'/>
-    <enum name='XML_ELEMENT_CONTENT_MULT' file='tree' type='xmlElementContentOccur'/>
+    <enum name='XML_ELEMENT_CONTENT_ELEMENT' file='tree' value='2' type='xmlElementContentType'/>
+    <enum name='XML_ELEMENT_CONTENT_MULT' file='tree' value='3' type='xmlElementContentOccur'/>
     <enum name='XML_ELEMENT_CONTENT_ONCE' file='tree' value='1' type='xmlElementContentOccur'/>
-    <enum name='XML_ELEMENT_CONTENT_OPT' file='tree' type='xmlElementContentOccur'/>
-    <enum name='XML_ELEMENT_CONTENT_OR' file='tree' type='xmlElementContentType'/>
+    <enum name='XML_ELEMENT_CONTENT_OPT' file='tree' value='2' type='xmlElementContentOccur'/>
+    <enum name='XML_ELEMENT_CONTENT_OR' file='tree' value='4' type='xmlElementContentType'/>
     <enum name='XML_ELEMENT_CONTENT_PCDATA' file='tree' value='1' type='xmlElementContentType'/>
-    <enum name='XML_ELEMENT_CONTENT_PLUS' file='tree' type='xmlElementContentOccur'/>
-    <enum name='XML_ELEMENT_CONTENT_SEQ' file='tree' type='xmlElementContentType'/>
+    <enum name='XML_ELEMENT_CONTENT_PLUS' file='tree' value='4' type='xmlElementContentOccur'/>
+    <enum name='XML_ELEMENT_CONTENT_SEQ' file='tree' value='3' type='xmlElementContentType'/>
     <enum name='XML_ELEMENT_DECL' file='tree' value='15' type='xmlElementType'/>
     <enum name='XML_ELEMENT_NODE' file='tree' value='1' type='xmlElementType'/>
-    <enum name='XML_ELEMENT_TYPE_ANY' file='tree' type='xmlElementTypeVal'/>
-    <enum name='XML_ELEMENT_TYPE_ELEMENT' file='tree' type='xmlElementTypeVal'/>
+    <enum name='XML_ELEMENT_TYPE_ANY' file='tree' value='2' type='xmlElementTypeVal'/>
+    <enum name='XML_ELEMENT_TYPE_ELEMENT' file='tree' value='4' type='xmlElementTypeVal'/>
     <enum name='XML_ELEMENT_TYPE_EMPTY' file='tree' value='1' type='xmlElementTypeVal'/>
-    <enum name='XML_ELEMENT_TYPE_MIXED' file='tree' type='xmlElementTypeVal'/>
+    <enum name='XML_ELEMENT_TYPE_MIXED' file='tree' value='3' type='xmlElementTypeVal'/>
     <enum name='XML_ELEMENT_TYPE_UNDEFINED' file='tree' value='0' type='xmlElementTypeVal'/>
     <enum name='XML_ENTITY_DECL' file='tree' value='17' type='xmlElementType'/>
     <enum name='XML_ENTITY_NODE' file='tree' value='6' type='xmlElementType'/>
     <enum name='XML_ENTITY_REF_NODE' file='tree' value='5' type='xmlElementType'/>
-    <enum name='XML_ERR_ATTLIST_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ATTLIST_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='51'/>
-    <enum name='XML_ERR_ATTRIBUTE_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ATTRIBUTE_NOT_STARTED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ATTRIBUTE_REDEFINED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ATTRIBUTE_WITHOUT_VALUE' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_CDATA_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_CHARREF_AT_EOF' file='xmlerror' type='xmlParserErrors' info='10'/>
-    <enum name='XML_ERR_CHARREF_IN_DTD' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_CHARREF_IN_EPILOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_CHARREF_IN_PROLOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_COMMENT_NOT_FINISHED' file='xmlerror' type='xmlParserErrors' info='45'/>
-    <enum name='XML_ERR_CONDSEC_INVALID' file='xmlerror' type='xmlParserErrors' info='84'/>
-    <enum name='XML_ERR_CONDSEC_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_CONDSEC_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='59'/>
-    <enum name='XML_ERR_DOCTYPE_NOT_FINISHED' file='xmlerror' type='xmlParserErrors' info='62'/>
-    <enum name='XML_ERR_DOCUMENT_EMPTY' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_DOCUMENT_END' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_DOCUMENT_START' file='xmlerror' type='xmlParserErrors' info='3'/>
-    <enum name='XML_ERR_ELEMCONTENT_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ELEMCONTENT_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='55'/>
-    <enum name='XML_ERR_ENCODING_NAME' file='xmlerror' type='xmlParserErrors' info='80'/>
-    <enum name='XML_ERR_ENTITYREF_AT_EOF' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITYREF_IN_DTD' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITYREF_IN_EPILOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITYREF_IN_PROLOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITYREF_NO_NAME' file='xmlerror' type='xmlParserErrors' info='22'/>
-    <enum name='XML_ERR_ENTITYREF_SEMICOL_MISSING' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITY_BOUNDARY' file='xmlerror' type='xmlParserErrors' info='90'/>
-    <enum name='XML_ERR_ENTITY_CHAR_ERROR' file='xmlerror' type='xmlParserErrors' info='88'/>
-    <enum name='XML_ERR_ENTITY_IS_EXTERNAL' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITY_IS_PARAMETER' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITY_LOOP' file='xmlerror' type='xmlParserErrors' info='89'/>
-    <enum name='XML_ERR_ENTITY_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_ENTITY_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='36'/>
-    <enum name='XML_ERR_ENTITY_PE_INTERNAL' file='xmlerror' type='xmlParserErrors' info='88'/>
-    <enum name='XML_ERR_EQUAL_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_EXTRA_CONTENT' file='xmlerror' type='xmlParserErrors' info='87'/>
-    <enum name='XML_ERR_EXT_ENTITY_STANDALONE' file='xmlerror' type='xmlParserErrors' info='83'/>
-    <enum name='XML_ERR_EXT_SUBSET_NOT_FINISHED' file='xmlerror' type='xmlParserErrors' info='61'/>
-    <enum name='XML_ERR_GT_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_HYPHEN_IN_COMMENT' file='xmlerror' type='xmlParserErrors' info='81'/>
-    <enum name='XML_ERR_INTERNAL_ERROR' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_INVALID_CHAR' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_INVALID_CHARREF' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_INVALID_DEC_CHARREF' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_INVALID_ENCODING' file='xmlerror' type='xmlParserErrors' info='82'/>
-    <enum name='XML_ERR_INVALID_HEX_CHARREF' file='xmlerror' type='xmlParserErrors' info='6'/>
-    <enum name='XML_ERR_INVALID_URI' file='xmlerror' type='xmlParserErrors' info='91'/>
-    <enum name='XML_ERR_LITERAL_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_LITERAL_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='43'/>
-    <enum name='XML_ERR_LTSLASH_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_LT_IN_ATTRIBUTE' file='xmlerror' type='xmlParserErrors' info='38'/>
-    <enum name='XML_ERR_LT_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_MISPLACED_CDATA_END' file='xmlerror' type='xmlParserErrors' info='63'/>
-    <enum name='XML_ERR_MIXED_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_MIXED_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='53'/>
-    <enum name='XML_ERR_NAME_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_NMTOKEN_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_NOTATION_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_NOTATION_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='49'/>
-    <enum name='XML_ERR_NOT_WELL_BALANCED' file='xmlerror' type='xmlParserErrors' info='86'/>
-    <enum name='XML_ERR_NO_DTD' file='xmlerror' type='xmlParserErrors' info=' 94'/>
-    <enum name='XML_ERR_NO_MEMORY' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_NS_DECL_ERROR' file='xmlerror' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ATTLIST_NOT_FINISHED' file='xmlerror' value='51' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ATTLIST_NOT_STARTED' file='xmlerror' value='50' type='xmlParserErrors' info='51'/>
+    <enum name='XML_ERR_ATTRIBUTE_NOT_FINISHED' file='xmlerror' value='40' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ATTRIBUTE_NOT_STARTED' file='xmlerror' value='39' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ATTRIBUTE_REDEFINED' file='xmlerror' value='42' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ATTRIBUTE_WITHOUT_VALUE' file='xmlerror' value='41' type='xmlParserErrors'/>
+    <enum name='XML_ERR_CDATA_NOT_FINISHED' file='xmlerror' value='63' type='xmlParserErrors'/>
+    <enum name='XML_ERR_CHARREF_AT_EOF' file='xmlerror' value='10' type='xmlParserErrors' info='10'/>
+    <enum name='XML_ERR_CHARREF_IN_DTD' file='xmlerror' value='13' type='xmlParserErrors'/>
+    <enum name='XML_ERR_CHARREF_IN_EPILOG' file='xmlerror' value='12' type='xmlParserErrors'/>
+    <enum name='XML_ERR_CHARREF_IN_PROLOG' file='xmlerror' value='11' type='xmlParserErrors'/>
+    <enum name='XML_ERR_COMMENT_NOT_FINISHED' file='xmlerror' value='45' type='xmlParserErrors' info='45'/>
+    <enum name='XML_ERR_CONDSEC_INVALID' file='xmlerror' value='83' type='xmlParserErrors' info='84'/>
+    <enum name='XML_ERR_CONDSEC_NOT_FINISHED' file='xmlerror' value='59' type='xmlParserErrors'/>
+    <enum name='XML_ERR_CONDSEC_NOT_STARTED' file='xmlerror' value='58' type='xmlParserErrors' info='59'/>
+    <enum name='XML_ERR_DOCTYPE_NOT_FINISHED' file='xmlerror' value='61' type='xmlParserErrors' info='62'/>
+    <enum name='XML_ERR_DOCUMENT_EMPTY' file='xmlerror' value='4' type='xmlParserErrors'/>
+    <enum name='XML_ERR_DOCUMENT_END' file='xmlerror' value='5' type='xmlParserErrors'/>
+    <enum name='XML_ERR_DOCUMENT_START' file='xmlerror' value='3' type='xmlParserErrors' info='3'/>
+    <enum name='XML_ERR_ELEMCONTENT_NOT_FINISHED' file='xmlerror' value='55' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ELEMCONTENT_NOT_STARTED' file='xmlerror' value='54' type='xmlParserErrors' info='55'/>
+    <enum name='XML_ERR_ENCODING_NAME' file='xmlerror' value='79' type='xmlParserErrors' info='80'/>
+    <enum name='XML_ERR_ENTITYREF_AT_EOF' file='xmlerror' value='14' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITYREF_IN_DTD' file='xmlerror' value='17' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITYREF_IN_EPILOG' file='xmlerror' value='16' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITYREF_IN_PROLOG' file='xmlerror' value='15' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITYREF_NO_NAME' file='xmlerror' value='22' type='xmlParserErrors' info='22'/>
+    <enum name='XML_ERR_ENTITYREF_SEMICOL_MISSING' file='xmlerror' value='23' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITY_BOUNDARY' file='xmlerror' value='90' type='xmlParserErrors' info='90'/>
+    <enum name='XML_ERR_ENTITY_CHAR_ERROR' file='xmlerror' value='87' type='xmlParserErrors' info='88'/>
+    <enum name='XML_ERR_ENTITY_IS_EXTERNAL' file='xmlerror' value='29' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITY_IS_PARAMETER' file='xmlerror' value='30' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITY_LOOP' file='xmlerror' value='89' type='xmlParserErrors' info='89'/>
+    <enum name='XML_ERR_ENTITY_NOT_FINISHED' file='xmlerror' value='37' type='xmlParserErrors'/>
+    <enum name='XML_ERR_ENTITY_NOT_STARTED' file='xmlerror' value='36' type='xmlParserErrors' info='36'/>
+    <enum name='XML_ERR_ENTITY_PE_INTERNAL' file='xmlerror' value='88' type='xmlParserErrors' info='88'/>
+    <enum name='XML_ERR_EQUAL_REQUIRED' file='xmlerror' value='75' type='xmlParserErrors'/>
+    <enum name='XML_ERR_EXTRA_CONTENT' file='xmlerror' value='86' type='xmlParserErrors' info='87'/>
+    <enum name='XML_ERR_EXT_ENTITY_STANDALONE' file='xmlerror' value='82' type='xmlParserErrors' info='83'/>
+    <enum name='XML_ERR_EXT_SUBSET_NOT_FINISHED' file='xmlerror' value='60' type='xmlParserErrors' info='61'/>
+    <enum name='XML_ERR_GT_REQUIRED' file='xmlerror' value='73' type='xmlParserErrors'/>
+    <enum name='XML_ERR_HYPHEN_IN_COMMENT' file='xmlerror' value='80' type='xmlParserErrors' info='81'/>
+    <enum name='XML_ERR_INTERNAL_ERROR' file='xmlerror' value='1' type='xmlParserErrors'/>
+    <enum name='XML_ERR_INVALID_CHAR' file='xmlerror' value='9' type='xmlParserErrors'/>
+    <enum name='XML_ERR_INVALID_CHARREF' file='xmlerror' value='8' type='xmlParserErrors'/>
+    <enum name='XML_ERR_INVALID_DEC_CHARREF' file='xmlerror' value='7' type='xmlParserErrors'/>
+    <enum name='XML_ERR_INVALID_ENCODING' file='xmlerror' value='81' type='xmlParserErrors' info='82'/>
+    <enum name='XML_ERR_INVALID_HEX_CHARREF' file='xmlerror' value='6' type='xmlParserErrors' info='6'/>
+    <enum name='XML_ERR_INVALID_URI' file='xmlerror' value='91' type='xmlParserErrors' info='91'/>
+    <enum name='XML_ERR_LITERAL_NOT_FINISHED' file='xmlerror' value='44' type='xmlParserErrors'/>
+    <enum name='XML_ERR_LITERAL_NOT_STARTED' file='xmlerror' value='43' type='xmlParserErrors' info='43'/>
+    <enum name='XML_ERR_LTSLASH_REQUIRED' file='xmlerror' value='74' type='xmlParserErrors'/>
+    <enum name='XML_ERR_LT_IN_ATTRIBUTE' file='xmlerror' value='38' type='xmlParserErrors' info='38'/>
+    <enum name='XML_ERR_LT_REQUIRED' file='xmlerror' value='72' type='xmlParserErrors'/>
+    <enum name='XML_ERR_MISPLACED_CDATA_END' file='xmlerror' value='62' type='xmlParserErrors' info='63'/>
+    <enum name='XML_ERR_MIXED_NOT_FINISHED' file='xmlerror' value='53' type='xmlParserErrors'/>
+    <enum name='XML_ERR_MIXED_NOT_STARTED' file='xmlerror' value='52' type='xmlParserErrors' info='53'/>
+    <enum name='XML_ERR_NAME_REQUIRED' file='xmlerror' value='68' type='xmlParserErrors'/>
+    <enum name='XML_ERR_NMTOKEN_REQUIRED' file='xmlerror' value='67' type='xmlParserErrors'/>
+    <enum name='XML_ERR_NOTATION_NOT_FINISHED' file='xmlerror' value='49' type='xmlParserErrors'/>
+    <enum name='XML_ERR_NOTATION_NOT_STARTED' file='xmlerror' value='48' type='xmlParserErrors' info='49'/>
+    <enum name='XML_ERR_NOT_WELL_BALANCED' file='xmlerror' value='85' type='xmlParserErrors' info='86'/>
+    <enum name='XML_ERR_NO_DTD' file='xmlerror' value='94' type='xmlParserErrors' info=' 94'/>
+    <enum name='XML_ERR_NO_MEMORY' file='xmlerror' value='2' type='xmlParserErrors'/>
+    <enum name='XML_ERR_NS_DECL_ERROR' file='xmlerror' value='35' type='xmlParserErrors'/>
     <enum name='XML_ERR_OK' file='xmlerror' value='0' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PCDATA_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PEREF_AT_EOF' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PEREF_IN_EPILOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PEREF_IN_INT_SUBSET' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PEREF_IN_PROLOG' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PEREF_NO_NAME' file='xmlerror' type='xmlParserErrors' info='24'/>
-    <enum name='XML_ERR_PEREF_SEMICOL_MISSING' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PI_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_PI_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='47'/>
-    <enum name='XML_ERR_PUBID_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_RESERVED_XML_NAME' file='xmlerror' type='xmlParserErrors' info='65'/>
-    <enum name='XML_ERR_SEPARATOR_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_SPACE_REQUIRED' file='xmlerror' type='xmlParserErrors' info='66'/>
-    <enum name='XML_ERR_STANDALONE_VALUE' file='xmlerror' type='xmlParserErrors' info='79'/>
-    <enum name='XML_ERR_STRING_NOT_CLOSED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_STRING_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='33'/>
-    <enum name='XML_ERR_TAG_NAME_MISMATCH' file='xmlerror' type='xmlParserErrors' info='77'/>
-    <enum name='XML_ERR_TAG_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_UNDECLARED_ENTITY' file='xmlerror' type='xmlParserErrors' info='26'/>
-    <enum name='XML_ERR_UNKNOWN_ENCODING' file='xmlerror' type='xmlParserErrors' info='31'/>
-    <enum name='XML_ERR_UNPARSED_ENTITY' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_UNSUPPORTED_ENCODING' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_URI_FRAGMENT' file='xmlerror' type='xmlParserErrors' info='92'/>
-    <enum name='XML_ERR_URI_REQUIRED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_VALUE_REQUIRED' file='xmlerror' type='xmlParserErrors' info='85'/>
-    <enum name='XML_ERR_XMLDECL_NOT_FINISHED' file='xmlerror' type='xmlParserErrors'/>
-    <enum name='XML_ERR_XMLDECL_NOT_STARTED' file='xmlerror' type='xmlParserErrors' info='57'/>
+    <enum name='XML_ERR_PCDATA_REQUIRED' file='xmlerror' value='69' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PEREF_AT_EOF' file='xmlerror' value='18' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PEREF_IN_EPILOG' file='xmlerror' value='20' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PEREF_IN_INT_SUBSET' file='xmlerror' value='21' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PEREF_IN_PROLOG' file='xmlerror' value='19' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PEREF_NO_NAME' file='xmlerror' value='24' type='xmlParserErrors' info='24'/>
+    <enum name='XML_ERR_PEREF_SEMICOL_MISSING' file='xmlerror' value='25' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PI_NOT_FINISHED' file='xmlerror' value='47' type='xmlParserErrors'/>
+    <enum name='XML_ERR_PI_NOT_STARTED' file='xmlerror' value='46' type='xmlParserErrors' info='47'/>
+    <enum name='XML_ERR_PUBID_REQUIRED' file='xmlerror' value='71' type='xmlParserErrors'/>
+    <enum name='XML_ERR_RESERVED_XML_NAME' file='xmlerror' value='64' type='xmlParserErrors' info='65'/>
+    <enum name='XML_ERR_SEPARATOR_REQUIRED' file='xmlerror' value='66' type='xmlParserErrors'/>
+    <enum name='XML_ERR_SPACE_REQUIRED' file='xmlerror' value='65' type='xmlParserErrors' info='66'/>
+    <enum name='XML_ERR_STANDALONE_VALUE' file='xmlerror' value='78' type='xmlParserErrors' info='79'/>
+    <enum name='XML_ERR_STRING_NOT_CLOSED' file='xmlerror' value='34' type='xmlParserErrors'/>
+    <enum name='XML_ERR_STRING_NOT_STARTED' file='xmlerror' value='33' type='xmlParserErrors' info='33'/>
+    <enum name='XML_ERR_TAG_NAME_MISMATCH' file='xmlerror' value='76' type='xmlParserErrors' info='77'/>
+    <enum name='XML_ERR_TAG_NOT_FINISHED' file='xmlerror' value='77' type='xmlParserErrors'/>
+    <enum name='XML_ERR_UNDECLARED_ENTITY' file='xmlerror' value='26' type='xmlParserErrors' info='26'/>
+    <enum name='XML_ERR_UNKNOWN_ENCODING' file='xmlerror' value='31' type='xmlParserErrors' info='31'/>
+    <enum name='XML_ERR_UNPARSED_ENTITY' file='xmlerror' value='28' type='xmlParserErrors'/>
+    <enum name='XML_ERR_UNSUPPORTED_ENCODING' file='xmlerror' value='32' type='xmlParserErrors'/>
+    <enum name='XML_ERR_URI_FRAGMENT' file='xmlerror' value='92' type='xmlParserErrors' info='92'/>
+    <enum name='XML_ERR_URI_REQUIRED' file='xmlerror' value='70' type='xmlParserErrors'/>
+    <enum name='XML_ERR_VALUE_REQUIRED' file='xmlerror' value='84' type='xmlParserErrors' info='85'/>
+    <enum name='XML_ERR_XMLDECL_NOT_FINISHED' file='xmlerror' value='57' type='xmlParserErrors'/>
+    <enum name='XML_ERR_XMLDECL_NOT_STARTED' file='xmlerror' value='56' type='xmlParserErrors' info='57'/>
     <enum name='XML_EXTERNAL_GENERAL_PARSED_ENTITY' file='entities' value='2' type='xmlEntityType'/>
     <enum name='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY' file='entities' value='3' type='xmlEntityType'/>
     <enum name='XML_EXTERNAL_PARAMETER_ENTITY' file='entities' value='5' type='xmlEntityType'/>
@@ -2335,62 +2336,62 @@
     <enum name='XML_INTERNAL_PREDEFINED_ENTITY' file='entities' value='6' type='xmlEntityType'/>
     <enum name='XML_NAMESPACE_DECL' file='tree' value='18' type='xmlElementType'/>
     <enum name='XML_NOTATION_NODE' file='tree' value='12' type='xmlElementType'/>
-    <enum name='XML_PARSER_ATTRIBUTE_VALUE' file='parser' type='xmlParserInputState' info='within an attribute value'/>
-    <enum name='XML_PARSER_CDATA_SECTION' file='parser' type='xmlParserInputState' info='within a CDATA section'/>
-    <enum name='XML_PARSER_COMMENT' file='parser' type='xmlParserInputState' info='within a comment'/>
-    <enum name='XML_PARSER_CONTENT' file='parser' type='xmlParserInputState' info='within the content'/>
-    <enum name='XML_PARSER_DTD' file='parser' type='xmlParserInputState' info='within some DTD content'/>
-    <enum name='XML_PARSER_END_TAG' file='parser' type='xmlParserInputState' info='within a closing tag'/>
-    <enum name='XML_PARSER_ENTITY_DECL' file='parser' type='xmlParserInputState' info='within an entity declaration'/>
-    <enum name='XML_PARSER_ENTITY_VALUE' file='parser' type='xmlParserInputState' info='within an entity value in a decl'/>
+    <enum name='XML_PARSER_ATTRIBUTE_VALUE' file='parser' value='12' type='xmlParserInputState' info='within an attribute value'/>
+    <enum name='XML_PARSER_CDATA_SECTION' file='parser' value='8' type='xmlParserInputState' info='within a CDATA section'/>
+    <enum name='XML_PARSER_COMMENT' file='parser' value='5' type='xmlParserInputState' info='within a comment'/>
+    <enum name='XML_PARSER_CONTENT' file='parser' value='7' type='xmlParserInputState' info='within the content'/>
+    <enum name='XML_PARSER_DTD' file='parser' value='3' type='xmlParserInputState' info='within some DTD content'/>
+    <enum name='XML_PARSER_END_TAG' file='parser' value='9' type='xmlParserInputState' info='within a closing tag'/>
+    <enum name='XML_PARSER_ENTITY_DECL' file='parser' value='10' type='xmlParserInputState' info='within an entity declaration'/>
+    <enum name='XML_PARSER_ENTITY_VALUE' file='parser' value='11' type='xmlParserInputState' info='within an entity value in a decl'/>
     <enum name='XML_PARSER_EOF' file='parser' value='-1' type='xmlParserInputState' info='nothing is to be parsed'/>
-    <enum name='XML_PARSER_EPILOG' file='parser' type='xmlParserInputState' info='the Misc* after the last end tag'/>
-    <enum name='XML_PARSER_IGNORE' file='parser' type='xmlParserInputState' info='within an IGNORED section'/>
-    <enum name='XML_PARSER_MISC' file='parser' type='xmlParserInputState' info='Misc* before int subset'/>
-    <enum name='XML_PARSER_PI' file='parser' type='xmlParserInputState' info='Within a processing instruction'/>
-    <enum name='XML_PARSER_PROLOG' file='parser' type='xmlParserInputState' info='Misc* after internal subset'/>
-    <enum name='XML_PARSER_PUBLIC_LITERAL' file='parser' type='xmlParserInputState' info=' within a PUBLIC value'/>
+    <enum name='XML_PARSER_EPILOG' file='parser' value='14' type='xmlParserInputState' info='the Misc* after the last end tag'/>
+    <enum name='XML_PARSER_IGNORE' file='parser' value='15' type='xmlParserInputState' info='within an IGNORED section'/>
+    <enum name='XML_PARSER_MISC' file='parser' value='1' type='xmlParserInputState' info='Misc* before int subset'/>
+    <enum name='XML_PARSER_PI' file='parser' value='2' type='xmlParserInputState' info='Within a processing instruction'/>
+    <enum name='XML_PARSER_PROLOG' file='parser' value='4' type='xmlParserInputState' info='Misc* after internal subset'/>
+    <enum name='XML_PARSER_PUBLIC_LITERAL' file='parser' value='16' type='xmlParserInputState' info=' within a PUBLIC value'/>
     <enum name='XML_PARSER_START' file='parser' value='0' type='xmlParserInputState' info='nothing has been parsed'/>
-    <enum name='XML_PARSER_START_TAG' file='parser' type='xmlParserInputState' info='within a start tag'/>
-    <enum name='XML_PARSER_SYSTEM_LITERAL' file='parser' type='xmlParserInputState' info='within a SYSTEM value'/>
+    <enum name='XML_PARSER_START_TAG' file='parser' value='6' type='xmlParserInputState' info='within a start tag'/>
+    <enum name='XML_PARSER_SYSTEM_LITERAL' file='parser' value='13' type='xmlParserInputState' info='within a SYSTEM value'/>
     <enum name='XML_PI_NODE' file='tree' value='7' type='xmlElementType'/>
     <enum name='XML_TEXT_NODE' file='tree' value='3' type='xmlElementType'/>
-    <enum name='XML_WAR_CATALOG_PI' file='xmlerror' type='xmlParserErrors' info='93'/>
-    <enum name='XML_WAR_UNDECLARED_ENTITY' file='xmlerror' type='xmlParserErrors'/>
+    <enum name='XML_WAR_CATALOG_PI' file='xmlerror' value='93' type='xmlParserErrors' info='93'/>
+    <enum name='XML_WAR_UNDECLARED_ENTITY' file='xmlerror' value='27' type='xmlParserErrors'/>
     <enum name='XML_XINCLUDE_END' file='tree' value='20' type='xmlElementType'/>
     <enum name='XML_XINCLUDE_START' file='tree' value='19' type='xmlElementType'/>
     <enum name='XPATH_BOOLEAN' file='xpath' value='2' type='xmlXPathObjectType'/>
-    <enum name='XPATH_ENCODING_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_ENCODING_ERROR' file='xpath' value='20' type='xmlXPathError'/>
     <enum name='XPATH_EXPRESSION_OK' file='xpath' value='0' type='xmlXPathError'/>
-    <enum name='XPATH_EXPR_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_ARITY' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_CHAR_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_CTXT_POSITION' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_CTXT_SIZE' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_OPERAND' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_PREDICATE_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_INVALID_TYPE' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_EXPR_ERROR' file='xpath' value='7' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_ARITY' file='xpath' value='12' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_CHAR_ERROR' file='xpath' value='21' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_CTXT_POSITION' file='xpath' value='14' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_CTXT_SIZE' file='xpath' value='13' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_OPERAND' file='xpath' value='10' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_PREDICATE_ERROR' file='xpath' value='6' type='xmlXPathError'/>
+    <enum name='XPATH_INVALID_TYPE' file='xpath' value='11' type='xmlXPathError'/>
     <enum name='XPATH_LOCATIONSET' file='xpath' value='7' type='xmlXPathObjectType'/>
-    <enum name='XPATH_MEMORY_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_MEMORY_ERROR' file='xpath' value='15' type='xmlXPathError'/>
     <enum name='XPATH_NODESET' file='xpath' value='1' type='xmlXPathObjectType'/>
     <enum name='XPATH_NUMBER' file='xpath' value='3' type='xmlXPathObjectType'/>
-    <enum name='XPATH_NUMBER_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_NUMBER_ERROR' file='xpath' value='1' type='xmlXPathError'/>
     <enum name='XPATH_POINT' file='xpath' value='5' type='xmlXPathObjectType'/>
     <enum name='XPATH_RANGE' file='xpath' value='6' type='xmlXPathObjectType'/>
-    <enum name='XPATH_START_LITERAL_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_START_LITERAL_ERROR' file='xpath' value='3' type='xmlXPathError'/>
     <enum name='XPATH_STRING' file='xpath' value='4' type='xmlXPathObjectType'/>
-    <enum name='XPATH_UNCLOSED_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_UNCLOSED_ERROR' file='xpath' value='8' type='xmlXPathError'/>
     <enum name='XPATH_UNDEFINED' file='xpath' value='0' type='xmlXPathObjectType'/>
-    <enum name='XPATH_UNDEF_PREFIX_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_UNDEF_VARIABLE_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_UNFINISHED_LITERAL_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPATH_UNKNOWN_FUNC_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_UNDEF_PREFIX_ERROR' file='xpath' value='19' type='xmlXPathError'/>
+    <enum name='XPATH_UNDEF_VARIABLE_ERROR' file='xpath' value='5' type='xmlXPathError'/>
+    <enum name='XPATH_UNFINISHED_LITERAL_ERROR' file='xpath' value='2' type='xmlXPathError'/>
+    <enum name='XPATH_UNKNOWN_FUNC_ERROR' file='xpath' value='9' type='xmlXPathError'/>
     <enum name='XPATH_USERS' file='xpath' value='8' type='xmlXPathObjectType'/>
-    <enum name='XPATH_VARIABLE_REF_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPATH_VARIABLE_REF_ERROR' file='xpath' value='4' type='xmlXPathError'/>
     <enum name='XPATH_XSLT_TREE' file='xpath' value='9' type='xmlXPathObjectType' info=' An XSLT value tree, non modifiable'/>
-    <enum name='XPTR_RESOURCE_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPTR_SUB_RESOURCE_ERROR' file='xpath' type='xmlXPathError'/>
-    <enum name='XPTR_SYNTAX_ERROR' file='xpath' type='xmlXPathError'/>
+    <enum name='XPTR_RESOURCE_ERROR' file='xpath' value='17' type='xmlXPathError'/>
+    <enum name='XPTR_SUB_RESOURCE_ERROR' file='xpath' value='18' type='xmlXPathError'/>
+    <enum name='XPTR_SYNTAX_ERROR' file='xpath' value='16' type='xmlXPathError'/>
     <typedef name='docbDocPtr' file='DOCBparser' type='xmlDocPtr'/>
     <typedef name='docbNodePtr' file='DOCBparser' type='xmlNodePtr'/>
     <typedef name='docbParserCtxt' file='DOCBparser' type='xmlParserCtxt'/>
@@ -2584,7 +2585,7 @@
     </function>
     <functype name='attributeDeclSAXFunc' file='parser'>
       <info>An attribute definition has been parsed.</info>
-      <return type='void(*attributeDeclSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='elem' type='const xmlChar *' info='the name of the element'/>
       <arg name='fullname' type='const xmlChar *' info='the attribute name'/>
@@ -2595,7 +2596,7 @@
     </functype>
     <functype name='attributeSAXFunc' file='parser'>
       <info>Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element.</info>
-      <return type='void(*attributeSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The attribute name, including namespace prefix'/>
       <arg name='value' type='const xmlChar *' info='The attribute value'/>
@@ -2609,7 +2610,7 @@
     </function>
     <functype name='cdataBlockSAXFunc' file='parser'>
       <info>Called when a pcdata block has been parsed.</info>
-      <return type='void(*cdataBlockSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='value' type='const xmlChar *' info='The pcdata content'/>
       <arg name='len' type='int' info='the block length'/>
@@ -2623,7 +2624,7 @@
     </function>
     <functype name='charactersSAXFunc' file='parser'>
       <info>Receiving some chars from the parser.</info>
-      <return type='void(*charactersSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='ch' type='const xmlChar *' info='a xmlChar string'/>
       <arg name='len' type='int' info='the number of xmlChar'/>
@@ -2642,7 +2643,7 @@
     </function>
     <functype name='commentSAXFunc' file='parser'>
       <info>A comment has been parsed.</info>
-      <return type='void(*commentSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='value' type='const xmlChar *' info='the comment content'/>
     </functype>
@@ -2731,7 +2732,7 @@
     </function>
     <functype name='elementDeclSAXFunc' file='parser'>
       <info>An element definition has been parsed.</info>
-      <return type='void(*elementDeclSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='the element name'/>
       <arg name='type' type='int' info='the element type'/>
@@ -2744,7 +2745,7 @@
     </function>
     <functype name='endDocumentSAXFunc' file='parser'>
       <info>Called when the document end has been detected.</info>
-      <return type='void(*endDocumentSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
     </functype>
     <function name='endElement' file='SAX'>
@@ -2755,7 +2756,7 @@
     </function>
     <functype name='endElementSAXFunc' file='parser'>
       <info>Called when the end of an element has been detected.</info>
-      <return type='void(*endElementSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The element name'/>
     </functype>
@@ -2771,7 +2772,7 @@
     </function>
     <functype name='entityDeclSAXFunc' file='parser'>
       <info>An entity definition has been parsed.</info>
-      <return type='void(*entityDeclSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='the entity name'/>
       <arg name='type' type='int' info='the entity type'/>
@@ -2781,7 +2782,7 @@
     </functype>
     <functype name='errorSAXFunc' file='parser'>
       <info>Display and format an error messages, callback.</info>
-      <return type='void(*errorSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='an XML parser context'/>
       <arg name='msg' type='const char *' info='the message to display/transmit'/>
       <arg name='...' type='...' info='extra parameters for the message display'/>
@@ -2796,7 +2797,7 @@
     </function>
     <functype name='externalSubsetSAXFunc' file='parser'>
       <info>Callback on external subset declaration.</info>
-      <return type='void(*externalSubsetSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='the root element name'/>
       <arg name='ExternalID' type='const xmlChar *' info='the external ID'/>
@@ -2804,21 +2805,21 @@
     </functype>
     <functype name='fatalErrorSAXFunc' file='parser'>
       <info>Display and format fatal error messages, callback. Note: so far fatalError() SAX callbacks are not used, error() get all the callbacks for errors.</info>
-      <return type='void(*fatalErrorSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='an XML parser context'/>
       <arg name='msg' type='const char *' info='the message to display/transmit'/>
       <arg name='...' type='...' info='extra parameters for the message display'/>
     </functype>
     <functype name='ftpDataCallback' file='nanoftp'>
       <info>A callback for the xmlNanoFTPGet command.</info>
-      <return type='void(*ftpDataCallback)' info=''/>
+      <return type='void'/>
       <arg name='userData' type='void *' info='the user provided context'/>
       <arg name='data' type='const char *' info='the data received'/>
       <arg name='len' type='int' info='its size in bytes'/>
     </functype>
     <functype name='ftpListCallback' file='nanoftp'>
       <info>A callback for the xmlNanoFTPList command. Note that only one of year and day:minute are specified.</info>
-      <return type='void(*ftpListCallback)' info=''/>
+      <return type='void'/>
       <arg name='userData' type='void *' info='user provided data for the callback'/>
       <arg name='filename' type='const char *' info='the file name (including &quot;-&gt;&quot; when links are shown)'/>
       <arg name='attrib' type='const char *' info='the attribute string'/>
@@ -2845,7 +2846,7 @@
     </function>
     <functype name='getEntitySAXFunc' file='parser'>
       <info>Get an entity by name.</info>
-      <return type='xmlEntityPtr(*getEntitySAXFunc)' info='the xmlEntityPtr if found.'/>
+      <return type='xmlEntityPtr' info='the xmlEntityPtr if found.'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The entity name'/>
     </functype>
@@ -2867,7 +2868,7 @@
     </function>
     <functype name='getParameterEntitySAXFunc' file='parser'>
       <info>Get a parameter entity by name.</info>
-      <return type='xmlEntityPtr(*getParameterEntitySAXFunc)' info='the xmlEntityPtr if found.'/>
+      <return type='xmlEntityPtr' info='the xmlEntityPtr if found.'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The entity name'/>
     </functype>
@@ -2895,7 +2896,7 @@
     </function>
     <functype name='hasExternalSubsetSAXFunc' file='parser'>
       <info>Does this document has an external subset?</info>
-      <return type='int(*hasExternalSubsetSAXFunc)' info='1 if true'/>
+      <return type='int' info='1 if true'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
     </functype>
     <function name='hasInternalSubset' file='SAX'>
@@ -2905,7 +2906,7 @@
     </function>
     <functype name='hasInternalSubsetSAXFunc' file='parser'>
       <info>Does this document has an internal subset.</info>
-      <return type='int(*hasInternalSubsetSAXFunc)' info='1 if true'/>
+      <return type='int' info='1 if true'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
     </functype>
     <function name='htmlAutoCloseTag' file='HTMLparser'>
@@ -3061,6 +3062,14 @@
       <arg name='encoding' type='const char *' info='the encoding string'/>
       <arg name='format' type='int' info='should formatting spaces been added'/>
     </function>
+    <function name='htmlNodeDumpOutput' file='HTMLtree'>
+      <info>Dump an HTML node, recursive behaviour,children are printed too, and formatting returns/spaces are added.</info>
+      <return type='void'/>
+      <arg name='buf' type='xmlOutputBufferPtr' info='the HTML buffer output'/>
+      <arg name='doc' type='xmlDocPtr' info='the document'/>
+      <arg name='cur' type='xmlNodePtr' info='the current node'/>
+      <arg name='encoding' type='const char *' info='the encoding string'/>
+    </function>
     <function name='htmlParseCharRef' file='HTMLparser'>
       <info>parse Reference declarations  [66] CharRef ::= &apos;&amp;#&apos; [0-9]+ &apos;;&apos; | &apos;&amp;#x&apos; [0-9a-fA-F]+ &apos;;&apos;</info>
       <return type='int' info='the value parsed (as an int)'/>
@@ -3159,7 +3168,7 @@
     </function>
     <functype name='ignorableWhitespaceSAXFunc' file='parser'>
       <info>Receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters.</info>
-      <return type='void(*ignorableWhitespaceSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='ch' type='const xmlChar *' info='a xmlChar string'/>
       <arg name='len' type='int' info='the number of xmlChar'/>
@@ -3206,7 +3215,7 @@
     </function>
     <functype name='internalSubsetSAXFunc' file='parser'>
       <info>Callback on internal subset declaration.</info>
-      <return type='void(*internalSubsetSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='the root element name'/>
       <arg name='ExternalID' type='const xmlChar *' info='the external ID'/>
@@ -3219,7 +3228,7 @@
     </function>
     <functype name='isStandaloneSAXFunc' file='parser'>
       <info>Is this document tagged standalone?</info>
-      <return type='int(*isStandaloneSAXFunc)' info='1 if true'/>
+      <return type='int' info='1 if true'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
     </functype>
     <function name='isolat1ToUTF8' file='encoding'>
@@ -3269,7 +3278,7 @@
     </function>
     <functype name='notationDeclSAXFunc' file='parser'>
       <info>What to do when a notation declaration has been parsed.</info>
-      <return type='void(*notationDeclSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The name of the notation'/>
       <arg name='publicId' type='const xmlChar *' info='The public ID of the entity'/>
@@ -3284,7 +3293,7 @@
     </function>
     <functype name='processingInstructionSAXFunc' file='parser'>
       <info>A processing instruction has been parsed.</info>
-      <return type='void(*processingInstructionSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='target' type='const xmlChar *' info='the target name'/>
       <arg name='data' type='const xmlChar *' info='the PI data&apos;s'/>
@@ -3297,7 +3306,7 @@
     </function>
     <functype name='referenceSAXFunc' file='parser'>
       <info>Called when an entity reference is detected.</info>
-      <return type='void(*referenceSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The entity name'/>
     </functype>
@@ -3310,7 +3319,7 @@
     </function>
     <functype name='resolveEntitySAXFunc' file='parser'>
       <info>Callback: The entity loader, to control the loading of external entities, the application can either: - override this resolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it&apos;s own entity resolution routine</info>
-      <return type='xmlParserInputPtr(*resolveEntitySAXFunc)' info='the xmlParserInputPtr if inlined or NULL for DOM behaviour.'/>
+      <return type='xmlParserInputPtr' info='the xmlParserInputPtr if inlined or NULL for DOM behaviour.'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='publicId' type='const xmlChar *' info='The public ID of the entity'/>
       <arg name='systemId' type='const xmlChar *' info='The system ID of the entity'/>
@@ -3323,7 +3332,7 @@
     </function>
     <functype name='setDocumentLocatorSAXFunc' file='parser'>
       <info>Receive the document locator at startup, actually xmlDefaultSAXLocator. Everything is available on the context, so this is useless in our case.</info>
-      <return type='void(*setDocumentLocatorSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='loc' type='xmlSAXLocatorPtr' info='A SAX Locator'/>
     </functype>
@@ -3340,7 +3349,7 @@
     </function>
     <functype name='startDocumentSAXFunc' file='parser'>
       <info>Called when the document start being processed.</info>
-      <return type='void(*startDocumentSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
     </functype>
     <function name='startElement' file='SAX'>
@@ -3352,7 +3361,7 @@
     </function>
     <functype name='startElementSAXFunc' file='parser'>
       <info>Called when an opening tag has been processed.</info>
-      <return type='void(*startElementSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The element name, including namespace prefix'/>
       <arg name='atts' type='const xmlChar **' info='An array of name/value attributes pairs, NULL terminated'/>
@@ -3368,7 +3377,7 @@
     </function>
     <functype name='unparsedEntityDeclSAXFunc' file='parser'>
       <info>What to do when an unparsed entity declaration is parsed.</info>
-      <return type='void(*unparsedEntityDeclSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='the user data (XML parser context)'/>
       <arg name='name' type='const xmlChar *' info='The name of the entity'/>
       <arg name='publicId' type='const xmlChar *' info='The public ID of the entity'/>
@@ -3388,14 +3397,14 @@
     </function>
     <functype name='warningSAXFunc' file='parser'>
       <info>Display and format a warning messages, callback.</info>
-      <return type='void(*warningSAXFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='an XML parser context'/>
       <arg name='msg' type='const char *' info='the message to display/transmit'/>
       <arg name='...' type='...' info='extra parameters for the message display'/>
     </functype>
     <functype name='xlinkExtendedLinkFunk' file='xlink'>
       <info>This is the prototype for a extended link detection callback.</info>
-      <return type='void(*xlinkExtendedLinkFunk)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='user data pointer'/>
       <arg name='node' type='xmlNodePtr' info='the node carrying the link'/>
       <arg name='nbLocators' type='int' info='the number of locators detected on the link'/>
@@ -3412,7 +3421,7 @@
     </functype>
     <functype name='xlinkExtendedLinkSetFunk' file='xlink'>
       <info>This is the prototype for a extended link set detection callback.</info>
-      <return type='void(*xlinkExtendedLinkSetFunk)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='user data pointer'/>
       <arg name='node' type='xmlNodePtr' info='the node carrying the link'/>
       <arg name='nbLocators' type='int' info='the number of locators detected on the link'/>
@@ -3438,7 +3447,7 @@
     </function>
     <functype name='xlinkNodeDetectFunc' file='xlink'>
       <info>This is the prototype for the link detection routine. It calls the default link detection callbacks upon link detection.</info>
-      <return type='void(*xlinkNodeDetectFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='user data pointer'/>
       <arg name='node' type='xmlNodePtr' info='the node to check'/>
     </functype>
@@ -3454,7 +3463,7 @@
     </function>
     <functype name='xlinkSimpleLinkFunk' file='xlink'>
       <info>This is the prototype for a simple link detection callback.</info>
-      <return type='void(*xlinkSimpleLinkFunk)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='user data pointer'/>
       <arg name='node' type='xmlNodePtr' info='the node carrying the link'/>
       <arg name='href' type='const xlinkHRef' info='the target of the link'/>
@@ -3872,7 +3881,7 @@
     </function>
     <functype name='xmlC14NIsVisibleCallback' file='c14n'>
       <info></info>
-      <return type='int(*xmlC14NIsVisibleCallback)' info=''/>
+      <return type='int' info=''/>
       <arg name='user_data' type='void *' info=''/>
       <arg name='node' type='xmlNodePtr' info=''/>
       <arg name='parent' type='xmlNodePtr' info=''/>
@@ -4009,7 +4018,7 @@
     </function>
     <functype name='xmlCharEncodingInputFunc' file='encoding'>
       <info>Take a block of chars in the original encoding and try to convert it to an UTF-8 block of chars out.</info>
-      <return type='int(*xmlCharEncodingInputFunc)' info='the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictiable. The value of @outlen after return is the number of octets consumed.'/>
+      <return type='int' info='the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictiable. The value of @outlen after return is the number of octets consumed.'/>
       <arg name='out' type='unsigned char *' info='a pointer to an array of bytes to store the UTF-8 result'/>
       <arg name='outlen' type='int *' info='the length of @out'/>
       <arg name='in' type='const unsigned char *' info='a pointer to an array of chars in the original encoding'/>
@@ -4017,7 +4026,7 @@
     </functype>
     <functype name='xmlCharEncodingOutputFunc' file='encoding'>
       <info>Take a block of UTF-8 chars in and try to convert it to an other encoding. Note: a first call designed to produce heading info is called with in = NULL. If stateful this should also initialize the encoder state.</info>
-      <return type='int(*xmlCharEncodingOutputFunc)' info='the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictiable. The value of @outlen after return is the number of ocetes consumed.'/>
+      <return type='int' info='the number of byte written, or -1 by lack of space, or -2 if the transcoding failed. The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictiable. The value of @outlen after return is the number of ocetes consumed.'/>
       <arg name='out' type='unsigned char *' info='a pointer to an array of bytes to store the result'/>
       <arg name='outlen' type='int *' info='the length of @out'/>
       <arg name='in' type='const unsigned char *' info='a pointer to an array of UTF-8 chars'/>
@@ -4481,14 +4490,14 @@
     </function>
     <functype name='xmlEntityReferenceFunc' file='parserInternals'>
       <info>Callback function used when one needs to be able to track back the provenance of a chunk of nodes inherited from an entity replacement.</info>
-      <return type='void(*xmlEntityReferenceFunc)' info=''/>
+      <return type='void'/>
       <arg name='ent' type='xmlEntityPtr' info='the entity'/>
       <arg name='firstNode' type='xmlNodePtr' info='the fist node in the chunk'/>
       <arg name='lastNode' type='xmlNodePtr' info='the last nod in the chunk'/>
     </functype>
     <functype name='xmlExternalEntityLoader' file='parser'>
       <info>External entity loaders types.</info>
-      <return type='xmlParserInputPtr(*xmlExternalEntityLoader)' info='the entity input parser.'/>
+      <return type='xmlParserInputPtr' info='the entity input parser.'/>
       <arg name='URL' type='const char *' info='The System ID of the resource requested'/>
       <arg name='ID' type='const char *' info='The Public ID of the resource requested'/>
       <arg name='context' type='xmlParserCtxtPtr' info='the XML parser context'/>
@@ -4567,7 +4576,7 @@
     </function>
     <functype name='xmlFreeFunc' file='xmlmemory'>
       <info>Signature for a free() implementation.</info>
-      <return type='void(*xmlFreeFunc)' info=''/>
+      <return type='void'/>
       <arg name='mem' type='void *' info='an already allocated block of memory'/>
     </functype>
     <function name='xmlFreeIDTable' file='valid'>
@@ -4652,7 +4661,7 @@
     </function>
     <functype name='xmlGenericErrorFunc' file='xmlerror'>
       <info>Signature of the function to use when there is an error and no parsing or validity context available .</info>
-      <return type='void(*xmlGenericErrorFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='a parsing context'/>
       <arg name='msg' type='const char *' info='the message'/>
       <arg name='...' type='...' info='the extra arguments of the varags to format the message'/>
@@ -4869,7 +4878,7 @@
     </function>
     <functype name='xmlHashCopier' file='hash'>
       <info>Callback to copy data from a hash.</info>
-      <return type='void *(*xmlHashCopier)' info='a copy of the data or NULL in case of error.'/>
+      <return type='void *' info='a copy of the data or NULL in case of error.'/>
       <arg name='payload' type='void *' info='the data in the hash'/>
       <arg name='name' type='xmlChar *' info='the name associated'/>
     </functype>
@@ -4886,7 +4895,7 @@
     </function>
     <functype name='xmlHashDeallocator' file='hash'>
       <info>Callback to free data from a hash.</info>
-      <return type='void(*xmlHashDeallocator)' info=''/>
+      <return type='void'/>
       <arg name='payload' type='void *' info='the data in the hash'/>
       <arg name='name' type='xmlChar *' info='the name associated'/>
     </functype>
@@ -4977,14 +4986,14 @@
     </function>
     <functype name='xmlHashScanner' file='hash'>
       <info>Callback when scanning data in a hash with the simple scanner.</info>
-      <return type='void(*xmlHashScanner)' info=''/>
+      <return type='void'/>
       <arg name='payload' type='void *' info='the data in the hash'/>
       <arg name='data' type='void *' info='extra scannner data'/>
       <arg name='name' type='xmlChar *' info='the name associated'/>
     </functype>
     <functype name='xmlHashScannerFull' file='hash'>
       <info>Callback when scanning data in a hash with the full scanner.</info>
-      <return type='void(*xmlHashScannerFull)' info=''/>
+      <return type='void'/>
       <arg name='payload' type='void *' info='the data in the hash'/>
       <arg name='data' type='void *' info='extra scannner data'/>
       <arg name='name' type='const xmlChar *' info='the name associated'/>
@@ -5121,22 +5130,22 @@
     </function>
     <functype name='xmlInputCloseCallback' file='xmlIO'>
       <info>Callback used in the I/O Input API to close the resource</info>
-      <return type='int(*xmlInputCloseCallback)' info='0 or -1 in case of error'/>
+      <return type='int' info='0 or -1 in case of error'/>
       <arg name='context' type='void *' info='an Input context'/>
     </functype>
     <functype name='xmlInputMatchCallback' file='xmlIO'>
       <info>Callback used in the I/O Input API to detect if the current handler can provide input fonctionnalities for this resource.</info>
-      <return type='int(*xmlInputMatchCallback)' info='1 if yes and 0 if another Input module should be used'/>
+      <return type='int' info='1 if yes and 0 if another Input module should be used'/>
       <arg name='filename' type='char const *' info='the filename or URI'/>
     </functype>
     <functype name='xmlInputOpenCallback' file='xmlIO'>
       <info>Callback used in the I/O Input API to open the resource</info>
-      <return type='void *(*xmlInputOpenCallback)' info='an Input context or NULL in case or error'/>
+      <return type='void *' info='an Input context or NULL in case or error'/>
       <arg name='filename' type='char const *' info='the filename or URI'/>
     </functype>
     <functype name='xmlInputReadCallback' file='xmlIO'>
       <info>Callback used in the I/O Input API to read the resource</info>
-      <return type='int(*xmlInputReadCallback)' info='the number of bytes read or -1 in case of error'/>
+      <return type='int' info='the number of bytes read or -1 in case of error'/>
       <arg name='context' type='void *' info='an Input context'/>
       <arg name='buffer' type='char *' info='the buffer to store data read'/>
       <arg name='len' type='int' info='the length of the buffer in bytes'/>
@@ -5261,13 +5270,13 @@
     </function>
     <functype name='xmlListDataCompare' file='list'>
       <info>Callback function used to compare 2 data.</info>
-      <return type='int(*xmlListDataCompare)' info='0 is equality, -1 or 1 otherwise depending on the ordering.'/>
+      <return type='int' info='0 is equality, -1 or 1 otherwise depending on the ordering.'/>
       <arg name='data0' type='const void *' info='the first data'/>
       <arg name='data1' type='const void *' info='the second data'/>
     </functype>
     <functype name='xmlListDeallocator' file='list'>
       <info>Callback function used to free data from a list.</info>
-      <return type='void(*xmlListDeallocator)' info=''/>
+      <return type='void'/>
       <arg name='lk' type='xmlLinkPtr' info='the data to deallocate'/>
     </functype>
     <function name='xmlListDelete' file='list'>
@@ -5390,7 +5399,7 @@
     </function>
     <functype name='xmlListWalker' file='list'>
       <info>Callback function used when walking a list with xmlListWalk().</info>
-      <return type='int(*xmlListWalker)' info='0 to stop walking the list, 1 otherwise.'/>
+      <return type='int' info='0 to stop walking the list, 1 otherwise.'/>
       <arg name='data' type='const void *' info='the data found in the list'/>
       <arg name='user' type='const void *' info='extra user provided data to the walker'/>
     </functype>
@@ -5438,7 +5447,7 @@
     </function>
     <functype name='xmlMallocFunc' file='xmlmemory'>
       <info>Signature for a malloc() implementation.</info>
-      <return type='void *(*xmlMallocFunc)' info='a pointer to the newly allocated block or NULL in case of error.'/>
+      <return type='void *' info='a pointer to the newly allocated block or NULL in case of error.'/>
       <arg name='size' type='size_t' info='the size requested in bytes'/>
     </functype>
     <function name='xmlMallocLoc' file='xmlmemory'>
@@ -6169,22 +6178,22 @@
     </function>
     <functype name='xmlOutputCloseCallback' file='xmlIO'>
       <info>Callback used in the I/O Output API to close the resource</info>
-      <return type='int(*xmlOutputCloseCallback)' info='0 or -1 in case of error'/>
+      <return type='int' info='0 or -1 in case of error'/>
       <arg name='context' type='void *' info='an Output context'/>
     </functype>
     <functype name='xmlOutputMatchCallback' file='xmlIO'>
       <info>Callback used in the I/O Output API to detect if the current handler can provide output fonctionnalities for this resource.</info>
-      <return type='int(*xmlOutputMatchCallback)' info='1 if yes and 0 if another Output module should be used'/>
+      <return type='int' info='1 if yes and 0 if another Output module should be used'/>
       <arg name='filename' type='char const *' info='the filename or URI'/>
     </functype>
     <functype name='xmlOutputOpenCallback' file='xmlIO'>
       <info>Callback used in the I/O Output API to open the resource</info>
-      <return type='void *(*xmlOutputOpenCallback)' info='an Output context or NULL in case or error'/>
+      <return type='void *' info='an Output context or NULL in case or error'/>
       <arg name='filename' type='char const *' info='the filename or URI'/>
     </functype>
     <functype name='xmlOutputWriteCallback' file='xmlIO'>
       <info>Callback used in the I/O Output API to write to the resource</info>
-      <return type='int(*xmlOutputWriteCallback)' info='the number of bytes written or -1 in case of error'/>
+      <return type='int' info='the number of bytes written or -1 in case of error'/>
       <arg name='context' type='void *' info='an Output context'/>
       <arg name='buffer' type='const char *' info='the buffer of data to write'/>
       <arg name='len' type='int' info='the length of the buffer in bytes'/>
@@ -6633,7 +6642,7 @@
     </function>
     <functype name='xmlParserInputDeallocate' file='parser'>
       <info>Callback for freeing some parser input allocations.</info>
-      <return type='void(*xmlParserInputDeallocate)' info=''/>
+      <return type='void'/>
       <arg name='str' type='xmlChar *' info='the string to deallocate'/>
     </functype>
     <function name='xmlParserInputGrow' file='parser'>
@@ -6718,7 +6727,7 @@
     </function>
     <functype name='xmlReallocFunc' file='xmlmemory'>
       <info>Signature for a realloc() implementation.</info>
-      <return type='void *(*xmlReallocFunc)' info='a pointer to the newly reallocated block or NULL in case of error.'/>
+      <return type='void *' info='a pointer to the newly reallocated block or NULL in case of error.'/>
       <arg name='mem' type='void *' info='an already allocated block of memory'/>
       <arg name='size' type='size_t' info='the new size requested in bytes'/>
     </functype>
@@ -6754,7 +6763,7 @@
     </function>
     <functype name='xmlRegExecCallbacks' file='xmlregexp'>
       <info></info>
-      <return type='void(*xmlRegExecCallbacks)' info=''/>
+      <return type='void'/>
       <arg name='exec' type='xmlRegExecCtxtPtr' info=''/>
       <arg name='token' type='const xmlChar *' info=''/>
       <arg name='transdata' type='void *' info=''/>
@@ -7101,7 +7110,7 @@
     </function>
     <functype name='xmlShellCmd' file='debugXML'>
       <info>This is a generic signature for the XML shell functions.</info>
-      <return type='int(*xmlShellCmd)' info='an int, negative returns indicating errors.'/>
+      <return type='int' info='an int, negative returns indicating errors.'/>
       <arg name='ctxt' type='xmlShellCtxtPtr' info='a shell context'/>
       <arg name='arg' type='char *' info='a string argument'/>
       <arg name='node' type='xmlNodePtr' info='a first node'/>
@@ -7165,7 +7174,7 @@
     </function>
     <functype name='xmlShellReadlineFunc' file='debugXML'>
       <info>This is a generic signature for the XML shell input function.</info>
-      <return type='char *(*xmlShellReadlineFunc)' info='a string which will be freed by the Shell.'/>
+      <return type='char *' info='a string which will be freed by the Shell.'/>
       <arg name='prompt' type='char *' info='a string prompt'/>
     </functype>
     <function name='xmlShellSave' file='debugXML'>
@@ -7273,7 +7282,7 @@
     </function>
     <functype name='xmlStrdupFunc' file='xmlmemory'>
       <info>Signature for an strdup() implementation.</info>
-      <return type='char *(*xmlStrdupFunc)' info='the copy of the string or NULL in case of error.'/>
+      <return type='char *' info='the copy of the string or NULL in case of error.'/>
       <arg name='str' type='const char *' info='a zero terminated string'/>
     </functype>
     <function name='xmlStringCurrentChar' file='parserInternals'>
@@ -8368,14 +8377,14 @@
     </function>
     <functype name='xmlValidityErrorFunc' file='valid'>
       <info>Callback called when a validity error is found. This is a message oriented function similar to an *printf function.</info>
-      <return type='void(*xmlValidityErrorFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='an xmlValidCtxtPtr validity error context'/>
       <arg name='msg' type='const char *' info='the string to format *printf like vararg'/>
       <arg name='...' type='...' info='remaining arguments to the format'/>
     </functype>
     <functype name='xmlValidityWarningFunc' file='valid'>
       <info>Callback called when a validity warning is found. This is a message oriented function similar to an *printf function.</info>
-      <return type='void(*xmlValidityWarningFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctx' type='void *' info='an xmlValidCtxtPtr validity error context'/>
       <arg name='msg' type='const char *' info='the string to format *printf like vararg'/>
       <arg name='...' type='...' info='remaining arguments to the format'/>
@@ -8392,7 +8401,7 @@
     </function>
     <functype name='xmlXPathAxisFunc' file='xpath'>
       <info>An axis traversal function. To traverse an axis, the engine calls the first time with cur == NULL and repeat until the function returns NULL indicating the end of the axis traversal.</info>
-      <return type='xmlXPathObjectPtr(*xmlXPathAxisFunc)' info='the next node in that axis or NULL if at the end of the axis.'/>
+      <return type='xmlXPathObjectPtr' info='the next node in that axis or NULL if at the end of the axis.'/>
       <arg name='ctxt' type='xmlXPathParserContextPtr' info='the XPath interpreter context'/>
       <arg name='cur' type='xmlXPathObjectPtr' info='the previous node being explored on that axis'/>
     </functype>
@@ -8521,7 +8530,7 @@
     </function>
     <functype name='xmlXPathConvertFunc' file='xpath'>
       <info>A conversion function is associated to a type and used to cast the new type to primitive values.</info>
-      <return type='int(*xmlXPathConvertFunc)' info='-1 in case of error, 0 otherwise'/>
+      <return type='int' info='-1 in case of error, 0 otherwise'/>
       <arg name='obj' type='xmlXPathObjectPtr' info='an XPath object'/>
       <arg name='type' type='int' info='the number of the target type'/>
     </functype>
@@ -8600,7 +8609,7 @@
     </function>
     <functype name='xmlXPathEvalFunc' file='xpath'>
       <info>An XPath evaluation function, the parameters are on the XPath context stack.</info>
-      <return type='void(*xmlXPathEvalFunc)' info=''/>
+      <return type='void'/>
       <arg name='ctxt' type='xmlXPathParserContextPtr' info='an XPath parser context'/>
       <arg name='nargs' type='int' info='the number of arguments passed to the function'/>
     </functype>
@@ -8660,14 +8669,14 @@
     </function>
     <functype name='xmlXPathFuncLookupFunc' file='xpathInternals'>
       <info>Prototype for callbacks used to plug function lookup in the XPath engine.</info>
-      <return type='xmlXPathFunction(*xmlXPathFuncLookupFunc)' info='the XPath function or NULL if not found.'/>
+      <return type='xmlXPathFunction' info='the XPath function or NULL if not found.'/>
       <arg name='ctxt' type='void *' info='an XPath context'/>
       <arg name='name' type='const xmlChar *' info='name of the function'/>
       <arg name='ns_uri' type='const xmlChar *' info='the namespace name hosting this function'/>
     </functype>
     <functype name='xmlXPathFunction' file='xpath'>
       <info>An XPath function. The arguments (if any) are popped out from the context stack and the result is pushed on the stack.</info>
-      <return type='void(*xmlXPathFunction)' info=''/>
+      <return type='void'/>
       <arg name='ctxt' type='xmlXPathParserContextPtr' info='the XPath interprestation context'/>
       <arg name='nargs' type='int' info='the number of arguments'/>
     </functype>
@@ -9219,7 +9228,7 @@
     </function>
     <functype name='xmlXPathVariableLookupFunc' file='xpathInternals'>
       <info>Prototype for callbacks used to plug variable lookup in the XPath engine.</info>
-      <return type='xmlXPathObjectPtr(*xmlXPathVariableLookupFunc)' info='the XPath object value or NULL if not found.'/>
+      <return type='xmlXPathObjectPtr' info='the XPath object value or NULL if not found.'/>
       <arg name='ctxt' type='void *' info='an XPath context'/>
       <arg name='name' type='const xmlChar *' info='name of the variable'/>
       <arg name='ns_uri' type='const xmlChar *' info='the namespace name hosting this variable'/>