Load /tmp/tmp.5kkLmZ/libxml2-2.6.17 intoupstream/2.6.17

packages/libxml2/branches/upstream/current.

7 files changed, 6386 insertions, 6269 deletions

diff --git a/python/Makefile.am b/python/Makefile.am
index fa13310..c37c0c2 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -6,7 +6,8 @@ SUBDIRS= . tests
 INCLUDES = \
 	-I$(PYTHON_INCLUDES) \
 	-I$(top_srcdir)/include	\
-	-I$(top_builddir)/include
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/$(subdir)
 
 DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
 # libxml2class.txt is generated
@@ -37,8 +38,8 @@ python_LTLIBRARIES = libxml2mod.la
 libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
 libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
 
-libxml2.py: $(srcdir)/libxml.py $(srcdir)/libxml2class.py
-	cat $(srcdir)/libxml.py $(srcdir)/libxml2class.py > libxml2.py
+libxml2.py: $(srcdir)/libxml.py libxml2class.py
+	cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pythondir)
@@ -50,18 +51,18 @@ install-data-local:
 
 GENERATE = generator.py
 API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
-GENERATED= $(srcdir)/libxml2class.py \
-           $(srcdir)/libxml2-export.c \
-           $(srcdir)/libxml2class.txt \
-	   $(srcdir)/libxml2-py.c \
-	   $(srcdir)/libxml2-py.h
+GENERATED= libxml2class.py \
+           libxml2-export.c \
+           libxml2class.txt \
+	   libxml2-py.c \
+	   libxml2-py.h
 
 CLEANFILES= $(GENERATED) gen_prog libxml2.py
 
 $(GENERATED): gen_prog
 
 gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
-	cd $(srcdir) && $(PYTHON) $(GENERATE)
+	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 	touch gen_prog
 
 $(libxml2mod_la_OBJECTS): $(GENERATED)
diff --git a/python/Makefile.in b/python/Makefile.in
index 28ced16..e1d33cd 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36,6 +36,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = python
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -48,7 +49,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = setup.py
-am__installdirs = $(DESTDIR)$(pythondir)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(pythondir)"
 pythonLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(python_LTLIBRARIES)
 @WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la
@@ -57,18 +64,17 @@ am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
 @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
 @WITH_PYTHON_TRUE@	libxml2-py.lo
 libxml2mod_la_OBJECTS = $(am_libxml2mod_la_OBJECTS)
+@WITH_PYTHON_TRUE@am_libxml2mod_la_rpath = -rpath $(pythondir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libxml.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libxml2-py.Plo ./$(DEPDIR)/types.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libxml2mod_la_SOURCES)
 DIST_SOURCES = $(am__libxml2mod_la_SOURCES_DIST)
@@ -144,6 +150,8 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MODULE_EXTENSION = @MODULE_EXTENSION@
+MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@
 MV = @MV@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
@@ -177,6 +185,7 @@ TEST_C14N = @TEST_C14N@
 TEST_CATALOG = @TEST_CATALOG@
 TEST_DEBUG = @TEST_DEBUG@
 TEST_HTML = @TEST_HTML@
+TEST_MODULES = @TEST_MODULES@
 TEST_PHTML = @TEST_PHTML@
 TEST_PUSH = @TEST_PUSH@
 TEST_REGEXPS = @TEST_REGEXPS@
@@ -206,6 +215,7 @@ WITH_ICONV = @WITH_ICONV@
 WITH_ISO8859X = @WITH_ISO8859X@
 WITH_LEGACY = @WITH_LEGACY@
 WITH_MEM_DEBUG = @WITH_MEM_DEBUG@
+WITH_MODULES = @WITH_MODULES@
 WITH_OUTPUT = @WITH_OUTPUT@
 WITH_PATTERN = @WITH_PATTERN@
 WITH_PUSH = @WITH_PUSH@
@@ -254,6 +264,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -290,7 +302,8 @@ SUBDIRS = . tests
 INCLUDES = \
 	-I$(PYTHON_INCLUDES) \
 	-I$(top_srcdir)/include	\
-	-I$(top_builddir)/include
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/$(subdir)
 
 DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
 # libxml2class.txt is generated
@@ -316,11 +329,11 @@ libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -av
 @WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@
 @WITH_PYTHON_TRUE@GENERATE = generator.py
 @WITH_PYTHON_TRUE@API_DESC = $(top_srcdir)/doc/libxml2-api.xml $(srcdir)/libxml2-python-api.xml
-@WITH_PYTHON_TRUE@GENERATED = $(srcdir)/libxml2class.py \
-@WITH_PYTHON_TRUE@           $(srcdir)/libxml2-export.c \
-@WITH_PYTHON_TRUE@           $(srcdir)/libxml2class.txt \
-@WITH_PYTHON_TRUE@	   $(srcdir)/libxml2-py.c \
-@WITH_PYTHON_TRUE@	   $(srcdir)/libxml2-py.h
+@WITH_PYTHON_TRUE@GENERATED = libxml2class.py \
+@WITH_PYTHON_TRUE@           libxml2-export.c \
+@WITH_PYTHON_TRUE@           libxml2class.txt \
+@WITH_PYTHON_TRUE@	   libxml2-py.c \
+@WITH_PYTHON_TRUE@	   libxml2-py.h
 
 @WITH_PYTHON_TRUE@CLEANFILES = $(GENERATED) gen_prog libxml2.py
 all: all-recursive
@@ -360,33 +373,33 @@ setup.py: $(top_builddir)/config.status $(srcdir)/setup.py.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	$(mkdir_p) $(DESTDIR)$(pythondir)
+	test -z "$(pythondir)" || $(mkdir_p) "$(DESTDIR)$(pythondir)"
 	@list='$(python_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(pythondir)/$$f; \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
+	    $(LIBTOOL) --mode=install $(pythonLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pythondir)/$$f"; \
 	  else :; fi; \
 	done
 
 uninstall-pythonLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(python_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pythondir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(pythondir)/$$p; \
+	@set -x; list='$(python_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pythondir)/$$p'"; \
+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pythondir)/$$p"; \
 	done
 
 clean-pythonLTLIBRARIES:
 	-test -z "$(python_LTLIBRARIES)" || rm -f $(python_LTLIBRARIES)
 	@list='$(python_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
 libxml2mod.la: $(libxml2mod_la_OBJECTS) $(libxml2mod_la_DEPENDENCIES) 
-	$(LINK) -rpath $(pythondir) $(libxml2mod_la_LDFLAGS) $(libxml2mod_la_OBJECTS) $(libxml2mod_la_LIBADD) $(LIBS)
+	$(LINK) $(am_libxml2mod_la_rpath) $(libxml2mod_la_LDFLAGS) $(libxml2mod_la_OBJECTS) $(libxml2mod_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -402,24 +415,21 @@ distclean-compile:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
@@ -505,14 +515,16 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
+	  empty_fix=.; \
 	else \
 	  include_option=--include; \
+	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -522,9 +534,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -576,25 +590,30 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
+@WITH_PYTHON_FALSE@all-local:
 all-am: Makefile $(LTLIBRARIES) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkdir_p) $(DESTDIR)$(pythondir)
+	for dir in "$(DESTDIR)$(pythondir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -615,11 +634,12 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@WITH_PYTHON_FALSE@install-data-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-pythonLTLIBRARIES \
@@ -692,8 +712,8 @@ uninstall-info: uninstall-info-recursive
 
 @WITH_PYTHON_TRUE@all-local:	libxml2.py
 
-@WITH_PYTHON_TRUE@libxml2.py: $(srcdir)/libxml.py $(srcdir)/libxml2class.py
-@WITH_PYTHON_TRUE@	cat $(srcdir)/libxml.py $(srcdir)/libxml2class.py > libxml2.py
+@WITH_PYTHON_TRUE@libxml2.py: $(srcdir)/libxml.py libxml2class.py
+@WITH_PYTHON_TRUE@	cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
 
 @WITH_PYTHON_TRUE@install-data-local:
 @WITH_PYTHON_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pythondir)
@@ -706,7 +726,7 @@ uninstall-info: uninstall-info-recursive
 @WITH_PYTHON_TRUE@$(GENERATED): gen_prog
 
 @WITH_PYTHON_TRUE@gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
-@WITH_PYTHON_TRUE@	cd $(srcdir) && $(PYTHON) $(GENERATE)
+@WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 @WITH_PYTHON_TRUE@	touch gen_prog
 
 @WITH_PYTHON_TRUE@$(libxml2mod_la_OBJECTS): $(GENERATED)
diff --git a/python/generator.py b/python/generator.py
index 6032065..0b09b9a 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -9,6 +9,11 @@ enums = {} # { enumType: { enumConstant: enumValue } }
 import sys
 import string
 
+if len(sys.argv) > 1:
+    srcPref = sys.argv[1] + '/'
+else:
+    srcPref = ''
+
 #######################################################################
 #
 #  That part if purely the API acquisition phase from the
@@ -294,6 +299,20 @@ py_return_types = {
 
 unknown_types = {}
 
+foreign_encoding_args = (
+    'htmlCreateMemoryParserCtxt',
+    'htmlCtxtReadMemory',
+    'htmlParseChunk',
+    'htmlReadMemory',
+    'xmlCreateMemoryParserCtxt',
+    'xmlCtxtReadMemory',
+    'xmlCtxtResetPush',
+    'xmlParseChunk',
+    'xmlParseMemory',
+    'xmlReadMemory',
+    'xmlRecoverMemory',
+)
+
 #######################################################################
 #
 #  This part writes the C <-> Python stubs libxml2-py.[ch] and
@@ -382,6 +401,7 @@ def print_function_wrapper(name, output, export, include):
     c_args=""
     c_return=""
     c_convert=""
+    num_bufs=0
     for arg in args:
         # This should be correct
         if arg[1][0:6] == "const ":
@@ -389,6 +409,8 @@ def print_function_wrapper(name, output, export, include):
         c_args = c_args + "    %s %s;\n" % (arg[1], arg[0])
         if py_types.has_key(arg[1]):
             (f, t, n, c) = py_types[arg[1]]
+	    if (f == 'z') and (name in foreign_encoding_args) and (num_bufs == 0):
+	        f = 't#'
             if f != None:
                 format = format + f
             if t != None:
@@ -399,6 +421,10 @@ def print_function_wrapper(name, output, export, include):
                    arg[1], t, arg[0]);
             else:
                 format_args = format_args + ", &%s" % (arg[0])
+	    if f == 't#':
+	        format_args = format_args + ", &py_buffsize%d" % num_bufs
+	        c_args = c_args + "    int py_buffsize%d;\n" % num_bufs
+		num_bufs = num_bufs + 1
             if c_call != "":
                 c_call = c_call + ", ";
             c_call = c_call + "%s" % (arg[0])
@@ -570,14 +596,14 @@ def buildStubs():
     global unknown_types
 
     try:
-	f = open("libxml2-api.xml")
+	f = open(srcPref + "libxml2-api.xml")
 	data = f.read()
 	(parser, target)  = getparser()
 	parser.feed(data)
 	parser.close()
     except IOError, msg:
 	try:
-	    f = open("../doc/libxml2-api.xml")
+	    f = open(srcPref + "../doc/libxml2-api.xml")
 	    data = f.read()
 	    (parser, target)  = getparser()
 	    parser.feed(data)
@@ -591,7 +617,7 @@ def buildStubs():
 
     py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject")
     try:
-	f = open("libxml2-python-api.xml")
+	f = open(srcPref + "libxml2-python-api.xml")
 	data = f.read()
 	(parser, target)  = getparser()
 	parser.feed(data)
@@ -735,6 +761,8 @@ functions_noexcept = {
     "xmlHasProp": 1,
     "xmlHasNsProp": 1,
     "xmlDocSetRootElement": 1,
+    "xmlNodeGetNs": 1,
+    "xmlNodeGetNsDefs": 1,
 }
 
 reference_keepers = {
diff --git a/python/libxml.py b/python/libxml.py
index 588e862..bde8aba 100644
--- a/python/libxml.py
+++ b/python/libxml.py
@@ -231,6 +231,8 @@ class xmlCore:
             self._o = _obj;
             return
         self._o = None
+    def __str__(self):
+        return self.serialize()
     def get_parent(self):
         ret = libxml2mod.parent(self._o)
         if ret == None:
diff --git a/python/libxml2-py.c b/python/libxml2-py.c
index 2dc4649..e6602a4 100644
--- a/python/libxml2-py.c
+++ b/python/libxml2-py.c
@@ -8,20 +8,6 @@
 #include "libxml2-py.h"
 
 PyObject *
-libxml_xmlUCSIsBlockElements(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBlockElements", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsBlockElements(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlGetDocEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlEntityPtr c_retval;
@@ -52,42 +38,21 @@ libxml_xmlUCSIsBopomofo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlNodeGetBase(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlNodeGetBase", &pyobj_doc, &pyobj_cur))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlNodeGetBase(doc, cur);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNextAncestorOrSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNsLookup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
+    const xmlChar * c_retval;
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+    xmlChar * prefix;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAncestorOrSelf", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlXPathNsLookup", &pyobj_ctxt, &prefix))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNextAncestorOrSelf(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlXPathNsLookup(ctxt, prefix);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
@@ -123,22 +88,6 @@ libxml_xmlReaderForFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNewFloat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    double val;
-
-    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathNewFloat", &val))
-        return(NULL);
-
-    c_retval = xmlXPathNewFloat(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlTextReaderExpand(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -156,22 +105,6 @@ libxml_xmlTextReaderExpand(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlScanName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlScanName", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlScanName(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlFreeParserInputBuffer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserInputBufferPtr in;
     PyObject *pyobj_in;
@@ -186,14 +119,6 @@ libxml_xmlFreeParserInputBuffer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 PyObject *
-libxml_xmlRegisterDefaultInputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlRegisterDefaultInputCallbacks();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlUCSIsMathematicalAlphanumericSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -207,44 +132,6 @@ libxml_xmlUCSIsMathematicalAlphanumericSymbols(PyObject *self ATTRIBUTE_UNUSED,
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNsLookup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * prefix;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlXPathNsLookup", &pyobj_ctxt, &prefix))
-        return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
-
-    c_retval = xmlXPathNsLookup(ctxt, prefix);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_DEBUG_ENABLED
-PyObject *
-libxml_xmlDebugDumpEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpEntities", &pyobj_output, &pyobj_doc))
-        return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    xmlDebugDumpEntities(output, doc);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_DEBUG_ENABLED */
 #ifdef LIBXML_DEBUG_ENABLED
 PyObject *
 libxml_xmlDebugDumpNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -265,100 +152,36 @@ libxml_xmlDebugDumpNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* LIBXML_DEBUG_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNextAncestor(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAncestor", &pyobj_ctxt, &pyobj_cur))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlXPathNextAncestor(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathCastNumberToBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    double val;
-
-    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathCastNumberToBoolean", &val))
-        return(NULL);
-
-    c_retval = xmlXPathCastNumberToBoolean(val);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlUCSIsCatCs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCs", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCatCs(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlUCSIsCatCf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHangulJamo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCf", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulJamo", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatCf(code);
+    c_retval = xmlUCSIsHangulJamo(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlNodeAddContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    xmlChar * content;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeAddContent", &pyobj_cur, &content))
-        return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    xmlNodeAddContent(cur, content);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlUCSIsCatCo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaWhiteSpaceReplace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlChar * c_retval;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlSchemaWhiteSpaceReplace", &value))
         return(NULL);
 
-    c_retval = xmlUCSIsCatCo(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlSchemaWhiteSpaceReplace(value);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
 libxml_xmlNanoFTPCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
@@ -390,66 +213,22 @@ libxml_xmlValidateOneElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlRecoverMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * buffer;
-    int size;
-
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlRecoverMemory", &buffer, &size))
-        return(NULL);
-
-    c_retval = xmlRecoverMemory(buffer, size);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderIsDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsDefault", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderIsDefault(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlUCSIsTagalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlAttrPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * ID;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTagalog", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetID", &pyobj_doc, &ID))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsTagalog(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlGetID(doc, ID);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-PyObject *
-libxml_xmlRelaxNGFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlRelaxNGPtr schema;
-    PyObject *pyobj_schema;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGFree", &pyobj_schema))
-        return(NULL);
-    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
-
-    xmlRelaxNGFree(schema);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
 libxml_xmlUCSIsMalayalam(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -561,27 +340,6 @@ libxml_xmlFreeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
-PyObject *
-libxml_xmlReaderNewMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    char * buffer;
-    int size;
-    char * URL;
-    char * encoding;
-    int options;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozizzi:xmlReaderNewMemory", &pyobj_reader, &buffer, &size, &URL, &encoding, &options))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlReaderNewMemory(reader, buffer, size, URL, encoding, options);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
 libxml_xmlXPathNormalizeFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -616,72 +374,19 @@ libxml_xmlGetNoNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNewString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlChar * val;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathNewString", &val))
-        return(NULL);
-
-    c_retval = xmlXPathNewString(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlNewProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * name;
-    xmlChar * value;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewProp", &pyobj_node, &name, &value))
-        return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-
-    c_retval = xmlNewProp(node, name, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlParserGetDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetDoc", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = ctxt->myDoc;
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlAddSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddSibling", &pyobj_cur, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetPath", &pyobj_URI))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = xmlAddSibling(cur, elem);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = URI->path;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
@@ -709,14 +414,6 @@ libxml_xmlRegisterDefaultOutputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObje
     return(Py_None);
 }
 
-PyObject *
-libxml_xmlCleanupCharEncodingHandlers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlCleanupCharEncodingHandlers();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlNodeDumpFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -755,22 +452,23 @@ libxml_xmlXPathModValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlParseEntityRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlEntityPtr c_retval;
-    xmlParserCtxtPtr ctxt;
+libxml_xmlXPtrRangeToFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEntityRef", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPtrRangeToFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlParseEntityRef(ctxt);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
+    xmlXPtrRangeToFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
 libxml_xmlCatalogIsEmpty(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -787,29 +485,19 @@ libxml_xmlCatalogIsEmpty(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlInitAutoClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    htmlInitAutoClose();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlTextReaderReadOuterXml(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
+    int c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadOuterXml", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderClose", &pyobj_reader))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderReadOuterXml(reader);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlTextReaderClose(reader);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
@@ -828,54 +516,6 @@ libxml_xmlLoadSGMLSuperCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 PyObject *
-libxml_xmlUCSIsTamil(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTamil", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsTamil(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlXPathSetContextDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathSetContextDoc", &pyobj_ctxt, &pyobj_doc))
-        return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    ctxt->doc = doc;
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#ifdef LIBXML_DEBUG_ENABLED
-PyObject *
-libxml_xmlDebugDumpString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlChar * str;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlDebugDumpString", &pyobj_output, &str))
-        return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-
-    xmlDebugDumpString(output, str);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_DEBUG_ENABLED */
-PyObject *
 libxml_xmlCopyChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -909,47 +549,6 @@ libxml_xmlSchemaNewMemParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlCleanupGlobals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlCleanupGlobals();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathRegisteredVariablesCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredVariablesCleanup", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
-
-    xmlXPathRegisteredVariablesCleanup(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlEncodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * input;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeEntities", &pyobj_doc, &input))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlEncodeEntities(doc, input);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlGetDtdQElementDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlElementPtr c_retval;
@@ -968,20 +567,6 @@ libxml_xmlGetDtdQElementDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlParseNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseNamespace", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    xmlParseNamespace(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlValidatePopElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -1004,22 +589,6 @@ libxml_xmlValidatePopElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlStrncasecmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncasecmp", &str1, &str2, &len))
-        return(NULL);
-
-    c_retval = xmlStrncasecmp(str1, str2, len);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
 libxml_xmlXPathLocalNameFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -1038,58 +607,15 @@ libxml_xmlXPathLocalNameFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCanonicPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * path;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCanonicPath", &path))
-        return(NULL);
-
-    c_retval = xmlCanonicPath(path);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNextPrecedingSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextPrecedingSibling", &pyobj_ctxt, &pyobj_cur))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlXPathNextPrecedingSibling(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlCatalogCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlCatalogCleanup();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlNextChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParserHandleReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNextChar", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserHandleReference", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlNextChar(ctxt);
+    xmlParserHandleReference(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
@@ -1119,28 +645,6 @@ libxml_xmlCopyNamespaceList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlIsID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlIsID", &pyobj_doc, &pyobj_elem, &pyobj_attr))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
-
-    c_retval = xmlIsID(doc, elem, attr);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUCSIsSpecials(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -1197,22 +701,6 @@ libxml_xmlUCSIsLatinExtendedA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlParseExtParsedEnt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseExtParsedEnt", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlParseExtParsedEnt(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlCopyDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlDtdPtr c_retval;
@@ -1265,73 +753,6 @@ libxml_xmlErrorGetLine(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlStringLenDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * str;
-    int len;
-    int what;
-    xmlChar end;
-    xmlChar end2;
-    xmlChar end3;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oziiccc:xmlStringLenDecodeEntities", &pyobj_ctxt, &str, &len, &what, &end, &end2, &end3))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlStringLenDecodeEntities(ctxt, str, len, what, end, end2, end3);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlUCSIsCJKUnifiedIdeographsExtensionA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographsExtensionA", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCJKUnifiedIdeographsExtensionA(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlUCSIsCJKUnifiedIdeographsExtensionB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographsExtensionB", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCJKUnifiedIdeographsExtensionB(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlCreateMemoryParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    htmlParserCtxtPtr c_retval;
-    char * buffer;
-    int size;
-
-    if (!PyArg_ParseTuple(args, (char *)"zi:htmlCreateMemoryParserCtxt", &buffer, &size))
-        return(NULL);
-
-    c_retval = htmlCreateMemoryParserCtxt(buffer, size);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
 libxml_xmlNewDocNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
@@ -1352,20 +773,6 @@ libxml_xmlNewDocNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlIsDigit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    unsigned int ch;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsDigit", &ch))
-        return(NULL);
-
-    c_retval = xmlIsDigit(ch);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlParseDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -1383,20 +790,6 @@ libxml_htmlParseDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlCatalogSetDebug(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int level;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlCatalogSetDebug", &level))
-        return(NULL);
-
-    c_retval = xmlCatalogSetDebug(level);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
 libxml_xmlRelaxNGInitTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
@@ -1410,20 +803,6 @@ libxml_xmlRelaxNGInitTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRI
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlParserGetDirectory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    char * c_retval;
-    char * filename;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlParserGetDirectory", &filename))
-        return(NULL);
-
-    c_retval = xmlParserGetDirectory(filename);
-    py_retval = libxml_charPtrWrap((char *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUCSIsMiscellaneousMathematicalSymbolsA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -1437,16 +816,6 @@ libxml_xmlUCSIsMiscellaneousMathematicalSymbolsA(PyObject *self ATTRIBUTE_UNUSED
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
-PyObject *
-libxml_xmlSchemaCleanupTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlSchemaCleanupTypes();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_SCHEMAS_ENABLED */
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
 libxml_xmlXPathFreeParserContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -1464,66 +833,18 @@ libxml_xmlXPathFreeParserContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlFreeNsList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNsPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNsList", &pyobj_cur))
-        return(NULL);
-    cur = (xmlNsPtr) PyxmlNode_Get(pyobj_cur);
-
-    xmlFreeNsList(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlParseEntityDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEntityDecl", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    xmlParseEntityDecl(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlDocCopyNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    int extended;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDocCopyNode", &pyobj_node, &pyobj_doc, &extended))
-        return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlDocCopyNode(node, doc, extended);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_nodePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetAuthority(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:nodePop", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetAuthority", &pyobj_URI))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = nodePop(ctxt);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = URI->authority;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
@@ -1537,27 +858,6 @@ libxml_xmlCreateURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UN
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNextDescendant(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextDescendant", &pyobj_ctxt, &pyobj_cur))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlXPathNextDescendant(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlStrcat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -1589,73 +889,19 @@ libxml_xmlSchemaFreeParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_SCHEMAS_ENABLED
-PyObject *
-libxml_xmlSchemaFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlSchemaValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaFreeValidCtxt", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
-
-    xmlSchemaFreeValidCtxt(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlSchemaNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderGetParserLineNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlSchemaParserCtxtPtr c_retval;
-    char * URL;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlSchemaNewParserCtxt", &URL))
-        return(NULL);
-
-    c_retval = xmlSchemaNewParserCtxt(URL);
-    py_retval = libxml_xmlSchemaParserCtxtPtrWrap((xmlSchemaParserCtxtPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_SCHEMAS_ENABLED */
-PyObject *
-libxml_xmlInitializeCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlInitializeCatalog();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlParseEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * filename;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseEntity", &filename))
-        return(NULL);
-
-    c_retval = xmlParseEntity(filename);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlDocGetRootElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlDocGetRootElement", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderGetParserLineNumber", &pyobj_reader))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlDocGetRootElement(doc);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlTextReaderGetParserLineNumber(reader);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
@@ -1687,65 +933,6 @@ libxml_xmlParseMarkupDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlCreateFileParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    htmlParserCtxtPtr c_retval;
-    char * filename;
-    char * encoding;
-
-    if (!PyArg_ParseTuple(args, (char *)"zz:htmlCreateFileParserCtxt", &filename, &encoding))
-        return(NULL);
-
-    c_retval = htmlCreateFileParserCtxt(filename, encoding);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlTextReaderConstEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstEncoding", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderConstEncoding(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlValidateOneAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
-    xmlChar * value;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOOOz:xmlValidateOneAttribute", &pyobj_ctxt, &pyobj_doc, &pyobj_elem, &pyobj_attr, &value))
-        return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
-
-    c_retval = xmlValidateOneAttribute(ctxt, doc, elem, attr, value);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 PyObject *
 libxml_xmlHasNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -1784,37 +971,6 @@ libxml_xmlAddPrevSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * name;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderMoveToAttribute", &pyobj_reader, &name))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderMoveToAttribute(reader, name);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlUCSIsCyrillic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCyrillic", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCyrillic(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlGetDtdAttrDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlAttributePtr c_retval;
@@ -1832,20 +988,6 @@ libxml_xmlGetDtdAttrDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlUCSIsCJKCompatibilityForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityForms", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCJKCompatibilityForms(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlGetMetaEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -1865,40 +1007,6 @@ libxml_htmlGetMetaEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlCharStrdup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    char * cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCharStrdup", &cur))
-        return(NULL);
-
-    c_retval = xmlCharStrdup(cur);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlElemDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * f;
-    PyObject *pyobj_f;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlElemDump", &pyobj_f, &pyobj_doc, &pyobj_cur))
-        return(NULL);
-    f = (FILE *) PyFile_Get(pyobj_f);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    xmlElemDump(f, doc, cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlUCSIsEnclosedCJKLettersandMonths(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -1929,20 +1037,6 @@ libxml_xmlGetIntSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlRecoverDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlChar * cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlRecoverDoc", &cur))
-        return(NULL);
-
-    c_retval = xmlRecoverDoc(cur);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlCleanupInputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
     xmlCleanupInputCallbacks();
@@ -2013,3699 +1107,5115 @@ libxml_xmlUCSIsCombiningDiacriticalMarksforSymbols(PyObject *self ATTRIBUTE_UNUS
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugDumpAttrList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
-    int depth;
+libxml_xmlParserInputBufferRead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlParserInputBufferPtr in;
+    PyObject *pyobj_in;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpAttrList", &pyobj_output, &pyobj_attr, &depth))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserInputBufferRead", &pyobj_in, &len))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
+    in = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_in);
 
-    xmlDebugDumpAttrList(output, attr, depth);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlParserInputBufferRead(in, len);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlTextReaderGetAttributeNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIOHTTPMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    int no;
+    int c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlTextReaderGetAttributeNo", &pyobj_reader, &no))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlIOHTTPMatch", &filename))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderGetAttributeNo(reader, no);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlIOHTTPMatch(filename);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlParserInputBufferRead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNewFloat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlParserInputBufferPtr in;
-    PyObject *pyobj_in;
-    int len;
+    xmlXPathObjectPtr c_retval;
+    double val;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserInputBufferRead", &pyobj_in, &len))
+    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathNewFloat", &val))
         return(NULL);
-    in = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_in);
 
-    c_retval = xmlParserInputBufferRead(in, len);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlXPathNewFloat(val);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsLinearBIdeograms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatCc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLinearBIdeograms", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCc", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsLinearBIdeograms(code);
+    c_retval = xmlUCSIsCatCc(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseCharData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int cdata;
+libxml_xmlURISetServer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * server;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParseCharData", &pyobj_ctxt, &cdata))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetServer", &pyobj_URI, &server))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    xmlParseCharData(ctxt, cdata);
+    if (URI->server != NULL) xmlFree(URI->server);
+    URI->server = (char *)xmlStrdup((const xmlChar *)server);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlUCSIsHangulJamo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSpacingModifierLetters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulJamo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSpacingModifierLetters", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsHangulJamo(code);
+    c_retval = xmlUCSIsSpacingModifierLetters(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsThai(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHighPrivateUseSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsThai", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHighPrivateUseSurrogates", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsThai(code);
+    c_retval = xmlUCSIsHighPrivateUseSurrogates(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlCtxtReset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:htmlCtxtReset", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+libxml_xmlDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
-    htmlCtxtReset(ctxt);
+    xmlDefaultSAXHandlerInit();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlCtxtReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsBraillePatterns(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBraillePatterns", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsBraillePatterns(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlParseAttValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    char * filename;
-    char * encoding;
-    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzi:xmlCtxtReadFile", &pyobj_ctxt, &filename, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseAttValue", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlCtxtReadFile(ctxt, filename, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlParseAttValue(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathRegisterNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStringGetNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * value;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlStringGetNodeList", &pyobj_doc, &value))
+        return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    c_retval = xmlStringGetNodeList(doc, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlHandleOmittedElem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * prefix;
-    xmlChar * ns_uri;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlXPathRegisterNs", &pyobj_ctxt, &prefix, &ns_uri))
+    if (!PyArg_ParseTuple(args, (char *)"i:htmlHandleOmittedElem", &val))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathRegisterNs(ctxt, prefix, ns_uri);
+    c_retval = htmlHandleOmittedElem(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathTrueFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathTrueFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathTrueFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlIOFTPMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogAdd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
+    xmlChar * type;
+    xmlChar * orig;
+    xmlChar * replace;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlIOFTPMatch", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlCatalogAdd", &type, &orig, &replace))
         return(NULL);
 
-    c_retval = xmlIOFTPMatch(filename);
+    c_retval = xmlCatalogAdd(type, orig, replace);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCopyNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCombiningDiacriticalMarks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    int extended;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCopyNode", &pyobj_node, &extended))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningDiacriticalMarks", &code))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlCopyNode(node, extended);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsCombiningDiacriticalMarks(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlCatalogResolveSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathEqualValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * sysID;
+    int c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolveSystem", &sysID))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathEqualValues", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlCatalogResolveSystem(sysID);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlXPathEqualValues(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlTextReaderConstLocalName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtUseOptions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstLocalName", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCtxtUseOptions", &pyobj_ctxt, &options))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderConstLocalName(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlCtxtUseOptions(ctxt, options);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURISetServer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * server;
+libxml_xmlUCSIsShavian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetServer", &pyobj_URI, &server))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsShavian", &code))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    if (URI->server != NULL) xmlFree(URI->server);
-    URI->server = (char *)xmlStrdup((const xmlChar *)server);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsShavian(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsHebrew(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHebrew", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsHebrew(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathLastFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathLangFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
     int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathLastFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathLangFunction", &pyobj_ctxt, &nargs))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathLastFunction(ctxt, nargs);
+    xmlXPathLangFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlUCSIsSpacingModifierLetters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaValidateDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlSchemaValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSpacingModifierLetters", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSchemaValidateDoc", &pyobj_ctxt, &pyobj_doc))
         return(NULL);
+    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsSpacingModifierLetters(code);
+    c_retval = xmlSchemaValidateDoc(ctxt, doc);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsOpticalCharacterRecognition(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlErrorPtr from;
+    PyObject *pyobj_from;
+    xmlErrorPtr to;
+    PyObject *pyobj_to;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOpticalCharacterRecognition", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyError", &pyobj_from, &pyobj_to))
         return(NULL);
+    from = (xmlErrorPtr) PyError_Get(pyobj_from);
+    to = (xmlErrorPtr) PyError_Get(pyobj_to);
 
-    c_retval = xmlUCSIsOpticalCharacterRecognition(code);
+    c_retval = xmlCopyError(from, to);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlThrDefSubstituteEntitiesDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGValidateDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    xmlRelaxNGValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefSubstituteEntitiesDefaultValue", &v))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGValidateDoc", &pyobj_ctxt, &pyobj_doc))
         return(NULL);
+    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlThrDefSubstituteEntitiesDefaultValue(v);
+    c_retval = xmlRelaxNGValidateDoc(ctxt, doc);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlNewNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeSetSpacePreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    int val;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlNodeSetSpacePreserve", &pyobj_cur, &val))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeSetSpacePreserve(cur, val);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUCSIsArmenian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArmenian", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsArmenian(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathCastNodeToNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    double c_retval;
     xmlNodePtr node;
     PyObject *pyobj_node;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewNsProp", &pyobj_node, &pyobj_ns, &name, &value))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathCastNodeToNumber", &pyobj_node))
         return(NULL);
     node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    c_retval = xmlNewNsProp(node, ns, name, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlXPathCastNodeToNumber(node);
+    py_retval = libxml_doubleWrap((double) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlThrDefIndentTreeOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUTF8Size(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    xmlChar * utf;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefIndentTreeOutput", &v))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlUTF8Size", &utf))
         return(NULL);
 
-    c_retval = xmlThrDefIndentTreeOutput(v);
+    c_retval = xmlUTF8Size(utf);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlCatalogPtr c_retval;
-    int sgml;
+    xmlNodePtr c_retval;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlNewCatalog", &sgml))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewText", &content))
         return(NULL);
 
-    c_retval = xmlNewCatalog(sgml);
-    py_retval = libxml_xmlCatalogPtrWrap((xmlCatalogPtr) c_retval);
+    c_retval = xmlNewText(content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsYijingHexagramSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocCopyNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsYijingHexagramSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocCopyNodeList", &pyobj_doc, &pyobj_node))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlUCSIsYijingHexagramSymbols(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlDocCopyNodeList(doc, node);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsHighPrivateUseSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHighPrivateUseSurrogates", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewDocText", &pyobj_doc, &content))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsHighPrivateUseSurrogates(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNewDocText(doc, content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlXPtrNewContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathContextPtr c_retval;
+    xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr here;
-    PyObject *pyobj_here;
-    xmlNodePtr origin;
-    PyObject *pyobj_origin;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlXPtrNewContext", &pyobj_doc, &pyobj_here, &pyobj_origin))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewReference", &pyobj_doc, &name))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    here = (xmlNodePtr) PyxmlNode_Get(pyobj_here);
-    origin = (xmlNodePtr) PyxmlNode_Get(pyobj_origin);
 
-    c_retval = xmlXPtrNewContext(doc, here, origin);
-    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
+    c_retval = xmlNewReference(doc, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlXPathNewValueTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
+    xmlNodePtr val;
+    PyObject *pyobj_val;
 
-    xmlDefaultSAXHandlerInit();
-    Py_INCREF(Py_None);
-    return(Py_None);
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewValueTree", &pyobj_val))
+        return(NULL);
+    val = (xmlNodePtr) PyxmlNode_Get(pyobj_val);
+
+    c_retval = xmlXPathNewValueTree(val);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlReaderNewFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSupplementalMathematicalOperators(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    int fd;
-    char * URL;
-    char * encoding;
-    int options;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oizzi:xmlReaderNewFd", &pyobj_reader, &fd, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalMathematicalOperators", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlReaderNewFd(reader, fd, URL, encoding, options);
+    c_retval = xmlUCSIsSupplementalMathematicalOperators(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsBraillePatterns(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlOutputBufferWriteString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlOutputBufferPtr out;
+    PyObject *pyobj_out;
+    char * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBraillePatterns", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlOutputBufferWriteString", &pyobj_out, &str))
         return(NULL);
+    out = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_out);
 
-    c_retval = xmlUCSIsBraillePatterns(code);
+    c_retval = xmlOutputBufferWriteString(out, str);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseAttValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
+    int c_retval;
+    xmlValidCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlDtdPtr dtd;
+    PyObject *pyobj_dtd;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseAttValue", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlValidateDtd", &pyobj_ctxt, &pyobj_doc, &pyobj_dtd))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
 
-    c_retval = xmlParseAttValue(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlValidateDtd(ctxt, doc, dtd);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCreateMemoryParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsBlank(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
-    char * buffer;
-    int size;
+    int c_retval;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCreateMemoryParserCtxt", &buffer, &size))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsBlank", &ch))
         return(NULL);
 
-    c_retval = xmlCreateMemoryParserCtxt(buffer, size);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    c_retval = xmlIsBlank(ch);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlStringGetNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPtrNewLocationSetNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
+    xmlXPathObjectPtr c_retval;
+    xmlNodePtr start;
+    PyObject *pyobj_start;
+    xmlNodePtr end;
+    PyObject *pyobj_end;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPtrNewLocationSetNodes", &pyobj_start, &pyobj_end))
+        return(NULL);
+    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
+    end = (xmlNodePtr) PyxmlNode_Get(pyobj_end);
+
+    c_retval = xmlXPtrNewLocationSetNodes(start, end);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPTR_ENABLED */
+PyObject *
+libxml_xmlUCSIsCombiningMarksforSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningMarksforSymbols", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsCombiningMarksforSymbols(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlValidateElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * value;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlStringGetNodeList", &pyobj_doc, &value))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlValidateElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
         return(NULL);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlStringGetNodeList(doc, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlValidateElement(ctxt, doc, elem);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlHandleOmittedElem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlPopInputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
     PyObject *py_retval;
     int c_retval;
-    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:htmlHandleOmittedElem", &val))
+    c_retval = xmlPopInputCallbacks();
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsLao(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLao", &code))
         return(NULL);
 
-    c_retval = htmlHandleOmittedElem(val);
+    c_retval = xmlUCSIsLao(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlParseName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseName", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNewDocFragment", &pyobj_doc))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlParseName(ctxt);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlNewDocFragment(doc);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    htmlDocPtr c_retval;
+    char * buffer;
+    int py_buffsize0;
+    int size;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"t#izzi:htmlReadMemory", &buffer, &py_buffsize0, &size, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = htmlReadMemory(buffer, size, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathTrueFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlXPathNodeSetFreeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathTrueFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNodeSetFreeNs", &pyobj_ns))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    xmlXPathTrueFunction(ctxt, nargs);
+    xmlXPathNodeSetFreeNs(ns);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCatalogAdd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderHasAttributes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * type;
-    xmlChar * orig;
-    xmlChar * replace;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlCatalogAdd", &type, &orig, &replace))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderHasAttributes", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlCatalogAdd(type, orig, replace);
+    c_retval = xmlTextReaderHasAttributes(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCombiningDiacriticalMarks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsGothic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningDiacriticalMarks", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGothic", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCombiningDiacriticalMarks(code);
+    c_retval = xmlUCSIsGothic(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+PyObject *
+libxml_xmlNodeDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlOutputBufferPtr buf;
+    PyObject *pyobj_buf;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    int level;
+    int format;
+    char * encoding;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOOiiz:xmlNodeDumpOutput", &pyobj_buf, &pyobj_doc, &pyobj_cur, &level, &format, &encoding))
+        return(NULL);
+    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeDumpOutput(buf, doc, cur, level, format, encoding);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCastStringToBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * val;
+libxml_xmlXPathRegisteredFuncsCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathCastStringToBoolean", &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredFuncsCleanup", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathCastStringToBoolean(val);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlXPathRegisteredFuncsCleanup(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathEqualValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsBlock(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int code;
+    char * block;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathEqualValues", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"iz:xmlUCSIsBlock", &code, &block))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathEqualValues(ctxt);
+    c_retval = xmlUCSIsBlock(code, block);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCtxtUseOptions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderMoveToNextAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int options;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCtxtUseOptions", &pyobj_ctxt, &options))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToNextAttribute", &pyobj_reader))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlCtxtUseOptions(ctxt, options);
+    c_retval = xmlTextReaderMoveToNextAttribute(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsShavian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatNd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsShavian", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNd", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsShavian(code);
+    c_retval = xmlUCSIsCatNd(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseSDDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToElement", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseSDDecl", &pyobj_ctxt))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderMoveToElement(reader);
+    c_retval = xmlParseSDDecl(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlIsAutoClosed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderNewWalker(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlDocPtr doc;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlDocPtr doc;
     PyObject *pyobj_doc;
-    htmlNodePtr elem;
-    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:htmlIsAutoClosed", &pyobj_doc, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlReaderNewWalker", &pyobj_reader, &pyobj_doc))
         return(NULL);
-    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (htmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = htmlIsAutoClosed(doc, elem);
+    c_retval = xmlReaderNewWalker(reader, doc);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsUgaritic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatNl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsUgaritic", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNl", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsUgaritic(code);
+    c_retval = xmlUCSIsCatNl(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCJKCompatibilityIdeographsSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityIdeographsSupplement", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNo", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCJKCompatibilityIdeographsSupplement(code);
+    c_retval = xmlUCSIsCatNo(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatCc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSkipBlankChars(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCc", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSkipBlankChars", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsCatCc(code);
+    c_retval = xmlSkipBlankChars(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsHebrew(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNmtokenValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHebrew", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNmtokenValue", &value))
         return(NULL);
 
-    c_retval = xmlUCSIsHebrew(code);
+    c_retval = xmlValidateNmtokenValue(value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlReconciliateNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetNodePath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr tree;
-    PyObject *pyobj_tree;
+    xmlChar * c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlReconciliateNs", &pyobj_doc, &pyobj_tree))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetNodePath", &pyobj_node))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlReconciliateNs(doc, tree);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlGetNodePath(node);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlXPathLangFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_htmlDocContentDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlOutputBufferPtr buf;
+    PyObject *pyobj_buf;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathLangFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"OOz:htmlDocContentDumpOutput", &pyobj_buf, &pyobj_cur, &encoding))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlXPathLangFunction(ctxt, nargs);
+    htmlDocContentDumpOutput(buf, cur, encoding);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_SCHEMAS_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlSchemaValidateDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathPopBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlSchemaValidCtxtPtr ctxt;
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSchemaValidateDoc", &pyobj_ctxt, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathPopBoolean", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlSchemaValidateDoc(ctxt, doc);
+    c_retval = xmlXPathPopBoolean(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlXPathEvalExpression(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsIdeographic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlChar * str;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathEvalExpression", &str, &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsIdeographic", &ch))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathEvalExpression(str, ctxt);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlIsIdeographic(ch);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCopyError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsLatinExtendedAdditional(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlErrorPtr from;
-    PyObject *pyobj_from;
-    xmlErrorPtr to;
-    PyObject *pyobj_to;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyError", &pyobj_from, &pyobj_to))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatinExtendedAdditional", &code))
         return(NULL);
-    from = (xmlErrorPtr) PyError_Get(pyobj_from);
-    to = (xmlErrorPtr) PyError_Get(pyobj_to);
 
-    c_retval = xmlCopyError(from, to);
+    c_retval = xmlUCSIsLatinExtendedAdditional(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+PyObject *
+libxml_xmlURISetAuthority(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * authority;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetAuthority", &pyobj_URI, &authority))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    if (URI->authority != NULL) xmlFree(URI->authority);
+    URI->authority = (char *)xmlStrdup((const xmlChar *)authority);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGValidateDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGValidatePushCData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     xmlRelaxNGValidCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    xmlChar * data;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGValidateDoc", &pyobj_ctxt, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlRelaxNGValidatePushCData", &pyobj_ctxt, &data, &len))
         return(NULL);
     ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlRelaxNGValidateDoc(ctxt, doc);
+    c_retval = xmlRelaxNGValidatePushCData(ctxt, data, len);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlSearchNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
     PyObject *py_retval;
-    xmlNsPtr c_retval;
+    xmlErrorPtr c_retval;
+
+    c_retval = xmlGetLastError();
+    py_retval = libxml_xmlErrorPtrWrap((xmlErrorPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlEncodeEntitiesReentrant(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * nameSpace;
+    xmlChar * input;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOz:xmlSearchNs", &pyobj_doc, &pyobj_node, &nameSpace))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeEntitiesReentrant", &pyobj_doc, &input))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlSearchNs(doc, node, nameSpace);
-    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
+    c_retval = xmlEncodeEntitiesReentrant(doc, input);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsKangxiRadicals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRemoveProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlAttrPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKangxiRadicals", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRemoveProp", &pyobj_cur))
         return(NULL);
+    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlUCSIsKangxiRadicals(code);
+    c_retval = xmlRemoveProp(cur);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNodeSetSpacePreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    int val;
+libxml_xmlACatalogDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    FILE * out;
+    PyObject *pyobj_out;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlNodeSetSpacePreserve", &pyobj_cur, &val))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlACatalogDump", &pyobj_catal, &pyobj_out))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+    out = (FILE *) PyFile_Get(pyobj_out);
 
-    xmlNodeSetSpacePreserve(cur, val);
+    xmlACatalogDump(catal, out);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlUCSIsArmenian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
+    char * filename;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlReadFile", &filename, &encoding, &options))
+        return(NULL);
+
+    c_retval = xmlReadFile(filename, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsNumberForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArmenian", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsNumberForms", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsArmenian(code);
+    c_retval = xmlUCSIsNumberForms(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCreateIntSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrncmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDtdPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * name;
-    xmlChar * ExternalID;
-    xmlChar * SystemID;
+    int c_retval;
+    xmlChar * str1;
+    xmlChar * str2;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlCreateIntSubset", &pyobj_doc, &name, &ExternalID, &SystemID))
+    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncmp", &str1, &str2, &len))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlCreateIntSubset(doc, name, ExternalID, SystemID);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlStrncmp(str1, str2, len);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathSubValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
+libxml_xmlCatalogGetPublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const xmlChar * c_retval;
+    xmlChar * pubID;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogGetPublic", &pubID))
+        return(NULL);
+
+    c_retval = xmlCatalogGetPublic(pubID);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlSaveFormatFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    int format;
+
+    if (!PyArg_ParseTuple(args, (char *)"zOi:xmlSaveFormatFile", &filename, &pyobj_cur, &format))
+        return(NULL);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlSaveFormatFile(filename, cur, format);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlParseXMLDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathSubValues", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseXMLDecl", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlXPathSubValues(ctxt);
+    xmlParseXMLDecl(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsArabicPresentationFormsA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlChar * content;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewComment", &content))
+        return(NULL);
+
+    c_retval = xmlNewComment(content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+PyObject *
+libxml_xmlRelaxNGNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlRelaxNGValidCtxtPtr c_retval;
+    xmlRelaxNGPtr schema;
+    PyObject *pyobj_schema;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGNewValidCtxt", &pyobj_schema))
+        return(NULL);
+    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
+
+    c_retval = xmlRelaxNGNewValidCtxt(schema);
+    py_retval = libxml_xmlRelaxNGValidCtxtPtrWrap((xmlRelaxNGValidCtxtPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+PyObject *
+libxml_xmlUCSIsKatakana(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabicPresentationFormsA", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKatakana", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsArabicPresentationFormsA(code);
+    c_retval = xmlUCSIsKatakana(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsArabicPresentationFormsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHalfwidthandFullwidthForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabicPresentationFormsB", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHalfwidthandFullwidthForms", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsArabicPresentationFormsB(code);
+    c_retval = xmlUCSIsHalfwidthandFullwidthForms(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGeometricShapes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNamesValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeometricShapes", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNamesValue", &value))
         return(NULL);
 
-    c_retval = xmlUCSIsGeometricShapes(code);
+    c_retval = xmlValidateNamesValue(value);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlParseURIReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlURIPtr uri;
+    PyObject *pyobj_uri;
+    char * str;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlParseURIReference", &pyobj_uri, &str))
+        return(NULL);
+    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
+
+    c_retval = xmlParseURIReference(uri, str);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCastNodeToNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathOrderDocElems(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    double c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    long c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathCastNodeToNumber", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathOrderDocElems", &pyobj_doc))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlXPathCastNodeToNumber(node);
-    py_retval = libxml_doubleWrap((double) c_retval);
+    c_retval = xmlXPathOrderDocElems(doc);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlGetPredefinedEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsGurmukhi(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlEntityPtr c_retval;
-    xmlChar * name;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlGetPredefinedEntity", &name))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGurmukhi", &code))
         return(NULL);
 
-    c_retval = xmlGetPredefinedEntity(name);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsGurmukhi(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_namePush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlChar * content;
+    int c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewText", &content))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:namePush", &pyobj_ctxt, &value))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlNewText(content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = namePush(ctxt, value);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlSaveFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeSetBase(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlChar * uri;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetBase", &pyobj_cur, &uri))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeSetBase(cur, uri);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlTextReaderRelaxNGSetSchema(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlRelaxNGPtr schema;
+    PyObject *pyobj_schema;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlTextReaderRelaxNGSetSchema", &pyobj_reader, &pyobj_schema))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
+
+    c_retval = xmlTextReaderRelaxNGSetSchema(reader, schema);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_DEBUG_ENABLED
+PyObject *
+libxml_xmlDebugDumpAttr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
+    int depth;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpAttr", &pyobj_output, &pyobj_attr, &depth))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
+
+    xmlDebugDumpAttr(output, attr, depth);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+PyObject *
+libxml_xmlCleanupOutputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlCleanupOutputCallbacks();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlXPathSetContextNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathSetContextNode", &pyobj_ctxt, &pyobj_node))
+        return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+
+    ctxt->node = node;
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlSaveFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     char * filename;
     xmlDocPtr cur;
     PyObject *pyobj_cur;
+    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"zO:xmlSaveFile", &filename, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"zOz:xmlSaveFileEnc", &filename, &pyobj_cur, &encoding))
         return(NULL);
     cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlSaveFile(filename, cur);
+    c_retval = xmlSaveFileEnc(filename, cur, encoding);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlDocCopyNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathGetFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    const xmlChar * c_retval;
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetFunction", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+
+    c_retval = ctxt->function;
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_DEBUG_ENABLED
+PyObject *
+libxml_xmlDebugDumpOneNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
     xmlNodePtr node;
     PyObject *pyobj_node;
+    int depth;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocCopyNodeList", &pyobj_doc, &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpOneNode", &pyobj_output, &pyobj_node, &depth))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    output = (FILE *) PyFile_Get(pyobj_output);
     node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlDocCopyNodeList(doc, node);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
+    xmlDebugDumpOneNode(output, node, depth);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlXPathNextNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+    xmlNsPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * href;
+    xmlChar * prefix;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextNamespace", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewNs", &pyobj_node, &href, &prefix))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlXPathNextNamespace(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlNewNs(node, href, prefix);
+    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlNewDocText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrcasestr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * content;
+    const xmlChar * c_retval;
+    xmlChar * str;
+    xmlChar * val;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewDocText", &pyobj_doc, &content))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcasestr", &str, &val))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlNewDocText(doc, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlStrcasestr(str, val);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsBuhid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderReadState(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBuhid", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadState", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsBuhid(code);
+    c_retval = xmlTextReaderReadState(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlSchemaValidateOneElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHangulSyllables(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlSchemaValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSchemaValidateOneElement", &pyobj_ctxt, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulSyllables", &code))
         return(NULL);
-    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlSchemaValidateOneElement(ctxt, elem);
+    c_retval = xmlUCSIsHangulSyllables(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateQName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
+    int c_retval;
+    xmlChar * value;
+    int space;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlReadDoc", &cur, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateQName", &value, &space))
         return(NULL);
 
-    c_retval = xmlReadDoc(cur, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlValidateQName(value, space);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNewValueTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathCompareValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlNodePtr val;
-    PyObject *pyobj_val;
+    int c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int inf;
+    int strict;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewValueTree", &pyobj_val))
+    if (!PyArg_ParseTuple(args, (char *)"Oii:xmlXPathCompareValues", &pyobj_ctxt, &inf, &strict))
         return(NULL);
-    val = (xmlNodePtr) PyxmlNode_Get(pyobj_val);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNewValueTree(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlXPathCompareValues(ctxt, inf, strict);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlReaderNewFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSyriac(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    char * filename;
-    char * encoding;
-    int options;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzi:xmlReaderNewFile", &pyobj_reader, &filename, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSyriac", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlReaderNewFile(reader, filename, encoding, options);
+    c_retval = xmlUCSIsSyriac(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsSupplementalMathematicalOperators(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrQEqual(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * pref;
+    xmlChar * name;
+    xmlChar * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalMathematicalOperators", &code))
+    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlStrQEqual", &pref, &name, &str))
         return(NULL);
 
-    c_retval = xmlUCSIsSupplementalMathematicalOperators(code);
+    c_retval = xmlStrQEqual(pref, name, str);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlFreeDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlDtdPtr cur;
-    PyObject *pyobj_cur;
+libxml_xmlBuildURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * URI;
+    xmlChar * base;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeDtd", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlBuildURI", &URI, &base))
         return(NULL);
-    cur = (xmlDtdPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlFreeDtd(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlBuildURI(URI, base);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlOutputBufferWriteString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderGetParserColumnNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlOutputBufferPtr out;
-    PyObject *pyobj_out;
-    char * str;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlOutputBufferWriteString", &pyobj_out, &str))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderGetParserColumnNumber", &pyobj_reader))
         return(NULL);
-    out = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_out);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlOutputBufferWriteString(out, str);
+    c_retval = xmlTextReaderGetParserColumnNumber(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlSetListDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr list;
-    PyObject *pyobj_list;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+libxml_valuePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSetListDoc", &pyobj_list, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"O:valuePop", &pyobj_ctxt))
         return(NULL);
-    list = (xmlNodePtr) PyxmlNode_Get(pyobj_list);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlSetListDoc(list, doc);
+    c_retval = valuePop(ctxt);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathContainsFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathContainsFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathContainsFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlValidateDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlCtxtUseOptions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlValidCtxtPtr ctxt;
+    htmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlDtdPtr dtd;
-    PyObject *pyobj_dtd;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlValidateDtd", &pyobj_ctxt, &pyobj_doc, &pyobj_dtd))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:htmlCtxtUseOptions", &pyobj_ctxt, &options))
         return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlValidateDtd(ctxt, doc, dtd);
+    c_retval = htmlCtxtUseOptions(ctxt, options);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_htmlReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogConvert(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    char * filename;
-    char * encoding;
-    int options;
+    int c_retval;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzi:htmlReadFile", &filename, &encoding, &options))
+    c_retval = xmlCatalogConvert();
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlCreateDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlParserCtxtPtr c_retval;
+    xmlChar * cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCreateDocParserCtxt", &cur))
         return(NULL);
 
-    c_retval = htmlReadFile(filename, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlCreateDocParserCtxt(cur);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlCtxtReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlResetError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlErrorPtr err;
+    PyObject *pyobj_err;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlResetError", &pyobj_err))
+        return(NULL);
+    err = (xmlErrorPtr) PyError_Get(pyobj_err);
+
+    xmlResetError(err);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUCSIsArrows(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    char * filename;
-    char * encoding;
-    int options;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzi:htmlCtxtReadFile", &pyobj_ctxt, &filename, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArrows", &code))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = htmlCtxtReadFile(ctxt, filename, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlUCSIsArrows(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlThrDefLineNumbersDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathGetContextSize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefLineNumbersDefaultValue", &v))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextSize", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlThrDefLineNumbersDefaultValue(v);
+    c_retval = ctxt->contextSize;
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsLimbu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr parent;
-    PyObject *pyobj_parent;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-    xmlChar * content;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewChild", &pyobj_parent, &pyobj_ns, &name, &content))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLimbu", &code))
         return(NULL);
-    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    c_retval = xmlNewChild(parent, ns, name, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsLimbu(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocPI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
+    xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * ID;
+    xmlChar * name;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetID", &pyobj_doc, &ID))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewDocPI", &pyobj_doc, &name, &content))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlGetID(doc, ID);
+    c_retval = xmlNewDocPI(doc, name, content);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsCombiningHalfMarks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
+libxml_xmlXPathTranslateFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningHalfMarks", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathTranslateFunction", &pyobj_ctxt, &nargs))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsCombiningHalfMarks(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlXPathTranslateFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlIsBlank(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeGetSpacePreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    unsigned int ch;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsBlank", &ch))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetSpacePreserve", &pyobj_cur))
         return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlIsBlank(ch);
+    c_retval = xmlNodeGetSpacePreserve(cur);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlXPtrNewLocationSetNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlNodePtr start;
-    PyObject *pyobj_start;
-    xmlNodePtr end;
-    PyObject *pyobj_end;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPtrNewLocationSetNodes", &pyobj_start, &pyobj_end))
-        return(NULL);
-    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
-    end = (xmlNodePtr) PyxmlNode_Get(pyobj_end);
+libxml_xmlResetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
-    c_retval = xmlXPtrNewLocationSetNodes(start, end);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
+    xmlResetLastError();
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsCombiningMarksforSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathIsNaN(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    double val;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningMarksforSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathIsNaN", &val))
         return(NULL);
 
-    c_retval = xmlUCSIsCombiningMarksforSymbols(code);
+    c_retval = xmlXPathIsNaN(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlValidateElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateDtdFinal(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     xmlValidCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlValidateElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlValidateDtdFinal", &pyobj_ctxt, &pyobj_doc))
         return(NULL);
     ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlValidateElement(ctxt, doc, elem);
+    c_retval = xmlValidateDtdFinal(ctxt, doc);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlPopInputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlParseEncName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    c_retval = xmlPopInputCallbacks();
-    py_retval = libxml_intWrap((int) c_retval);
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEncName", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlParseEncName(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsCatSc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSc", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAttribute", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlUCSIsCatSc(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlXPathNextAttribute(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlUCSIsLao(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPtrEvalRangePredicate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPtrEvalRangePredicate", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPtrEvalRangePredicate(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPTR_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlAutoCloseTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    htmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * name;
+    htmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLao", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OzO:htmlAutoCloseTag", &pyobj_doc, &name, &pyobj_elem))
         return(NULL);
+    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (htmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlUCSIsLao(code);
+    c_retval = htmlAutoCloseTag(doc, name, elem);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatSk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefLoadExtDtdDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSk", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefLoadExtDtdDefaultValue", &v))
         return(NULL);
 
-    c_retval = xmlUCSIsCatSk(code);
+    c_retval = xmlThrDefLoadExtDtdDefaultValue(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewDocFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefTreeIndentString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
+    const char * c_retval;
+    char * v;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlThrDefTreeIndentString", &v))
+        return(NULL);
+
+    c_retval = xmlThrDefTreeIndentString(v);
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlGetDocCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNewDocFragment", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetDocCompressMode", &pyobj_doc))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlNewDocFragment(doc);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlGetDocCompressMode(doc);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlValidateName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDebugDumpDocumentHead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDocumentHead", &pyobj_output, &pyobj_doc))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    xmlDebugDumpDocumentHead(output, doc);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlNodeDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlOutputBufferPtr buf;
+    PyObject *pyobj_buf;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOOz:htmlNodeDumpOutput", &pyobj_buf, &pyobj_doc, &pyobj_cur, &encoding))
+        return(NULL);
+    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    htmlNodeDumpOutput(buf, doc, cur, encoding);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlParseElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseElement", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    htmlParseElement(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+PyObject *
+libxml_xmlSubstituteEntitiesDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * value;
-    int space;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateName", &value, &space))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlSubstituteEntitiesDefault", &val))
         return(NULL);
 
-    c_retval = xmlValidateName(value, space);
+    c_retval = xmlSubstituteEntitiesDefault(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsGreek(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    char * buffer;
-    int size;
-    char * URL;
-    char * encoding;
-    int options;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zizzi:htmlReadMemory", &buffer, &size, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreek", &code))
         return(NULL);
 
-    c_retval = htmlReadMemory(buffer, size, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlUCSIsGreek(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlURIGetAuthority(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int len;
+    int what;
+    xmlChar end;
+    xmlChar end2;
+    xmlChar end3;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetAuthority", &pyobj_URI))
+    if (!PyArg_ParseTuple(args, (char *)"Oiiccc:xmlDecodeEntities", &pyobj_ctxt, &len, &what, &end, &end2, &end3))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = URI->authority;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlDecodeEntities(ctxt, len, what, end, end2, end3);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseEncodingDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNamespaceParseNSDef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
+    xmlChar * c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEncodingDecl", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNamespaceParseNSDef", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseEncodingDecl(ctxt);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlNamespaceParseNSDef(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsMiscellaneousSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathCastNumberToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    double val;
+
+    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathCastNumberToString", &val))
+        return(NULL);
+
+    c_retval = xmlXPathCastNumberToString(val);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlCatalogRemove(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogRemove", &value))
         return(NULL);
 
-    c_retval = xmlUCSIsMiscellaneousSymbols(code);
+    c_retval = xmlCatalogRemove(value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlSaveFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlOutputBufferWrite(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
+    xmlOutputBufferPtr out;
+    PyObject *pyobj_out;
+    int len;
+    char * buf;
 
-    if (!PyArg_ParseTuple(args, (char *)"zOz:htmlSaveFileEnc", &filename, &pyobj_cur, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"Oiz:xmlOutputBufferWrite", &pyobj_out, &len, &buf))
         return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+    out = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_out);
 
-    c_retval = htmlSaveFileEnc(filename, cur, encoding);
+    c_retval = xmlOutputBufferWrite(out, len, buf);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_namePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIOFTPMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:namePop", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlIOFTPMatch", &filename))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = namePop(ctxt);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlIOFTPMatch(filename);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseContent", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseReference", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlParseContent(ctxt);
+    xmlParseReference(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * buffer;
-    int size;
+libxml_xmlNanoHTTPScanProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     char * URL;
-    char * encoding;
-    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"zizzi:xmlReadMemory", &buffer, &size, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNanoHTTPScanProxy", &URL))
         return(NULL);
 
-    c_retval = xmlReadMemory(buffer, size, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
+    xmlNanoHTTPScanProxy(URL);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 PyObject *
-libxml_xmlThrDefGetWarningsDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatMc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefGetWarningsDefaultValue", &v))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMc", &code))
         return(NULL);
 
-    c_retval = xmlThrDefGetWarningsDefaultValue(v);
+    c_retval = xmlUCSIsCatMc(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsMongolian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStringLenGetNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * value;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMongolian", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlStringLenGetNodeList", &pyobj_doc, &value, &len))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsMongolian(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlStringLenGetNodeList(doc, value, len);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderHasAttributes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderLocatorBaseURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlTextReaderLocatorPtr locator;
+    PyObject *pyobj_locator;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderLocatorBaseURI", &pyobj_locator))
+        return(NULL);
+    locator = (xmlTextReaderLocatorPtr) PyxmlTextReaderLocator_Get(pyobj_locator);
+
+    c_retval = xmlTextReaderLocatorBaseURI(locator);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlSetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlAttrPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+    xmlChar * value;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlSetNsProp", &pyobj_node, &pyobj_ns, &name, &value))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
+
+    c_retval = xmlSetNsProp(node, ns, name, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlSAXDefaultVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int version;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderHasAttributes", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlSAXDefaultVersion", &version))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderHasAttributes(reader);
+    c_retval = xmlSAXDefaultVersion(version);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCJKRadicalsSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNotationUse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * notationName;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKRadicalsSupplement", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OOz:xmlValidateNotationUse", &pyobj_ctxt, &pyobj_doc, &notationName))
         return(NULL);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsCJKRadicalsSupplement(code);
+    c_retval = xmlValidateNotationUse(ctxt, doc, notationName);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGothic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
     PyObject *py_retval;
     int c_retval;
-    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGothic", &code))
+    c_retval = xmlGetCompressMode();
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlNewDocNoDtD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    htmlDocPtr c_retval;
+    xmlChar * URI;
+    xmlChar * ExternalID;
+
+    if (!PyArg_ParseTuple(args, (char *)"zz:htmlNewDocNoDtD", &URI, &ExternalID))
         return(NULL);
 
-    c_retval = xmlUCSIsGothic(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = htmlNewDocNoDtD(URI, ExternalID);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlNodeDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIEscape(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * str;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlURIEscape", &str))
+        return(NULL);
+
+    c_retval = xmlURIEscape(str);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlDocContentDumpFormatOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlOutputBufferPtr buf;
     PyObject *pyobj_buf;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr cur;
+    xmlDocPtr cur;
     PyObject *pyobj_cur;
-    int level;
-    int format;
     char * encoding;
+    int format;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOOiiz:xmlNodeDumpOutput", &pyobj_buf, &pyobj_doc, &pyobj_cur, &level, &format, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"OOzi:htmlDocContentDumpFormatOutput", &pyobj_buf, &pyobj_cur, &encoding, &format))
         return(NULL);
     buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlNodeDumpOutput(buf, doc, cur, level, format, encoding);
+    htmlDocContentDumpFormatOutput(buf, cur, encoding, format);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlCopyNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURISetQuery(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * query;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetQuery", &pyobj_URI, &query))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    if (URI->query != NULL) xmlFree(URI->query);
+    URI->query = (char *)xmlStrdup((const xmlChar *)query);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUCSIsGreekandCoptic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNsPtr c_retval;
-    xmlNsPtr cur;
-    PyObject *pyobj_cur;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlCopyNamespace", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreekandCoptic", &code))
         return(NULL);
-    cur = (xmlNsPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlCopyNamespace(cur);
-    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
+    c_retval = xmlUCSIsGreekandCoptic(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUTF8Strlen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlChar * utf;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlUTF8Strlen", &utf))
+        return(NULL);
+
+    c_retval = xmlUTF8Strlen(utf);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathRegisteredFuncsCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathContextPtr ctxt;
+libxml_xmlXPathAddValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredFuncsCleanup", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathAddValues", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathRegisteredFuncsCleanup(ctxt);
+    xmlXPathAddValues(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsBlock(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrchr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
-    char * block;
+    const xmlChar * c_retval;
+    xmlChar * str;
+    xmlChar val;
 
-    if (!PyArg_ParseTuple(args, (char *)"iz:xmlUCSIsBlock", &code, &block))
+    if (!PyArg_ParseTuple(args, (char *)"zc:xmlStrchr", &str, &val))
         return(NULL);
 
-    c_retval = xmlUCSIsBlock(code, block);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlStrchr(str, val);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToNextAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewTextLen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlChar * content;
+    int len;
+
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlNewTextLen", &content, &len))
+        return(NULL);
+
+    c_retval = xmlNewTextLen(content, len);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathIsInf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    double val;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToNextAttribute", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathIsInf", &val))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderMoveToNextAttribute(reader);
+    c_retval = xmlXPathIsInf(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatNd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKUnifiedIdeographs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNd", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographs", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatNd(code);
+    c_retval = xmlUCSIsCJKUnifiedIdeographs(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseSDDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlChar * value;
+    int space;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseSDDecl", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateName", &value, &space))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseSDDecl(ctxt);
+    c_retval = xmlValidateName(value, space);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlReaderNewWalker(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    const xmlChar * c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    xmlChar * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlReaderNewWalker", &pyobj_reader, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderConstString", &pyobj_reader, &str))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlReaderNewWalker(reader, doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderConstString(reader, str);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURISetFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * fragment;
+libxml_xmlAddNextSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetFragment", &pyobj_URI, &fragment))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddNextSibling", &pyobj_cur, &pyobj_elem))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    if (URI->fragment != NULL) xmlFree(URI->fragment);
-    URI->fragment = (char *)xmlStrdup((const xmlChar *)fragment);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlAddNextSibling(cur, elem);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatNl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSupplementalArrowsA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNl", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalArrowsA", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatNl(code);
+    c_retval = xmlUCSIsSupplementalArrowsA(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSupplementalArrowsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatNo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalArrowsB", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatNo(code);
+    c_retval = xmlUCSIsSupplementalArrowsB(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlErrorGetMessage(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const char * c_retval;
+    xmlErrorPtr Error;
+    PyObject *pyobj_Error;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetMessage", &pyobj_Error))
+        return(NULL);
+    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
+
+    c_retval = Error->message;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlRemoveID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRemoveID", &pyobj_doc, &pyobj_attr))
+        return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
+
+    c_retval = xmlRemoveID(doc, attr);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathSumFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathFalseFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
     int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSumFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathFalseFunction", &pyobj_ctxt, &nargs))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathSumFunction(ctxt, nargs);
+    xmlXPathFalseFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlSkipBlankChars(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderHasValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSkipBlankChars", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderHasValue", &pyobj_reader))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlSkipBlankChars(ctxt);
+    c_retval = xmlTextReaderHasValue(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlValidateNmtokenValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * value;
+libxml_xmlRelaxNGDumpTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlRelaxNGPtr schema;
+    PyObject *pyobj_schema;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNmtokenValue", &value))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGDumpTree", &pyobj_output, &pyobj_schema))
         return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
 
-    c_retval = xmlValidateNmtokenValue(value);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlRelaxNGDumpTree(output, schema);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlAddChildList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr parent;
-    PyObject *pyobj_parent;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+libxml_xmlRegexpPrint(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlRegexpPtr regexp;
+    PyObject *pyobj_regexp;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddChildList", &pyobj_parent, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRegexpPrint", &pyobj_output, &pyobj_regexp))
         return(NULL);
-    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    regexp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_regexp);
 
-    c_retval = xmlAddChildList(parent, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    xmlRegexpPrint(output, regexp);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_REGEXP_ENABLED */
+PyObject *
+libxml_xmlNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+    PyObject *py_retval;
+    xmlValidCtxtPtr c_retval;
+
+    c_retval = xmlNewValidCtxt();
+    py_retval = libxml_xmlValidCtxtPtrWrap((xmlValidCtxtPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetNodePath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIEscapeStr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    xmlChar * str;
+    xmlChar * list;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetNodePath", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlURIEscapeStr", &str, &list))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlGetNodePath(node);
+    c_retval = xmlURIEscapeStr(str, list);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_htmlDocContentDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlOutputBufferPtr buf;
-    PyObject *pyobj_buf;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
+libxml_xmlXPathCountFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOz:htmlDocContentDumpOutput", &pyobj_buf, &pyobj_cur, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathCountFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    htmlDocContentDumpOutput(buf, cur, encoding);
+    xmlXPathCountFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_htmlParseChunk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderNext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    char * chunk;
-    int size;
-    int terminate;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozii:htmlParseChunk", &pyobj_ctxt, &chunk, &size, &terminate))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNext", &pyobj_reader))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = htmlParseChunk(ctxt, chunk, size, terminate);
+    c_retval = xmlTextReaderNext(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathPopBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathGetContextNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlXPathParserContextPtr ctxt;
+    xmlNodePtr c_retval;
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathPopBoolean", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextNode", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathPopBoolean(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = ctxt->node;
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathIdFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
+libxml_xmlParserSetPedantic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    int nargs;
+    int pedantic;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathIdFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetPedantic", &pyobj_ctxt, &pedantic))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlXPathIdFunction(ctxt, nargs);
+    ctxt->pedantic = pedantic;
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCreateURLParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatLu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
-    char * filename;
-    int options;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCreateURLParserCtxt", &filename, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLu", &code))
         return(NULL);
 
-    c_retval = xmlCreateURLParserCtxt(filename, options);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    c_retval = xmlUCSIsCatLu(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderRead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatLt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderRead", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLt", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderRead(reader);
+    c_retval = xmlUCSIsCatLt(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlSaveUri(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatLo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlURIPtr uri;
-    PyObject *pyobj_uri;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSaveUri", &pyobj_uri))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLo", &code))
         return(NULL);
-    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
 
-    c_retval = xmlSaveUri(uri);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUCSIsCatLo(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlIsChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsPubidChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsChar", &ch))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsPubidChar", &ch))
         return(NULL);
 
-    c_retval = xmlIsChar(ch);
+    c_retval = xmlIsPubidChar(ch);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURIGetServer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatLm(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetServer", &pyobj_URI))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLm", &code))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = URI->server;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlUCSIsCatLm(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlIsIdeographic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatLl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    unsigned int ch;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsIdeographic", &ch))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLl", &code))
         return(NULL);
 
-    c_retval = xmlIsIdeographic(ch);
+    c_retval = xmlUCSIsCatLl(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlCtxtReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int fd;
-    char * URL;
-    char * encoding;
-    int options;
+    xmlAttrPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * name;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oizzi:htmlCtxtReadFd", &pyobj_ctxt, &fd, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewDocProp", &pyobj_doc, &name, &value))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = htmlCtxtReadFd(ctxt, fd, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlNewDocProp(doc, name, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsLatinExtendedAdditional(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlLoadACatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlCatalogPtr c_retval;
+    char * filename;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadACatalog", &filename))
+        return(NULL);
+
+    c_retval = xmlLoadACatalog(filename);
+    py_retval = libxml_xmlCatalogPtrWrap((xmlCatalogPtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_REGEXP_ENABLED
+PyObject *
+libxml_xmlRegexpExec(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlRegexpPtr comp;
+    PyObject *pyobj_comp;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatinExtendedAdditional", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlRegexpExec", &pyobj_comp, &content))
         return(NULL);
+    comp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_comp);
 
-    c_retval = xmlUCSIsLatinExtendedAdditional(code);
+    c_retval = xmlRegexpExec(comp, content);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_REGEXP_ENABLED */
 PyObject *
-libxml_xmlPedanticParserDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlByteConsumed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int val;
+    long c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlPedanticParserDefault", &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlByteConsumed", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlPedanticParserDefault(val);
+    c_retval = xmlByteConsumed(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURISetAuthority(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlHasProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlAttrPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlHasProp", &pyobj_node, &name))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+
+    c_retval = xmlHasProp(node, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlURISetScheme(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlURIPtr URI;
     PyObject *pyobj_URI;
-    char * authority;
+    char * scheme;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetAuthority", &pyobj_URI, &authority))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetScheme", &pyobj_URI, &scheme))
         return(NULL);
     URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    if (URI->authority != NULL) xmlFree(URI->authority);
-    URI->authority = (char *)xmlStrdup((const xmlChar *)authority);
+    if (URI->scheme != NULL) xmlFree(URI->scheme);
+    URI->scheme = (char *)xmlStrdup((const xmlChar *)scheme);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGValidatePushCData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMiscellaneousSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlRelaxNGValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * data;
-    int len;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlRelaxNGValidatePushCData", &pyobj_ctxt, &data, &len))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousSymbols", &code))
         return(NULL);
-    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlRelaxNGValidatePushCData(ctxt, data, len);
+    c_retval = xmlUCSIsMiscellaneousSymbols(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlGetDtdQAttrDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlErrorPtr c_retval;
+    xmlAttributePtr c_retval;
+    xmlDtdPtr dtd;
+    PyObject *pyobj_dtd;
+    xmlChar * elem;
+    xmlChar * name;
+    xmlChar * prefix;
 
-    c_retval = xmlGetLastError();
-    py_retval = libxml_xmlErrorPtrWrap((xmlErrorPtr) c_retval);
+    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlGetDtdQAttrDesc", &pyobj_dtd, &elem, &name, &prefix))
+        return(NULL);
+    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
+
+    c_retval = xmlGetDtdQAttrDesc(dtd, elem, name, prefix);
+    py_retval = libxml_xmlAttributePtrWrap((xmlAttributePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSetNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSetNs", &pyobj_node, &pyobj_ns))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
+
+    xmlSetNs(node, ns);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlGetDtdEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlChar * cur;
+    xmlEntityPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseDoc", &cur))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetDtdEntity", &pyobj_doc, &name))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlParseDoc(cur);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlGetDtdEntity(doc, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathParseNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsXHTML(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    xmlChar * systemID;
+    xmlChar * publicID;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParseNCName", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlIsXHTML", &systemID, &publicID))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathParseNCName(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlIsXHTML(systemID, publicID);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGNewDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIUnescapeString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlRelaxNGParserCtxtPtr c_retval;
+    char * c_retval;
+    char * str;
+    int len;
+    char * target;
+
+    if (!PyArg_ParseTuple(args, (char *)"ziz:xmlURIUnescapeString", &str, &len, &target))
+        return(NULL);
+
+    c_retval = xmlURIUnescapeString(str, len, target);
+    py_retval = libxml_charPtrWrap((char *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsRunic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsRunic", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsRunic(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlGetParameterEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlEntityPtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGNewDocParserCtxt", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetParameterEntity", &pyobj_doc, &name))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlRelaxNGNewDocParserCtxt(doc);
-    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
+    c_retval = xmlGetParameterEntity(doc, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlConvertSGMLCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocTextLen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * content;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlConvertSGMLCatalog", &pyobj_catal))
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlNewDocTextLen", &pyobj_doc, &content, &len))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlConvertSGMLCatalog(catal);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNewDocTextLen(doc, content, len);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlParserHandleReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
+libxml_xmlXPathParseName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserHandleReference", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParseName", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlParserHandleReference(ctxt);
+    c_retval = xmlXPathParseName(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlURISetPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * path;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetPath", &pyobj_URI, &path))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    if (URI->path != NULL) xmlFree(URI->path);
+    URI->path = (char *)xmlStrdup((const xmlChar *)path);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlEncodeEntitiesReentrant(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlErrorGetFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const char * c_retval;
+    xmlErrorPtr Error;
+    PyObject *pyobj_Error;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetFile", &pyobj_Error))
+        return(NULL);
+    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
+
+    c_retval = Error->file;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlGetProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * input;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeEntitiesReentrant", &pyobj_doc, &input))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetProp", &pyobj_node, &name))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlEncodeEntitiesReentrant(doc, input);
+    c_retval = xmlGetProp(node, name);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlRemoveProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlACatalogResolveURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    xmlChar * URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolveURI", &pyobj_catal, &URI))
+        return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+
+    c_retval = xmlACatalogResolveURI(catal, URI);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsVariationSelectors(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlAttrPtr cur;
-    PyObject *pyobj_cur;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRemoveProp", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsVariationSelectors", &code))
         return(NULL);
-    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlRemoveProp(cur);
+    c_retval = xmlUCSIsVariationSelectors(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlACatalogDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    FILE * out;
-    PyObject *pyobj_out;
+libxml_xmlLoadCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlACatalogDump", &pyobj_catal, &pyobj_out))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadCatalog", &filename))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
-    out = (FILE *) PyFile_Get(pyobj_out);
 
-    xmlACatalogDump(catal, out);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlLoadCatalog(filename);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNewParserContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathEval(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathParserContextPtr c_retval;
+    xmlXPathObjectPtr c_retval;
     xmlChar * str;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlXPathContextPtr ctx;
+    PyObject *pyobj_ctx;
 
-    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathNewParserContext", &str, &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathEval", &str, &pyobj_ctx))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    ctx = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctx);
 
-    c_retval = xmlXPathNewParserContext(str, ctxt);
-    py_retval = libxml_xmlXPathParserContextPtrWrap((xmlXPathParserContextPtr) c_retval);
+    c_retval = xmlXPathEval(str, ctx);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsTags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * filename;
-    char * encoding;
-    int options;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlReadFile", &filename, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTags", &code))
         return(NULL);
 
-    c_retval = xmlReadFile(filename, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlUCSIsTags(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsNumberForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewPI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlChar * name;
+    xmlChar * content;
+
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlNewPI", &name, &content))
+        return(NULL);
+
+    c_retval = xmlNewPI(name, content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsLowSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsNumberForms", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLowSurrogates", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsNumberForms(code);
+    c_retval = xmlUCSIsLowSurrogates(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsOsmanya(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseDocument", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOsmanya", &code))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseDocument(ctxt);
+    c_retval = xmlUCSIsOsmanya(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStrncmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefDoValidityCheckingDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
-    int len;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncmp", &str1, &str2, &len))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefDoValidityCheckingDefaultValue", &v))
         return(NULL);
 
-    c_retval = xmlStrncmp(str1, str2, len);
+    c_retval = xmlThrDefDoValidityCheckingDefaultValue(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlFreeNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+libxml_xmlUCSIsBoxDrawing(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNode", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBoxDrawing", &code))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlFreeNode(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsBoxDrawing(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlCatalogGetPublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlChar * pubID;
+    xmlChar * c_retval;
+    xmlChar * cur;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogGetPublic", &pubID))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlStrndup", &cur, &len))
         return(NULL);
 
-    c_retval = xmlCatalogGetPublic(pubID);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlStrndup(cur, len);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGValidatePushElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderIsValid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlRelaxNGValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidatePushElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsValid", &pyobj_reader))
         return(NULL);
-    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlRelaxNGValidatePushElement(ctxt, doc, elem);
+    c_retval = xmlTextReaderIsValid(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsSinhala(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsByzantineMusicalSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSinhala", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsByzantineMusicalSymbols", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsSinhala(code);
+    c_retval = xmlUCSIsByzantineMusicalSymbols(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlParserInputBufferPush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    htmlDefaultSAXHandlerInit();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
+PyObject *
+libxml_xmlShellPrintXPathError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    int errorType;
+    char * arg;
+
+    if (!PyArg_ParseTuple(args, (char *)"iz:xmlShellPrintXPathError", &errorType, &arg))
+        return(NULL);
+
+    xmlShellPrintXPathError(errorType, arg);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+PyObject *
+libxml_xmlCatalogResolve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlParserInputBufferPtr in;
-    PyObject *pyobj_in;
-    int len;
-    char * buf;
+    xmlChar * c_retval;
+    xmlChar * pubID;
+    xmlChar * sysID;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oiz:xmlParserInputBufferPush", &pyobj_in, &len, &buf))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlCatalogResolve", &pubID, &sysID))
         return(NULL);
-    in = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_in);
 
-    c_retval = xmlParserInputBufferPush(in, len, buf);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCatalogResolve(pubID, sysID);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlTextReaderConstName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstName", &pyobj_reader))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderConstName(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlSchemaFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlSchemaValidCtxtPtr c_retval;
     xmlSchemaPtr schema;
     PyObject *pyobj_schema;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaFree", &pyobj_schema))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaNewValidCtxt", &pyobj_schema))
         return(NULL);
     schema = (xmlSchemaPtr) PySchema_Get(pyobj_schema);
 
-    xmlSchemaFree(schema);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlSchemaNewValidCtxt(schema);
+    py_retval = libxml_xmlSchemaValidCtxtPtrWrap((xmlSchemaValidCtxtPtr) c_retval);
+    return(py_retval);
 }
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlSaveFormatFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsKhmer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    int format;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zOi:xmlSaveFormatFile", &filename, &pyobj_cur, &format))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKhmer", &code))
         return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlSaveFormatFile(filename, cur, format);
+    c_retval = xmlUCSIsKhmer(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlFileMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlFileMatch", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseCharRef", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlFileMatch(filename);
+    c_retval = xmlParseCharRef(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStrEqual(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyCharMultiByte(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
+    xmlChar * out;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrEqual", &str1, &str2))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCopyCharMultiByte", &out, &val))
         return(NULL);
 
-    c_retval = xmlStrEqual(str1, str2);
+    c_retval = xmlCopyCharMultiByte(out, val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderPreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseVersionNum(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseVersionNum", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlParseVersionNum(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlReaderWalker(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlTextReaderPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlReaderWalker", &pyobj_doc))
+        return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    c_retval = xmlReaderWalker(doc);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlTextReaderNodeType(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderPreserve", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNodeType", &pyobj_reader))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderPreserve(reader);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlTextReaderNodeType(reader);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsKatakanaPhoneticExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsBlankNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKatakanaPhoneticExtensions", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlIsBlankNode", &pyobj_node))
         return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlUCSIsKatakanaPhoneticExtensions(code);
+    c_retval = xmlIsBlankNode(node);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlRelaxNGParserCtxtPtr c_retval;
-    char * URL;
+libxml_xmlRelaxNGFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlRelaxNGPtr schema;
+    PyObject *pyobj_schema;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlRelaxNGNewParserCtxt", &URL))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGFree", &pyobj_schema))
         return(NULL);
+    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
 
-    c_retval = xmlRelaxNGNewParserCtxt(URL);
-    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
-    return(py_retval);
+    xmlRelaxNGFree(schema);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlParseXMLDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlFreeProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlAttrPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseXMLDecl", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeProp", &pyobj_cur))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlParseXMLDecl(ctxt);
+    xmlFreeProp(cur);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlNewComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrcmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlChar * content;
+    int c_retval;
+    xmlChar * str1;
+    xmlChar * str2;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewComment", &content))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcmp", &str1, &str2))
         return(NULL);
 
-    c_retval = xmlNewComment(content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlStrcmp(str1, str2);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocSetRootElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlRelaxNGValidCtxtPtr c_retval;
-    xmlRelaxNGPtr schema;
-    PyObject *pyobj_schema;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr root;
+    PyObject *pyobj_root;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGNewValidCtxt", &pyobj_schema))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocSetRootElement", &pyobj_doc, &pyobj_root))
         return(NULL);
-    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    root = (xmlNodePtr) PyxmlNode_Get(pyobj_root);
 
-    c_retval = xmlRelaxNGNewValidCtxt(schema);
-    py_retval = libxml_xmlRelaxNGValidCtxtPtrWrap((xmlRelaxNGValidCtxtPtr) c_retval);
+    c_retval = xmlDocSetRootElement(doc, root);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsKatakana(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
+libxml_xmlCheckVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    int version;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKatakana", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlCheckVersion", &version))
         return(NULL);
 
-    c_retval = xmlUCSIsKatakana(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlCheckVersion(version);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#ifdef LIBXML_XINCLUDE_ENABLED
+#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlXIncludeProcess(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRegFreeRegexp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlRegexpPtr regexp;
+    PyObject *pyobj_regexp;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRegFreeRegexp", &pyobj_regexp))
+        return(NULL);
+    regexp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_regexp);
+
+    xmlRegFreeRegexp(regexp);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_REGEXP_ENABLED */
+PyObject *
+libxml_xmlSearchNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlNsPtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * nameSpace;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXIncludeProcess", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"OOz:xmlSearchNs", &pyobj_doc, &pyobj_node, &nameSpace))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlXIncludeProcess(doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlSearchNs(doc, node, nameSpace);
+    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XINCLUDE_ENABLED */
 PyObject *
-libxml_xmlURIGetPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathParserGetContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
+    xmlXPathContextPtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetPath", &pyobj_URI))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParserGetContext", &pyobj_ctxt))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = URI->path;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = ctxt->context;
+    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsHalfwidthandFullwidthForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderReadAttributeValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHalfwidthandFullwidthForms", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadAttributeValue", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsHalfwidthandFullwidthForms(code);
+    c_retval = xmlTextReaderReadAttributeValue(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XINCLUDE_ENABLED
 PyObject *
-libxml_xmlValidateNamesValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXIncludeProcessTreeFlags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * value;
+    xmlNodePtr tree;
+    PyObject *pyobj_tree;
+    int flags;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNamesValue", &value))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXIncludeProcessTreeFlags", &pyobj_tree, &flags))
         return(NULL);
+    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
 
-    c_retval = xmlValidateNamesValue(value);
+    c_retval = xmlXIncludeProcessTreeFlags(tree, flags);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XINCLUDE_ENABLED */
 PyObject *
-libxml_xmlParseURIReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsGeorgian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlURIPtr uri;
-    PyObject *pyobj_uri;
-    char * str;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlParseURIReference", &pyobj_uri, &str))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeorgian", &code))
         return(NULL);
-    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
 
-    c_retval = xmlParseURIReference(uri, str);
+    c_retval = xmlUCSIsGeorgian(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUTF8Size(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * utf;
+libxml_xmlParserSetValidate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int validate;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlUTF8Size", &utf))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetValidate", &pyobj_ctxt, &validate))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUTF8Size(utf);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    ctxt->validate = validate;
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 PyObject *
-libxml_xmlIsRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidNormalizeAttributeValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlChar * c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
     xmlNodePtr elem;
     PyObject *pyobj_elem;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
+    xmlChar * name;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlIsRef", &pyobj_doc, &pyobj_elem, &pyobj_attr))
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlValidNormalizeAttributeValue", &pyobj_doc, &pyobj_elem, &name, &value))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
     elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlIsRef(doc, elem, attr);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlValidNormalizeAttributeValue(doc, elem, name, value);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGurmukhi(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParsePubidLiteral(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePubidLiteral", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlParsePubidLiteral(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNewCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewCharRef", &pyobj_doc, &name))
+        return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    c_retval = xmlNewCharRef(doc, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsArabic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGurmukhi", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabic", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsGurmukhi(code);
+    c_retval = xmlUCSIsArabic(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_namePush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMiscellaneousMathematicalSymbolsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousMathematicalSymbolsB", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsMiscellaneousMathematicalSymbolsB(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNanoHTTPCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlNanoHTTPCleanup();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlParseQuotedString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:namePush", &pyobj_ctxt, &value))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseQuotedString", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = namePush(ctxt, value);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlParseQuotedString(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlNodeSetBase(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    xmlChar * uri;
+libxml_xmlXPathCastStringToNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    double c_retval;
+    xmlChar * val;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetBase", &pyobj_cur, &uri))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathCastStringToNumber", &val))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlNodeSetBase(cur, uri);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlXPathCastStringToNumber(val);
+    py_retval = libxml_doubleWrap((double) c_retval);
+    return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlTextReaderRelaxNGSetSchema(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNewCString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
+    char * val;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathNewCString", &val))
+        return(NULL);
+
+    c_retval = xmlXPathNewCString(val);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlTextReaderIsNamespaceDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
-    xmlRelaxNGPtr schema;
-    PyObject *pyobj_schema;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlTextReaderRelaxNGSetSchema", &pyobj_reader, &pyobj_schema))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsNamespaceDecl", &pyobj_reader))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
 
-    c_retval = xmlTextReaderRelaxNGSetSchema(reader, schema);
+    c_retval = xmlTextReaderIsNamespaceDecl(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsKanbun(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStopParser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlStopParser", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlStopParser(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
+    int fd;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"izzi:xmlReadFd", &fd, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = xmlReadFd(fd, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlACatalogResolveSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    xmlChar * sysID;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolveSystem", &pyobj_catal, &sysID))
+        return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+
+    c_retval = xmlACatalogResolveSystem(catal, sysID);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlValidatePushElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+    xmlChar * qname;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOOz:xmlValidatePushElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem, &qname))
+        return(NULL);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+
+    c_retval = xmlValidatePushElement(ctxt, doc, elem, qname);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsTaiXuanJingSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKanbun", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTaiXuanJingSymbols", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsKanbun(code);
+    c_retval = xmlUCSIsTaiXuanJingSymbols(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlDebugDumpAttr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
-    int depth;
+libxml_htmlDocDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    FILE * f;
+    PyObject *pyobj_f;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpAttr", &pyobj_output, &pyobj_attr, &depth))
+    if (!PyArg_ParseTuple(args, (char *)"OO:htmlDocDump", &pyobj_f, &pyobj_cur))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
+    f = (FILE *) PyFile_Get(pyobj_f);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlDebugDumpAttr(output, attr, depth);
+    c_retval = htmlDocDump(f, cur);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+PyObject *
+libxml_xmlTextReaderRelaxNGValidate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    char * rng;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderRelaxNGValidate", &pyobj_reader, &rng))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderRelaxNGValidate(reader, rng);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlFreeNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNodeList", &pyobj_cur))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlFreeNodeList(cur);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlCleanupOutputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlXPathDivValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    xmlCleanupOutputCallbacks();
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathDivValues", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathDivValues(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsLatin1Supplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathPositionFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathPositionFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathPositionFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlUCSIsTelugu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatin1Supplement", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTelugu", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsLatin1Supplement(code);
+    c_retval = xmlUCSIsTelugu(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlXPathSetContextNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlLsCountNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
     xmlNodePtr node;
     PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathSetContextNode", &pyobj_ctxt, &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlLsCountNode", &pyobj_node))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
     node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    ctxt->node = node;
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlLsCountNode(node);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
+#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlSaveFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseCatalogFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlDocPtr c_retval;
     char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"zOz:xmlSaveFileEnc", &filename, &pyobj_cur, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseCatalogFile", &filename))
         return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlSaveFileEnc(filename, cur, encoding);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlParseCatalogFile(filename);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlXPathGetFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathGetFunctionURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     const xmlChar * c_retval;
     xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetFunction", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetFunctionURI", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = ctxt->function;
+    c_retval = ctxt->functionURI;
     py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugDumpOneNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    int depth;
+libxml_xmlUCSIsCatMn(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpOneNode", &pyobj_output, &pyobj_node, &depth))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMn", &code))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    xmlDebugDumpOneNode(output, node, depth);
+    c_retval = xmlUCSIsCatMn(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+PyObject *
+libxml_xmlRelaxNGCleanupTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlRelaxNGCleanupTypes();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsSyriac(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatMe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSyriac", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMe", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsSyriac(code);
+    c_retval = xmlUCSIsCatMe(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUTF8Strloc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetEncodingAlias(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlChar * utf;
-    xmlChar * utfchar;
+    const char * c_retval;
+    char * alias;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlUTF8Strloc", &utf, &utfchar))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlGetEncodingAlias", &alias))
         return(NULL);
 
-    c_retval = xmlUTF8Strloc(utf, utfchar);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlGetEncodingAlias(alias);
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsDeseret(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlACatalogAdd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    xmlChar * type;
+    xmlChar * orig;
+    xmlChar * replace;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDeseret", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlACatalogAdd", &pyobj_catal, &type, &orig, &replace))
         return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
 
-    c_retval = xmlUCSIsDeseret(code);
+    c_retval = xmlACatalogAdd(catal, type, orig, replace);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCreateDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewNsPropEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
+    xmlAttrPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+    xmlChar * value;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewNsPropEatName", &pyobj_node, &pyobj_ns, &name, &value))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
+
+    c_retval = xmlNewNsPropEatName(node, ns, name, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlStrdup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlChar * cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCreateDocParserCtxt", &cur))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlStrdup", &cur))
         return(NULL);
 
-    c_retval = xmlCreateDocParserCtxt(cur);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    c_retval = xmlStrdup(cur);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathRoundFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNamespaceURIFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
     int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathRoundFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNamespaceURIFunction", &pyobj_ctxt, &nargs))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathRoundFunction(ctxt, nargs);
+    xmlXPathNamespaceURIFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsDingbats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:xmlCtxtReadDoc", &pyobj_ctxt, &cur, &URL, &encoding, &options))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlCtxtReadDoc(ctxt, cur, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlTextReaderQuoteChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDingbats", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderQuoteChar", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsDingbats(code);
+    c_retval = xmlTextReaderQuoteChar(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStrcasestr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlInitCharEncodingHandlers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlInitCharEncodingHandlers();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_REGEXP_ENABLED
+PyObject *
+libxml_xmlRegexpCompile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlChar * str;
-    xmlChar * val;
+    xmlRegexpPtr c_retval;
+    xmlChar * regexp;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcasestr", &str, &val))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlRegexpCompile", &regexp))
         return(NULL);
 
-    c_retval = xmlStrcasestr(str, val);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlRegexpCompile(regexp);
+    py_retval = libxml_xmlRegexpPtrWrap((xmlRegexpPtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#endif /* LIBXML_REGEXP_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlSchemaParse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlSchemaPtr c_retval;
-    xmlSchemaParserCtxtPtr ctxt;
+libxml_xmlXPathRegisteredNsCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaParse", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredNsCleanup", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlSchemaParserCtxtPtr) PySchemaParserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlSchemaParse(ctxt);
-    py_retval = libxml_xmlSchemaPtrWrap((xmlSchemaPtr) c_retval);
-    return(py_retval);
+    xmlXPathRegisteredNsCleanup(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlThrDefDefaultBufferSize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsKannada(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefDefaultBufferSize", &v))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKannada", &code))
         return(NULL);
 
-    c_retval = xmlThrDefDefaultBufferSize(v);
+    c_retval = xmlUCSIsKannada(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderReadState(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    const xmlChar * c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadState", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstValue", &pyobj_reader))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderReadState(reader);
+    c_retval = xmlTextReaderConstValue(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_docbDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    docbDefaultSAXHandlerInit();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlValidatePushCData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * data;
+    int len;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlValidatePushCData", &pyobj_ctxt, &data, &len))
+        return(NULL);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlValidatePushCData(ctxt, data, len);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsPrivateUse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlErrorGetDomain(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlErrorPtr Error;
+    PyObject *pyobj_Error;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPrivateUse", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetDomain", &pyobj_Error))
         return(NULL);
+    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
 
-    c_retval = xmlUCSIsPrivateUse(code);
+    c_retval = Error->domain;
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsHangulSyllables(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCheckFilename(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * path;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCheckFilename", &path))
+        return(NULL);
+
+    c_retval = xmlCheckFilename(path);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathFloorFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathFloorFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathFloorFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlUCSIsTibetan(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulSyllables", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTibetan", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsHangulSyllables(code);
+    c_retval = xmlUCSIsTibetan(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlRecoverFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewGlobalNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * filename;
+    xmlNsPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * href;
+    xmlChar * prefix;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlRecoverFile", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewGlobalNs", &pyobj_doc, &href, &prefix))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlRecoverFile(filename);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlNewGlobalNs(doc, href, prefix);
+    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNextFollowingSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
+libxml_xmlXPathStringLengthFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextFollowingSibling", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathStringLengthFunction", &pyobj_ctxt, &nargs))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlXPathNextFollowingSibling(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
+    xmlXPathStringLengthFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlValidateQName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * value;
-    int space;
+    FILE * f;
+    PyObject *pyobj_f;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateQName", &value, &space))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocDump", &pyobj_f, &pyobj_cur))
         return(NULL);
+    f = (FILE *) PyFile_Get(pyobj_f);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlValidateQName(value, space);
+    c_retval = xmlDocDump(f, cur);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCompareValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlNodePtr c_retval;
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    int inf;
-    int strict;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oii:xmlXPathCompareValues", &pyobj_ctxt, &inf, &strict))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextSelf", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlXPathCompareValues(ctxt, inf, strict);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlXPathNextSelf(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlStrQEqual(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCyrillicSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * pref;
-    xmlChar * name;
-    xmlChar * str;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlStrQEqual", &pref, &name, &str))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCyrillicSupplement", &code))
         return(NULL);
 
-    c_retval = xmlStrQEqual(pref, name, str);
+    c_retval = xmlUCSIsCyrillicSupplement(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlBuildURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * URI;
-    xmlChar * base;
+    xmlURIPtr c_retval;
+    char * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlBuildURI", &URI, &base))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseURI", &str))
         return(NULL);
 
-    c_retval = xmlBuildURI(URI, base);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlParseURI(str);
+    py_retval = libxml_xmlURIPtrWrap((xmlURIPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlIsExtender(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    unsigned int ch;
+    xmlAttrPtr c_retval;
+    xmlNodePtr target;
+    PyObject *pyobj_target;
+    xmlAttrPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsExtender", &ch))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyProp", &pyobj_target, &pyobj_cur))
         return(NULL);
+    target = (xmlNodePtr) PyxmlNode_Get(pyobj_target);
+    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlIsExtender(ch);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCopyProp(target, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCastBooleanToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetPort(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    int val;
+    int c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlXPathCastBooleanToString", &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetPort", &pyobj_URI))
         return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = xmlXPathCastBooleanToString(val);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = URI->port;
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlUTF8Charcmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlSetMetaEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * utf1;
-    xmlChar * utf2;
+    htmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlUTF8Charcmp", &utf1, &utf2))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:htmlSetMetaEncoding", &pyobj_doc, &encoding))
         return(NULL);
+    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUTF8Charcmp(utf1, utf2);
+    c_retval = htmlSetMetaEncoding(doc, encoding);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlXPtrNewRangeNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderCurrentDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlNodePtr start;
-    PyObject *pyobj_start;
-    xmlNodePtr end;
-    PyObject *pyobj_end;
+    xmlDocPtr c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPtrNewRangeNodes", &pyobj_start, &pyobj_end))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderCurrentDoc", &pyobj_reader))
         return(NULL);
-    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
-    end = (xmlNodePtr) PyxmlNode_Get(pyobj_end);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlXPtrNewRangeNodes(start, end);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlTextReaderCurrentDoc(reader);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_valuePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParsePITarget(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlXPathParserContextPtr ctxt;
+    const xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:valuePop", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePITarget", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = valuePop(ctxt);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlParsePITarget(ctxt);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathContainsFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlURISetOpaque(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * opaque;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathContainsFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetOpaque", &pyobj_URI, &opaque))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    xmlXPathContainsFunction(ctxt, nargs);
+    if (URI->opaque != NULL) xmlFree(URI->opaque);
+    URI->opaque = (char *)xmlStrdup((const xmlChar *)opaque);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlCtxtUseOptions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewNodeEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewNodeEatName", &pyobj_ns, &name))
+        return(NULL);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
+
+    c_retval = xmlNewNodeEatName(ns, name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlIsCombining(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int options;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:htmlCtxtUseOptions", &pyobj_ctxt, &options))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsCombining", &ch))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = htmlCtxtUseOptions(ctxt, options);
+    c_retval = xmlIsCombining(ch);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    htmlDocPtr c_retval;
+    int fd;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"izzi:htmlReadFd", &fd, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = htmlReadFd(fd, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlStringDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderNormalization(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNormalization", &pyobj_reader))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderNormalization(reader);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathEvalExpression(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
     xmlChar * str;
-    int what;
-    xmlChar end;
-    xmlChar end2;
-    xmlChar end3;
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oziccc:xmlStringDecodeEntities", &pyobj_ctxt, &str, &what, &end, &end2, &end3))
+    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathEvalExpression", &str, &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlStringDecodeEntities(ctxt, str, what, end, end2, end3);
+    c_retval = xmlXPathEvalExpression(str, ctxt);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlStrncatNew(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * str1;
+    xmlChar * str2;
+    int len;
+
+    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncatNew", &str1, &str2, &len))
+        return(NULL);
+
+    c_retval = xmlStrncatNew(str1, str2, len);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlFreeCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
+libxml_xmlCatalogResolvePublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * pubID;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeCatalog", &pyobj_catal))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolvePublic", &pubID))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
 
-    xmlFreeCatalog(catal);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlCatalogResolvePublic(pubID);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewCDataBlock(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * name;
+    xmlChar * content;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewReference", &pyobj_doc, &name))
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlNewCDataBlock", &pyobj_doc, &content, &len))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlNewReference(doc, name);
+    c_retval = xmlNewCDataBlock(doc, content, len);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCJKSymbolsandPunctuation(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetServer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetServer", &pyobj_URI))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    c_retval = URI->server;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlSaveFileFormat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
+    int format;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKSymbolsandPunctuation", &code))
+    if (!PyArg_ParseTuple(args, (char *)"zOzi:htmlSaveFileFormat", &filename, &pyobj_cur, &encoding, &format))
         return(NULL);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlUCSIsCJKSymbolsandPunctuation(code);
+    c_retval = htmlSaveFileFormat(filename, cur, encoding, format);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsOgham(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeIsText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOgham", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeIsText", &pyobj_node))
         return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlUCSIsOgham(code);
+    c_retval = xmlNodeIsText(node);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewDocComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParserSetReplaceEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int replaceEntities;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetReplaceEntities", &pyobj_ctxt, &replaceEntities))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    ctxt->replaceEntities = replaceEntities;
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathStringEvalNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * content;
+    double c_retval;
+    xmlChar * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewDocComment", &pyobj_doc, &content))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathStringEvalNumber", &str))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlNewDocComment(doc, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlXPathStringEvalNumber(str);
+    py_retval = libxml_doubleWrap((double) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsBopomofoExtended(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUTF8Strsize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * utf;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBopomofoExtended", &code))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlUTF8Strsize", &utf, &len))
         return(NULL);
 
-    c_retval = xmlUCSIsBopomofoExtended(code);
+    c_retval = xmlUTF8Strsize(utf, len);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsArrows(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderStandalone(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArrows", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderStandalone", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsArrows(code);
+    c_retval = xmlTextReaderStandalone(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlValidateNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseStartTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlChar * value;
-    int space;
+    const xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateNCName", &value, &space))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseStartTag", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlValidateNCName(value, space);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlParseStartTag(ctxt);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCJKCompatibility(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSetupParserForBuffer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * buffer;
+    char * filename;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlSetupParserForBuffer", &pyobj_ctxt, &buffer, &filename))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlSetupParserForBuffer(ctxt, buffer, filename);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlNewTextReaderFilename(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlTextReaderPtr c_retval;
+    char * URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewTextReaderFilename", &URI))
+        return(NULL);
+
+    c_retval = xmlNewTextReaderFilename(URI);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNumberFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNumberFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathNumberFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
+PyObject *
+libxml_xmlLsOneNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlLsOneNode", &pyobj_output, &pyobj_node))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+
+    xmlLsOneNode(output, node);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+PyObject *
+libxml_xmlUCSIsGreekExtended(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibility", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreekExtended", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCJKCompatibility(code);
+    c_retval = xmlUCSIsGreekExtended(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGValidateFullElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocNodeEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlRelaxNGValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidateFullElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewDocNodeEatName", &pyobj_doc, &pyobj_ns, &name, &content))
         return(NULL);
-    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    c_retval = xmlRelaxNGValidateFullElement(ctxt, doc, elem);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNewDocNodeEatName(doc, ns, name, content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlValidateDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderForDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    xmlTextReaderPtr c_retval;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlValidateDocument", &pyobj_ctxt, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlReaderForDoc", &cur, &URL, &encoding, &options))
         return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlValidateDocument(ctxt, doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlReaderForDoc(cur, URL, encoding, options);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsLimbu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMyanmar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLimbu", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMyanmar", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsLimbu(code);
+    c_retval = xmlUCSIsMyanmar(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlAddEncodingAlias(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathIsNodeType(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * name;
-    char * alias;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlAddEncodingAlias", &name, &alias))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathIsNodeType", &name))
         return(NULL);
 
-    c_retval = xmlAddEncodingAlias(name, alias);
+    c_retval = xmlXPathIsNodeType(name);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlNewDocPI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlValidCtxtPtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeValidCtxt", &pyobj_cur))
+        return(NULL);
+    cur = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_cur);
+
+    xmlFreeValidCtxt(cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathRoot(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRoot", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathRoot(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathVariableLookup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    xmlXPathObjectPtr c_retval;
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
     xmlChar * name;
-    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewDocPI", &pyobj_doc, &name, &content))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlXPathVariableLookup", &pyobj_ctxt, &name))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlNewDocPI(doc, name, content);
+    c_retval = xmlXPathVariableLookup(ctxt, name);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNextFollowing(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextFollowing", &pyobj_ctxt, &pyobj_cur))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlXPathNextFollowing(ctxt, cur);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatPc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHangulCompatibilityJamo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPc", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulCompatibilityJamo", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatPc(code);
+    c_retval = xmlUCSIsHangulCompatibilityJamo(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
@@ -5732,462 +6242,709 @@ libxml_xmlNewTextChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlUCSIsCatPf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlAddChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlNodePtr parent;
+    PyObject *pyobj_parent;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPf", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddChild", &pyobj_parent, &pyobj_cur))
         return(NULL);
+    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlUCSIsCatPf(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlAddChild(parent, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsCatPe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathErr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int error;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathErr", &pyobj_ctxt, &error))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathErr(ctxt, error);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlTextReaderDepth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPe", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderDepth", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsCatPe(code);
+    c_retval = xmlTextReaderDepth(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatPd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNanoFTPProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    char * host;
+    int port;
+    char * user;
+    char * passwd;
+    int type;
+
+    if (!PyArg_ParseTuple(args, (char *)"zizzi:xmlNanoFTPProxy", &host, &port, &user, &passwd, &type))
+        return(NULL);
+
+    xmlNanoFTPProxy(host, port, user, passwd, type);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUCSIsHiragana(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPd", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHiragana", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatPd(code);
+    c_retval = xmlUCSIsHiragana(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_htmlCtxtReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlRelaxNGPtr schema;
+    PyObject *pyobj_schema;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGDump", &pyobj_output, &pyobj_schema))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
+
+    xmlRelaxNGDump(output, schema);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+PyObject *
+libxml_xmlFreeURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr uri;
+    PyObject *pyobj_uri;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeURI", &pyobj_uri))
+        return(NULL);
+    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
+
+    xmlFreeURI(uri);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNextParent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    htmlParserCtxtPtr ctxt;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    char * buffer;
-    int size;
-    char * URL;
-    char * encoding;
-    int options;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozizzi:htmlCtxtReadMemory", &pyobj_ctxt, &buffer, &size, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextParent", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = htmlCtxtReadMemory(ctxt, buffer, size, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlXPathNextParent(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatPi(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsDevanagari(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPi", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDevanagari", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatPi(code);
+    c_retval = xmlUCSIsDevanagari(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatPo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeGetContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetContent", &pyobj_cur))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlNodeGetContent(cur);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlTextReaderIsEmptyElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsEmptyElement", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsCatPo(code);
+    c_retval = xmlTextReaderIsEmptyElement(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatPs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsIPAExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPs", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsIPAExtensions", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatPs(code);
+    c_retval = xmlUCSIsIPAExtensions(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlXPathTranslateFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlXPtrNewContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathContextPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr here;
+    PyObject *pyobj_here;
+    xmlNodePtr origin;
+    PyObject *pyobj_origin;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathTranslateFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlXPtrNewContext", &pyobj_doc, &pyobj_here, &pyobj_origin))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    here = (xmlNodePtr) PyxmlNode_Get(pyobj_here);
+    origin = (xmlNodePtr) PyxmlNode_Get(pyobj_origin);
 
-    xmlXPathTranslateFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlXPtrNewContext(doc, here, origin);
+    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
-libxml_xmlUCSIsHighSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsYiSyllables(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHighSurrogates", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsYiSyllables", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsHighSurrogates(code);
+    c_retval = xmlUCSIsYiSyllables(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNodeGetSpacePreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderLookupNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlChar * prefix;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderLookupNamespace", &pyobj_reader, &prefix))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderLookupNamespace(reader, prefix);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNodeGetLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlNodePtr cur;
     PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetSpacePreserve", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetLang", &pyobj_cur))
         return(NULL);
     cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlNodeGetSpacePreserve(cur);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNodeGetLang(cur);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlResetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+    PyObject *py_retval;
+    xmlParserCtxtPtr c_retval;
 
-    xmlResetLastError();
+    c_retval = xmlNewParserCtxt();
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNanoFTPScanProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    char * URL;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNanoFTPScanProxy", &URL))
+        return(NULL);
+
+    xmlNanoFTPScanProxy(URL);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlAddDocEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlEntityPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * name;
-    int type;
-    xmlChar * ExternalID;
-    xmlChar * SystemID;
-    xmlChar * content;
+libxml_xmlSchemaFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlSchemaPtr schema;
+    PyObject *pyobj_schema;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozizzz:xmlAddDocEntity", &pyobj_doc, &name, &type, &ExternalID, &SystemID, &content))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaFree", &pyobj_schema))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    schema = (xmlSchemaPtr) PySchema_Get(pyobj_schema);
 
-    c_retval = xmlAddDocEntity(doc, name, type, ExternalID, SystemID, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
+    xmlSchemaFree(schema);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlCatalogResolveURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderNextSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * URI;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolveURI", &URI))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNextSibling", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlCatalogResolveURI(URI);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlTextReaderNextSibling(reader);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathIsNaN(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlClearParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlClearParserCtxt", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlClearParserCtxt(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlValidateNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    double val;
+    xmlChar * value;
+    int space;
 
-    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathIsNaN", &val))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateNCName", &value, &space))
         return(NULL);
 
-    c_retval = xmlXPathIsNaN(val);
+    c_retval = xmlValidateNCName(value, space);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNotEqualValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrlen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlChar * str;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNotEqualValues", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlStrlen", &str))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNotEqualValues(ctxt);
+    c_retval = xmlStrlen(str);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlValidateDtdFinal(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlDebugDumpDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlValidateDtdFinal", &pyobj_ctxt, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDocument", &pyobj_output, &pyobj_doc))
         return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    output = (FILE *) PyFile_Get(pyobj_output);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlValidateDtdFinal(ctxt, doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    xmlDebugDumpDocument(output, doc);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_XPTR_ENABLED
+PyObject *
+libxml_xmlXPtrEval(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
+    xmlChar * str;
+    xmlXPathContextPtr ctx;
+    PyObject *pyobj_ctx;
+
+    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPtrEval", &str, &pyobj_ctx))
+        return(NULL);
+    ctx = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctx);
+
+    c_retval = xmlXPtrEval(str, ctx);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
-libxml_xmlParseEncName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlPopInput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
+    xmlChar c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEncName", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlPopInput", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseEncName(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlPopInput(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlXPtrRangeToFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlTextReaderSetParserProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    int prop;
+    int value;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPtrRangeToFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oii:xmlTextReaderSetParserProp", &pyobj_reader, &prop, &value))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    xmlXPtrRangeToFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlTextReaderSetParserProp(reader, prop, value);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
-libxml_xmlTextReaderLocatorLineNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderGetRemainder(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderLocatorPtr locator;
-    PyObject *pyobj_locator;
+    xmlParserInputBufferPtr c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderLocatorLineNumber", &pyobj_locator))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderGetRemainder", &pyobj_reader))
         return(NULL);
-    locator = (xmlTextReaderLocatorPtr) PyxmlTextReaderLocator_Get(pyobj_locator);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderLocatorLineNumber(locator);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderGetRemainder(reader);
+    py_retval = libxml_xmlParserInputBufferPtrWrap((xmlParserInputBufferPtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlXPtrEvalRangePredicate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlUCSIsGujarati(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPtrEvalRangePredicate", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGujarati", &code))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPtrEvalRangePredicate(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsGujarati(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlAutoCloseTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlSaveFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * name;
-    htmlNodePtr elem;
-    PyObject *pyobj_elem;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"OzO:htmlAutoCloseTag", &pyobj_doc, &name, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"zO:htmlSaveFile", &filename, &pyobj_cur))
         return(NULL);
-    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (htmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = htmlAutoCloseTag(doc, name, elem);
+    c_retval = htmlSaveFile(filename, cur);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatLo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderNewDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:xmlReaderNewDoc", &pyobj_reader, &cur, &URL, &encoding, &options))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsCatLo(code);
+    c_retval = xmlReaderNewDoc(reader, cur, URL, encoding, options);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderAttributeCount(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParsePI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePI", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlParsePI(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlTextReaderConstPrefix(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    const xmlChar * c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderAttributeCount", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstPrefix", &pyobj_reader))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderAttributeCount(reader);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderConstPrefix(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCharStrndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNormalizeWindowsPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    char * cur;
-    int len;
+    xmlChar * path;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCharStrndup", &cur, &len))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlNormalizeWindowsPath", &path))
         return(NULL);
 
-    c_retval = xmlCharStrndup(cur, len);
+    c_retval = xmlNormalizeWindowsPath(path);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XINCLUDE_ENABLED
 PyObject *
-libxml_xmlThrDefLoadExtDtdDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXIncludeProcessTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int v;
+    xmlNodePtr tree;
+    PyObject *pyobj_tree;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefLoadExtDtdDefaultValue", &v))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXIncludeProcessTree", &pyobj_tree))
         return(NULL);
+    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
 
-    c_retval = xmlThrDefLoadExtDtdDefaultValue(v);
+    c_retval = xmlXIncludeProcessTree(tree);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XINCLUDE_ENABLED */
 PyObject *
-libxml_xmlThrDefTreeIndentString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * out;
+    PyObject *pyobj_out;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlCatalogDump", &pyobj_out))
+        return(NULL);
+    out = (FILE *) PyFile_Get(pyobj_out);
+
+    xmlCatalogDump(out);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNextDescendantOrSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    char * v;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlThrDefTreeIndentString", &v))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextDescendantOrSelf", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlThrDefTreeIndentString(v);
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlXPathNextDescendantOrSelf(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsAlphabeticPresentationForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseNamespace", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlParseNamespace(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlStrcasecmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * str1;
+    xmlChar * str2;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsAlphabeticPresentationForms", &code))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcasecmp", &str1, &str2))
         return(NULL);
 
-    c_retval = xmlUCSIsAlphabeticPresentationForms(code);
+    c_retval = xmlStrcasecmp(str1, str2);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCJKUnifiedIdeographs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderForMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlTextReaderPtr c_retval;
+    char * buffer;
+    int size;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"zizzi:xmlReaderForMemory", &buffer, &size, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = xmlReaderForMemory(buffer, size, URL, encoding, options);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNewDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDtdPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * name;
+    xmlChar * ExternalID;
+    xmlChar * SystemID;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlNewDtd", &pyobj_doc, &name, &ExternalID, &SystemID))
+        return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    c_retval = xmlNewDtd(doc, name, ExternalID, SystemID);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsBlockElements(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographs", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBlockElements", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCJKUnifiedIdeographs(code);
+    c_retval = xmlUCSIsBlockElements(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetDocCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeGetBase(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlChar * c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetDocCompressMode", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlNodeGetBase", &pyobj_doc, &pyobj_cur))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlGetDocCompressMode(doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNodeGetBase(doc, cur);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNextChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextAncestorOrSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
     xmlXPathParserContextPtr ctxt;
@@ -6195,2362 +6952,3001 @@ libxml_xmlXPathNextChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlNodePtr cur;
     PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextChild", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAncestorOrSelf", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
     cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlXPathNextChild(ctxt, cur);
+    c_retval = xmlXPathNextAncestorOrSelf(ctxt, cur);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNewString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathObjectPtr c_retval;
+    xmlChar * val;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathNewString", &val))
+        return(NULL);
+
+    c_retval = xmlXPathNewString(val);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlAddSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddSibling", &pyobj_cur, &pyobj_elem))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+
+    c_retval = xmlAddSibling(cur, elem);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlScanName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlScanName", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = xmlScanName(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlRegisterDefaultInputCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlRegisterDefaultInputCallbacks();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
 #ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugDumpDocumentHead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDebugDumpEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     FILE * output;
     PyObject *pyobj_output;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDocumentHead", &pyobj_output, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpEntities", &pyobj_output, &pyobj_doc))
         return(NULL);
     output = (FILE *) PyFile_Get(pyobj_output);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    xmlDebugDumpDocumentHead(output, doc);
+    xmlDebugDumpEntities(output, doc);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsUnifiedCanadianAboriginalSyllabics(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextAncestor(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAncestor", &pyobj_ctxt, &pyobj_cur))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlXPathNextAncestor(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathCastNumberToBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    double val;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsUnifiedCanadianAboriginalSyllabics", &code))
+    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathCastNumberToBoolean", &val))
         return(NULL);
 
-    c_retval = xmlUCSIsUnifiedCanadianAboriginalSyllabics(code);
+    c_retval = xmlXPathCastNumberToBoolean(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_htmlNodeDumpOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlOutputBufferPtr buf;
-    PyObject *pyobj_buf;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
+libxml_xmlUCSIsCatCs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOOz:htmlNodeDumpOutput", &pyobj_buf, &pyobj_doc, &pyobj_cur, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCs", &code))
         return(NULL);
-    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    htmlNodeDumpOutput(buf, doc, cur, encoding);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatCs(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlEncodeSpecialChars(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatCf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * input;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeSpecialChars", &pyobj_doc, &input))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCf", &code))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlEncodeSpecialChars(doc, input);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUCSIsCatCf(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlParseElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlUCSIsCatCo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseElement", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatCo", &code))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    htmlParseElement(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatCo(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlCopyPropList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRecoverMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr target;
-    PyObject *pyobj_target;
-    xmlAttrPtr cur;
-    PyObject *pyobj_cur;
+    xmlDocPtr c_retval;
+    char * buffer;
+    int py_buffsize0;
+    int size;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyPropList", &pyobj_target, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"t#i:xmlRecoverMemory", &buffer, &py_buffsize0, &size))
         return(NULL);
-    target = (xmlNodePtr) PyxmlNode_Get(pyobj_target);
-    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlCopyPropList(target, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlRecoverMemory(buffer, size);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlSubstituteEntitiesDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderIsDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int val;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlSubstituteEntitiesDefault", &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsDefault", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlSubstituteEntitiesDefault(val);
+    c_retval = xmlTextReaderIsDefault(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGreek(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParserGetWellFormed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreek", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetWellFormed", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsGreek(code);
+    c_retval = ctxt->wellFormed;
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlDocFormatDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRemoveRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    FILE * f;
-    PyObject *pyobj_f;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    int format;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDocFormatDump", &pyobj_f, &pyobj_cur, &format))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRemoveRef", &pyobj_doc, &pyobj_attr))
         return(NULL);
-    f = (FILE *) PyFile_Get(pyobj_f);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlDocFormatDump(f, cur, format);
+    c_retval = xmlRemoveRef(doc, attr);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsOriya(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderNewMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    char * buffer;
+    int size;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOriya", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Ozizzi:xmlReaderNewMemory", &pyobj_reader, &buffer, &size, &URL, &encoding, &options))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsOriya(code);
+    c_retval = xmlReaderNewMemory(reader, buffer, size, URL, encoding, options);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCtxtReset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlAttrPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * name;
+    xmlChar * value;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewProp", &pyobj_node, &name, &value))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+
+    c_retval = xmlNewProp(node, name, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlParserGetDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlCtxtReset", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetDoc", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlCtxtReset(ctxt);
+    c_retval = ctxt->myDoc;
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlCleanupCharEncodingHandlers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlCleanupCharEncodingHandlers();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGValidatePopElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
+    int c_retval;
+    xmlRelaxNGValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidatePopElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
+        return(NULL);
+    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+
+    c_retval = xmlRelaxNGValidatePopElement(ctxt, doc, elem);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+PyObject *
+libxml_xmlParseEntityRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlEntityPtr c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    int len;
-    int what;
-    xmlChar end;
-    xmlChar end2;
-    xmlChar end3;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oiiccc:xmlDecodeEntities", &pyobj_ctxt, &len, &what, &end, &end2, &end3))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEntityRef", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlDecodeEntities(ctxt, len, what, end, end2, end3);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlParseEntityRef(ctxt);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlUTF8Strndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlInitAutoClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    htmlInitAutoClose();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+PyObject *
+libxml_xmlTextReaderReadOuterXml(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlChar * utf;
-    int len;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlUTF8Strndup", &utf, &len))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadOuterXml", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUTF8Strndup(utf, len);
+    c_retval = xmlTextReaderReadOuterXml(reader);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlXPathGetContextDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsTamil(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextDoc", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTamil", &code))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = ctxt->doc;
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlUCSIsTamil(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlXPathPopString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDebugDumpString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlChar * str;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlDebugDumpString", &pyobj_output, &str))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+
+    xmlDebugDumpString(output, str);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+PyObject *
+libxml_xmlCleanupGlobals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlCleanupGlobals();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlEncodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    const xmlChar * c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * input;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathPopString", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeEntities", &pyobj_doc, &input))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlXPathPopString(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlEncodeEntities(doc, input);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatC(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlCatalogPtr c_retval;
+    int sgml;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatC", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlNewCatalog", &sgml))
         return(NULL);
 
-    c_retval = xmlUCSIsCatC(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNewCatalog(sgml);
+    py_retval = libxml_xmlCatalogPtrWrap((xmlCatalogPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsTaiLe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrncasecmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlChar * str1;
+    xmlChar * str2;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTaiLe", &code))
+    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncasecmp", &str1, &str2, &len))
         return(NULL);
 
-    c_retval = xmlUCSIsTaiLe(code);
+    c_retval = xmlStrncasecmp(str1, str2, len);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCastNumberToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCanonicPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    double val;
+    xmlChar * path;
 
-    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathCastNumberToString", &val))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCanonicPath", &path))
         return(NULL);
 
-    c_retval = xmlXPathCastNumberToString(val);
+    c_retval = xmlCanonicPath(path);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlParseComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
+libxml_xmlXPathNextPrecedingSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseComment", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextPrecedingSibling", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlParseComment(ctxt);
+    c_retval = xmlXPathNextPrecedingSibling(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlCatalogCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlCatalogCleanup();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathSubstringAfterFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
+libxml_xmlNextChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringAfterFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNextChar", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlXPathSubstringAfterFunction(ctxt, nargs);
+    xmlNextChar(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCatalogRemove(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * value;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogRemove", &value))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlIsID", &pyobj_doc, &pyobj_elem, &pyobj_attr))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlCatalogRemove(value);
+    c_retval = xmlIsID(doc, elem, attr);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlSaveFormatFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseExtParsedEnt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
-    int format;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"zOzi:xmlSaveFormatFileEnc", &filename, &pyobj_cur, &encoding, &format))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseExtParsedEnt", &pyobj_ctxt))
         return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlSaveFormatFileEnc(filename, cur, encoding, format);
+    c_retval = xmlParseExtParsedEnt(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGParse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStringLenDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlRelaxNGPtr c_retval;
-    xmlRelaxNGParserCtxtPtr ctxt;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
+    xmlChar * str;
+    int len;
+    int what;
+    xmlChar end;
+    xmlChar end2;
+    xmlChar end3;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGParse", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Oziiccc:xmlStringLenDecodeEntities", &pyobj_ctxt, &str, &len, &what, &end, &end2, &end3))
         return(NULL);
-    ctxt = (xmlRelaxNGParserCtxtPtr) PyrelaxNgParserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlRelaxNGParse(ctxt);
-    py_retval = libxml_xmlRelaxNGPtrWrap((xmlRelaxNGPtr) c_retval);
+    c_retval = xmlStringLenDecodeEntities(ctxt, str, len, what, end, end2, end3);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlParseCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKUnifiedIdeographsExtensionA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseCharRef", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographsExtensionA", &code))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = htmlParseCharRef(ctxt);
+    c_retval = xmlUCSIsCJKUnifiedIdeographsExtensionA(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsCJKUnifiedIdeographsExtensionB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKUnifiedIdeographsExtensionB", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsCJKUnifiedIdeographsExtensionB(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlCreateMemoryParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    htmlParserCtxtPtr c_retval;
+    char * buffer;
+    int py_buffsize0;
+    int size;
+
+    if (!PyArg_ParseTuple(args, (char *)"t#i:htmlCreateMemoryParserCtxt", &buffer, &py_buffsize0, &size))
+        return(NULL);
+
+    c_retval = htmlCreateMemoryParserCtxt(buffer, size);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    return(py_retval);
+}
+
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlParseNmtoken(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsDigit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseNmtoken", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsDigit", &ch))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseNmtoken(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlIsDigit(ch);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParserGetIsValid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogSetDebug(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int level;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetIsValid", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlCatalogSetDebug", &level))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = ctxt->valid;
+    c_retval = xmlCatalogSetDebug(level);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlParserGetDirectory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    char * c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseReference", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlParserGetDirectory", &filename))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlParseReference(ctxt);
+    c_retval = xmlParserGetDirectory(filename);
+    py_retval = libxml_charPtrWrap((char *) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+PyObject *
+libxml_xmlSchemaCleanupTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlSchemaCleanupTypes();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlXPathPositionFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlFreeNsList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNsPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathPositionFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNsList", &pyobj_cur))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNsPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlXPathPositionFunction(ctxt, nargs);
+    xmlFreeNsList(cur);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlNanoHTTPScanProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    char * URL;
+libxml_xmlParseEntityDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNanoHTTPScanProxy", &URL))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEntityDecl", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlNanoHTTPScanProxy(URL);
+    xmlParseEntityDecl(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlUCSIsMathematicalOperators(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocCopyNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    int extended;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMathematicalOperators", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDocCopyNode", &pyobj_node, &pyobj_doc, &extended))
         return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsMathematicalOperators(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlDocCopyNode(node, doc, extended);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugDumpDTD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlDtdPtr dtd;
-    PyObject *pyobj_dtd;
+libxml_nodePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDTD", &pyobj_output, &pyobj_dtd))
+    if (!PyArg_ParseTuple(args, (char *)"O:nodePop", &pyobj_ctxt))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlDebugDumpDTD(output, dtd);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = nodePop(ctxt);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
-#ifdef LIBXML_XPTR_ENABLED
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPtrNewCollapsedRange(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextDescendant(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextDescendant", &pyobj_ctxt, &pyobj_cur))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlXPathNextDescendant(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathNewNodeSet(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlXPathObjectPtr c_retval;
-    xmlNodePtr start;
-    PyObject *pyobj_start;
+    xmlNodePtr val;
+    PyObject *pyobj_val;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPtrNewCollapsedRange", &pyobj_start))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewNodeSet", &pyobj_val))
         return(NULL);
-    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
+    val = (xmlNodePtr) PyxmlNode_Get(pyobj_val);
 
-    c_retval = xmlXPtrNewCollapsedRange(start);
+    c_retval = xmlXPathNewNodeSet(val);
     py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPTR_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlTextConcat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlSchemaValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaFreeValidCtxt", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
+
+    xmlSchemaFreeValidCtxt(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#ifdef LIBXML_SCHEMAS_ENABLED
+PyObject *
+libxml_xmlSchemaNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * content;
-    int len;
+    xmlSchemaParserCtxtPtr c_retval;
+    char * URL;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlTextConcat", &pyobj_node, &content, &len))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlSchemaNewParserCtxt", &URL))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlTextConcat(node, content, len);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlSchemaNewParserCtxt(URL);
+    py_retval = libxml_xmlSchemaParserCtxtPtrWrap((xmlSchemaParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatMc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlInitializeCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlInitializeCatalog();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlParseEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlDocPtr c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMc", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseEntity", &filename))
         return(NULL);
 
-    c_retval = xmlUCSIsCatMc(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlParseEntity(filename);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStringLenGetNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocGetRootElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * value;
-    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlStringLenGetNodeList", &pyobj_doc, &value, &len))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlDocGetRootElement", &pyobj_doc))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlStringLenGetNodeList(doc, value, len);
+    c_retval = xmlDocGetRootElement(doc);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlTextReaderLocatorBaseURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathPopString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlTextReaderLocatorPtr locator;
-    PyObject *pyobj_locator;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderLocatorBaseURI", &pyobj_locator))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathPopString", &pyobj_ctxt))
         return(NULL);
-    locator = (xmlTextReaderLocatorPtr) PyxmlTextReaderLocator_Get(pyobj_locator);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderLocatorBaseURI(locator);
+    c_retval = xmlXPathPopString(ctxt);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlSetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlCreateFileParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-    xmlChar * value;
+    htmlParserCtxtPtr c_retval;
+    char * filename;
+    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlSetNsProp", &pyobj_node, &pyobj_ns, &name, &value))
+    if (!PyArg_ParseTuple(args, (char *)"zz:htmlCreateFileParserCtxt", &filename, &encoding))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    c_retval = xmlSetNsProp(node, ns, name, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = htmlCreateFileParserCtxt(filename, encoding);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlURIGetUser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
+    const xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetUser", &pyobj_URI))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstEncoding", &pyobj_reader))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = URI->user;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlTextReaderConstEncoding(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlSAXDefaultVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateOneAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int version;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlSAXDefaultVersion", &version))
+    if (!PyArg_ParseTuple(args, (char *)"OOOOz:xmlValidateOneAttribute", &pyobj_ctxt, &pyobj_doc, &pyobj_elem, &pyobj_attr, &value))
         return(NULL);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlSAXDefaultVersion(version);
+    c_retval = xmlValidateOneAttribute(ctxt, doc, elem, attr, value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlLoadCatalogs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    char * pathss;
+libxml_xmlAddEncodingAlias(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * name;
+    char * alias;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadCatalogs", &pathss))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlAddEncodingAlias", &name, &alias))
         return(NULL);
 
-    xmlLoadCatalogs(pathss);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlAddEncodingAlias(name, alias);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlValidateNotationUse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderMoveToAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * notationName;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOz:xmlValidateNotationUse", &pyobj_ctxt, &pyobj_doc, &notationName))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderMoveToAttribute", &pyobj_reader, &name))
         return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlValidateNotationUse(ctxt, doc, notationName);
+    c_retval = xmlTextReaderMoveToAttribute(reader, name);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlCtxtReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKCompatibilityForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    htmlParserCtxtPtr ctxt;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityForms", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsCJKCompatibilityForms(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlCharStrdup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    char * cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCharStrdup", &cur))
+        return(NULL);
+
+    c_retval = xmlCharStrdup(cur);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlElemDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * f;
+    PyObject *pyobj_f;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlElemDump", &pyobj_f, &pyobj_doc, &pyobj_cur))
+        return(NULL);
+    f = (FILE *) PyFile_Get(pyobj_f);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlElemDump(f, doc, cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathConcatFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:htmlCtxtReadDoc", &pyobj_ctxt, &cur, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathConcatFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = htmlCtxtReadDoc(ctxt, cur, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    xmlXPathConcatFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
+PyObject *
+libxml_xmlDebugDumpAttrList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
+    int depth;
+
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpAttrList", &pyobj_output, &pyobj_attr, &depth))
+        return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
+
+    xmlDebugDumpAttrList(output, attr, depth);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_DEBUG_ENABLED */
+PyObject *
+libxml_xmlTextReaderReadString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadString", &pyobj_reader))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderReadString(reader);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlGetCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlUCSIsLinearBIdeograms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
+    int code;
 
-    c_retval = xmlGetCompressMode();
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLinearBIdeograms", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsLinearBIdeograms(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseChunk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
+libxml_xmlParseCharData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    char * chunk;
-    int size;
-    int terminate;
+    int cdata;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozii:xmlParseChunk", &pyobj_ctxt, &chunk, &size, &terminate))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParseCharData", &pyobj_ctxt, &cdata))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseChunk(ctxt, chunk, size, terminate);
+    xmlParseCharData(ctxt, cdata);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUCSIsThai(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsThai", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsThai(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlNewDocNoDtD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    htmlDocPtr c_retval;
-    xmlChar * URI;
-    xmlChar * ExternalID;
+libxml_htmlCtxtReset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:htmlNewDocNoDtD", &URI, &ExternalID))
+    if (!PyArg_ParseTuple(args, (char *)"O:htmlCtxtReset", &pyobj_ctxt))
         return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = htmlNewDocNoDtD(URI, ExternalID);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
+    htmlCtxtReset(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlParseElementDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlDocPtr c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
+    char * filename;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseElementDecl", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzi:xmlCtxtReadFile", &pyobj_ctxt, &filename, &encoding, &options))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseElementDecl(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCtxtReadFile(ctxt, filename, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURIEscape(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogResolveSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlChar * str;
+    xmlChar * sysID;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlURIEscape", &str))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolveSystem", &sysID))
         return(NULL);
 
-    c_retval = xmlURIEscape(str);
+    c_retval = xmlCatalogResolveSystem(sysID);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlReaderForFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstLocalName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    int fd;
-    char * URL;
-    char * encoding;
-    int options;
+    const xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"izzi:xmlReaderForFd", &fd, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstLocalName", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlReaderForFd(fd, URL, encoding, options);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    c_retval = xmlTextReaderConstLocalName(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_htmlDocContentDumpFormatOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlOutputBufferPtr buf;
-    PyObject *pyobj_buf;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
-    int format;
+libxml_xmlXPathLastFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOzi:htmlDocContentDumpFormatOutput", &pyobj_buf, &pyobj_cur, &encoding, &format))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathLastFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    buf = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_buf);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    htmlDocContentDumpFormatOutput(buf, cur, encoding, format);
+    xmlXPathLastFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlXPathNextDescendantOrSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsOpticalCharacterRecognition(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextDescendantOrSelf", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOpticalCharacterRecognition", &code))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlXPathNextDescendantOrSelf(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsOpticalCharacterRecognition(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCJKCompatibilityIdeographs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefSubstituteEntitiesDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityIdeographs", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefSubstituteEntitiesDefaultValue", &v))
         return(NULL);
 
-    c_retval = xmlUCSIsCJKCompatibilityIdeographs(code);
+    c_retval = xmlThrDefSubstituteEntitiesDefaultValue(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURISetQuery(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * query;
+libxml_xmlNewNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlAttrPtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetQuery", &pyobj_URI, &query))
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewNsProp", &pyobj_node, &pyobj_ns, &name, &value))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    if (URI->query != NULL) xmlFree(URI->query);
-    URI->query = (char *)xmlStrdup((const xmlChar *)query);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlNewNsProp(node, ns, name, value);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGreekandCoptic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefIndentTreeOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreekandCoptic", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefIndentTreeOutput", &v))
         return(NULL);
 
-    c_retval = xmlUCSIsGreekandCoptic(code);
+    c_retval = xmlThrDefIndentTreeOutput(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToFirstAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsYijingHexagramSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToFirstAttribute", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsYijingHexagramSymbols", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderMoveToFirstAttribute(reader);
+    c_retval = xmlUCSIsYijingHexagramSymbols(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUTF8Strlen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderNewFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * utf;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    int fd;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlUTF8Strlen", &utf))
+    if (!PyArg_ParseTuple(args, (char *)"Oizzi:xmlReaderNewFd", &pyobj_reader, &fd, &URL, &encoding, &options))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUTF8Strlen(utf);
+    c_retval = xmlReaderNewFd(reader, fd, URL, encoding, options);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathAddValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlCreateMemoryParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlParserCtxtPtr c_retval;
+    char * buffer;
+    int py_buffsize0;
+    int size;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathAddValues", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"t#i:xmlCreateMemoryParserCtxt", &buffer, &py_buffsize0, &size))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathAddValues(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlCreateMemoryParserCtxt(buffer, size);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlStrchr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     const xmlChar * c_retval;
-    xmlChar * str;
-    xmlChar val;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"zc:xmlStrchr", &str, &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseName", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlStrchr(str, val);
+    c_retval = xmlParseName(ctxt);
     py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewTextReader(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    xmlParserInputBufferPtr input;
-    PyObject *pyobj_input;
-    char * URI;
+    xmlNodePtr c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    int extended;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewTextReader", &pyobj_input, &URI))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCopyNode", &pyobj_node, &extended))
         return(NULL);
-    input = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_input);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlNewTextReader(input, URI);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    c_retval = xmlCopyNode(node, extended);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlTextReaderGetAttributeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathCastStringToBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * localName;
-    xmlChar * namespaceURI;
+    int c_retval;
+    xmlChar * val;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlTextReaderGetAttributeNs", &pyobj_reader, &localName, &namespaceURI))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathCastStringToBoolean", &val))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderGetAttributeNs(reader, localName, namespaceURI);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlXPathCastStringToBoolean(val);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlURIGetQuery(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderMoveToElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetQuery", &pyobj_URI))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToElement", &pyobj_reader))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = URI->query;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlTextReaderMoveToElement(reader);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlNewTextLen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlIsAutoClosed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlChar * content;
-    int len;
+    int c_retval;
+    htmlDocPtr doc;
+    PyObject *pyobj_doc;
+    htmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlNewTextLen", &content, &len))
+    if (!PyArg_ParseTuple(args, (char *)"OO:htmlIsAutoClosed", &pyobj_doc, &pyobj_elem))
         return(NULL);
+    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (htmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlNewTextLen(content, len);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = htmlIsAutoClosed(doc, elem);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlXPathGetContextSize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsUgaritic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextSize", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsUgaritic", &code))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = ctxt->contextSize;
+    c_retval = xmlUCSIsUgaritic(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathIsInf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKCompatibilityIdeographsSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    double val;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"d:xmlXPathIsInf", &val))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityIdeographsSupplement", &code))
         return(NULL);
 
-    c_retval = xmlXPathIsInf(val);
+    c_retval = xmlUCSIsCJKCompatibilityIdeographsSupplement(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsGeneralPunctuation(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReconciliateNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr tree;
+    PyObject *pyobj_tree;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeneralPunctuation", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlReconciliateNs", &pyobj_doc, &pyobj_tree))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
 
-    c_retval = xmlUCSIsGeneralPunctuation(code);
+    c_retval = xmlReconciliateNs(doc, tree);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsControlPictures(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlNodePtr c_retval;
+    xmlNodePtr parent;
+    PyObject *pyobj_parent;
+    xmlNsPtr ns;
+    PyObject *pyobj_ns;
+    xmlChar * name;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsControlPictures", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewChild", &pyobj_parent, &pyobj_ns, &name, &content))
         return(NULL);
+    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
+    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    c_retval = xmlUCSIsControlPictures(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlNewChild(parent, ns, name, content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlIsBooleanAttr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsKangxiRadicals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * name;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:htmlIsBooleanAttr", &name))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKangxiRadicals", &code))
         return(NULL);
 
-    c_retval = htmlIsBooleanAttr(name);
+    c_retval = xmlUCSIsKangxiRadicals(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlNodeListGetString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCreateIntSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
+    xmlDtdPtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr list;
-    PyObject *pyobj_list;
-    int inLine;
+    xmlChar * name;
+    xmlChar * ExternalID;
+    xmlChar * SystemID;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlNodeListGetString", &pyobj_doc, &pyobj_list, &inLine))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlCreateIntSubset", &pyobj_doc, &name, &ExternalID, &SystemID))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    list = (xmlNodePtr) PyxmlNode_Get(pyobj_list);
 
-    c_retval = xmlNodeListGetString(doc, list, inLine);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlCreateIntSubset(doc, name, ExternalID, SystemID);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsBengali(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathSubValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathSubValues", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathSubValues(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlUCSIsArabicPresentationFormsA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBengali", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabicPresentationFormsA", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsBengali(code);
+    c_retval = xmlUCSIsArabicPresentationFormsA(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlBuildQName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsArabicPresentationFormsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * ncname;
-    xmlChar * prefix;
-    xmlChar * memory;
-    int len;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlBuildQName", &ncname, &prefix, &memory, &len))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabicPresentationFormsB", &code))
         return(NULL);
 
-    c_retval = xmlBuildQName(ncname, prefix, memory, len);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUCSIsArabicPresentationFormsB(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlFreePropList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlAttrPtr cur;
-    PyObject *pyobj_cur;
+libxml_xmlUCSIsGeometricShapes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreePropList", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeometricShapes", &code))
         return(NULL);
-    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlFreePropList(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsGeometricShapes(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderConstString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetPredefinedEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * str;
+    xmlEntityPtr c_retval;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderConstString", &pyobj_reader, &str))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlGetPredefinedEntity", &name))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderConstString(reader, str);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlGetPredefinedEntity(name);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathStringFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlSaveFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathStringFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"zO:xmlSaveFile", &filename, &pyobj_cur))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlXPathStringFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlSaveFile(filename, cur);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlAddNextSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
     xmlNodePtr cur;
     PyObject *pyobj_cur;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddNextSibling", &pyobj_cur, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextNamespace", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
     cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlAddNextSibling(cur, elem);
+    c_retval = xmlXPathNextNamespace(ctxt, cur);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsSupplementalArrowsA(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsBuhid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalArrowsA", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBuhid", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsSupplementalArrowsA(code);
+    c_retval = xmlUCSIsBuhid(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlUCSIsSupplementalArrowsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaValidateOneElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlSchemaValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSupplementalArrowsB", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSchemaValidateOneElement", &pyobj_ctxt, &pyobj_elem))
         return(NULL);
+    ctxt = (xmlSchemaValidCtxtPtr) PySchemaValidCtxt_Get(pyobj_ctxt);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlUCSIsSupplementalArrowsB(code);
+    c_retval = xmlSchemaValidateOneElement(ctxt, elem);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlInitParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlReadDoc", &cur, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = xmlReadDoc(cur, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlReaderNewFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    char * filename;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlInitParserCtxt", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzi:xmlReaderNewFile", &pyobj_reader, &filename, &encoding, &options))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlInitParserCtxt(ctxt);
+    c_retval = xmlReaderNewFile(reader, filename, encoding, options);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlErrorGetMessage(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlFreeDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlDtdPtr cur;
+    PyObject *pyobj_cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeDtd", &pyobj_cur))
+        return(NULL);
+    cur = (xmlDtdPtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlFreeDtd(cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlSetListDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr list;
+    PyObject *pyobj_list;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSetListDoc", &pyobj_list, &pyobj_doc))
+        return(NULL);
+    list = (xmlNodePtr) PyxmlNode_Get(pyobj_list);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    xmlSetListDoc(list, doc);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlCtxtReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlErrorPtr Error;
-    PyObject *pyobj_Error;
+    htmlDocPtr c_retval;
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    char * filename;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetMessage", &pyobj_Error))
+    if (!PyArg_ParseTuple(args, (char *)"Ozzi:htmlCtxtReadFile", &pyobj_ctxt, &filename, &encoding, &options))
         return(NULL);
-    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = Error->message;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = htmlCtxtReadFile(ctxt, filename, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlRemoveID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefLineNumbersDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRemoveID", &pyobj_doc, &pyobj_attr))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefLineNumbersDefaultValue", &v))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlRemoveID(doc, attr);
+    c_retval = xmlThrDefLineNumbersDefaultValue(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsTagbanwa(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCombiningHalfMarks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTagbanwa", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCombiningHalfMarks", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsTagbanwa(code);
+    c_retval = xmlUCSIsCombiningHalfMarks(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathFalseFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlUCSIsCatSc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathFalseFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSc", &code))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathFalseFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatSc(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlTextReaderHasValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatSo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderHasValue", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSo", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderHasValue(reader);
+    c_retval = xmlUCSIsCatSo(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGDumpTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlRelaxNGPtr schema;
-    PyObject *pyobj_schema;
+libxml_xmlUCSIsCatSk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGDumpTree", &pyobj_output, &pyobj_schema))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSk", &code))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
 
-    xmlRelaxNGDumpTree(output, schema);
+    c_retval = xmlUCSIsCatSk(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathFreeContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathFreeContext", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+
+    xmlXPathFreeContext(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatSo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlEncodeSpecialChars(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlChar * c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlChar * input;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSo", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlEncodeSpecialChars", &pyobj_doc, &input))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlUCSIsCatSo(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlEncodeSpecialChars(doc, input);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderConstBaseUri(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_namePop(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstBaseUri", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:namePop", &pyobj_ctxt))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderConstBaseUri(reader);
+    c_retval = namePop(ctxt);
     py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlRegexpPrint(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlRegexpPtr regexp;
-    PyObject *pyobj_regexp;
+libxml_xmlParseContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRegexpPrint", &pyobj_output, &pyobj_regexp))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseContent", &pyobj_ctxt))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    regexp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_regexp);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlRegexpPrint(output, regexp);
+    xmlParseContent(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_REGEXP_ENABLED */
 PyObject *
-libxml_xmlNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlValidCtxtPtr c_retval;
+    xmlDocPtr c_retval;
+    char * buffer;
+    int py_buffsize0;
+    int size;
+    char * URL;
+    char * encoding;
+    int options;
 
-    c_retval = xmlNewValidCtxt();
-    py_retval = libxml_xmlValidCtxtPtrWrap((xmlValidCtxtPtr) c_retval);
+    if (!PyArg_ParseTuple(args, (char *)"t#izzi:xmlReadMemory", &buffer, &py_buffsize0, &size, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = xmlReadMemory(buffer, size, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatSm(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefGetWarningsDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int v;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefGetWarningsDefaultValue", &v))
+        return(NULL);
+
+    c_retval = xmlThrDefGetWarningsDefaultValue(v);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsMongolian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSm", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMongolian", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatSm(code);
+    c_retval = xmlUCSIsMongolian(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURIEscapeStr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * str;
-    xmlChar * list;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlURIEscapeStr", &str, &list))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetFragment", &pyobj_URI))
         return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = xmlURIEscapeStr(str, list);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = URI->fragment;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToAttributeNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKRadicalsSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    int no;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlTextReaderMoveToAttributeNo", &pyobj_reader, &no))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKRadicalsSupplement", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderMoveToAttributeNo(reader, no);
+    c_retval = xmlUCSIsCJKRadicalsSupplement(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCountFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathSumFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
     int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathCountFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSumFunction", &pyobj_ctxt, &nargs))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPathCountFunction(ctxt, nargs);
+    xmlXPathSumFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlParserHandlePEReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlCopyNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNsPtr c_retval;
+    xmlNsPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserHandlePEReference", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlCopyNamespace", &pyobj_cur))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    cur = (xmlNsPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlParserHandlePEReference(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlCopyNamespace(cur);
+    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderMoveToAttributeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCyrillic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * localName;
-    xmlChar * namespaceURI;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlTextReaderMoveToAttributeNs", &pyobj_reader, &localName, &namespaceURI))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCyrillic", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderMoveToAttributeNs(reader, localName, namespaceURI);
+    c_retval = xmlUCSIsCyrillic(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderNext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+libxml_xmlURISetFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * fragment;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNext", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetFragment", &pyobj_URI, &fragment))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = xmlTextReaderNext(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    if (URI->fragment != NULL) xmlFree(URI->fragment);
+    URI->fragment = (char *)xmlStrdup((const xmlChar *)fragment);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNewBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlAddChildList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    int val;
+    xmlNodePtr c_retval;
+    xmlNodePtr parent;
+    PyObject *pyobj_parent;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlXPathNewBoolean", &val))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddChildList", &pyobj_parent, &pyobj_cur))
         return(NULL);
+    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlXPathNewBoolean(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlAddChildList(parent, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlUCSIsPrivateUseArea(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlParseChunk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    char * chunk;
+    int py_buffsize0;
+    int size;
+    int terminate;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPrivateUseArea", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Ot#ii:htmlParseChunk", &pyobj_ctxt, &chunk, &py_buffsize0, &size, &terminate))
         return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsPrivateUseArea(code);
+    c_retval = htmlParseChunk(ctxt, chunk, size, terminate);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathGetContextNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathContextPtr ctxt;
+libxml_xmlXPathIdFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextNode", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathIdFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = ctxt->node;
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
+    xmlXPathIdFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlParserSetPedantic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int pedantic;
+libxml_xmlCreateURLParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlParserCtxtPtr c_retval;
+    char * filename;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetPedantic", &pyobj_ctxt, &pedantic))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCreateURLParserCtxt", &filename, &options))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    ctxt->pedantic = pedantic;
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlCreateURLParserCtxt(filename, options);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatLu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderRead(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLu", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderRead", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsCatLu(code);
+    c_retval = xmlTextReaderRead(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatLt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSaveUri(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlURIPtr uri;
+    PyObject *pyobj_uri;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSaveUri", &pyobj_uri))
+        return(NULL);
+    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
+
+    c_retval = xmlSaveUri(uri);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlIsChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLt", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsChar", &ch))
         return(NULL);
 
-    c_retval = xmlUCSIsCatLt(code);
+    c_retval = xmlIsChar(ch);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlCtxtReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlCtxtReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlParserCtxtPtr ctxt;
+    htmlDocPtr c_retval;
+    htmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
     int fd;
     char * URL;
     char * encoding;
     int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oizzi:xmlCtxtReadFd", &pyobj_ctxt, &fd, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"Oizzi:htmlCtxtReadFd", &pyobj_ctxt, &fd, &URL, &encoding, &options))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlCtxtReadFd(ctxt, fd, URL, encoding, options);
+    c_retval = htmlCtxtReadFd(ctxt, fd, URL, encoding, options);
     py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlIsPubidChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlPedanticParserDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    unsigned int ch;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsPubidChar", &ch))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlPedanticParserDefault", &val))
         return(NULL);
 
-    c_retval = xmlIsPubidChar(ch);
+    c_retval = xmlPedanticParserDefault(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatLm(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
+    xmlChar * cur;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseDoc", &cur))
+        return(NULL);
+
+    c_retval = xmlParseDoc(cur);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_XPATH_ENABLED
+PyObject *
+libxml_xmlXPathParseNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParseNCName", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    c_retval = xmlXPathParseNCName(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlLineNumbersDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLm", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlLineNumbersDefault", &val))
         return(NULL);
 
-    c_retval = xmlUCSIsCatLm(code);
+    c_retval = xmlLineNumbersDefault(val);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatLl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlConvertSGMLCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatLl", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlConvertSGMLCatalog", &pyobj_catal))
         return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
 
-    c_retval = xmlUCSIsCatLl(code);
+    c_retval = xmlConvertSGMLCatalog(catal);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlNodeAddContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlChar * content;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeAddContent", &pyobj_cur, &content))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeAddContent(cur, content);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlErrorGetLevel(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlErrorPtr Error;
+    PyObject *pyobj_Error;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetLevel", &pyobj_Error))
+        return(NULL);
+    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
+
+    c_retval = Error->level;
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathFreeContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNewParserContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlXPathParserContextPtr c_retval;
+    xmlChar * str;
     xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathFreeContext", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathNewParserContext", &str, &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    xmlXPathFreeContext(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlXPathNewParserContext(str, ctxt);
+    py_retval = libxml_xmlXPathParserContextPtrWrap((xmlXPathParserContextPtr) c_retval);
+    return(py_retval);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsCypriotSyllabary(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCypriotSyllabary", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseDocument", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsCypriotSyllabary(code);
+    c_retval = xmlParseDocument(ctxt);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * name;
-    xmlChar * nameSpace;
+libxml_xmlFreeNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlGetNsProp", &pyobj_node, &name, &nameSpace))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNode", &pyobj_cur))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlGetNsProp(node, name, nameSpace);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
+    xmlFreeNode(cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlNewDocProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGValidatePushElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
+    int c_retval;
+    xmlRelaxNGValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * name;
-    xmlChar * value;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewDocProp", &pyobj_doc, &name, &value))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidatePushElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
         return(NULL);
+    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlNewDocProp(doc, name, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlRelaxNGValidatePushElement(ctxt, doc, elem);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatN(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSinhala(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatN", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSinhala", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatN(code);
+    c_retval = xmlUCSIsSinhala(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatL(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParserInputBufferPush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlParserInputBufferPtr in;
+    PyObject *pyobj_in;
+    int len;
+    char * buf;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatL", &code))
+    if (!PyArg_ParseTuple(args, (char *)"Oiz:xmlParserInputBufferPush", &pyobj_in, &len, &buf))
         return(NULL);
+    in = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_in);
 
-    c_retval = xmlUCSIsCatL(code);
+    c_retval = xmlParserInputBufferPush(in, len, buf);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatM(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlFileMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatM", &code))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlFileMatch", &filename))
         return(NULL);
 
-    c_retval = xmlUCSIsCatM(code);
+    c_retval = xmlFileMatch(filename);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlLoadACatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStrEqual(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlCatalogPtr c_retval;
-    char * filename;
+    int c_retval;
+    xmlChar * str1;
+    xmlChar * str2;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadACatalog", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrEqual", &str1, &str2))
         return(NULL);
 
-    c_retval = xmlLoadACatalog(filename);
-    py_retval = libxml_xmlCatalogPtrWrap((xmlCatalogPtr) c_retval);
+    c_retval = xmlStrEqual(str1, str2);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCtxtResetPush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderPreserve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    char * chunk;
-    int size;
-    char * filename;
-    char * encoding;
+    xmlNodePtr c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozizz:xmlCtxtResetPush", &pyobj_ctxt, &chunk, &size, &filename, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderPreserve", &pyobj_reader))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlCtxtResetPush(ctxt, chunk, size, filename, encoding);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderPreserve(reader);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatS(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsKatakanaPhoneticExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatS", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKatakanaPhoneticExtensions", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatS(code);
+    c_retval = xmlUCSIsKatakanaPhoneticExtensions(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlUCSIsCatP(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlRelaxNGParserCtxtPtr c_retval;
+    char * URL;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlRelaxNGNewParserCtxt", &URL))
+        return(NULL);
+
+    c_retval = xmlRelaxNGNewParserCtxt(URL);
+    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+PyObject *
+libxml_xmlXPathSetContextDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathSetContextDoc", &pyobj_ctxt, &pyobj_doc))
+        return(NULL);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+
+    ctxt->doc = doc;
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlIsRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
+    xmlAttrPtr attr;
+    PyObject *pyobj_attr;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatP", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlIsRef", &pyobj_doc, &pyobj_elem, &pyobj_attr))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
+    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlUCSIsCatP(code);
+    c_retval = xmlIsRef(doc, elem, attr);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCatalogGetSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsKanbun(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlChar * sysID;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogGetSystem", &sysID))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKanbun", &code))
         return(NULL);
 
-    c_retval = xmlCatalogGetSystem(sysID);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlUCSIsKanbun(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatZ(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsLatin1Supplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatZ", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLatin1Supplement", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatZ(code);
+    c_retval = xmlUCSIsLatin1Supplement(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlRegexpExec(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNodeSetName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetName", &pyobj_cur, &name))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeSetName(cur, name);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUTF8Strloc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlRegexpPtr comp;
-    PyObject *pyobj_comp;
-    xmlChar * content;
+    xmlChar * utf;
+    xmlChar * utfchar;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlRegexpExec", &pyobj_comp, &content))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlUTF8Strloc", &utf, &utfchar))
         return(NULL);
-    comp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_comp);
 
-    c_retval = xmlRegexpExec(comp, content);
+    c_retval = xmlUTF8Strloc(utf, utfchar);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_REGEXP_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlByteConsumed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlReadFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    long c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    htmlDocPtr c_retval;
+    char * filename;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlByteConsumed", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zzi:htmlReadFile", &filename, &encoding, &options))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlByteConsumed(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = htmlReadFile(filename, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsSuperscriptsandSubscripts(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsDingbats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSuperscriptsandSubscripts", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDingbats", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsSuperscriptsandSubscripts(code);
+    c_retval = xmlUCSIsDingbats(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlHasProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlSchemaParse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * name;
+    xmlSchemaPtr c_retval;
+    xmlSchemaParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlHasProp", &pyobj_node, &name))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaParse", &pyobj_ctxt))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ctxt = (xmlSchemaParserCtxtPtr) PySchemaParserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlHasProp(node, name);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlSchemaParse(ctxt);
+    py_retval = libxml_xmlSchemaPtrWrap((xmlSchemaPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlGetDtdElementDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlThrDefDefaultBufferSize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlElementPtr c_retval;
-    xmlDtdPtr dtd;
-    PyObject *pyobj_dtd;
-    xmlChar * name;
+    int c_retval;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetDtdElementDesc", &pyobj_dtd, &name))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefDefaultBufferSize", &v))
         return(NULL);
-    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
 
-    c_retval = xmlGetDtdElementDesc(dtd, name);
-    py_retval = libxml_xmlElementPtrWrap((xmlElementPtr) c_retval);
+    c_retval = xmlThrDefDefaultBufferSize(v);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsPhoneticExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsPrivateUse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPhoneticExtensions", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPrivateUse", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsPhoneticExtensions(code);
+    c_retval = xmlUCSIsPrivateUse(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathCastNodeToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRecoverFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    xmlDocPtr c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathCastNodeToString", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlRecoverFile", &filename))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlXPathCastNodeToString(node);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlRecoverFile(filename);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlURISetPort(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    int port;
+libxml_xmlXPathNextFollowingSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlURISetPort", &pyobj_URI, &port))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextFollowingSibling", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    URI->port = port;
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlXPathNextFollowingSibling(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlGetDtdQAttrDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlIsExtender(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlAttributePtr c_retval;
-    xmlDtdPtr dtd;
-    PyObject *pyobj_dtd;
-    xmlChar * elem;
-    xmlChar * name;
-    xmlChar * prefix;
+    int c_retval;
+    unsigned int ch;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlGetDtdQAttrDesc", &pyobj_dtd, &elem, &name, &prefix))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsExtender", &ch))
         return(NULL);
-    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
 
-    c_retval = xmlGetDtdQAttrDesc(dtd, elem, name, prefix);
-    py_retval = libxml_xmlAttributePtrWrap((xmlAttributePtr) c_retval);
+    c_retval = xmlIsExtender(ch);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlSetNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
+libxml_xmlXPathCastBooleanToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlSetNs", &pyobj_node, &pyobj_ns))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlXPathCastBooleanToString", &val))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
 
-    xmlSetNs(node, ns);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlXPathCastBooleanToString(val);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlNamespaceParseNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUTF8Charcmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    xmlChar * utf1;
+    xmlChar * utf2;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNamespaceParseNCName", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlUTF8Charcmp", &utf1, &utf2))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlNamespaceParseNCName(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUTF8Charcmp(utf1, utf2);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlGetDtdEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPtrNewRangeNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlEntityPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * name;
+    xmlXPathObjectPtr c_retval;
+    xmlNodePtr start;
+    PyObject *pyobj_start;
+    xmlNodePtr end;
+    PyObject *pyobj_end;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetDtdEntity", &pyobj_doc, &name))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPtrNewRangeNodes", &pyobj_start, &pyobj_end))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
+    end = (xmlNodePtr) PyxmlNode_Get(pyobj_end);
 
-    c_retval = xmlGetDtdEntity(doc, name);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlXPtrNewRangeNodes(start, end);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
-libxml_xmlIsXHTML(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlStringDecodeEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlChar * systemID;
-    xmlChar * publicID;
+    xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * str;
+    int what;
+    xmlChar end;
+    xmlChar end2;
+    xmlChar end3;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlIsXHTML", &systemID, &publicID))
+    if (!PyArg_ParseTuple(args, (char *)"Oziccc:xmlStringDecodeEntities", &pyobj_ctxt, &str, &what, &end, &end2, &end3))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlIsXHTML(systemID, publicID);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlStringDecodeEntities(ctxt, str, what, end, end2, end3);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlURIUnescapeString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNotEqualValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    char * c_retval;
-    char * str;
-    int len;
-    char * target;
+    int c_retval;
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"ziz:xmlURIUnescapeString", &str, &len, &target))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNotEqualValues", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlURIUnescapeString(str, len, target);
-    py_retval = libxml_charPtrWrap((char *) c_retval);
+    c_retval = xmlXPathNotEqualValues(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsRunic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsOgham(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsRunic", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOgham", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsRunic(code);
+    c_retval = xmlUCSIsOgham(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetParameterEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewDocComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlEntityPtr c_retval;
+    xmlNodePtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * name;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetParameterEntity", &pyobj_doc, &name))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewDocComment", &pyobj_doc, &content))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlGetParameterEntity(doc, name);
+    c_retval = xmlNewDocComment(doc, content);
     py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlInitGlobals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlUCSIsBopomofoExtended(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    xmlInitGlobals();
-    Py_INCREF(Py_None);
-    return(Py_None);
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBopomofoExtended", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsBopomofoExtended(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewDocTextLen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKCompatibility(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * content;
-    int len;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlNewDocTextLen", &pyobj_doc, &content, &len))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibility", &code))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlNewDocTextLen(doc, content, len);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsCJKCompatibility(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlXPathParseName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGValidateFullElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlXPathParserContextPtr ctxt;
+    int c_retval;
+    xmlRelaxNGValidCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    xmlNodePtr elem;
+    PyObject *pyobj_elem;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParseName", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidateFullElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlXPathParseName(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlRelaxNGValidateFullElement(ctxt, doc, elem);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlURISetPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * path;
+libxml_xmlValidateDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlValidCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetPath", &pyobj_URI, &path))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlValidateDocument", &pyobj_ctxt, &pyobj_doc))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    if (URI->path != NULL) xmlFree(URI->path);
-    URI->path = (char *)xmlStrdup((const xmlChar *)path);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlValidateDocument(ctxt, doc);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsEthiopic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsEthiopic", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPc", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsEthiopic(code);
+    c_retval = xmlUCSIsCatPc(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderClose", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPf", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderClose(reader);
+    c_retval = xmlUCSIsCatPf(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlErrorGetFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    xmlErrorPtr Error;
-    PyObject *pyobj_Error;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetFile", &pyobj_Error))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPe", &code))
         return(NULL);
-    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
 
-    c_retval = Error->file;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlUCSIsCatPe(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlChar * name;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetProp", &pyobj_node, &name))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPd", &code))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlGetProp(node, name);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUCSIsCatPd(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlParseFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlCtxtReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     htmlDocPtr c_retval;
-    char * filename;
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    char * buffer;
+    int py_buffsize0;
+    int size;
+    char * URL;
     char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:htmlParseFile", &filename, &encoding))
+    if (!PyArg_ParseTuple(args, (char *)"Ot#izzi:htmlCtxtReadMemory", &pyobj_ctxt, &buffer, &py_buffsize0, &size, &URL, &encoding, &options))
         return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = htmlParseFile(filename, encoding);
+    c_retval = htmlCtxtReadMemory(ctxt, buffer, size, URL, encoding, options);
     py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlACatalogResolveURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPi(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    xmlChar * URI;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolveURI", &pyobj_catal, &URI))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPi", &code))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
 
-    c_retval = xmlACatalogResolveURI(catal, URI);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlUCSIsCatPi(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsVariationSelectors(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatPo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsVariationSelectors", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPo", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsVariationSelectors(code);
+    c_retval = xmlUCSIsCatPo(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPatherror(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    char * file;
-    int line;
-    int no;
+libxml_xmlUCSIsCatPs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozii:xmlXPatherror", &pyobj_ctxt, &file, &line, &no))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatPs", &code))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlXPatherror(ctxt, file, line, no);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatPs(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlLoadCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsHighSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    char * filename;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadCatalog", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHighSurrogates", &code))
         return(NULL);
 
-    c_retval = xmlLoadCatalog(filename);
+    c_retval = xmlUCSIsHighSurrogates(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugCheckDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlAddDocEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    FILE * output;
-    PyObject *pyobj_output;
+    xmlEntityPtr c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
+    xmlChar * name;
+    int type;
+    xmlChar * ExternalID;
+    xmlChar * SystemID;
+    xmlChar * content;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugCheckDocument", &pyobj_output, &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"Ozizzz:xmlAddDocEntity", &pyobj_doc, &name, &type, &ExternalID, &SystemID, &content))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlDebugCheckDocument(output, doc);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlAddDocEntity(doc, name, type, ExternalID, SystemID, content);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlCatalogResolveURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolveURI", &URI))
+        return(NULL);
+
+    c_retval = xmlCatalogResolveURI(URI);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
 libxml_xmlURIGetScheme(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -8567,1623 +9963,1903 @@ libxml_xmlURIGetScheme(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathEval(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderLocatorLineNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlChar * str;
-    xmlXPathContextPtr ctx;
-    PyObject *pyobj_ctx;
+    int c_retval;
+    xmlTextReaderLocatorPtr locator;
+    PyObject *pyobj_locator;
 
-    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPathEval", &str, &pyobj_ctx))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderLocatorLineNumber", &pyobj_locator))
         return(NULL);
-    ctx = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctx);
+    locator = (xmlTextReaderLocatorPtr) PyxmlTextReaderLocator_Get(pyobj_locator);
 
-    c_retval = xmlXPathEval(str, ctx);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = xmlTextReaderLocatorLineNumber(locator);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_htmlReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGNewMemParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
+    xmlRelaxNGParserCtxtPtr c_retval;
+    char * buffer;
+    int size;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzzi:htmlReadDoc", &cur, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlRelaxNGNewMemParserCtxt", &buffer, &size))
         return(NULL);
 
-    c_retval = htmlReadDoc(cur, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlRelaxNGNewMemParserCtxt(buffer, size);
+    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsTags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderAttributeCount(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTags", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderAttributeCount", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsTags(code);
+    c_retval = xmlTextReaderAttributeCount(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNewPI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCharStrndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlChar * name;
-    xmlChar * content;
+    xmlChar * c_retval;
+    char * cur;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlNewPI", &name, &content))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCharStrndup", &cur, &len))
         return(NULL);
 
-    c_retval = xmlNewPI(name, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlCharStrndup(cur, len);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsLowSurrogates(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseEncodingDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    const xmlChar * c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsLowSurrogates", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseEncodingDecl", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlUCSIsLowSurrogates(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlParseEncodingDecl(ctxt);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsOsmanya(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsUnifiedCanadianAboriginalSyllabics(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOsmanya", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsUnifiedCanadianAboriginalSyllabics", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsOsmanya(code);
+    c_retval = xmlUCSIsUnifiedCanadianAboriginalSyllabics(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlThrDefDoValidityCheckingDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyPropList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int v;
+    xmlAttrPtr c_retval;
+    xmlNodePtr target;
+    PyObject *pyobj_target;
+    xmlAttrPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefDoValidityCheckingDefaultValue", &v))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyPropList", &pyobj_target, &pyobj_cur))
         return(NULL);
+    target = (xmlNodePtr) PyxmlNode_Get(pyobj_target);
+    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlThrDefDoValidityCheckingDefaultValue(v);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCopyPropList(target, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlXPathGetContextPosition(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDocFormatDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    FILE * f;
+    PyObject *pyobj_f;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    int format;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextPosition", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDocFormatDump", &pyobj_f, &pyobj_cur, &format))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    f = (FILE *) PyFile_Get(pyobj_f);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = ctxt->proximityPosition;
+    c_retval = xmlDocFormatDump(f, cur, format);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlNodeDumpFileFormat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtReset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlCtxtReset", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlCtxtReset(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlUTF8Strndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    FILE * out;
-    PyObject *pyobj_out;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
-    int format;
+    xmlChar * c_retval;
+    xmlChar * utf;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOOzi:htmlNodeDumpFileFormat", &pyobj_out, &pyobj_doc, &pyobj_cur, &encoding, &format))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlUTF8Strndup", &utf, &len))
         return(NULL);
-    out = (FILE *) PyFile_Get(pyobj_out);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = htmlNodeDumpFileFormat(out, doc, cur, encoding, format);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlUTF8Strndup(utf, len);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlTextReaderIsValid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathGetContextDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    xmlDocPtr c_retval;
+    xmlXPathContextPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsValid", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextDoc", &pyobj_ctxt))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderIsValid(reader);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = ctxt->doc;
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsByzantineMusicalSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsTaiLe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsByzantineMusicalSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTaiLe", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsByzantineMusicalSymbols(code);
+    c_retval = xmlUCSIsTaiLe(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlResetError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlErrorPtr err;
-    PyObject *pyobj_err;
+libxml_xmlParseComment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlResetError", &pyobj_err))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseComment", &pyobj_ctxt))
         return(NULL);
-    err = (xmlErrorPtr) PyError_Get(pyobj_err);
-
-    xmlResetError(err);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    htmlDefaultSAXHandlerInit();
+    xmlParseComment(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_DEBUG_ENABLED
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlShellPrintXPathError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    int errorType;
-    char * arg;
+libxml_xmlXPathSubstringAfterFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"iz:xmlShellPrintXPathError", &errorType, &arg))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringAfterFunction", &pyobj_ctxt, &nargs))
         return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlShellPrintXPathError(errorType, arg);
+    xmlXPathSubstringAfterFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlCleanupEncodingAliases(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlSaveFormatFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
+    int format;
 
-    xmlCleanupEncodingAliases();
-    Py_INCREF(Py_None);
-    return(Py_None);
+    if (!PyArg_ParseTuple(args, (char *)"zOzi:xmlSaveFormatFileEnc", &filename, &pyobj_cur, &encoding, &format))
+        return(NULL);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = xmlSaveFormatFileEnc(filename, cur, encoding, format);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlXPathRegisteredNsCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathContextPtr ctxt;
+libxml_xmlRelaxNGParse(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlRelaxNGPtr c_retval;
+    xmlRelaxNGParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredNsCleanup", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGParse", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    ctxt = (xmlRelaxNGParserCtxtPtr) PyrelaxNgParserCtxt_Get(pyobj_ctxt);
 
-    xmlXPathRegisteredNsCleanup(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlRelaxNGParse(ctxt);
+    py_retval = libxml_xmlRelaxNGPtrWrap((xmlRelaxNGPtr) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlCatalogResolve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseNmtoken(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlChar * pubID;
-    xmlChar * sysID;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlCatalogResolve", &pubID, &sysID))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseNmtoken", &pyobj_ctxt))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlCatalogResolve(pubID, sysID);
+    c_retval = xmlParseNmtoken(ctxt);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderConstName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParserGetIsValid(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstName", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetIsValid", &pyobj_ctxt))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderConstName(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = ctxt->valid;
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderConstXmlLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMathematicalOperators(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstXmlLang", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMathematicalOperators", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderConstXmlLang(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlUCSIsMathematicalOperators(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlUCSIsCherokee(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
+libxml_xmlDebugDumpDTD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
+    xmlDtdPtr dtd;
+    PyObject *pyobj_dtd;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCherokee", &code))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDTD", &pyobj_output, &pyobj_dtd))
         return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
+    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
 
-    c_retval = xmlUCSIsCherokee(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlDebugDumpDTD(output, dtd);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_XPTR_ENABLED
 PyObject *
-libxml_xmlUCSIsKhmer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPtrNewCollapsedRange(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    xmlXPathObjectPtr c_retval;
+    xmlNodePtr start;
+    PyObject *pyobj_start;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKhmer", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPtrNewCollapsedRange", &pyobj_start))
         return(NULL);
+    start = (xmlNodePtr) PyxmlNode_Get(pyobj_start);
 
-    c_retval = xmlUCSIsKhmer(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlXPtrNewCollapsedRange(start);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPTR_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlNodeSetContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    xmlChar * content;
+libxml_xmlXPathNotFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetContent", &pyobj_cur, &content))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNotFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlNodeSetContent(cur, content);
+    xmlXPathNotFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlParseCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextConcat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * content;
+    int len;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseCharRef", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlTextConcat", &pyobj_node, &content, &len))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlParseCharRef(ctxt);
+    c_retval = xmlTextConcat(node, content, len);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUnlinkNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+libxml_xmlLoadCatalogs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    char * pathss;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlUnlinkNode", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlLoadCatalogs", &pathss))
         return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlUnlinkNode(cur);
+    xmlLoadCatalogs(pathss);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlCtxtReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    htmlDocPtr c_retval;
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:htmlCtxtReadDoc", &pyobj_ctxt, &cur, &URL, &encoding, &options))
+        return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    c_retval = htmlCtxtReadDoc(ctxt, cur, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlCopyCharMultiByte(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseChunk(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * out;
-    int val;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    char * chunk;
+    int py_buffsize0;
+    int size;
+    int terminate;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlCopyCharMultiByte", &out, &val))
+    if (!PyArg_ParseTuple(args, (char *)"Ot#ii:xmlParseChunk", &pyobj_ctxt, &chunk, &py_buffsize0, &size, &terminate))
         return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlCopyCharMultiByte(out, val);
+    c_retval = xmlParseChunk(ctxt, chunk, size, terminate);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#ifdef LIBXML_HTML_ENABLED
+PyObject *
+libxml_htmlSaveFileEnc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    char * filename;
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
+
+    if (!PyArg_ParseTuple(args, (char *)"zOz:htmlSaveFileEnc", &filename, &pyobj_cur, &encoding))
+        return(NULL);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
+
+    c_retval = htmlSaveFileEnc(filename, cur, encoding);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlParseVersionNum(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseElementDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
+    int c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseVersionNum", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseElementDecl", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseVersionNum(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlParseElementDecl(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlBoolToText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlReaderForFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const char * c_retval;
-    int boolval;
+    xmlTextReaderPtr c_retval;
+    int fd;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlBoolToText", &boolval))
+    if (!PyArg_ParseTuple(args, (char *)"izzi:xmlReaderForFd", &fd, &URL, &encoding, &options))
         return(NULL);
 
-    c_retval = xmlBoolToText(boolval);
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    c_retval = xmlReaderForFd(fd, URL, encoding, options);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlSetCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    int mode;
+libxml_xmlUCSIsCJKCompatibilityIdeographs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlSetCompressMode", &mode))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKCompatibilityIdeographs", &code))
         return(NULL);
 
-    xmlSetCompressMode(mode);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCJKCompatibilityIdeographs(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlParseDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderMoveToFirstAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    htmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseDocument", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderMoveToFirstAttribute", &pyobj_reader))
         return(NULL);
-    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = htmlParseDocument(ctxt);
+    c_retval = xmlTextReaderMoveToFirstAttribute(reader);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlTextReaderNodeType(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNewTextReader(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlTextReaderPtr c_retval;
+    xmlParserInputBufferPtr input;
+    PyObject *pyobj_input;
+    char * URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewTextReader", &pyobj_input, &URI))
+        return(NULL);
+    input = (xmlParserInputBufferPtr) PyinputBuffer_Get(pyobj_input);
+
+    c_retval = xmlNewTextReader(input, URI);
+    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlTextReaderGetAttributeNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlTextReaderPtr reader;
     PyObject *pyobj_reader;
+    int no;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNodeType", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlTextReaderGetAttributeNo", &pyobj_reader, &no))
         return(NULL);
     reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderNodeType(reader);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderGetAttributeNo(reader, no);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathSubstringFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
+libxml_xmlTextReaderGetAttributeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlChar * localName;
+    xmlChar * namespaceURI;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlTextReaderGetAttributeNs", &pyobj_reader, &localName, &namespaceURI))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    xmlXPathSubstringFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlTextReaderGetAttributeNs(reader, localName, namespaceURI);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlIsBlankNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlURIGetQuery(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    const char * c_retval;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetQuery", &pyobj_URI))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    c_retval = URI->query;
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsGeneralPunctuation(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlIsBlankNode", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeneralPunctuation", &code))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlIsBlankNode(node);
+    c_retval = xmlUCSIsGeneralPunctuation(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlDebugDumpNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    int depth;
+libxml_xmlUCSIsControlPictures(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpNode", &pyobj_output, &pyobj_node, &depth))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsControlPictures", &code))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    xmlDebugDumpNode(output, node, depth);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsControlPictures(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlCopyDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlIsBooleanAttr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
+    int c_retval;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"z:htmlIsBooleanAttr", &name))
+        return(NULL);
+
+    c_retval = htmlIsBooleanAttr(name);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+PyObject *
+libxml_xmlNodeListGetString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    int recursive;
+    xmlNodePtr list;
+    PyObject *pyobj_list;
+    int inLine;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCopyDoc", &pyobj_doc, &recursive))
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlNodeListGetString", &pyobj_doc, &pyobj_list, &inLine))
         return(NULL);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    list = (xmlNodePtr) PyxmlNode_Get(pyobj_list);
 
-    c_retval = xmlCopyDoc(doc, recursive);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlNodeListGetString(doc, list, inLine);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGNewMemParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsBengali(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlRelaxNGParserCtxtPtr c_retval;
-    char * buffer;
-    int size;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlRelaxNGNewMemParserCtxt", &buffer, &size))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBengali", &code))
         return(NULL);
 
-    c_retval = xmlRelaxNGNewMemParserCtxt(buffer, size);
-    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
+    c_retval = xmlUCSIsBengali(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlFreeProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlBuildQName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlChar * ncname;
+    xmlChar * prefix;
+    xmlChar * memory;
+    int len;
+
+    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlBuildQName", &ncname, &prefix, &memory, &len))
+        return(NULL);
+
+    c_retval = xmlBuildQName(ncname, prefix, memory, len);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlFreePropList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlAttrPtr cur;
     PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeProp", &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreePropList", &pyobj_cur))
         return(NULL);
     cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlFreeProp(cur);
+    xmlFreePropList(cur);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlCtxtReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathStringFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathStringFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathStringFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlInitParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
+    int c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    char * buffer;
-    int size;
-    char * URL;
-    char * encoding;
-    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozizzi:xmlCtxtReadMemory", &pyobj_ctxt, &buffer, &size, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlInitParserCtxt", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlCtxtReadMemory(ctxt, buffer, size, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlInitParserCtxt(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlCreateFileParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsTagbanwa(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
-    char * filename;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCreateFileParserCtxt", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTagbanwa", &code))
         return(NULL);
 
-    c_retval = xmlCreateFileParserCtxt(filename);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    c_retval = xmlUCSIsTagbanwa(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseSystemLiteral(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstBaseUri(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    const xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseSystemLiteral", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstBaseUri", &pyobj_reader))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlParseSystemLiteral(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlTextReaderConstBaseUri(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStrcmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsDeseret(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcmp", &str1, &str2))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDeseret", &code))
         return(NULL);
 
-    c_retval = xmlStrcmp(str1, str2);
+    c_retval = xmlUCSIsDeseret(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlDocSetRootElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathRoundFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathRoundFunction", &pyobj_ctxt, &nargs))
+        return(NULL);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+
+    xmlXPathRoundFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlUCSIsCatSm(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr root;
-    PyObject *pyobj_root;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocSetRootElement", &pyobj_doc, &pyobj_root))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatSm", &code))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    root = (xmlNodePtr) PyxmlNode_Get(pyobj_root);
 
-    c_retval = xmlDocSetRootElement(doc, root);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsCatSm(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlParseAttributeListDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderMoveToAttributeNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    int no;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlTextReaderMoveToAttributeNo", &pyobj_reader, &no))
+        return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+
+    c_retval = xmlTextReaderMoveToAttributeNo(reader, no);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlParserHandlePEReference(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseAttributeListDecl", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserHandlePEReference", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlParseAttributeListDecl(ctxt);
+    xmlParserHandlePEReference(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlCheckVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    int version;
+libxml_xmlTextReaderMoveToAttributeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
+    xmlChar * localName;
+    xmlChar * namespaceURI;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlCheckVersion", &version))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlTextReaderMoveToAttributeNs", &pyobj_reader, &localName, &namespaceURI))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    xmlCheckVersion(version);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlTextReaderMoveToAttributeNs(reader, localName, namespaceURI);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlSchemaNewDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNewBoolean(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlSchemaParserCtxtPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
+    xmlXPathObjectPtr c_retval;
+    int val;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaNewDocParserCtxt", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlXPathNewBoolean", &val))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlSchemaNewDocParserCtxt(doc);
-    py_retval = libxml_xmlSchemaParserCtxtPtrWrap((xmlSchemaParserCtxtPtr) c_retval);
+    c_retval = xmlXPathNewBoolean(val);
+    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_REGEXP_ENABLED
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlRegFreeRegexp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlRegexpPtr regexp;
-    PyObject *pyobj_regexp;
+libxml_xmlUCSIsPrivateUseArea(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRegFreeRegexp", &pyobj_regexp))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPrivateUseArea", &code))
         return(NULL);
-    regexp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_regexp);
 
-    xmlRegFreeRegexp(regexp);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsPrivateUseArea(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_REGEXP_ENABLED */
 PyObject *
-libxml_nodePush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
+    xmlDocPtr c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlNodePtr value;
-    PyObject *pyobj_value;
+    int fd;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:nodePush", &pyobj_ctxt, &pyobj_value))
+    if (!PyArg_ParseTuple(args, (char *)"Oizzi:xmlCtxtReadFd", &pyobj_ctxt, &fd, &URL, &encoding, &options))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-    value = (xmlNodePtr) PyxmlNode_Get(pyobj_value);
 
-    c_retval = nodePush(ctxt, value);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCtxtReadFd(ctxt, fd, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetLineNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsAlphabeticPresentationForms(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    long c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetLineNo", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsAlphabeticPresentationForms", &code))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlGetLineNo(node);
+    c_retval = xmlUCSIsAlphabeticPresentationForms(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlRegexpIsDeterminist(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCypriotSyllabary(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlRegexpPtr comp;
-    PyObject *pyobj_comp;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlRegexpIsDeterminist", &pyobj_comp))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCypriotSyllabary", &code))
         return(NULL);
-    comp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_comp);
 
-    c_retval = xmlRegexpIsDeterminist(comp);
+    c_retval = xmlUCSIsCypriotSyllabary(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_REGEXP_ENABLED */
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlNewDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    htmlDocPtr c_retval;
-    xmlChar * URI;
-    xmlChar * ExternalID;
+    xmlChar * c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+    xmlChar * name;
+    xmlChar * nameSpace;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:htmlNewDoc", &URI, &ExternalID))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlGetNsProp", &pyobj_node, &name, &nameSpace))
         return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = htmlNewDoc(URI, ExternalID);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlGetNsProp(node, name, nameSpace);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsCat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatC(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
-    char * cat;
 
-    if (!PyArg_ParseTuple(args, (char *)"iz:xmlUCSIsCat", &code, &cat))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatC", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCat(code, cat);
+    c_retval = xmlUCSIsCatC(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlURISetUser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * user;
+libxml_xmlUCSIsCatN(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetUser", &pyobj_URI, &user))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatN", &code))
         return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    if (URI->user != NULL) xmlFree(URI->user);
-    URI->user = (char *)xmlStrdup((const xmlChar *)user);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatN(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlIsScriptAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatL(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * name;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:htmlIsScriptAttribute", &name))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatL", &code))
         return(NULL);
 
-    c_retval = htmlIsScriptAttribute(name);
+    c_retval = xmlUCSIsCatL(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlInitializePredefinedEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlUCSIsCatM(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    xmlInitializePredefinedEntities();
-    Py_INCREF(Py_None);
-    return(Py_None);
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatM", &code))
+        return(NULL);
+
+    c_retval = xmlUCSIsCatM(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNextAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtResetPush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
+    int c_retval;
+    xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
+    char * chunk;
+    int py_buffsize0;
+    int size;
+    char * filename;
+    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextAttribute", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"Ot#izz:xmlCtxtResetPush", &pyobj_ctxt, &chunk, &py_buffsize0, &size, &filename, &encoding))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNextAttribute(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlCtxtResetPush(ctxt, chunk, size, filename, encoding);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsMiscellaneousTechnical(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatS(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousTechnical", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatS", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsMiscellaneousTechnical(code);
+    c_retval = xmlUCSIsCatS(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlXPathParserGetContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCatP(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathContextPtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathParserGetContext", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatP", &code))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = ctxt->context;
-    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
+    c_retval = xmlUCSIsCatP(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGValidatePopElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCatalogGetSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlRelaxNGValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
+    const xmlChar * c_retval;
+    xmlChar * sysID;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOO:xmlRelaxNGValidatePopElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogGetSystem", &sysID))
         return(NULL);
-    ctxt = (xmlRelaxNGValidCtxtPtr) PyrelaxNgValidCtxt_Get(pyobj_ctxt);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlRelaxNGValidatePopElement(ctxt, doc, elem);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCatalogGetSystem(sysID);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlShellPrintNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+libxml_xmlUCSIsCatZ(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlShellPrintNode", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatZ", &code))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    xmlShellPrintNode(node);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlUCSIsCatZ(code);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlValidateNMToken(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsSuperscriptsandSubscripts(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlChar * value;
-    int space;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateNMToken", &value, &space))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsSuperscriptsandSubscripts", &code))
         return(NULL);
 
-    c_retval = xmlValidateNMToken(value, space);
+    c_retval = xmlUCSIsSuperscriptsandSubscripts(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlTextReaderReadAttributeValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsTagalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadAttributeValue", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTagalog", &code))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderReadAttributeValue(reader);
+    c_retval = xmlUCSIsTagalog(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsGeorgian(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetDtdElementDesc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlElementPtr c_retval;
+    xmlDtdPtr dtd;
+    PyObject *pyobj_dtd;
+    xmlChar * name;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlGetDtdElementDesc", &pyobj_dtd, &name))
+        return(NULL);
+    dtd = (xmlDtdPtr) PyxmlNode_Get(pyobj_dtd);
+
+    c_retval = xmlGetDtdElementDesc(dtd, name);
+    py_retval = libxml_xmlElementPtrWrap((xmlElementPtr) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlUCSIsPhoneticExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGeorgian", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsPhoneticExtensions", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsGeorgian(code);
+    c_retval = xmlUCSIsPhoneticExtensions(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlParserSetValidate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathCastNodeToString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathCastNodeToString", &pyobj_node))
+        return(NULL);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+
+    c_retval = xmlXPathCastNodeToString(node);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_XPATH_ENABLED */
+PyObject *
+libxml_xmlURISetPort(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    int port;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlURISetPort", &pyobj_URI, &port))
+        return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
+
+    URI->port = port;
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlNamespaceParseNCName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    int validate;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetValidate", &pyobj_ctxt, &validate))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlNamespaceParseNCName", &pyobj_ctxt))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    ctxt->validate = validate;
+    c_retval = xmlNamespaceParseNCName(ctxt);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlInitGlobals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlInitGlobals();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlErrorGetCode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsEthiopic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlErrorPtr Error;
-    PyObject *pyobj_Error;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetCode", &pyobj_Error))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsEthiopic", &code))
         return(NULL);
-    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
 
-    c_retval = Error->code;
+    c_retval = xmlUCSIsEthiopic(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlValidNormalizeAttributeValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlParseFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
-    xmlChar * name;
-    xmlChar * value;
+    htmlDocPtr c_retval;
+    char * filename;
+    char * encoding;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlValidNormalizeAttributeValue", &pyobj_doc, &pyobj_elem, &name, &value))
+    if (!PyArg_ParseTuple(args, (char *)"zz:htmlParseFile", &filename, &encoding))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlValidNormalizeAttributeValue(doc, elem, name, value);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = htmlParseFile(filename, encoding);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlXPathNewContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlDebugCheckDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathContextPtr c_retval;
+    int c_retval;
+    FILE * output;
+    PyObject *pyobj_output;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewContext", &pyobj_doc))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugCheckDocument", &pyobj_output, &pyobj_doc))
         return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlXPathNewContext(doc);
-    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
+    c_retval = xmlDebugCheckDocument(output, doc);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlParsePubidLiteral(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
+    htmlDocPtr c_retval;
+    xmlChar * cur;
+    char * URL;
+    char * encoding;
+    int options;
+
+    if (!PyArg_ParseTuple(args, (char *)"zzzi:htmlReadDoc", &cur, &URL, &encoding, &options))
+        return(NULL);
+
+    c_retval = htmlReadDoc(cur, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
+}
+
+#endif /* LIBXML_HTML_ENABLED */
+PyObject *
+libxml_xmlXPathGetContextPosition(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePubidLiteral", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetContextPosition", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlParsePubidLiteral(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = ctxt->proximityPosition;
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlNewCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlNodeDumpFileFormat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
+    int c_retval;
+    FILE * out;
+    PyObject *pyobj_out;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlChar * name;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    char * encoding;
+    int format;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewCharRef", &pyobj_doc, &name))
+    if (!PyArg_ParseTuple(args, (char *)"OOOzi:htmlNodeDumpFileFormat", &pyobj_out, &pyobj_doc, &pyobj_cur, &encoding, &format))
         return(NULL);
+    out = (FILE *) PyFile_Get(pyobj_out);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlNewCharRef(doc, name);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = htmlNodeDumpFileFormat(out, doc, cur, encoding, format);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsArabic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlTextReaderConstXmlLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int code;
+    const xmlChar * c_retval;
+    xmlTextReaderPtr reader;
+    PyObject *pyobj_reader;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsArabic", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstXmlLang", &pyobj_reader))
         return(NULL);
+    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlUCSIsArabic(code);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlTextReaderConstXmlLang(reader);
+    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsMiscellaneousMathematicalSymbolsB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCherokee(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousMathematicalSymbolsB", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCherokee", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsMiscellaneousMathematicalSymbolsB(code);
+    c_retval = xmlUCSIsCherokee(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlNanoHTTPCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlNodeSetContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
+    xmlChar * content;
 
-    xmlNanoHTTPCleanup();
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetContent", &pyobj_cur, &content))
+        return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+
+    xmlNodeSetContent(cur, content);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlBuildRelativeURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * URI;
-    xmlChar * base;
+libxml_xmlUnlinkNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlBuildRelativeURI", &URI, &base))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlUnlinkNode", &pyobj_cur))
         return(NULL);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlBuildRelativeURI(URI, base);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
+    xmlUnlinkNode(cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlParseQuotedString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlBoolToText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+    const char * c_retval;
+    int boolval;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseQuotedString", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlBoolToText", &boolval))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlParseQuotedString(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlBoolToText(boolval);
+    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlXPathCastStringToNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    double c_retval;
-    xmlChar * val;
+libxml_xmlSetCompressMode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    int mode;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathCastStringToNumber", &val))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlSetCompressMode", &mode))
         return(NULL);
 
-    c_retval = xmlXPathCastStringToNumber(val);
-    py_retval = libxml_doubleWrap((double) c_retval);
-    return(py_retval);
+    xmlSetCompressMode(mode);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlXPathNewCString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlParseDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    char * val;
+    int c_retval;
+    htmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathNewCString", &val))
+    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseDocument", &pyobj_ctxt))
         return(NULL);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNewCString(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
+    c_retval = htmlParseDocument(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_HTML_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlTextReaderIsNamespaceDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+libxml_xmlXPathSubstringFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsNamespaceDecl", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    c_retval = xmlTextReaderIsNamespaceDecl(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
+    xmlXPathSubstringFunction(ctxt, nargs);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlNewNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNsPtr c_retval;
+libxml_xmlDebugDumpNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    FILE * output;
+    PyObject *pyobj_output;
     xmlNodePtr node;
     PyObject *pyobj_node;
-    xmlChar * href;
-    xmlChar * prefix;
+    int depth;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewNs", &pyobj_node, &href, &prefix))
+    if (!PyArg_ParseTuple(args, (char *)"OOi:xmlDebugDumpNode", &pyobj_output, &pyobj_node, &depth))
         return(NULL);
+    output = (FILE *) PyFile_Get(pyobj_output);
     node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlNewNs(node, href, prefix);
-    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
-    return(py_retval);
+    xmlDebugDumpNode(output, node, depth);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
+#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlACatalogResolvePublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCopyDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    xmlChar * pubID;
+    xmlDocPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
+    int recursive;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolvePublic", &pyobj_catal, &pubID))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlCopyDoc", &pyobj_doc, &recursive))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlACatalogResolvePublic(catal, pubID);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    c_retval = xmlCopyDoc(doc, recursive);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlStopParser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCtxtReadMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlDocPtr c_retval;
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
+    char * buffer;
+    int py_buffsize0;
+    int size;
+    char * URL;
+    char * encoding;
+    int options;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlStopParser", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Ot#izzi:xmlCtxtReadMemory", &pyobj_ctxt, &buffer, &py_buffsize0, &size, &URL, &encoding, &options))
         return(NULL);
     ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    xmlStopParser(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
+    c_retval = xmlCtxtReadMemory(ctxt, buffer, size, URL, encoding, options);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    return(py_retval);
 }
 
 PyObject *
-libxml_xmlReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCreateFileParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    int fd;
-    char * URL;
-    char * encoding;
-    int options;
+    xmlParserCtxtPtr c_retval;
+    char * filename;
 
-    if (!PyArg_ParseTuple(args, (char *)"izzi:xmlReadFd", &fd, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlCreateFileParserCtxt", &filename))
         return(NULL);
 
-    c_retval = xmlReadFd(fd, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlCreateFileParserCtxt(filename);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlACatalogResolveSystem(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseSystemLiteral(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    xmlChar * sysID;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolveSystem", &pyobj_catal, &sysID))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseSystemLiteral", &pyobj_ctxt))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlACatalogResolveSystem(catal, sysID);
+    c_retval = xmlParseSystemLiteral(ctxt);
     py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlThrDefParserDebugEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlParseAttributeListDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseAttributeListDecl", &pyobj_ctxt))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+
+    xmlParseAttributeListDecl(ctxt);
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+PyObject *
+libxml_xmlSchemaNewDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    int v;
+    xmlSchemaParserCtxtPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefParserDebugEntities", &v))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaNewDocParserCtxt", &pyobj_doc))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlThrDefParserDebugEntities(v);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlSchemaNewDocParserCtxt(doc);
+    py_retval = libxml_xmlSchemaParserCtxtPtrWrap((xmlSchemaParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlCatalogConvert(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_nodePush(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
+    xmlParserCtxtPtr ctxt;
+    PyObject *pyobj_ctxt;
+    xmlNodePtr value;
+    PyObject *pyobj_value;
 
-    c_retval = xmlCatalogConvert();
+    if (!PyArg_ParseTuple(args, (char *)"OO:nodePush", &pyobj_ctxt, &pyobj_value))
+        return(NULL);
+    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    value = (xmlNodePtr) PyxmlNode_Get(pyobj_value);
+
+    c_retval = nodePush(ctxt, value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_XINCLUDE_ENABLED
 PyObject *
-libxml_xmlValidatePushElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXIncludeProcess(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
     xmlDocPtr doc;
     PyObject *pyobj_doc;
-    xmlNodePtr elem;
-    PyObject *pyobj_elem;
-    xmlChar * qname;
 
-    if (!PyArg_ParseTuple(args, (char *)"OOOz:xmlValidatePushElement", &pyobj_ctxt, &pyobj_doc, &pyobj_elem, &qname))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXIncludeProcess", &pyobj_doc))
         return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
     doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    elem = (xmlNodePtr) PyxmlNode_Get(pyobj_elem);
 
-    c_retval = xmlValidatePushElement(ctxt, doc, elem, qname);
+    c_retval = xmlXIncludeProcess(doc);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XINCLUDE_ENABLED */
+#ifdef LIBXML_REGEXP_ENABLED
 PyObject *
-libxml_xmlUCSIsTaiXuanJingSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRegexpIsDeterminist(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlRegexpPtr comp;
+    PyObject *pyobj_comp;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTaiXuanJingSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRegexpIsDeterminist", &pyobj_comp))
         return(NULL);
+    comp = (xmlRegexpPtr) PyxmlReg_Get(pyobj_comp);
 
-    c_retval = xmlUCSIsTaiXuanJingSymbols(code);
+    c_retval = xmlRegexpIsDeterminist(comp);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_REGEXP_ENABLED */
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_htmlDocDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlNewDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    FILE * f;
-    PyObject *pyobj_f;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
+    htmlDocPtr c_retval;
+    xmlChar * URI;
+    xmlChar * ExternalID;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:htmlDocDump", &pyobj_f, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"zz:htmlNewDoc", &URI, &ExternalID))
         return(NULL);
-    f = (FILE *) PyFile_Get(pyobj_f);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = htmlDocDump(f, cur);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = htmlNewDoc(URI, ExternalID);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
 #endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlUCSIsMusicalSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
+    char * cat;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMusicalSymbols", &code))
+    if (!PyArg_ParseTuple(args, (char *)"iz:xmlUCSIsCat", &code, &cat))
         return(NULL);
 
-    c_retval = xmlUCSIsMusicalSymbols(code);
+    c_retval = xmlUCSIsCat(code, cat);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlTextReaderRelaxNGValidate(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlIsScriptAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    char * rng;
+    xmlChar * name;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderRelaxNGValidate", &pyobj_reader, &rng))
+    if (!PyArg_ParseTuple(args, (char *)"z:htmlIsScriptAttribute", &name))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderRelaxNGValidate(reader, rng);
+    c_retval = htmlIsScriptAttribute(name);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
-libxml_xmlNanoFTPInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    xmlNanoFTPInit();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlFreeNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeNodeList", &pyobj_cur))
-        return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+libxml_xmlInitializePredefinedEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
-    xmlFreeNodeList(cur);
+    xmlInitializePredefinedEntities();
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlCreateEntityParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMiscellaneousTechnical(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
-    xmlChar * URL;
-    xmlChar * ID;
-    xmlChar * base;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlCreateEntityParserCtxt", &URL, &ID, &base))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMiscellaneousTechnical", &code))
         return(NULL);
 
-    c_retval = xmlCreateEntityParserCtxt(URL, ID, base);
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
+    c_retval = xmlUCSIsMiscellaneousTechnical(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlXPathDivValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlShellPrintNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathDivValues", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlShellPrintNode", &pyobj_node))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    xmlXPathDivValues(ctxt);
+    xmlShellPrintNode(node);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
-libxml_xmlRemoveRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNMToken(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlAttrPtr attr;
-    PyObject *pyobj_attr;
+    xmlChar * value;
+    int space;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRemoveRef", &pyobj_doc, &pyobj_attr))
+    if (!PyArg_ParseTuple(args, (char *)"zi:xmlValidateNMToken", &value, &space))
         return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    attr = (xmlAttrPtr) PyxmlNode_Get(pyobj_attr);
 
-    c_retval = xmlRemoveRef(doc, attr);
+    c_retval = xmlValidateNMToken(value, space);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsTelugu(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlErrorGetCode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    xmlErrorPtr Error;
+    PyObject *pyobj_Error;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTelugu", &code))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetCode", &pyobj_Error))
         return(NULL);
+    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
 
-    c_retval = xmlUCSIsTelugu(code);
+    c_retval = Error->code;
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
 PyObject *
-libxml_xmlLsCountNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNameValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlLsCountNode", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNameValue", &value))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlLsCountNode(node);
+    c_retval = xmlValidateNameValue(value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_DEBUG_ENABLED */
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlParseCatalogFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNewContext(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlDocPtr c_retval;
-    char * filename;
+    xmlXPathContextPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseCatalogFile", &filename))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewContext", &pyobj_doc))
         return(NULL);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = xmlParseCatalogFile(filename);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlXPathNewContext(doc);
+    py_retval = libxml_xmlXPathContextPtrWrap((xmlXPathContextPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
+#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlXPathGetFunctionURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRelaxNGNewDocParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
+    xmlRelaxNGParserCtxtPtr c_retval;
+    xmlDocPtr doc;
+    PyObject *pyobj_doc;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathGetFunctionURI", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlRelaxNGNewDocParserCtxt", &pyobj_doc))
         return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
+    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
 
-    c_retval = ctxt->functionURI;
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
+    c_retval = xmlRelaxNGNewDocParserCtxt(doc);
+    py_retval = libxml_xmlRelaxNGParserCtxtPtrWrap((xmlRelaxNGParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlOutputBufferWrite(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlBuildRelativeURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlOutputBufferPtr out;
-    PyObject *pyobj_out;
-    int len;
-    char * buf;
+    xmlChar * c_retval;
+    xmlChar * URI;
+    xmlChar * base;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oiz:xmlOutputBufferWrite", &pyobj_out, &len, &buf))
+    if (!PyArg_ParseTuple(args, (char *)"zz:xmlBuildRelativeURI", &URI, &base))
         return(NULL);
-    out = (xmlOutputBufferPtr) PyoutputBuffer_Get(pyobj_out);
 
-    c_retval = xmlOutputBufferWrite(out, len, buf);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlBuildRelativeURI(URI, base);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlUCSIsCatMn(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlACatalogResolvePublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    xmlChar * pubID;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlACatalogResolvePublic", &pyobj_catal, &pubID))
+        return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+
+    c_retval = xmlACatalogResolvePublic(catal, pubID);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
+PyObject *
+libxml_xmlThrDefParserDebugEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int code;
+    int v;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMn", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlThrDefParserDebugEntities", &v))
         return(NULL);
 
-    c_retval = xmlUCSIsCatMn(code);
+    c_retval = xmlThrDefParserDebugEntities(v);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
-libxml_xmlRelaxNGCleanupTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+libxml_xmlFreeCatalog(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
 
-    xmlRelaxNGCleanupTypes();
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeCatalog", &pyobj_catal))
+        return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+
+    xmlFreeCatalog(catal);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
 PyObject *
-libxml_xmlUCSIsCatMe(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsCJKSymbolsandPunctuation(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCatMe", &code))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCJKSymbolsandPunctuation", &code))
         return(NULL);
 
-    c_retval = xmlUCSIsCatMe(code);
+    c_retval = xmlUCSIsCJKSymbolsandPunctuation(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetLastChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsMusicalSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr parent;
-    PyObject *pyobj_parent;
+    int c_retval;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetLastChild", &pyobj_parent))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMusicalSymbols", &code))
         return(NULL);
-    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
 
-    c_retval = xmlGetLastChild(parent);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = xmlUCSIsMusicalSymbols(code);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlGetEncodingAlias(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlNanoFTPInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+
+    xmlNanoFTPInit();
+    Py_INCREF(Py_None);
+    return(Py_None);
+}
+
+PyObject *
+libxml_xmlURIGetUser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     const char * c_retval;
-    char * alias;
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlGetEncodingAlias", &alias))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetUser", &pyobj_URI))
         return(NULL);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    c_retval = xmlGetEncodingAlias(alias);
+    c_retval = URI->user;
     py_retval = libxml_charPtrConstWrap((const char *) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlACatalogAdd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetLastChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    xmlChar * type;
-    xmlChar * orig;
-    xmlChar * replace;
+    xmlNodePtr c_retval;
+    xmlNodePtr parent;
+    PyObject *pyobj_parent;
 
-    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlACatalogAdd", &pyobj_catal, &type, &orig, &replace))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetLastChild", &pyobj_parent))
         return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
 
-    c_retval = xmlACatalogAdd(catal, type, orig, replace);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlGetLastChild(parent);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
@@ -10209,27 +11885,6 @@ libxml_xmlAddDtdEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlNewNsPropEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-    xmlChar * value;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewNsPropEatName", &pyobj_node, &pyobj_ns, &name, &value))
-        return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
-
-    c_retval = xmlNewNsPropEatName(node, ns, name, value);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlParseNotationDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
@@ -10341,76 +11996,27 @@ libxml_xmlParserInputBufferGrow(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlStrdup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlStrdup", &cur))
-        return(NULL);
-
-    c_retval = xmlStrdup(cur);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XINCLUDE_ENABLED
-PyObject *
-libxml_xmlXIncludeProcessTreeFlags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlNodePtr tree;
-    PyObject *pyobj_tree;
-    int flags;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXIncludeProcessTreeFlags", &pyobj_tree, &flags))
-        return(NULL);
-    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
-
-    c_retval = xmlXIncludeProcessTreeFlags(tree, flags);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XINCLUDE_ENABLED */
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNamespaceURIFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathNextChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlNodePtr c_retval;
     xmlXPathParserContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    int nargs;
+    xmlNodePtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNamespaceURIFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextChild", &pyobj_ctxt, &pyobj_cur))
         return(NULL);
     ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
 
-    xmlXPathNamespaceURIFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlCtxtReadDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:xmlCtxtReadDoc", &pyobj_ctxt, &cur, &URL, &encoding, &options))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlCtxtReadDoc(ctxt, cur, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
+    c_retval = xmlXPathNextChild(ctxt, cur);
+    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
     return(py_retval);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlTextReaderGetParserProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -10444,72 +12050,34 @@ libxml_xmlStrncat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlTextReaderQuoteChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+libxml_xmlXPatherror(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    char * file;
+    int line;
+    int no;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderQuoteChar", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"Ozii:xmlXPatherror", &pyobj_ctxt, &file, &line, &no))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderQuoteChar(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlInitCharEncodingHandlers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlInitCharEncodingHandlers();
+    xmlXPatherror(ctxt, file, line, no);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-PyObject *
-libxml_xmlACatalogResolve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlCatalogPtr catal;
-    PyObject *pyobj_catal;
-    xmlChar * pubID;
-    xmlChar * sysID;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlACatalogResolve", &pyobj_catal, &pubID, &sysID))
-        return(NULL);
-    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
-
-    c_retval = xmlACatalogResolve(catal, pubID, sysID);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_REGEXP_ENABLED
-PyObject *
-libxml_xmlRegexpCompile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlRegexpPtr c_retval;
-    xmlChar * regexp;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlRegexpCompile", &regexp))
-        return(NULL);
-
-    c_retval = xmlRegexpCompile(regexp);
-    py_retval = libxml_xmlRegexpPtrWrap((xmlRegexpPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_REGEXP_ENABLED */
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlParseMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlDocPtr c_retval;
     char * buffer;
+    int py_buffsize0;
     int size;
 
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlParseMemory", &buffer, &size))
+    if (!PyArg_ParseTuple(args, (char *)"t#i:xmlParseMemory", &buffer, &py_buffsize0, &size))
         return(NULL);
 
     c_retval = xmlParseMemory(buffer, size);
@@ -10517,52 +12085,12 @@ libxml_xmlParseMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathNewNodeSet(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlNodePtr val;
-    PyObject *pyobj_val;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNewNodeSet", &pyobj_val))
-        return(NULL);
-    val = (xmlNodePtr) PyxmlNode_Get(pyobj_val);
-
-    c_retval = xmlXPathNewNodeSet(val);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlUCSIsKannada(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsKannada", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsKannada(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderConstValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstValue", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+libxml_xmlCleanupEncodingAliases(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
-    c_retval = xmlTextReaderConstValue(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
+    xmlCleanupEncodingAliases();
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
@@ -10597,14 +12125,6 @@ libxml_xmlUCSIsSmallFormVariants(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
 }
 
 PyObject *
-libxml_docbDefaultSAXHandlerInit(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-
-    docbDefaultSAXHandlerInit();
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlInitParser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
     xmlInitParser();
@@ -10630,24 +12150,6 @@ libxml_xmlXPathStartsWithFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlValidatePushCData(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlValidCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * data;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlValidatePushCData", &pyobj_ctxt, &data, &len))
-        return(NULL);
-    ctxt = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlValidatePushCData(ctxt, data, len);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlSearchNsByHref(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNsPtr c_retval;
@@ -10704,38 +12206,6 @@ libxml_xmlXPathNextPreceding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 #endif /* LIBXML_XPATH_ENABLED */
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathIsNodeType(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * name;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathIsNodeType", &name))
-        return(NULL);
-
-    c_retval = xmlXPathIsNodeType(name);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlURISetScheme(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * scheme;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetScheme", &pyobj_URI, &scheme))
-        return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
-
-    if (URI->scheme != NULL) xmlFree(URI->scheme);
-    URI->scheme = (char *)xmlStrdup((const xmlChar *)scheme);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
 libxml_xmlXPathRegisterAllFunctions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
@@ -10750,68 +12220,23 @@ libxml_xmlXPathRegisterAllFunctions(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlErrorGetDomain(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlErrorPtr Error;
-    PyObject *pyobj_Error;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetDomain", &pyobj_Error))
-        return(NULL);
-    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
-
-    c_retval = Error->domain;
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlCheckFilename(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    char * path;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCheckFilename", &path))
-        return(NULL);
-
-    c_retval = xmlCheckFilename(path);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathFloorFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
+libxml_xmlXPathRegisteredVariablesCleanup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
-    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathFloorFunction", &pyobj_ctxt, &nargs))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRegisteredVariablesCleanup", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    xmlXPathFloorFunction(ctxt, nargs);
+    xmlXPathRegisteredVariablesCleanup(ctxt);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
 PyObject *
-libxml_xmlUCSIsTibetan(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsTibetan", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsTibetan(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlHandleEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
@@ -10828,6 +12253,24 @@ libxml_xmlHandleEntity(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
+PyObject *
+libxml_xmlACatalogResolve(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    xmlChar * c_retval;
+    xmlCatalogPtr catal;
+    PyObject *pyobj_catal;
+    xmlChar * pubID;
+    xmlChar * sysID;
+
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlACatalogResolve", &pyobj_catal, &pubID, &sysID))
+        return(NULL);
+    catal = (xmlCatalogPtr) Pycatalog_Get(pyobj_catal);
+
+    c_retval = xmlACatalogResolve(catal, pubID, sysID);
+    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
+    return(py_retval);
+}
+
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
 libxml_xmlSchemaValidCtxtGetOptions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -10862,24 +12305,6 @@ libxml_xmlParseDTD(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlNewGlobalNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNsPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * href;
-    xmlChar * prefix;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlNewGlobalNs", &pyobj_doc, &href, &prefix))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlNewGlobalNs(doc, href, prefix);
-    py_retval = libxml_xmlNsPtrWrap((xmlNsPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlValidateDocumentFinal(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -10931,25 +12356,6 @@ libxml_xmlTextMerge(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
-#endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathStringLengthFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathStringLengthFunction", &pyobj_ctxt, &nargs))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathStringLengthFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlPrintURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     FILE * stream;
@@ -10967,20 +12373,6 @@ libxml_xmlPrintURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
-PyObject *
-libxml_xmlUCSIsCyrillicSupplement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsCyrillicSupplement", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsCyrillicSupplement(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
 libxml_xmlXPathValueFlipSign(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -11032,20 +12424,6 @@ libxml_xmlParserSetLoadSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlParseURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlURIPtr c_retval;
-    char * str;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlParseURI", &str))
-        return(NULL);
-
-    c_retval = xmlParseURI(str);
-    py_retval = libxml_xmlURIPtrWrap((xmlURIPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlValidateOneNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11073,25 +12451,6 @@ libxml_xmlValidateOneNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 PyObject *
-libxml_xmlCopyProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlAttrPtr c_retval;
-    xmlNodePtr target;
-    PyObject *pyobj_target;
-    xmlAttrPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlCopyProp", &pyobj_target, &pyobj_cur))
-        return(NULL);
-    target = (xmlNodePtr) PyxmlNode_Get(pyobj_target);
-    cur = (xmlAttrPtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlCopyProp(target, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlReplaceNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
@@ -11164,22 +12523,6 @@ libxml_xmlXPathMultValues(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlURIGetPort(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetPort", &pyobj_URI))
-        return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
-
-    c_retval = URI->port;
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
 libxml_xmlSchemaDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -11213,25 +12556,6 @@ libxml_xmlParseFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlSaveFile(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"zO:htmlSaveFile", &filename, &pyobj_cur))
-        return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = htmlSaveFile(filename, cur);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
 PyObject *
 libxml_xmlParseEndTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
@@ -11247,78 +12571,6 @@ libxml_xmlParseEndTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlDocDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    FILE * f;
-    PyObject *pyobj_f;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDocDump", &pyobj_f, &pyobj_cur))
-        return(NULL);
-    f = (FILE *) PyFile_Get(pyobj_f);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlDocDump(f, cur);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlURIGetFragment(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const char * c_retval;
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlURIGetFragment", &pyobj_URI))
-        return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
-
-    c_retval = URI->fragment;
-    py_retval = libxml_charPtrConstWrap((const char *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderCurrentDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDocPtr c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderCurrentDoc", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderCurrentDoc(reader);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNextSelf(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextSelf", &pyobj_ctxt, &pyobj_cur))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlXPathNextSelf(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
 libxml_xmlUCSIsHanunoo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11333,38 +12585,6 @@ libxml_xmlUCSIsHanunoo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlParsePITarget(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePITarget", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlParsePITarget(ctxt);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlURISetOpaque(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr URI;
-    PyObject *pyobj_URI;
-    char * opaque;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetOpaque", &pyobj_URI, &opaque))
-        return(NULL);
-    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
-
-    if (URI->opaque != NULL) xmlFree(URI->opaque);
-    URI->opaque = (char *)xmlStrdup((const xmlChar *)opaque);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlParserSetLineNumbers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
@@ -11424,37 +12644,6 @@ libxml_xmlNodeSetContentLen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlNewNodeEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNewNodeEatName", &pyobj_ns, &name))
-        return(NULL);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
-
-    c_retval = xmlNewNodeEatName(ns, name);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlIsCombining(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    unsigned int ch;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsCombining", &ch))
-        return(NULL);
-
-    c_retval = xmlIsCombining(ch);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlThrDefPedanticParserDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11468,57 +12657,6 @@ libxml_xmlThrDefPedanticParserDefaultValue(PyObject *self ATTRIBUTE_UNUSED, PyOb
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlReadFd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    htmlDocPtr c_retval;
-    int fd;
-    char * URL;
-    char * encoding;
-    int options;
-
-    if (!PyArg_ParseTuple(args, (char *)"izzi:htmlReadFd", &fd, &URL, &encoding, &options))
-        return(NULL);
-
-    c_retval = htmlReadFd(fd, URL, encoding, options);
-    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlTextReaderNormalization(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNormalization", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderNormalization(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlStrncatNew(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"zzi:xmlStrncatNew", &str1, &str2, &len))
-        return(NULL);
-
-    c_retval = xmlStrncatNew(str1, str2, len);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
 PyObject *
 libxml_xmlUTF8Strpos(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -11535,38 +12673,6 @@ libxml_xmlUTF8Strpos(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlCatalogResolvePublic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * pubID;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlCatalogResolvePublic", &pubID))
-        return(NULL);
-
-    c_retval = xmlCatalogResolvePublic(pubID);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNewCDataBlock(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * content;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozi:xmlNewCDataBlock", &pyobj_doc, &content, &len))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlNewCDataBlock(doc, content, len);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUnsetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11586,90 +12692,26 @@ libxml_xmlUnsetNsProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlNamespaceParseNSDef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNamespaceParseNSDef", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlNamespaceParseNSDef(ctxt);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlSaveFileFormat(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    char * filename;
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-    char * encoding;
-    int format;
-
-    if (!PyArg_ParseTuple(args, (char *)"zOzi:htmlSaveFileFormat", &filename, &pyobj_cur, &encoding, &format))
-        return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = htmlSaveFileFormat(filename, cur, encoding, format);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlParserGetWellFormed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlXPathRegisterNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlParserCtxtPtr ctxt;
+    xmlXPathContextPtr ctxt;
     PyObject *pyobj_ctxt;
+    xmlChar * prefix;
+    xmlChar * ns_uri;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParserGetWellFormed", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = ctxt->wellFormed;
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNodeIsText(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeIsText", &pyobj_node))
+    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlXPathRegisterNs", &pyobj_ctxt, &prefix, &ns_uri))
         return(NULL);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
+    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
 
-    c_retval = xmlNodeIsText(node);
+    c_retval = xmlXPathRegisterNs(ctxt, prefix, ns_uri);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlParserSetReplaceEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int replaceEntities;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlParserSetReplaceEntities", &pyobj_ctxt, &replaceEntities))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    ctxt->replaceEntities = replaceEntities;
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlUCSIsCurrencySymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -11686,41 +12728,6 @@ libxml_xmlUCSIsCurrencySymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlXPathVariableLookup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlXPathContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * name;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlXPathVariableLookup", &pyobj_ctxt, &name))
-        return(NULL);
-    ctxt = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctxt);
-
-    c_retval = xmlXPathVariableLookup(ctxt, name);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathStringEvalNumber(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    double c_retval;
-    xmlChar * str;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlXPathStringEvalNumber", &str))
-        return(NULL);
-
-    c_retval = xmlXPathStringEvalNumber(str);
-    py_retval = libxml_doubleWrap((double) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
 libxml_xmlXPathCmpNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11740,21 +12747,6 @@ libxml_xmlXPathCmpNodes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 #endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlUTF8Strsize(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * utf;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlUTF8Strsize", &utf, &len))
-        return(NULL);
-
-    c_retval = xmlUTF8Strsize(utf, len);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_XPATH_ENABLED
 PyObject *
 libxml_xmlXPathVariableLookupNS(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -11828,22 +12820,6 @@ libxml_xmlIsMixedElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlTextReaderStandalone(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderStandalone", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderStandalone(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUCSIsMiscellaneousSymbolsandArrows(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -11857,101 +12833,6 @@ libxml_xmlUCSIsMiscellaneousSymbolsandArrows(PyObject *self ATTRIBUTE_UNUSED, Py
     return(py_retval);
 }
 
-PyObject *
-libxml_xmlParseStartTag(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParseStartTag", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlParseStartTag(ctxt);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlSetupParserForBuffer(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlChar * buffer;
-    char * filename;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozz:xmlSetupParserForBuffer", &pyobj_ctxt, &buffer, &filename))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    xmlSetupParserForBuffer(ctxt, buffer, filename);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlNewTextReaderFilename(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    char * URI;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNewTextReaderFilename", &URI))
-        return(NULL);
-
-    c_retval = xmlNewTextReaderFilename(URI);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNumberFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNumberFunction", &pyobj_ctxt, &nargs))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathNumberFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlUCSIsBoxDrawing(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsBoxDrawing", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsBoxDrawing(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathOrderDocElems(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    long c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathOrderDocElems", &pyobj_doc))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlXPathOrderDocElems(doc);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 #ifdef LIBXML_HTML_ENABLED
 PyObject *
 libxml_htmlNodeDumpFormatOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
@@ -11976,39 +12857,6 @@ libxml_htmlNodeDumpFormatOutput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 #endif /* LIBXML_HTML_ENABLED */
-#ifdef LIBXML_DEBUG_ENABLED
-PyObject *
-libxml_xmlLsOneNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlNodePtr node;
-    PyObject *pyobj_node;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlLsOneNode", &pyobj_output, &pyobj_node))
-        return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
-
-    xmlLsOneNode(output, node);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_DEBUG_ENABLED */
-PyObject *
-libxml_xmlUCSIsGreekExtended(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGreekExtended", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsGreekExtended(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 PyObject *
 libxml_xmlParseExternalSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
@@ -12026,27 +12874,6 @@ libxml_xmlParseExternalSubset(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlNewDocNodeEatName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-    xmlChar * name;
-    xmlChar * content;
-
-    if (!PyArg_ParseTuple(args, (char *)"OOzz:xmlNewDocNodeEatName", &pyobj_doc, &pyobj_ns, &name, &content))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
-
-    c_retval = xmlNewDocNodeEatName(doc, ns, name, content);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlURIGetOpaque(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     const char * c_retval;
@@ -12063,38 +12890,6 @@ libxml_xmlURIGetOpaque(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlStrndup(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * cur;
-    int len;
-
-    if (!PyArg_ParseTuple(args, (char *)"zi:xmlStrndup", &cur, &len))
-        return(NULL);
-
-    c_retval = xmlStrndup(cur, len);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlReaderForDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
-
-    if (!PyArg_ParseTuple(args, (char *)"zzzi:xmlReaderForDoc", &cur, &URL, &encoding, &options))
-        return(NULL);
-
-    c_retval = xmlReaderForDoc(cur, URL, encoding, options);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlTextReaderReadInnerXml(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
@@ -12156,20 +12951,6 @@ libxml_xmlUCSIsThaana(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlUCSIsMyanmar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsMyanmar", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsMyanmar(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlStrsub(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlChar * c_retval;
@@ -12185,52 +12966,6 @@ libxml_xmlStrsub(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathConcatFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathConcatFunction", &pyobj_ctxt, &nargs))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathConcatFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlNodeSetName(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-    xmlChar * name;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlNodeSetName", &pyobj_cur, &name))
-        return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    xmlNodeSetName(cur, name);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlValidCtxtPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeValidCtxt", &pyobj_cur))
-        return(NULL);
-    cur = (xmlValidCtxtPtr) PyValidCtxt_Get(pyobj_cur);
-
-    xmlFreeValidCtxt(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
 PyObject *
 libxml_xmlUCSIsYiRadicals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -12245,74 +12980,6 @@ libxml_xmlUCSIsYiRadicals(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathRoot(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathRoot", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathRoot(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNextFollowing(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextFollowing", &pyobj_ctxt, &pyobj_cur))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlXPathNextFollowing(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlValidateNameValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * value;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNameValue", &value))
-        return(NULL);
-
-    c_retval = xmlValidateNameValue(value);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathSubstringBeforeFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringBeforeFunction", &pyobj_ctxt, &nargs))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathSubstringBeforeFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlCleanupPredefinedEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
@@ -12321,20 +12988,6 @@ libxml_xmlCleanupPredefinedEntities(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
     return(Py_None);
 }
 
-PyObject *
-libxml_xmlUCSIsHangulCompatibilityJamo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHangulCompatibilityJamo", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsHangulCompatibilityJamo(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 #ifdef LIBXML_SCHEMAS_ENABLED
 PyObject *
 libxml_xmlSchemaInitTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
@@ -12345,22 +12998,6 @@ libxml_xmlSchemaInitTypes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIB
 }
 
 #endif /* LIBXML_SCHEMAS_ENABLED */
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNodeSetFreeNs(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlNsPtr ns;
-    PyObject *pyobj_ns;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXPathNodeSetFreeNs", &pyobj_ns))
-        return(NULL);
-    ns = (xmlNsPtr) PyxmlNode_Get(pyobj_ns);
-
-    xmlXPathNodeSetFreeNs(ns);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlParseElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
@@ -12376,83 +13013,15 @@ libxml_xmlParseElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlAddChild(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlNodePtr parent;
-    PyObject *pyobj_parent;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlAddChild", &pyobj_parent, &pyobj_cur))
-        return(NULL);
-    parent = (xmlNodePtr) PyxmlNode_Get(pyobj_parent);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlAddChild(parent, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathErr(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int error;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathErr", &pyobj_ctxt, &error))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathErr(ctxt, error);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlTextReaderDepth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderDepth", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderDepth(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNanoFTPProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    char * host;
-    int port;
-    char * user;
-    char * passwd;
-    int type;
-
-    if (!PyArg_ParseTuple(args, (char *)"zizzi:xmlNanoFTPProxy", &host, &port, &user, &passwd, &type))
-        return(NULL);
-
-    xmlNanoFTPProxy(host, port, user, passwd, type);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlLineNumbersDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlUCSIsOriya(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    int val;
+    int code;
 
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlLineNumbersDefault", &val))
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsOriya", &code))
         return(NULL);
 
-    c_retval = xmlLineNumbersDefault(val);
+    c_retval = xmlUCSIsOriya(code);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
@@ -12473,53 +13042,23 @@ libxml_xmlParseVersionInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
+#ifdef LIBXML_XPATH_ENABLED
 PyObject *
-libxml_xmlUCSIsHiragana(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsHiragana", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsHiragana(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_SCHEMAS_ENABLED
-PyObject *
-libxml_xmlRelaxNGDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlRelaxNGPtr schema;
-    PyObject *pyobj_schema;
+libxml_xmlXPathSubstringBeforeFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlXPathParserContextPtr ctxt;
+    PyObject *pyobj_ctxt;
+    int nargs;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlRelaxNGDump", &pyobj_output, &pyobj_schema))
+    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathSubstringBeforeFunction", &pyobj_ctxt, &nargs))
         return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    schema = (xmlRelaxNGPtr) PyrelaxNgSchema_Get(pyobj_schema);
+    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
 
-    xmlRelaxNGDump(output, schema);
+    xmlXPathSubstringBeforeFunction(ctxt, nargs);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
-#endif /* LIBXML_SCHEMAS_ENABLED */
-PyObject *
-libxml_xmlIOHTTPMatch(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    char * filename;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlIOHTTPMatch", &filename))
-        return(NULL);
-
-    c_retval = xmlIOHTTPMatch(filename);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
+#endif /* LIBXML_XPATH_ENABLED */
 PyObject *
 libxml_xmlRegisterHTTPPostCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
 
@@ -12529,20 +13068,6 @@ libxml_xmlRegisterHTTPPostCallbacks(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
 }
 
 PyObject *
-libxml_xmlFreeURI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlURIPtr uri;
-    PyObject *pyobj_uri;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeURI", &pyobj_uri))
-        return(NULL);
-    uri = (xmlURIPtr) PyURI_Get(pyobj_uri);
-
-    xmlFreeURI(uri);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlSetTreeDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlNodePtr tree;
     PyObject *pyobj_tree;
@@ -12560,22 +13085,6 @@ libxml_xmlSetTreeDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlTextReaderConstPrefix(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    const xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderConstPrefix", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderConstPrefix(reader);
-    py_retval = libxml_xmlCharPtrConstWrap((const xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlCopyNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     xmlNodePtr c_retval;
@@ -12591,27 +13100,24 @@ libxml_xmlCopyNodeList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
+#ifdef LIBXML_HTML_ENABLED
 PyObject *
-libxml_xmlXPathNextParent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_htmlParseCharRef(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    xmlNodePtr c_retval;
-    xmlXPathParserContextPtr ctxt;
+    int c_retval;
+    htmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlXPathNextParent", &pyobj_ctxt, &pyobj_cur))
+    if (!PyArg_ParseTuple(args, (char *)"O:htmlParseCharRef", &pyobj_ctxt))
         return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
+    ctxt = (htmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
 
-    c_retval = xmlXPathNextParent(ctxt, cur);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
+    c_retval = htmlParseCharRef(ctxt);
+    py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
-#endif /* LIBXML_XPATH_ENABLED */
+#endif /* LIBXML_HTML_ENABLED */
 PyObject *
 libxml_xmlUCSIsAegeanNumbers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -12627,96 +13133,16 @@ libxml_xmlUCSIsAegeanNumbers(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlUCSIsDevanagari(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsDevanagari", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsDevanagari(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNodeGetContent(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetContent", &pyobj_cur))
-        return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlNodeGetContent(cur);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNormalizeWindowsPath(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlChar * path;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNormalizeWindowsPath", &path))
-        return(NULL);
-
-    c_retval = xmlNormalizeWindowsPath(path);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderIsEmptyElement(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderIsEmptyElement", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderIsEmptyElement(reader);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_SCHEMAS_ENABLED
-PyObject *
-libxml_xmlSchemaNewValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlSchemaValidCtxtPtr c_retval;
-    xmlSchemaPtr schema;
-    PyObject *pyobj_schema;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlSchemaNewValidCtxt", &pyobj_schema))
-        return(NULL);
-    schema = (xmlSchemaPtr) PySchema_Get(pyobj_schema);
-
-    c_retval = xmlSchemaNewValidCtxt(schema);
-    py_retval = libxml_xmlSchemaValidCtxtPtrWrap((xmlSchemaValidCtxtPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_SCHEMAS_ENABLED */
-PyObject *
-libxml_xmlErrorGetLevel(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlRecoverDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlErrorPtr Error;
-    PyObject *pyobj_Error;
+    xmlDocPtr c_retval;
+    xmlChar * cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlErrorGetLevel", &pyobj_Error))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlRecoverDoc", &cur))
         return(NULL);
-    Error = (xmlErrorPtr) PyError_Get(pyobj_Error);
 
-    c_retval = Error->level;
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlRecoverDoc(cur);
+    py_retval = libxml_xmlDocPtrWrap((xmlDocPtr) c_retval);
     return(py_retval);
 }
 
@@ -12734,37 +13160,6 @@ libxml_xmlCheckUTF8(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_XPATH_ENABLED
-PyObject *
-libxml_xmlXPathNotFunction(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlXPathParserContextPtr ctxt;
-    PyObject *pyobj_ctxt;
-    int nargs;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oi:xmlXPathNotFunction", &pyobj_ctxt, &nargs))
-        return(NULL);
-    ctxt = (xmlXPathParserContextPtr) PyxmlXPathParserContext_Get(pyobj_ctxt);
-
-    xmlXPathNotFunction(ctxt, nargs);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_XPATH_ENABLED */
-PyObject *
-libxml_xmlUCSIsIPAExtensions(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsIPAExtensions", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsIPAExtensions(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
 PyObject *
 libxml_xmlUCSIsOldItalic(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -12842,181 +13237,53 @@ libxml_xmlUCSIsIdeographicDescriptionCharacters(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 PyObject *
-libxml_xmlFreeDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlDocPtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeDoc", &pyobj_cur))
-        return(NULL);
-    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
-
-    xmlFreeDoc(cur);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlUCSIsYiSyllables(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsYiSyllables", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsYiSyllables(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderLookupNamespace(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * prefix;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlTextReaderLookupNamespace", &pyobj_reader, &prefix))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderLookupNamespace(reader, prefix);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNodeGetLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlNodePtr cur;
-    PyObject *pyobj_cur;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlNodeGetLang", &pyobj_cur))
-        return(NULL);
-    cur = (xmlNodePtr) PyxmlNode_Get(pyobj_cur);
-
-    c_retval = xmlNodeGetLang(cur);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNewParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) {
-    PyObject *py_retval;
-    xmlParserCtxtPtr c_retval;
-
-    c_retval = xmlNewParserCtxt();
-    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNanoFTPScanProxy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    char * URL;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlNanoFTPScanProxy", &URL))
-        return(NULL);
-
-    xmlNanoFTPScanProxy(URL);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
-libxml_xmlValidateNmtokensValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * value;
-
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNmtokensValue", &value))
-        return(NULL);
-
-    c_retval = xmlValidateNmtokensValue(value);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlTextReaderNextSibling(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlGetLineNo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
+    long c_retval;
+    xmlNodePtr node;
+    PyObject *pyobj_node;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderNextSibling", &pyobj_reader))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlGetLineNo", &pyobj_node))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
+    node = (xmlNodePtr) PyxmlNode_Get(pyobj_node);
 
-    c_retval = xmlTextReaderNextSibling(reader);
+    c_retval = xmlGetLineNo(node);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
 
 PyObject *
-libxml_xmlClearParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
+libxml_xmlURISetUser(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlURIPtr URI;
+    PyObject *pyobj_URI;
+    char * user;
 
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlClearParserCtxt", &pyobj_ctxt))
+    if (!PyArg_ParseTuple(args, (char *)"Oz:xmlURISetUser", &pyobj_URI, &user))
         return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
+    URI = (xmlURIPtr) PyURI_Get(pyobj_URI);
 
-    xmlClearParserCtxt(ctxt);
+    if (URI->user != NULL) xmlFree(URI->user);
+    URI->user = (char *)xmlStrdup((const xmlChar *)user);
     Py_INCREF(Py_None);
     return(Py_None);
 }
 
 PyObject *
-libxml_xmlTextReaderReadString(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar * c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderReadString", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderReadString(reader);
-    py_retval = libxml_xmlCharPtrWrap((xmlChar *) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlStrlen(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlCreateEntityParserCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
-    int c_retval;
-    xmlChar * str;
+    xmlParserCtxtPtr c_retval;
+    xmlChar * URL;
+    xmlChar * ID;
+    xmlChar * base;
 
-    if (!PyArg_ParseTuple(args, (char *)"z:xmlStrlen", &str))
+    if (!PyArg_ParseTuple(args, (char *)"zzz:xmlCreateEntityParserCtxt", &URL, &ID, &base))
         return(NULL);
 
-    c_retval = xmlStrlen(str);
-    py_retval = libxml_intWrap((int) c_retval);
+    c_retval = xmlCreateEntityParserCtxt(URL, ID, base);
+    py_retval = libxml_xmlParserCtxtPtrWrap((xmlParserCtxtPtr) c_retval);
     return(py_retval);
 }
 
-#ifdef LIBXML_DEBUG_ENABLED
-PyObject *
-libxml_xmlDebugDumpDocument(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * output;
-    PyObject *pyobj_output;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-
-    if (!PyArg_ParseTuple(args, (char *)"OO:xmlDebugDumpDocument", &pyobj_output, &pyobj_doc))
-        return(NULL);
-    output = (FILE *) PyFile_Get(pyobj_output);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    xmlDebugDumpDocument(output, doc);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-#endif /* LIBXML_DEBUG_ENABLED */
 PyObject *
 libxml_xmlThrDefSaveNoEmptyTags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -13048,25 +13315,6 @@ libxml_xmlTextReaderGetAttribute(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
     return(py_retval);
 }
 
-#ifdef LIBXML_XPTR_ENABLED
-PyObject *
-libxml_xmlXPtrEval(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlXPathObjectPtr c_retval;
-    xmlChar * str;
-    xmlXPathContextPtr ctx;
-    PyObject *pyobj_ctx;
-
-    if (!PyArg_ParseTuple(args, (char *)"zO:xmlXPtrEval", &str, &pyobj_ctx))
-        return(NULL);
-    ctx = (xmlXPathContextPtr) PyxmlXPathContext_Get(pyobj_ctx);
-
-    c_retval = xmlXPtrEval(str, ctx);
-    py_retval = libxml_xmlXPathObjectPtrWrap((xmlXPathObjectPtr) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XPTR_ENABLED */
 PyObject *
 libxml_xmlKeepBlanksDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -13082,22 +13330,6 @@ libxml_xmlKeepBlanksDefault(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlPopInput(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlChar c_retval;
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlPopInput", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    c_retval = xmlPopInput(ctxt);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUCSIsSupplementaryPrivateUseAreaB(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -13142,19 +13374,15 @@ libxml_xmlTextReaderCurrentNode(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 PyObject *
-libxml_xmlTextReaderSetParserProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libxml_xmlValidateNmtokensValue(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    int prop;
-    int value;
+    xmlChar * value;
 
-    if (!PyArg_ParseTuple(args, (char *)"Oii:xmlTextReaderSetParserProp", &pyobj_reader, &prop, &value))
+    if (!PyArg_ParseTuple(args, (char *)"z:xmlValidateNmtokensValue", &value))
         return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
 
-    c_retval = xmlTextReaderSetParserProp(reader, prop, value);
+    c_retval = xmlValidateNmtokensValue(value);
     py_retval = libxml_intWrap((int) c_retval);
     return(py_retval);
 }
@@ -13188,22 +13416,6 @@ libxml_xmlUCSIsLetterlikeSymbols(PyObject *self ATTRIBUTE_UNUSED, PyObject *args
 }
 
 PyObject *
-libxml_xmlTextReaderGetRemainder(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlParserInputBufferPtr c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlTextReaderGetRemainder", &pyobj_reader))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlTextReaderGetRemainder(reader);
-    py_retval = libxml_xmlParserInputBufferPtrWrap((xmlParserInputBufferPtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlUCSIsCatZp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -13246,20 +13458,6 @@ libxml_xmlUCSIsCatZl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlUCSIsGujarati(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    int code;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlUCSIsGujarati", &code))
-        return(NULL);
-
-    c_retval = xmlUCSIsGujarati(code);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlACatalogRemove(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -13276,59 +13474,6 @@ libxml_xmlACatalogRemove(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(py_retval);
 }
 
-#ifdef LIBXML_HTML_ENABLED
-PyObject *
-libxml_htmlSetMetaEncoding(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    htmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * encoding;
-
-    if (!PyArg_ParseTuple(args, (char *)"Oz:htmlSetMetaEncoding", &pyobj_doc, &encoding))
-        return(NULL);
-    doc = (htmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = htmlSetMetaEncoding(doc, encoding);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_HTML_ENABLED */
-PyObject *
-libxml_xmlReaderNewDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlTextReaderPtr reader;
-    PyObject *pyobj_reader;
-    xmlChar * cur;
-    char * URL;
-    char * encoding;
-    int options;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozzzi:xmlReaderNewDoc", &pyobj_reader, &cur, &URL, &encoding, &options))
-        return(NULL);
-    reader = (xmlTextReaderPtr) PyxmlTextReader_Get(pyobj_reader);
-
-    c_retval = xmlReaderNewDoc(reader, cur, URL, encoding, options);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlParsePI(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    xmlParserCtxtPtr ctxt;
-    PyObject *pyobj_ctxt;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlParsePI", &pyobj_ctxt))
-        return(NULL);
-    ctxt = (xmlParserCtxtPtr) PyparserCtxt_Get(pyobj_ctxt);
-
-    xmlParsePI(ctxt);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
 PyObject *
 libxml_xmlUnsetProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     PyObject *py_retval;
@@ -13395,54 +13540,6 @@ libxml_xmlSetProp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlReaderWalker(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlReaderWalker", &pyobj_doc))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlReaderWalker(doc);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
-    return(py_retval);
-}
-
-#ifdef LIBXML_XINCLUDE_ENABLED
-PyObject *
-libxml_xmlXIncludeProcessTree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlNodePtr tree;
-    PyObject *pyobj_tree;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlXIncludeProcessTree", &pyobj_tree))
-        return(NULL);
-    tree = (xmlNodePtr) PyxmlNode_Get(pyobj_tree);
-
-    c_retval = xmlXIncludeProcessTree(tree);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-#endif /* LIBXML_XINCLUDE_ENABLED */
-PyObject *
-libxml_xmlCatalogDump(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    FILE * out;
-    PyObject *pyobj_out;
-
-    if (!PyArg_ParseTuple(args, (char *)"O:xmlCatalogDump", &pyobj_out))
-        return(NULL);
-    out = (FILE *) PyFile_Get(pyobj_out);
-
-    xmlCatalogDump(out);
-    Py_INCREF(Py_None);
-    return(Py_None);
-}
-
-PyObject *
 libxml_xmlNodeSetLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlNodePtr cur;
     PyObject *pyobj_cur;
@@ -13458,36 +13555,17 @@ libxml_xmlNodeSetLang(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 PyObject *
-libxml_xmlStrcasecmp(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    xmlChar * str1;
-    xmlChar * str2;
-
-    if (!PyArg_ParseTuple(args, (char *)"zz:xmlStrcasecmp", &str1, &str2))
-        return(NULL);
-
-    c_retval = xmlStrcasecmp(str1, str2);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlReaderForMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlTextReaderPtr c_retval;
-    char * buffer;
-    int size;
-    char * URL;
-    char * encoding;
-    int options;
+libxml_xmlFreeDoc(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    xmlDocPtr cur;
+    PyObject *pyobj_cur;
 
-    if (!PyArg_ParseTuple(args, (char *)"zizzi:xmlReaderForMemory", &buffer, &size, &URL, &encoding, &options))
+    if (!PyArg_ParseTuple(args, (char *)"O:xmlFreeDoc", &pyobj_cur))
         return(NULL);
+    cur = (xmlDocPtr) PyxmlNode_Get(pyobj_cur);
 
-    c_retval = xmlReaderForMemory(buffer, size, URL, encoding, options);
-    py_retval = libxml_xmlTextReaderPtrWrap((xmlTextReaderPtr) c_retval);
-    return(py_retval);
+    xmlFreeDoc(cur);
+    Py_INCREF(Py_None);
+    return(Py_None);
 }
 
 #ifdef LIBXML_XPATH_ENABLED
@@ -13521,39 +13599,6 @@ libxml_xmlUCSIsLinearBSyllabary(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 PyObject *
-libxml_xmlIsBaseChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    int c_retval;
-    unsigned int ch;
-
-    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsBaseChar", &ch))
-        return(NULL);
-
-    c_retval = xmlIsBaseChar(ch);
-    py_retval = libxml_intWrap((int) c_retval);
-    return(py_retval);
-}
-
-PyObject *
-libxml_xmlNewDtd(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-    PyObject *py_retval;
-    xmlDtdPtr c_retval;
-    xmlDocPtr doc;
-    PyObject *pyobj_doc;
-    xmlChar * name;
-    xmlChar * ExternalID;
-    xmlChar * SystemID;
-
-    if (!PyArg_ParseTuple(args, (char *)"Ozzz:xmlNewDtd", &pyobj_doc, &name, &ExternalID, &SystemID))
-        return(NULL);
-    doc = (xmlDocPtr) PyxmlNode_Get(pyobj_doc);
-
-    c_retval = xmlNewDtd(doc, name, ExternalID, SystemID);
-    py_retval = libxml_xmlNodePtrWrap((xmlNodePtr) c_retval);
-    return(py_retval);
-}
-
-PyObject *
 libxml_xmlParseDocTypeDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     xmlParserCtxtPtr ctxt;
     PyObject *pyobj_ctxt;
@@ -13567,3 +13612,17 @@ libxml_xmlParseDocTypeDecl(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     return(Py_None);
 }
 
+PyObject *
+libxml_xmlIsBaseChar(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    PyObject *py_retval;
+    int c_retval;
+    unsigned int ch;
+
+    if (!PyArg_ParseTuple(args, (char *)"i:xmlIsBaseChar", &ch))
+        return(NULL);
+
+    c_retval = xmlIsBaseChar(ch);
+    py_retval = libxml_intWrap((int) c_retval);
+    return(py_retval);
+}
+
diff --git a/python/setup.py b/python/setup.py
index 75bf340..dd8aa76 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -226,7 +226,7 @@ else:
 setup (name = "libxml2-python",
        # On *nix, the version number is created from setup.py.in
        # On windows, it is set by configure.js
-       version = "2.6.16",
+       version = "2.6.17",
        description = descr,
        author = "Daniel Veillard",
        author_email = "veillard@redhat.com",
diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in
index 9113a20..d13d845 100644
--- a/python/tests/Makefile.in
+++ b/python/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33,6 +33,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = python/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -109,6 +110,8 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MODULE_EXTENSION = @MODULE_EXTENSION@
+MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@
 MV = @MV@
 M_LIBS = @M_LIBS@
 OBJDUMP = @OBJDUMP@
@@ -142,6 +145,7 @@ TEST_C14N = @TEST_C14N@
 TEST_CATALOG = @TEST_CATALOG@
 TEST_DEBUG = @TEST_DEBUG@
 TEST_HTML = @TEST_HTML@
+TEST_MODULES = @TEST_MODULES@
 TEST_PHTML = @TEST_PHTML@
 TEST_PUSH = @TEST_PUSH@
 TEST_REGEXPS = @TEST_REGEXPS@
@@ -171,6 +175,7 @@ WITH_ICONV = @WITH_ICONV@
 WITH_ISO8859X = @WITH_ISO8859X@
 WITH_LEGACY = @WITH_LEGACY@
 WITH_MEM_DEBUG = @WITH_MEM_DEBUG@
+WITH_MODULES = @WITH_MODULES@
 WITH_OUTPUT = @WITH_OUTPUT@
 WITH_PATTERN = @WITH_PATTERN@
 WITH_PUSH = @WITH_PUSH@
@@ -219,6 +224,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -394,7 +401,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"