lxml 5.3.2__cp39-cp39-macosx_10_9_universal2.whl → 6.0.0__cp39-cp39-macosx_10_9_universal2.whl

lxml/includes/libxml/xmlunicode.h

@@ -2,201 +2,14 @@
  * Summary: Unicode character APIs
  * Description: API for the Unicode character APIs
  *
- * This file is automatically generated from the
- * UCS description files of the Unicode Character Database
- * http://www.unicode.org/Public/4.0-Update1/UCD-4.0.1.html
- * using the genUnicode.py Python script.
- *
- * Generation date: Mon Mar 27 11:09:52 2006
- * Sources: Blocks-4.0.1.txt UnicodeData-4.0.1.txt
- * Author: Daniel Veillard
+ * Deprecated, don't use.
  */
 
 #ifndef __XML_UNICODE_H__
 #define __XML_UNICODE_H__
 
-#include <libxml/xmlversion.h>
-
-#ifdef LIBXML_UNICODE_ENABLED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-XMLPUBFUN int xmlUCSIsAegeanNumbers	(int code);
-XMLPUBFUN int xmlUCSIsAlphabeticPresentationForms	(int code);
-XMLPUBFUN int xmlUCSIsArabic	(int code);
-XMLPUBFUN int xmlUCSIsArabicPresentationFormsA	(int code);
-XMLPUBFUN int xmlUCSIsArabicPresentationFormsB	(int code);
-XMLPUBFUN int xmlUCSIsArmenian	(int code);
-XMLPUBFUN int xmlUCSIsArrows	(int code);
-XMLPUBFUN int xmlUCSIsBasicLatin	(int code);
-XMLPUBFUN int xmlUCSIsBengali	(int code);
-XMLPUBFUN int xmlUCSIsBlockElements	(int code);
-XMLPUBFUN int xmlUCSIsBopomofo	(int code);
-XMLPUBFUN int xmlUCSIsBopomofoExtended	(int code);
-XMLPUBFUN int xmlUCSIsBoxDrawing	(int code);
-XMLPUBFUN int xmlUCSIsBraillePatterns	(int code);
-XMLPUBFUN int xmlUCSIsBuhid	(int code);
-XMLPUBFUN int xmlUCSIsByzantineMusicalSymbols	(int code);
-XMLPUBFUN int xmlUCSIsCJKCompatibility	(int code);
-XMLPUBFUN int xmlUCSIsCJKCompatibilityForms	(int code);
-XMLPUBFUN int xmlUCSIsCJKCompatibilityIdeographs	(int code);
-XMLPUBFUN int xmlUCSIsCJKCompatibilityIdeographsSupplement	(int code);
-XMLPUBFUN int xmlUCSIsCJKRadicalsSupplement	(int code);
-XMLPUBFUN int xmlUCSIsCJKSymbolsandPunctuation	(int code);
-XMLPUBFUN int xmlUCSIsCJKUnifiedIdeographs	(int code);
-XMLPUBFUN int xmlUCSIsCJKUnifiedIdeographsExtensionA	(int code);
-XMLPUBFUN int xmlUCSIsCJKUnifiedIdeographsExtensionB	(int code);
-XMLPUBFUN int xmlUCSIsCherokee	(int code);
-XMLPUBFUN int xmlUCSIsCombiningDiacriticalMarks	(int code);
-XMLPUBFUN int xmlUCSIsCombiningDiacriticalMarksforSymbols	(int code);
-XMLPUBFUN int xmlUCSIsCombiningHalfMarks	(int code);
-XMLPUBFUN int xmlUCSIsCombiningMarksforSymbols	(int code);
-XMLPUBFUN int xmlUCSIsControlPictures	(int code);
-XMLPUBFUN int xmlUCSIsCurrencySymbols	(int code);
-XMLPUBFUN int xmlUCSIsCypriotSyllabary	(int code);
-XMLPUBFUN int xmlUCSIsCyrillic	(int code);
-XMLPUBFUN int xmlUCSIsCyrillicSupplement	(int code);
-XMLPUBFUN int xmlUCSIsDeseret	(int code);
-XMLPUBFUN int xmlUCSIsDevanagari	(int code);
-XMLPUBFUN int xmlUCSIsDingbats	(int code);
-XMLPUBFUN int xmlUCSIsEnclosedAlphanumerics	(int code);
-XMLPUBFUN int xmlUCSIsEnclosedCJKLettersandMonths	(int code);
-XMLPUBFUN int xmlUCSIsEthiopic	(int code);
-XMLPUBFUN int xmlUCSIsGeneralPunctuation	(int code);
-XMLPUBFUN int xmlUCSIsGeometricShapes	(int code);
-XMLPUBFUN int xmlUCSIsGeorgian	(int code);
-XMLPUBFUN int xmlUCSIsGothic	(int code);
-XMLPUBFUN int xmlUCSIsGreek	(int code);
-XMLPUBFUN int xmlUCSIsGreekExtended	(int code);
-XMLPUBFUN int xmlUCSIsGreekandCoptic	(int code);
-XMLPUBFUN int xmlUCSIsGujarati	(int code);
-XMLPUBFUN int xmlUCSIsGurmukhi	(int code);
-XMLPUBFUN int xmlUCSIsHalfwidthandFullwidthForms	(int code);
-XMLPUBFUN int xmlUCSIsHangulCompatibilityJamo	(int code);
-XMLPUBFUN int xmlUCSIsHangulJamo	(int code);
-XMLPUBFUN int xmlUCSIsHangulSyllables	(int code);
-XMLPUBFUN int xmlUCSIsHanunoo	(int code);
-XMLPUBFUN int xmlUCSIsHebrew	(int code);
-XMLPUBFUN int xmlUCSIsHighPrivateUseSurrogates	(int code);
-XMLPUBFUN int xmlUCSIsHighSurrogates	(int code);
-XMLPUBFUN int xmlUCSIsHiragana	(int code);
-XMLPUBFUN int xmlUCSIsIPAExtensions	(int code);
-XMLPUBFUN int xmlUCSIsIdeographicDescriptionCharacters	(int code);
-XMLPUBFUN int xmlUCSIsKanbun	(int code);
-XMLPUBFUN int xmlUCSIsKangxiRadicals	(int code);
-XMLPUBFUN int xmlUCSIsKannada	(int code);
-XMLPUBFUN int xmlUCSIsKatakana	(int code);
-XMLPUBFUN int xmlUCSIsKatakanaPhoneticExtensions	(int code);
-XMLPUBFUN int xmlUCSIsKhmer	(int code);
-XMLPUBFUN int xmlUCSIsKhmerSymbols	(int code);
-XMLPUBFUN int xmlUCSIsLao	(int code);
-XMLPUBFUN int xmlUCSIsLatin1Supplement	(int code);
-XMLPUBFUN int xmlUCSIsLatinExtendedA	(int code);
-XMLPUBFUN int xmlUCSIsLatinExtendedB	(int code);
-XMLPUBFUN int xmlUCSIsLatinExtendedAdditional	(int code);
-XMLPUBFUN int xmlUCSIsLetterlikeSymbols	(int code);
-XMLPUBFUN int xmlUCSIsLimbu	(int code);
-XMLPUBFUN int xmlUCSIsLinearBIdeograms	(int code);
-XMLPUBFUN int xmlUCSIsLinearBSyllabary	(int code);
-XMLPUBFUN int xmlUCSIsLowSurrogates	(int code);
-XMLPUBFUN int xmlUCSIsMalayalam	(int code);
-XMLPUBFUN int xmlUCSIsMathematicalAlphanumericSymbols	(int code);
-XMLPUBFUN int xmlUCSIsMathematicalOperators	(int code);
-XMLPUBFUN int xmlUCSIsMiscellaneousMathematicalSymbolsA	(int code);
-XMLPUBFUN int xmlUCSIsMiscellaneousMathematicalSymbolsB	(int code);
-XMLPUBFUN int xmlUCSIsMiscellaneousSymbols	(int code);
-XMLPUBFUN int xmlUCSIsMiscellaneousSymbolsandArrows	(int code);
-XMLPUBFUN int xmlUCSIsMiscellaneousTechnical	(int code);
-XMLPUBFUN int xmlUCSIsMongolian	(int code);
-XMLPUBFUN int xmlUCSIsMusicalSymbols	(int code);
-XMLPUBFUN int xmlUCSIsMyanmar	(int code);
-XMLPUBFUN int xmlUCSIsNumberForms	(int code);
-XMLPUBFUN int xmlUCSIsOgham	(int code);
-XMLPUBFUN int xmlUCSIsOldItalic	(int code);
-XMLPUBFUN int xmlUCSIsOpticalCharacterRecognition	(int code);
-XMLPUBFUN int xmlUCSIsOriya	(int code);
-XMLPUBFUN int xmlUCSIsOsmanya	(int code);
-XMLPUBFUN int xmlUCSIsPhoneticExtensions	(int code);
-XMLPUBFUN int xmlUCSIsPrivateUse	(int code);
-XMLPUBFUN int xmlUCSIsPrivateUseArea	(int code);
-XMLPUBFUN int xmlUCSIsRunic	(int code);
-XMLPUBFUN int xmlUCSIsShavian	(int code);
-XMLPUBFUN int xmlUCSIsSinhala	(int code);
-XMLPUBFUN int xmlUCSIsSmallFormVariants	(int code);
-XMLPUBFUN int xmlUCSIsSpacingModifierLetters	(int code);
-XMLPUBFUN int xmlUCSIsSpecials	(int code);
-XMLPUBFUN int xmlUCSIsSuperscriptsandSubscripts	(int code);
-XMLPUBFUN int xmlUCSIsSupplementalArrowsA	(int code);
-XMLPUBFUN int xmlUCSIsSupplementalArrowsB	(int code);
-XMLPUBFUN int xmlUCSIsSupplementalMathematicalOperators	(int code);
-XMLPUBFUN int xmlUCSIsSupplementaryPrivateUseAreaA	(int code);
-XMLPUBFUN int xmlUCSIsSupplementaryPrivateUseAreaB	(int code);
-XMLPUBFUN int xmlUCSIsSyriac	(int code);
-XMLPUBFUN int xmlUCSIsTagalog	(int code);
-XMLPUBFUN int xmlUCSIsTagbanwa	(int code);
-XMLPUBFUN int xmlUCSIsTags	(int code);
-XMLPUBFUN int xmlUCSIsTaiLe	(int code);
-XMLPUBFUN int xmlUCSIsTaiXuanJingSymbols	(int code);
-XMLPUBFUN int xmlUCSIsTamil	(int code);
-XMLPUBFUN int xmlUCSIsTelugu	(int code);
-XMLPUBFUN int xmlUCSIsThaana	(int code);
-XMLPUBFUN int xmlUCSIsThai	(int code);
-XMLPUBFUN int xmlUCSIsTibetan	(int code);
-XMLPUBFUN int xmlUCSIsUgaritic	(int code);
-XMLPUBFUN int xmlUCSIsUnifiedCanadianAboriginalSyllabics	(int code);
-XMLPUBFUN int xmlUCSIsVariationSelectors	(int code);
-XMLPUBFUN int xmlUCSIsVariationSelectorsSupplement	(int code);
-XMLPUBFUN int xmlUCSIsYiRadicals	(int code);
-XMLPUBFUN int xmlUCSIsYiSyllables	(int code);
-XMLPUBFUN int xmlUCSIsYijingHexagramSymbols	(int code);
-
-XMLPUBFUN int xmlUCSIsBlock	(int code, const char *block);
-
-XMLPUBFUN int xmlUCSIsCatC	(int code);
-XMLPUBFUN int xmlUCSIsCatCc	(int code);
-XMLPUBFUN int xmlUCSIsCatCf	(int code);
-XMLPUBFUN int xmlUCSIsCatCo	(int code);
-XMLPUBFUN int xmlUCSIsCatCs	(int code);
-XMLPUBFUN int xmlUCSIsCatL	(int code);
-XMLPUBFUN int xmlUCSIsCatLl	(int code);
-XMLPUBFUN int xmlUCSIsCatLm	(int code);
-XMLPUBFUN int xmlUCSIsCatLo	(int code);
-XMLPUBFUN int xmlUCSIsCatLt	(int code);
-XMLPUBFUN int xmlUCSIsCatLu	(int code);
-XMLPUBFUN int xmlUCSIsCatM	(int code);
-XMLPUBFUN int xmlUCSIsCatMc	(int code);
-XMLPUBFUN int xmlUCSIsCatMe	(int code);
-XMLPUBFUN int xmlUCSIsCatMn	(int code);
-XMLPUBFUN int xmlUCSIsCatN	(int code);
-XMLPUBFUN int xmlUCSIsCatNd	(int code);
-XMLPUBFUN int xmlUCSIsCatNl	(int code);
-XMLPUBFUN int xmlUCSIsCatNo	(int code);
-XMLPUBFUN int xmlUCSIsCatP	(int code);
-XMLPUBFUN int xmlUCSIsCatPc	(int code);
-XMLPUBFUN int xmlUCSIsCatPd	(int code);
-XMLPUBFUN int xmlUCSIsCatPe	(int code);
-XMLPUBFUN int xmlUCSIsCatPf	(int code);
-XMLPUBFUN int xmlUCSIsCatPi	(int code);
-XMLPUBFUN int xmlUCSIsCatPo	(int code);
-XMLPUBFUN int xmlUCSIsCatPs	(int code);
-XMLPUBFUN int xmlUCSIsCatS	(int code);
-XMLPUBFUN int xmlUCSIsCatSc	(int code);
-XMLPUBFUN int xmlUCSIsCatSk	(int code);
-XMLPUBFUN int xmlUCSIsCatSm	(int code);
-XMLPUBFUN int xmlUCSIsCatSo	(int code);
-XMLPUBFUN int xmlUCSIsCatZ	(int code);
-XMLPUBFUN int xmlUCSIsCatZl	(int code);
-XMLPUBFUN int xmlUCSIsCatZp	(int code);
-XMLPUBFUN int xmlUCSIsCatZs	(int code);
-
-XMLPUBFUN int xmlUCSIsCat	(int code, const char *cat);
-
-#ifdef __cplusplus
-}
+#ifdef __GNUC__
+  #warning "libxml/xmlunicode.h is deprecated"
 #endif
 
-#endif /* LIBXML_UNICODE_ENABLED */
-
 #endif /* __XML_UNICODE_H__ */

lxml/includes/libxml/xmlversion.h

@@ -10,40 +10,26 @@
 #ifndef __XML_VERSION_H__
 #define __XML_VERSION_H__
 
-#include <libxml/xmlexports.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * use those to be sure nothing nasty will happen if
- * your library and includes mismatch
- */
-#ifndef LIBXML2_COMPILING_MSCCDEF
-XMLPUBFUN void xmlCheckVersion(int version);
-#endif /* LIBXML2_COMPILING_MSCCDEF */
-
 /**
  * LIBXML_DOTTED_VERSION:
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.12.10"
+#define LIBXML_DOTTED_VERSION "2.14.4"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 21210
+#define LIBXML_VERSION 21404
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "21210"
+#define LIBXML_VERSION_STRING "21404"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -58,32 +44,7 @@ XMLPUBFUN void xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(21210);
-
-#ifndef VMS
-#if 0
-/**
- * WITH_TRIO:
- *
- * defined if the trio support need to be configured in
- */
-#define WITH_TRIO
-#else
-/**
- * WITHOUT_TRIO:
- *
- * defined if the trio support should not be configured in
- */
-#define WITHOUT_TRIO
-#endif
-#else /* VMS */
-/**
- * WITH_TRIO:
- *
- * defined if the trio support need to be configured in
- */
-#define WITH_TRIO 1
-#endif /* VMS */
+#define LIBXML_TEST_VERSION xmlCheckVersion(21404);
 
 /**
  * LIBXML_THREAD_ENABLED:
@@ -106,11 +67,9 @@ XMLPUBFUN void xmlCheckVersion(int version);
 /**
  * LIBXML_TREE_ENABLED:
  *
- * Whether the DOM like tree manipulation API support is configured in
+ * Always enabled since 2.14.0
  */
-#if 1
 #define LIBXML_TREE_ENABLED
-#endif
 
 /**
  * LIBXML_OUTPUT_ENABLED:
@@ -166,21 +125,12 @@ XMLPUBFUN void xmlCheckVersion(int version);
 #define LIBXML_SAX1_ENABLED
 #endif
 
-/**
- * LIBXML_FTP_ENABLED:
- *
- * Whether the FTP support is configured in
- */
-#if 0
-#define LIBXML_FTP_ENABLED
-#endif
-
 /**
  * LIBXML_HTTP_ENABLED:
  *
  * Whether the HTTP support is configured in
  */
-#if 1
+#if 0
 #define LIBXML_HTTP_ENABLED
 #endif
 
@@ -205,11 +155,9 @@ XMLPUBFUN void xmlCheckVersion(int version);
 /**
  * LIBXML_LEGACY_ENABLED:
  *
- * Whether the deprecated APIs are compiled in for compatibility
+ * Removed in 2.14
  */
-#if 0
-#define LIBXML_LEGACY_ENABLED
-#endif
+#undef LIBXML_LEGACY_ENABLED
 
 /**
  * LIBXML_C14N_ENABLED:
@@ -247,15 +195,6 @@ XMLPUBFUN void xmlCheckVersion(int version);
 #define LIBXML_XPTR_ENABLED
 #endif
 
-/**
- * LIBXML_XPTR_LOCS_ENABLED:
- *
- * Whether support for XPointer locations is configured in
- */
-#if 0
-#define LIBXML_XPTR_LOCS_ENABLED
-#endif
-
 /**
  * LIBXML_XINCLUDE_ENABLED:
  *
@@ -301,32 +240,12 @@ XMLPUBFUN void xmlCheckVersion(int version);
 #define LIBXML_DEBUG_ENABLED
 #endif
 
-/**
- * DEBUG_MEMORY_LOCATION:
- *
- * Whether the memory debugging is configured in
- */
-#if 0
-#define DEBUG_MEMORY_LOCATION
-#endif
-
-/**
- * LIBXML_DEBUG_RUNTIME:
- *
- * Removed
- */
-#if 0
-#define LIBXML_DEBUG_RUNTIME
-#endif
-
 /**
  * LIBXML_UNICODE_ENABLED:
  *
- * Whether the Unicode related interfaces are compiled in
+ * Removed in 2.14
  */
-#if 1
-#define LIBXML_UNICODE_ENABLED
-#endif
+#undef LIBXML_UNICODE_ENABLED
 
 /**
  * LIBXML_REGEXP_ENABLED:
@@ -347,14 +266,12 @@ XMLPUBFUN void xmlCheckVersion(int version);
 #endif
 
 /**
- * LIBXML_EXPR_ENABLED:
- *
- * Whether the formal expressions interfaces are compiled in
+ * LIBXML_RELAXNG_ENABLED:
  *
- * This code is unused and disabled unconditionally for now.
+ * Whether the RelaxNG validation interfaces are compiled in
  */
-#if 0
-#define LIBXML_EXPR_ENABLED
+#if 1
+#define LIBXML_RELAXNG_ENABLED
 #endif
 
 /**
@@ -408,104 +325,8 @@ XMLPUBFUN void xmlCheckVersion(int version);
 #define LIBXML_LZMA_ENABLED
 #endif
 
-#ifdef __GNUC__
-/** DOC_DISABLE */
-
-#ifndef ATTRIBUTE_UNUSED
-# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
-#  define ATTRIBUTE_UNUSED __attribute__((unused))
-# else
-#  define ATTRIBUTE_UNUSED
-# endif
-#endif
-
-#ifndef LIBXML_ATTR_ALLOC_SIZE
-# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
-#  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
-# else
-#  define LIBXML_ATTR_ALLOC_SIZE(x)
-# endif
-#else
-# define LIBXML_ATTR_ALLOC_SIZE(x)
-#endif
-
-#ifndef LIBXML_ATTR_FORMAT
-# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
-#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
-# else
-#  define LIBXML_ATTR_FORMAT(fmt,args)
-# endif
-#else
-# define LIBXML_ATTR_FORMAT(fmt,args)
-#endif
-
-#ifndef XML_DEPRECATED
-#  if defined (IN_LIBXML) || (__GNUC__ * 100 + __GNUC_MINOR__ < 301)
-#    define XML_DEPRECATED
-/* Available since at least GCC 3.1 */
-#  else
-#    define XML_DEPRECATED __attribute__((deprecated))
-#  endif
-#endif
-
-#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
-  #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800)
-    #define XML_IGNORE_FPTR_CAST_WARNINGS \
-      _Pragma("GCC diagnostic push") \
-      _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
-      _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"")
-  #else
-    #define XML_IGNORE_FPTR_CAST_WARNINGS \
-      _Pragma("GCC diagnostic push") \
-      _Pragma("GCC diagnostic ignored \"-Wpedantic\"")
-  #endif
-  #define XML_POP_WARNINGS \
-    _Pragma("GCC diagnostic pop")
-#else
-  #define XML_IGNORE_FPTR_CAST_WARNINGS
-  #define XML_POP_WARNINGS
-#endif
-
-#else /* ! __GNUC__ */
-#define ATTRIBUTE_UNUSED
-#define LIBXML_ATTR_ALLOC_SIZE(x)
-#define LIBXML_ATTR_FORMAT(fmt,args)
-#ifndef XML_DEPRECATED
-#  if defined (IN_LIBXML) || !defined (_MSC_VER)
-#    define XML_DEPRECATED
-/* Available since Visual Studio 2005 */
-#  elif defined (_MSC_VER) && (_MSC_VER >= 1400)
-#    define XML_DEPRECATED __declspec(deprecated)
-#  endif
-#endif
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
-#  define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
-#else
-#  define XML_IGNORE_FPTR_CAST_WARNINGS
-#endif
-#ifndef XML_POP_WARNINGS
-#  if defined (_MSC_VER) && (_MSC_VER >= 1400)
-#    define XML_POP_WARNINGS __pragma(warning(pop))
-#  else
-#    define XML_POP_WARNINGS
-#  endif
-#endif
-#endif /* __GNUC__ */
-
-#define XML_NO_ATTR
-
-#ifdef LIBXML_THREAD_ENABLED
-  #define XML_DECLARE_GLOBAL(name, type, attrs) \
-    attrs XMLPUBFUN type *__##name(void);
-  #define XML_GLOBAL_MACRO(name) (*__##name())
-#else
-  #define XML_DECLARE_GLOBAL(name, type, attrs) \
-    attrs XMLPUBVAR type name;
-#endif
+#include <libxml/xmlexports.h>
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 #endif
 
 

lxml/includes/libxml/xmlwriter.h

@@ -478,6 +478,7 @@ extern "C" {
  * misc
  */
     XMLPUBFUN int xmlTextWriterFlush(xmlTextWriterPtr writer);
+    XMLPUBFUN int xmlTextWriterClose(xmlTextWriterPtr writer);
 
 #ifdef __cplusplus
 }

lxml/includes/libxml/xpath.h

@@ -26,15 +26,10 @@
 #include <libxml/xmlerror.h>
 #include <libxml/tree.h>
 #include <libxml/hash.h>
-#endif /* LIBXML_XPATH_ENABLED */
 
-#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef __cplusplus
 extern "C" {
 #endif
-#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
-
-#ifdef LIBXML_XPATH_ENABLED
 
 typedef struct _xmlXPathContext xmlXPathContext;
 typedef xmlXPathContext *xmlXPathContextPtr;
@@ -104,22 +99,15 @@ typedef enum {
     XPATH_BOOLEAN = 2,
     XPATH_NUMBER = 3,
     XPATH_STRING = 4,
-#ifdef LIBXML_XPTR_LOCS_ENABLED
-    XPATH_POINT = 5,
-    XPATH_RANGE = 6,
-    XPATH_LOCATIONSET = 7,
-#endif
     XPATH_USERS = 8,
     XPATH_XSLT_TREE = 9  /* An XSLT value tree, non modifiable */
 } xmlXPathObjectType;
 
-#ifndef LIBXML_XPTR_LOCS_ENABLED
 /** DOC_DISABLE */
 #define XPATH_POINT 5
 #define XPATH_RANGE 6
 #define XPATH_LOCATIONSET 7
 /** DOC_ENABLE */
-#endif
 
 typedef struct _xmlXPathObject xmlXPathObject;
 typedef xmlXPathObject *xmlXPathObjectPtr;
@@ -413,8 +401,11 @@ struct _xmlXPathParserContext {
  * Objects and Nodesets handling
  */
 
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathNAN;
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathPINF;
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathNINF;
 
 /* These macros may later turn into functions */
@@ -515,6 +506,10 @@ XMLPUBFUN xmlXPathContextPtr
 		    xmlXPathNewContext		(xmlDocPtr doc);
 XMLPUBFUN void
 		    xmlXPathFreeContext		(xmlXPathContextPtr ctxt);
+XMLPUBFUN void
+		    xmlXPathSetErrorHandler(xmlXPathContextPtr ctxt,
+					    xmlStructuredErrorFunc handler,
+					    void *context);
 XMLPUBFUN int
 		    xmlXPathContextSetCache(xmlXPathContextPtr ctxt,
 				            int active,
@@ -557,8 +552,7 @@ XMLPUBFUN int
 						 xmlXPathContextPtr ctxt);
 XMLPUBFUN void
 		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
-#endif /* LIBXML_XPATH_ENABLED */
-#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+
 XML_DEPRECATED
 XMLPUBFUN void
 		    xmlXPathInit		(void);
@@ -571,5 +565,5 @@ XMLPUBFUN int
 }
 #endif
 
-#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED*/
+#endif /* LIBXML_XPATH_ENABLED */
 #endif /* ! __XML_XPATH_H__ */

lxml/includes/libxml/xpathInternals.h

@@ -22,6 +22,12 @@
 extern "C" {
 #endif
 
+/*
+ * Backward compatibility
+ */
+#define valuePush xmlXPathValuePush
+#define valuePop xmlXPathValuePop
+
 /************************************************************************
  *									*
  *			Helpers						*
@@ -478,11 +484,10 @@ XMLPUBFUN xmlXPathParserContextPtr
 XMLPUBFUN void
 		xmlXPathFreeParserContext	(xmlXPathParserContextPtr ctxt);
 
-/* TODO: remap to xmlXPathValuePop and Push. */
 XMLPUBFUN xmlXPathObjectPtr
-		valuePop			(xmlXPathParserContextPtr ctxt);
+		xmlXPathValuePop		(xmlXPathParserContextPtr ctxt);
 XMLPUBFUN int
-		valuePush			(xmlXPathParserContextPtr ctxt,
+		xmlXPathValuePush		(xmlXPathParserContextPtr ctxt,
 						 xmlXPathObjectPtr value);
 
 XMLPUBFUN xmlXPathObjectPtr
@@ -516,6 +521,7 @@ XMLPUBFUN void
 
 XMLPUBFUN void
 		xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN void
 		xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
 XMLPUBFUN xmlChar *