Bug 119343 (with apologies to Igor) - Enhanced handling of docb and

* win32/defgen.xsl, win32/libxml2.def.src: Bug 119343
(with apologies to Igor) - Enhanced handling of docb and
nanohttp.

2 files changed, 293 insertions, 160 deletions

diff --git a/win32/defgen.xsl b/win32/defgen.xsl
index 6be9bfc6..a598ff19 100644
--- a/win32/defgen.xsl
+++ b/win32/defgen.xsl
@@ -34,14 +34,16 @@
 			<xsl:if test="@file = 'debugXML'">
 				<xsl:text>#ifdef LIBXML_DEBUG_ENABLED&nl;</xsl:text>
 			</xsl:if>
-			<xsl:if test="@file = 'DOCBParser'">
+			<xsl:if test="@file = 'DOCBparser'">
 				<xsl:text>#ifdef LIBXML_DOCB_ENABLED&nl;</xsl:text>
 			</xsl:if>
 			<xsl:if test="(@file = 'HTMLparser') 
-					or (@file = 'HTMLtree') 
-					or (@file = 'nanohtml')">
+					or (@file = 'HTMLtree')">
 				<xsl:text>#ifdef LIBXML_HTML_ENABLED&nl;</xsl:text>
 			</xsl:if>
+			<xsl:if test="@file = 'nanohttp'">
+				<xsl:text>#ifdef LIBXML_HTTP_ENABLED&nl;</xsl:text>
+			</xsl:if>
 			<xsl:if test="@file = 'nanoftp'">
 				<xsl:text>#ifdef LIBXML_FTP_ENABLED&nl;</xsl:text>
 			</xsl:if>
@@ -201,12 +203,14 @@
 			<xsl:if test="@file = 'debugXML'">
 				<xsl:text>#endif&nl;</xsl:text>
 			</xsl:if>
-			<xsl:if test="@file = 'DOCBParser'">
+			<xsl:if test="@file = 'DOCBparser'">
 				<xsl:text>#endif&nl;</xsl:text>
 			</xsl:if>
 			<xsl:if test="(@file = 'HTMLparser') 
-					or (@file = 'HTMLtree') 
-					or (@file = 'nanohtml')">
+					or (@file = 'HTMLtree')">
+				<xsl:text>#endif&nl;</xsl:text>
+			</xsl:if>
+			<xsl:if test="@file = 'nanohttp'">
 				<xsl:text>#endif&nl;</xsl:text>
 			</xsl:if>
 			<xsl:if test="@file = 'nanoftp'">
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 164519c8..93b0c5a7 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -11,6 +11,7 @@ __docbDefaultSAXHandler
 docbDefaultSAXHandler DATA
 #endif
 #endif
+enum DATA
 #ifdef LIBXML_THREAD_ENABLED
 #ifdef LIBXML_HTML_ENABLED
 __htmlDefaultSAXHandler
@@ -172,19 +173,39 @@ cdataBlock
 characters
 checkNamespace
 comment
+#ifdef LIBXML_DOCB_ENABLED
 docbCreateFileParserCtxt
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbCreatePushParserCtxt
+#endif
 #ifdef LIBXML_DOCB_ENABLED
 docbDefaultSAXHandlerInit
 #endif
+#ifdef LIBXML_DOCB_ENABLED
 docbEncodeEntities
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbFreeParserCtxt
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbParseChunk
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbParseDoc
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbParseDocument
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbParseFile
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbSAXParseDoc
+#endif
+#ifdef LIBXML_DOCB_ENABLED
 docbSAXParseFile
+#endif
 elementDecl
 endDocument
 endElement
@@ -567,6 +588,7 @@ xmlCheckUTF8
 xmlCheckVersion
 xmlCleanupCharEncodingHandlers
 xmlCleanupEncodingAliases
+xmlCleanupGlobals
 xmlCleanupInputCallbacks
 xmlCleanupOutputCallbacks
 xmlCleanupParser
@@ -694,6 +716,7 @@ xmlFreeRMutex
 xmlFreeRefTable
 xmlFreeTextReader
 xmlFreeURI
+xmlFreeValidCtxt
 xmlGcMemGet
 xmlGcMemSetup
 xmlGetBufferAllocationScheme
@@ -779,6 +802,7 @@ xmlIOHTTPRead
 #endif
 xmlIOParseDTD
 xmlInitCharEncodingHandlers
+xmlInitGlobals
 xmlInitMemory
 xmlInitNodeInfoSeq
 xmlInitParser
@@ -941,19 +965,45 @@ xmlNanoFTPScanProxy
 #ifdef LIBXML_FTP_ENABLED
 xmlNanoFTPUpdateURL
 #endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPAuthHeader
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPCleanup
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPClose
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPFetch
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPInit
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPMethod
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPMethodRedir
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPOpen
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPOpenRedir
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPRead
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPReturnCode
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPSave
+#endif
+#ifdef LIBXML_HTTP_ENABLED
 xmlNanoHTTPScanProxy
+#endif
 #ifdef LIBXML_AUTOMATA_ENABLED
 xmlNewAutomata
 #endif
@@ -998,6 +1048,7 @@ xmlNewTextChild
 xmlNewTextLen
 xmlNewTextReader
 xmlNewTextReaderFilename
+xmlNewValidCtxt
 xmlNextChar
 xmlNoNetExternalEntityLoader
 xmlNodeAddContent
@@ -1182,6 +1233,12 @@ xmlRelaxNGFreeParserCtxt
 xmlRelaxNGFreeValidCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlRelaxNGGetParserErrors
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlRelaxNGGetValidErrors
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlRelaxNGNewDocParserCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1238,6 +1295,76 @@ xmlSaveFormatFileEnc
 xmlSaveFormatFileTo
 xmlSaveUri
 xmlScanName
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaCheckFacet
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaCleanupTypes
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaCompareValues
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaDump
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaFree
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaFreeFacet
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaFreeParserCtxt
+#endif
+xmlSchemaFreeType
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaFreeValidCtxt
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaFreeValue
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaGetPredefinedType
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaInitTypes
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewFacet
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewMemParserCtxt
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewParserCtxt
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewValidCtxt
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaParse
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaSetParserErrors
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaSetValidErrors
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValPredefTypeNode
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidateDoc
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidateFacet
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidatePredefinedType
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidateStream
+#endif
 xmlSearchNs
 xmlSearchNsByHref
 xmlSetBufferAllocationScheme
@@ -1299,6 +1426,7 @@ xmlSkipBlankChars
 xmlSnprintfElementContent
 xmlSplitQName
 xmlSplitQName2
+xmlSplitQName3
 xmlSprintfElementContent
 xmlStopParser
 xmlStrEqual
@@ -1375,411 +1503,429 @@ xmlTextReaderSetErrorHandler
 xmlTextReaderSetParserProp
 xmlTextReaderValue
 xmlTextReaderXmlLang
-#ifdef LIBXML_SCHEMAS_ENABLED
+xmlThrDefBufferAllocScheme
+xmlThrDefDefaultBufferSize
+xmlThrDefDeregisterNodeDefault
+xmlThrDefDoValidityCheckingDefaultValue
+xmlThrDefGetWarningsDefaultValue
+xmlThrDefIndentTreeOutput
+xmlThrDefKeepBlanksDefaultValue
+xmlThrDefLineNumbersDefaultValue
+xmlThrDefLoadExtDtdDefaultValue
+xmlThrDefParserDebugEntities
+xmlThrDefPedanticParserDefaultValue
+xmlThrDefRegisterNodeDefault
+xmlThrDefSaveNoEmptyTags
+xmlThrDefSetGenericErrorFunc
+xmlThrDefSubstituteEntitiesDefaultValue
+xmlThrDefTreeIndentString
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsAlphabeticPresentationForms
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsArabic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsArabicPresentationFormsA
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsArabicPresentationFormsB
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsArmenian
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsArrows
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBasicLatin
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBengali
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBlock
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBlockElements
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBopomofo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBopomofoExtended
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBoxDrawing
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsBraillePatterns
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsByzantineMusicalSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKCompatibility
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKCompatibilityForms
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKCompatibilityIdeographs
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKCompatibilityIdeographsSupplement
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKRadicalsSupplement
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKSymbolsandPunctuation
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKUnifiedIdeographs
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKUnifiedIdeographsExtensionA
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCJKUnifiedIdeographsExtensionB
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCat
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatC
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatCc
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatCf
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatCo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatCs
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatL
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatLl
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatLm
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatLo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatLt
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatLu
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatM
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatMc
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatMe
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatMn
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatN
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatNd
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatNl
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatNo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatP
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPc
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPd
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPe
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPf
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPi
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatPs
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatS
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatSc
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatSk
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatSm
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatSo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatZ
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatZl
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatZp
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCatZs
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCherokee
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCombiningDiacriticalMarks
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCombiningHalfMarks
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCombiningMarksforSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsControlPictures
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCurrencySymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsCyrillic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsDeseret
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsDevanagari
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsDingbats
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsEnclosedAlphanumerics
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsEnclosedCJKLettersandMonths
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsEthiopic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGeneralPunctuation
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGeometricShapes
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGeorgian
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGothic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGreek
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGreekExtended
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGujarati
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsGurmukhi
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHalfwidthandFullwidthForms
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHangulCompatibilityJamo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHangulJamo
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHangulSyllables
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHebrew
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHighPrivateUseSurrogates
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHighSurrogates
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsHiragana
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsIPAExtensions
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsIdeographicDescriptionCharacters
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsKanbun
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsKangxiRadicals
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsKannada
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsKatakana
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsKhmer
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLao
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLatin1Supplement
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLatinExtendedA
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLatinExtendedAdditional
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLatinExtendedB
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLetterlikeSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsLowSurrogates
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMalayalam
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMathematicalAlphanumericSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMathematicalOperators
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMiscellaneousSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMiscellaneousTechnical
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMongolian
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMusicalSymbols
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsMyanmar
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsNumberForms
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsOgham
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsOldItalic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsOpticalCharacterRecognition
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsOriya
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsPrivateUse
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsRunic
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSinhala
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSmallFormVariants
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSpacingModifierLetters
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSpecials
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSuperscriptsandSubscripts
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsSyriac
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsTags
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsTamil
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsTelugu
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsThaana
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsThai
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsTibetan
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsUnifiedCanadianAboriginalSyllabics
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsYiRadicals
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 xmlUCSIsYiSyllables
 #endif
 xmlURIEscape
 xmlURIEscapeStr
 xmlURIUnescapeString
+xmlUTF8Charcmp
+xmlUTF8Size
 xmlUTF8Strlen
 xmlUTF8Strloc
 xmlUTF8Strndup
@@ -1825,6 +1971,9 @@ xmlValidateRoot
 #ifdef LIBXML_XINCLUDE_ENABLED
 xmlXIncludeProcess
 #endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+xmlXIncludeProcessTree
+#endif
 #ifdef LIBXML_XPATH_ENABLED
 xmlXPathAddValues
 #endif
@@ -2339,23 +2488,3 @@ xmlXPtrRangeToFunction
 #ifdef LIBXML_XPTR_ENABLED
 xmlXPtrWrapLocationSet
 #endif
-#ifdef LIBXML_SCHEMAS_ENABLED
-xmlSchemaNewParserCtxt
-xmlSchemaNewMemParserCtxt
-xmlSchemaFreeParserCtxt
-xmlSchemaSetParserErrors
-xmlSchemaParse
-xmlSchemaFree
-xmlSchemaDump
-xmlSchemaSetValidErrors
-xmlSchemaNewValidCtxt
-xmlSchemaFreeValidCtxt
-xmlSchemaValidateDoc
-xmlSchemaValidateStream
-xmlSchemaInitTypes
-xmlSchemaCleanupTypes
-xmlSchemaGetPredefinedType
-xmlSchemaValidatePredefinedType
-xmlSchemaValidateFacet
-xmlSchemaFreeValue
-#endif