diff --git a/ChangeLog b/ChangeLog
index 44d28b1b..4bea36c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 12 08:28:07 HKT 2004 William Brack <wbrack@mmm.com.hk>
+
+	* python/libxslt-python-api.xml: fixed type for doctypeSystem
+	  and doctypePublic (problem reported on the list by Sitsofe
+	  Wheeler)
+	* doc/libxslt-api.xml: updated database.
+
 Sun Jul 11 22:46:31 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
 	* transform.c: small change to key handling for RVT, needed
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 6827204c..de44415e 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -14,57 +14,57 @@
      <summary>interface for the document handling</summary>
      <description>implements document loading and cache (multiple document() reference for the same resources must be equal. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xsltFreeDocuments' type='function'/>
-     <exports symbol='xsltNewDocument' type='function'/>
      <exports symbol='xsltFreeStyleDocuments' type='function'/>
-     <exports symbol='xsltLoadDocument' type='function'/>
      <exports symbol='xsltFindDocument' type='function'/>
      <exports symbol='xsltLoadStyleDocument' type='function'/>
      <exports symbol='xsltNewStyleDocument' type='function'/>
+     <exports symbol='xsltFreeDocuments' type='function'/>
+     <exports symbol='xsltNewDocument' type='function'/>
+     <exports symbol='xsltLoadDocument' type='function'/>
     </file>
     <file name='extensions'>
      <summary>interface for the extension support</summary>
      <description>This provide the API needed for simple and module extension support. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='xsltRegisterExtPrefix' type='function'/>
      <exports symbol='xsltRegisterExtFunction' type='function'/>
-     <exports symbol='xsltPreComputeFunction' type='function'/>
-     <exports symbol='xsltInitCtxtExts' type='function'/>
-     <exports symbol='xsltTopLevelFunction' type='function'/>
-     <exports symbol='xsltShutdownCtxtExts' type='function'/>
-     <exports symbol='xsltGetExtInfo' type='function'/>
-     <exports symbol='xsltUnregisterExtModuleFunction' type='function'/>
-     <exports symbol='xsltStyleGetExtData' type='function'/>
-     <exports symbol='xsltRegisterExtElement' type='function'/>
-     <exports symbol='xsltExtFunctionLookup' type='function'/>
-     <exports symbol='xsltExtInitFunction' type='function'/>
      <exports symbol='xsltRegisterExtModuleElement' type='function'/>
-     <exports symbol='xsltFreeCtxtExts' type='function'/>
-     <exports symbol='xsltRegisterTestModule' type='function'/>
-     <exports symbol='xsltXPathGetTransformContext' type='function'/>
-     <exports symbol='xsltExtModuleElementLookup' type='function'/>
-     <exports symbol='xsltRegisterExtModuleFull' type='function'/>
-     <exports symbol='xsltUnregisterExtModuleTopLevel' type='function'/>
+     <exports symbol='xsltInitCtxtExts' type='function'/>
+     <exports symbol='xsltGetExtData' type='function'/>
+     <exports symbol='xsltStyleGetExtData' type='function'/>
+     <exports symbol='xsltStyleExtInitFunction' type='function'/>
+     <exports symbol='xsltExtFunctionLookup' type='function'/>
      <exports symbol='xsltShutdownExts' type='function'/>
-     <exports symbol='xsltStyleExtShutdownFunction' type='function'/>
-     <exports symbol='xsltNewElemPreComp' type='function'/>
      <exports symbol='xsltExtModuleElementPreComputeLookup' type='function'/>
-     <exports symbol='xsltUnregisterExtModuleElement' type='function'/>
+     <exports symbol='xsltRegisterTestModule' type='function'/>
+     <exports symbol='xsltExtModuleElementLookup' type='function'/>
+     <exports symbol='xsltStyleExtShutdownFunction' type='function'/>
      <exports symbol='xsltInitElemPreComp' type='function'/>
      <exports symbol='xsltDebugDumpExtensions' type='function'/>
-     <exports symbol='xsltCheckExtPrefix' type='function'/>
-     <exports symbol='xsltGetExtData' type='function'/>
-     <exports symbol='xsltRegisterExtModule' type='function'/>
-     <exports symbol='xsltExtElementLookup' type='function'/>
-     <exports symbol='xsltRegisterExtModuleTopLevel' type='function'/>
-     <exports symbol='xsltRegisterExtModuleFunction' type='function'/>
+     <exports symbol='xsltGetExtInfo' type='function'/>
      <exports symbol='xsltExtModuleTopLevelLookup' type='function'/>
      <exports symbol='xsltFreeExts' type='function'/>
-     <exports symbol='xsltStyleExtInitFunction' type='function'/>
      <exports symbol='xsltExtModuleFunctionLookup' type='function'/>
      <exports symbol='xsltPreComputeExtModuleElement' type='function'/>
-     <exports symbol='xsltExtShutdownFunction' type='function'/>
+     <exports symbol='xsltRegisterExtModuleTopLevel' type='function'/>
+     <exports symbol='xsltPreComputeFunction' type='function'/>
+     <exports symbol='xsltTopLevelFunction' type='function'/>
+     <exports symbol='xsltShutdownCtxtExts' type='function'/>
+     <exports symbol='xsltXPathGetTransformContext' type='function'/>
+     <exports symbol='xsltRegisterExtElement' type='function'/>
+     <exports symbol='xsltExtInitFunction' type='function'/>
+     <exports symbol='xsltFreeCtxtExts' type='function'/>
      <exports symbol='xsltUnregisterExtModule' type='function'/>
+     <exports symbol='xsltRegisterExtModuleFull' type='function'/>
+     <exports symbol='xsltUnregisterExtModuleTopLevel' type='function'/>
+     <exports symbol='xsltNewElemPreComp' type='function'/>
+     <exports symbol='xsltUnregisterExtModuleElement' type='function'/>
+     <exports symbol='xsltUnregisterExtModuleFunction' type='function'/>
+     <exports symbol='xsltCheckExtPrefix' type='function'/>
+     <exports symbol='xsltRegisterExtModule' type='function'/>
+     <exports symbol='xsltExtElementLookup' type='function'/>
+     <exports symbol='xsltRegisterExtModuleFunction' type='function'/>
+     <exports symbol='xsltRegisterExtPrefix' type='function'/>
+     <exports symbol='xsltExtShutdownFunction' type='function'/>
     </file>
     <file name='extra'>
      <summary>interface for the non-standard features</summary>
@@ -86,10 +86,10 @@
      <author>Daniel Veillard and Bjorn Reese &lt;breese@users.sourceforge.net&gt; </author>
      <exports symbol='XSLT_REGISTER_FUNCTION_LOOKUP' type='macro'/>
      <exports symbol='xsltXPathFunctionLookup' type='function'/>
-     <exports symbol='xsltRegisterAllFunctions' type='function'/>
      <exports symbol='xsltFunctionAvailableFunction' type='function'/>
-     <exports symbol='xsltKeyFunction' type='function'/>
      <exports symbol='xsltFormatNumberFunction' type='function'/>
+     <exports symbol='xsltRegisterAllFunctions' type='function'/>
+     <exports symbol='xsltKeyFunction' type='function'/>
      <exports symbol='xsltUnparsedEntityURIFunction' type='function'/>
      <exports symbol='xsltDocumentFunction' type='function'/>
      <exports symbol='xsltSystemPropertyFunction' type='function'/>
@@ -102,12 +102,12 @@
      <author>Daniel Veillard </author>
      <exports symbol='XSLT_GET_IMPORT_PTR' type='macro'/>
      <exports symbol='XSLT_GET_IMPORT_INT' type='macro'/>
-     <exports symbol='xsltNeedElemSpaceHandling' type='function'/>
-     <exports symbol='xsltParseStylesheetImport' type='function'/>
      <exports symbol='xsltFindTemplate' type='function'/>
-     <exports symbol='xsltFindElemSpaceHandling' type='function'/>
      <exports symbol='xsltNextImport' type='function'/>
      <exports symbol='xsltParseStylesheetInclude' type='function'/>
+     <exports symbol='xsltNeedElemSpaceHandling' type='function'/>
+     <exports symbol='xsltFindElemSpaceHandling' type='function'/>
+     <exports symbol='xsltParseStylesheetImport' type='function'/>
     </file>
     <file name='keys'>
      <summary>interface for the key matching used in key() and template matches.</summary>
@@ -125,12 +125,12 @@
      <description>set of function easing the processing and generation of namespace nodes in XSLT. </description>
      <author>Daniel Veillard </author>
      <exports symbol='xsltFreeNamespaceAliasHashes' type='function'/>
-     <exports symbol='xsltGetSpecialNamespace' type='function'/>
-     <exports symbol='xsltCopyNamespaceList' type='function'/>
      <exports symbol='xsltCopyNamespace' type='function'/>
-     <exports symbol='xsltNamespaceAlias' type='function'/>
+     <exports symbol='xsltCopyNamespaceList' type='function'/>
      <exports symbol='xsltGetNamespace' type='function'/>
      <exports symbol='xsltGetPlainNamespace' type='function'/>
+     <exports symbol='xsltGetSpecialNamespace' type='function'/>
+     <exports symbol='xsltNamespaceAlias' type='function'/>
     </file>
     <file name='numbersInternals'>
      <summary>Implementation of the XSLT number functions</summary>
@@ -152,12 +152,12 @@
      <exports symbol='xsltNormalizeCompSteps' type='function'/>
      <exports symbol='xsltAddTemplate' type='function'/>
      <exports symbol='xsltCompilePattern' type='function'/>
-     <exports symbol='xsltFreeCompMatchList' type='function'/>
      <exports symbol='xsltMatchPattern' type='function'/>
-     <exports symbol='xsltFreeTemplateHashes' type='function'/>
-     <exports symbol='xsltCleanupTemplates' type='function'/>
      <exports symbol='xsltGetTemplate' type='function'/>
      <exports symbol='xsltTestCompMatchList' type='function'/>
+     <exports symbol='xsltFreeCompMatchList' type='function'/>
+     <exports symbol='xsltFreeTemplateHashes' type='function'/>
+     <exports symbol='xsltCleanupTemplates' type='function'/>
     </file>
     <file name='preproc'>
      <summary>precomputing stylesheets</summary>
@@ -198,11 +198,11 @@
      <description>This set of routine encapsulates XPath calls and Attribute Value Templates evaluation. </description>
      <author>Daniel Veillard </author>
      <exports symbol='xsltEvalStaticAttrValueTemplate' type='function'/>
-     <exports symbol='xsltEvalAttrValueTemplate' type='function'/>
+     <exports symbol='xsltAttrListTemplateProcess' type='function'/>
      <exports symbol='xsltEvalTemplateString' type='function'/>
      <exports symbol='xsltAttrTemplateValueProcess' type='function'/>
      <exports symbol='xsltAttrTemplateProcess' type='function'/>
-     <exports symbol='xsltAttrListTemplateProcess' type='function'/>
+     <exports symbol='xsltEvalAttrValueTemplate' type='function'/>
      <exports symbol='xsltEvalXPathPredicate' type='function'/>
      <exports symbol='xsltAttrTemplateValueProcessNode' type='function'/>
      <exports symbol='xsltTemplateProcess' type='function'/>
@@ -214,33 +214,33 @@
      <description>This module implements the bulk of the actual</description>
      <author>Daniel Veillard </author>
      <exports symbol='xsltValueOf' type='function'/>
-     <exports symbol='xsltNumber' type='function'/>
      <exports symbol='xsltRegisterAllElement' type='function'/>
-     <exports symbol='xsltRunStylesheetUser' type='function'/>
      <exports symbol='xsltSort' type='function'/>
+     <exports symbol='xsltCopyOf' type='function'/>
+     <exports symbol='xsltApplyTemplates' type='function'/>
+     <exports symbol='xsltIf' type='function'/>
+     <exports symbol='xsltCallTemplate' type='function'/>
+     <exports symbol='xsltApplyStylesheet' type='function'/>
+     <exports symbol='xsltApplyStripSpaces' type='function'/>
+     <exports symbol='xsltSetXIncludeDefault' type='function'/>
+     <exports symbol='xsltFreeTransformContext' type='function'/>
+     <exports symbol='xsltRunStylesheet' type='function'/>
+     <exports symbol='xsltChoose' type='function'/>
+     <exports symbol='xsltCopyTextString' type='function'/>
+     <exports symbol='xsltText' type='function'/>
+     <exports symbol='xsltNumber' type='function'/>
+     <exports symbol='xsltRunStylesheetUser' type='function'/>
      <exports symbol='xsltNewTransformContext' type='function'/>
      <exports symbol='xsltGetXIncludeDefault' type='function'/>
      <exports symbol='xsltApplyOneTemplate' type='function'/>
      <exports symbol='xslHandleDebugger' type='function'/>
      <exports symbol='xsltCopy' type='function'/>
      <exports symbol='xsltDocumentElem' type='function'/>
-     <exports symbol='xsltApplyTemplates' type='function'/>
-     <exports symbol='xsltApplyImports' type='function'/>
-     <exports symbol='xsltIf' type='function'/>
-     <exports symbol='xsltCallTemplate' type='function'/>
-     <exports symbol='xsltApplyStylesheet' type='function'/>
-     <exports symbol='xsltApplyStripSpaces' type='function'/>
-     <exports symbol='xsltSetXIncludeDefault' type='function'/>
-     <exports symbol='xsltCopyOf' type='function'/>
-     <exports symbol='xsltFreeTransformContext' type='function'/>
      <exports symbol='xsltAttribute' type='function'/>
-     <exports symbol='xsltRunStylesheet' type='function'/>
-     <exports symbol='xsltChoose' type='function'/>
-     <exports symbol='xsltCopyTextString' type='function'/>
+     <exports symbol='xsltApplyImports' type='function'/>
      <exports symbol='xsltElement' type='function'/>
      <exports symbol='xsltProfileStylesheet' type='function'/>
      <exports symbol='xsltForEach' type='function'/>
-     <exports symbol='xsltText' type='function'/>
      <exports symbol='xsltApplyStylesheetUser' type='function'/>
      <exports symbol='xsltProcessingInstruction' type='function'/>
      <exports symbol='xsltComment' type='function'/>
@@ -253,12 +253,12 @@
      <exports symbol='xsltFreeGlobalVariables' type='function'/>
      <exports symbol='xsltQuoteUserParams' type='function'/>
      <exports symbol='xsltXPathVariableLookup' type='function'/>
-     <exports symbol='xsltParseGlobalParam' type='function'/>
+     <exports symbol='xsltEvalUserParams' type='function'/>
      <exports symbol='xsltParseStylesheetCallerParam' type='function'/>
      <exports symbol='xsltAddStackElemList' type='function'/>
      <exports symbol='xsltParseGlobalVariable' type='function'/>
      <exports symbol='xsltQuoteOneUserParam' type='function'/>
-     <exports symbol='xsltEvalUserParams' type='function'/>
+     <exports symbol='xsltParseGlobalParam' type='function'/>
      <exports symbol='xsltParseStylesheetVariable' type='function'/>
      <exports symbol='xsltEvalGlobalVariables' type='function'/>
      <exports symbol='xsltEvalOneUserParam' type='function'/>
@@ -286,39 +286,39 @@
      <author>Daniel Veillard </author>
      <exports symbol='CHECK_STOPPED0' type='macro'/>
      <exports symbol='XSLT_PAT_NO_PRIORITY' type='macro'/>
-     <exports symbol='XSLT_MAX_SORT' type='macro'/>
-     <exports symbol='XSLT_RUNTIME_EXTRA' type='macro'/>
-     <exports symbol='CHECK_STOPPEDE' type='macro'/>
      <exports symbol='CHECK_STOPPED' type='macro'/>
      <exports symbol='XSLT_RUNTIME_EXTRA_LST' type='macro'/>
      <exports symbol='XSLT_RUNTIME_EXTRA_FREE' type='macro'/>
+     <exports symbol='XSLT_MAX_SORT' type='macro'/>
+     <exports symbol='XSLT_RUNTIME_EXTRA' type='macro'/>
+     <exports symbol='CHECK_STOPPEDE' type='macro'/>
      <exports symbol='XSLT_FUNC_ELEMENT' type='enum'/>
-     <exports symbol='XSLT_FUNC_WHEN' type='enum'/>
-     <exports symbol='XSLT_FUNC_APPLYIMPORTS' type='enum'/>
      <exports symbol='XSLT_FUNC_VALUEOF' type='enum'/>
      <exports symbol='XSLT_FUNC_WITHPARAM' type='enum'/>
-     <exports symbol='XSLT_FUNC_COPY' type='enum'/>
      <exports symbol='XSLT_OUTPUT_XML' type='enum'/>
-     <exports symbol='XSLT_FUNC_EXTENSION' type='enum'/>
      <exports symbol='XSLT_STATE_ERROR' type='enum'/>
      <exports symbol='XSLT_OUTPUT_HTML' type='enum'/>
      <exports symbol='XSLT_OUTPUT_TEXT' type='enum'/>
      <exports symbol='XSLT_STATE_OK' type='enum'/>
-     <exports symbol='XSLT_FUNC_COPYOF' type='enum'/>
-     <exports symbol='XSLT_FUNC_PARAM' type='enum'/>
      <exports symbol='XSLT_FUNC_FOREACH' type='enum'/>
-     <exports symbol='XSLT_FUNC_COMMENT' type='enum'/>
-     <exports symbol='XSLT_FUNC_DOCUMENT' type='enum'/>
      <exports symbol='XSLT_FUNC_CHOOSE' type='enum'/>
      <exports symbol='XSLT_FUNC_SORT' type='enum'/>
-     <exports symbol='XSLT_FUNC_IF' type='enum'/>
-     <exports symbol='XSLT_FUNC_PI' type='enum'/>
-     <exports symbol='XSLT_FUNC_TEXT' type='enum'/>
      <exports symbol='XSLT_STATE_STOPPED' type='enum'/>
-     <exports symbol='XSLT_FUNC_VARIABLE' type='enum'/>
      <exports symbol='XSLT_FUNC_NUMBER' type='enum'/>
      <exports symbol='XSLT_FUNC_ATTRIBUTE' type='enum'/>
      <exports symbol='XSLT_FUNC_APPLYTEMPLATES' type='enum'/>
+     <exports symbol='XSLT_FUNC_WHEN' type='enum'/>
+     <exports symbol='XSLT_FUNC_APPLYIMPORTS' type='enum'/>
+     <exports symbol='XSLT_FUNC_COPY' type='enum'/>
+     <exports symbol='XSLT_FUNC_EXTENSION' type='enum'/>
+     <exports symbol='XSLT_FUNC_COPYOF' type='enum'/>
+     <exports symbol='XSLT_FUNC_PARAM' type='enum'/>
+     <exports symbol='XSLT_FUNC_COMMENT' type='enum'/>
+     <exports symbol='XSLT_FUNC_DOCUMENT' type='enum'/>
+     <exports symbol='XSLT_FUNC_IF' type='enum'/>
+     <exports symbol='XSLT_FUNC_PI' type='enum'/>
+     <exports symbol='XSLT_FUNC_TEXT' type='enum'/>
+     <exports symbol='XSLT_FUNC_VARIABLE' type='enum'/>
      <exports symbol='XSLT_FUNC_CALLTEMPLATE' type='enum'/>
      <exports symbol='xsltStylePreComp' type='typedef'/>
      <exports symbol='xsltRuntimeExtra' type='typedef'/>
@@ -341,41 +341,41 @@
      <exports symbol='xsltTemplate' type='typedef'/>
      <exports symbol='xsltStackElem' type='typedef'/>
      <exports symbol='xsltStackElemPtr' type='typedef'/>
-     <exports symbol='_xsltStylePreComp' type='struct'/>
      <exports symbol='_xsltStackElem' type='struct'/>
      <exports symbol='_xsltTransformContext' type='struct'/>
      <exports symbol='_xsltElemPreComp' type='struct'/>
+     <exports symbol='_xsltRuntimeExtra' type='struct'/>
+     <exports symbol='_xsltStylePreComp' type='struct'/>
      <exports symbol='_xsltDecimalFormat' type='struct'/>
      <exports symbol='_xsltTemplate' type='struct'/>
      <exports symbol='_xsltDocument' type='struct'/>
-     <exports symbol='_xsltRuntimeExtra' type='struct'/>
      <exports symbol='_xsltStylesheet' type='struct'/>
-     <exports symbol='xsltNumberFormat' type='function'/>
      <exports symbol='xsltElemPreCompDeallocator' type='function'/>
      <exports symbol='xsltRegisterPersistRVT' type='function'/>
      <exports symbol='xsltParseStylesheetImportedDoc' type='function'/>
      <exports symbol='xsltFreeStackElemList' type='function'/>
-     <exports symbol='xsltCompileAttr' type='function'/>
      <exports symbol='xsltAllocateExtra' type='function'/>
-     <exports symbol='xsltFreeAVTList' type='function'/>
-     <exports symbol='xsltFreeRVTs' type='function'/>
      <exports symbol='xsltRegisterTmpRVT' type='function'/>
-     <exports symbol='xsltAllocateExtraCtxt' type='function'/>
      <exports symbol='xsltIsBlank' type='function'/>
-     <exports symbol='xsltSortFunc' type='function'/>
-     <exports symbol='xsltParseTemplateContent' type='function'/>
-     <exports symbol='xsltNewStylesheet' type='function'/>
      <exports symbol='xsltFormatNumberConversion' type='function'/>
-     <exports symbol='xsltDecimalFormatGetByName' type='function'/>
-     <exports symbol='xsltTransformFunction' type='function'/>
-     <exports symbol='xsltParseStylesheetFile' type='function'/>
-     <exports symbol='xsltParseStylesheetDoc' type='function'/>
-     <exports symbol='xsltLoadStylesheetPI' type='function'/>
-     <exports symbol='xsltEvalAVT' type='function'/>
+     <exports symbol='xsltSortFunc' type='function'/>
      <exports symbol='xsltFreeStylesheet' type='function'/>
      <exports symbol='xsltCreateRVT' type='function'/>
      <exports symbol='xsltParseStylesheetProcess' type='function'/>
      <exports symbol='xsltParseStylesheetOutput' type='function'/>
+     <exports symbol='xsltCompileAttr' type='function'/>
+     <exports symbol='xsltNumberFormat' type='function'/>
+     <exports symbol='xsltFreeRVTs' type='function'/>
+     <exports symbol='xsltFreeAVTList' type='function'/>
+     <exports symbol='xsltAllocateExtraCtxt' type='function'/>
+     <exports symbol='xsltParseTemplateContent' type='function'/>
+     <exports symbol='xsltNewStylesheet' type='function'/>
+     <exports symbol='xsltDecimalFormatGetByName' type='function'/>
+     <exports symbol='xsltTransformFunction' type='function'/>
+     <exports symbol='xsltParseStylesheetFile' type='function'/>
+     <exports symbol='xsltParseStylesheetDoc' type='function'/>
+     <exports symbol='xsltEvalAVT' type='function'/>
+     <exports symbol='xsltLoadStylesheetPI' type='function'/>
     </file>
     <file name='xsltexports'>
      <summary>macros for marking symbols as exportable/importable.</summary>
@@ -393,39 +393,39 @@
      <author>Daniel Veillard </author>
      <exports symbol='IS_XSLT_REAL_NODE' type='macro'/>
      <exports symbol='IS_XSLT_ELEM' type='macro'/>
-     <exports symbol='XSLT_TRACE' type='macro'/>
      <exports symbol='IS_XSLT_NAME' type='macro'/>
-     <exports symbol='XSLT_TIMESTAMP_TICS_PER_SEC' type='macro'/>
-     <exports symbol='XSLT_STRANGE' type='macro'/>
      <exports symbol='XSLT_TODO' type='macro'/>
-     <exports symbol='XSLT_TRACE_PROCESS_NODE' type='enum'/>
+     <exports symbol='XSLT_STRANGE' type='macro'/>
+     <exports symbol='XSLT_TIMESTAMP_TICS_PER_SEC' type='macro'/>
+     <exports symbol='XSLT_TRACE' type='macro'/>
      <exports symbol='XSLT_TRACE_KEYS' type='enum'/>
-     <exports symbol='XSLT_TRACE_APPLY_TEMPLATE' type='enum'/>
-     <exports symbol='XSLT_DEBUG_CONT' type='enum'/>
-     <exports symbol='XSLT_TRACE_VALUE_OF' type='enum'/>
-     <exports symbol='XSLT_DEBUG_STEP' type='enum'/>
      <exports symbol='XSLT_DEBUG_NEXT' type='enum'/>
      <exports symbol='XSLT_TRACE_COPY_OF' type='enum'/>
      <exports symbol='XSLT_TRACE_FOR_EACH' type='enum'/>
      <exports symbol='XSLT_DEBUG_STEPOUT' type='enum'/>
      <exports symbol='XSLT_DEBUG_RUN' type='enum'/>
-     <exports symbol='XSLT_TRACE_STRIP_SPACES' type='enum'/>
-     <exports symbol='XSLT_DEBUG_STOP' type='enum'/>
      <exports symbol='XSLT_TRACE_APPLY_TEMPLATES' type='enum'/>
-     <exports symbol='XSLT_TRACE_COPY' type='enum'/>
      <exports symbol='XSLT_TRACE_CHOOSE' type='enum'/>
      <exports symbol='XSLT_DEBUG_INIT' type='enum'/>
-     <exports symbol='XSLT_TRACE_COPY_TEXT' type='enum'/>
      <exports symbol='XSLT_DEBUG_RUN_RESTART' type='enum'/>
-     <exports symbol='XSLT_TRACE_NONE' type='enum'/>
      <exports symbol='XSLT_TRACE_ALL' type='enum'/>
+     <exports symbol='XSLT_TRACE_CALL_TEMPLATE' type='enum'/>
+     <exports symbol='XSLT_TRACE_IF' type='enum'/>
+     <exports symbol='XSLT_TRACE_PROCESS_NODE' type='enum'/>
+     <exports symbol='XSLT_TRACE_COPY_TEXT' type='enum'/>
+     <exports symbol='XSLT_TRACE_APPLY_TEMPLATE' type='enum'/>
+     <exports symbol='XSLT_DEBUG_CONT' type='enum'/>
+     <exports symbol='XSLT_TRACE_VALUE_OF' type='enum'/>
+     <exports symbol='XSLT_DEBUG_STEP' type='enum'/>
+     <exports symbol='XSLT_TRACE_STRIP_SPACES' type='enum'/>
+     <exports symbol='XSLT_DEBUG_STOP' type='enum'/>
+     <exports symbol='XSLT_TRACE_COPY' type='enum'/>
+     <exports symbol='XSLT_TRACE_NONE' type='enum'/>
      <exports symbol='XSLT_DEBUG_NONE' type='enum'/>
      <exports symbol='XSLT_TRACE_PI' type='enum'/>
      <exports symbol='XSLT_TRACE_COMMENT' type='enum'/>
      <exports symbol='XSLT_TRACE_VARIABLES' type='enum'/>
      <exports symbol='XSLT_DEBUG_QUIT' type='enum'/>
-     <exports symbol='XSLT_TRACE_CALL_TEMPLATE' type='enum'/>
-     <exports symbol='XSLT_TRACE_IF' type='enum'/>
      <exports symbol='XSLT_TRACE_TEMPLATES' type='enum'/>
      <exports symbol='xsltDebugTraceCodes' type='typedef'/>
      <exports symbol='xsltDebugStatusCodes' type='typedef'/>
@@ -434,44 +434,44 @@
      <exports symbol='xsltGenericErrorContext' type='variable'/>
      <exports symbol='xslDebugStatus' type='variable'/>
      <exports symbol='xsltGenericDebugContext' type='variable'/>
-     <exports symbol='xsltTimestamp' type='function'/>
      <exports symbol='xsltSaveResultToFile' type='function'/>
-     <exports symbol='xsltXPathCompile' type='function'/>
-     <exports symbol='xsltSetTransformErrorFunc' type='function'/>
      <exports symbol='xsltSetGenericErrorFunc' type='function'/>
      <exports symbol='xsltSetDebuggerCallbacks' type='function'/>
      <exports symbol='xsltSaveResultTo' type='function'/>
      <exports symbol='xsltTransformError' type='function'/>
-     <exports symbol='xsltSetGenericDebugFunc' type='function'/>
-     <exports symbol='xsltDebugSetDefaultTrace' type='function'/>
-     <exports symbol='xsltDropCallCallback' type='function'/>
-     <exports symbol='xsltSetCtxtParseOptions' type='function'/>
-     <exports symbol='xsltComputeSortResult' type='function'/>
-     <exports symbol='xsltSetSortFunc' type='function'/>
+     <exports symbol='xslAddCall' type='function'/>
      <exports symbol='xsltDocumentSortFunction' type='function'/>
      <exports symbol='xsltGetQNameURI2' type='function'/>
-     <exports symbol='xslAddCall' type='function'/>
-     <exports symbol='xsltGetDebuggerStatus' type='function'/>
+     <exports symbol='xsltComputeSortResult' type='function'/>
      <exports symbol='xsltPrintErrorContext' type='function'/>
      <exports symbol='xsltGetUTF8Char' type='function'/>
      <exports symbol='xsltDefaultSortFunction' type='function'/>
      <exports symbol='xsltSaveResultToFd' type='function'/>
      <exports symbol='xsltSetCtxtSortFunc' type='function'/>
      <exports symbol='xsltGetNsProp' type='function'/>
-     <exports symbol='xsltSaveResultToFilename' type='function'/>
      <exports symbol='xsltGetCNsProp' type='function'/>
      <exports symbol='xsltGetQNameURI' type='function'/>
      <exports symbol='xsltAddCallCallback' type='function'/>
-     <exports symbol='xsltSetDebuggerStatus' type='function'/>
      <exports symbol='xsltCalibrateAdjust' type='function'/>
      <exports symbol='xsltSaveProfiling' type='function'/>
      <exports symbol='xsltSaveResultToString' type='function'/>
-     <exports symbol='xsltHandleDebuggerCallback' type='function'/>
      <exports symbol='xsltSplitQName' type='function'/>
      <exports symbol='xsltDoSortFunction' type='function'/>
      <exports symbol='xsltDebugGetDefaultTrace' type='function'/>
      <exports symbol='xsltMessage' type='function'/>
+     <exports symbol='xsltGetDebuggerStatus' type='function'/>
+     <exports symbol='xsltTimestamp' type='function'/>
+     <exports symbol='xsltSetTransformErrorFunc' type='function'/>
+     <exports symbol='xsltXPathCompile' type='function'/>
+     <exports symbol='xsltDebugSetDefaultTrace' type='function'/>
+     <exports symbol='xsltSetGenericDebugFunc' type='function'/>
+     <exports symbol='xsltSetCtxtParseOptions' type='function'/>
+     <exports symbol='xsltSetDebuggerStatus' type='function'/>
      <exports symbol='xslDropCall' type='function'/>
+     <exports symbol='xsltSetSortFunc' type='function'/>
+     <exports symbol='xsltHandleDebuggerCallback' type='function'/>
+     <exports symbol='xsltSaveResultToFilename' type='function'/>
+     <exports symbol='xsltDropCallCallback' type='function'/>
      <exports symbol='xsltGetProfileInformation' type='function'/>
     </file>
   </files>
diff --git a/python/libxslt-python-api.xml b/python/libxslt-python-api.xml
index a9e3d6aa..4c411af6 100644
--- a/python/libxslt-python-api.xml
+++ b/python/libxslt-python-api.xml
@@ -161,12 +161,12 @@
     </function>
     <function name='xsltStylesheetGetDoctypePublic' file='python_accessor'>
       <info>Get the output PUBLIC of a stylesheet</info>
-      <return type='xmlChar *' info="The output PUBLIC" field="doctypePublic"/>
+      <return type='const xmlChar *' info="The output PUBLIC" field="doctypePublic"/>
       <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
     </function>
     <function name='xsltStylesheetGetDoctypeSystem' file='python_accessor'>
       <info>Get the output SYSTEM of a stylesheet</info>
-      <return type='xmlChar *' info="The output SYSTEM" field="doctypeSystem"/>
+      <return type='const xmlChar *' info="The output SYSTEM" field="doctypeSystem"/>
       <arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
     </function>
     <function name='xsltStylesheetGetPrivate' file='python_accessor'>