diff options
| author | Mike Hommey <glandium@debian.org> | 2008-01-19 17:16:58 +0100 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2008-01-19 17:16:58 +0100 |
| commit | fc760252aba4054a612dd20b803d0c7c19713064 (patch) | |
| tree | 088f8e29a5ed82c5417869894c17ba72f715d7a6 /doc | |
| parent | c69572cb9f2467259a73de64c08e141f21f17fa8 (diff) | |
| download | libxml2-fc760252aba4054a612dd20b803d0c7c19713064.tar.gz | |
Load /tmp/libxml2-2.6.31 intoupstream/2.6.31.dfsg
libxml2/branches/upstream/current.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.in | 142 | ||||
| -rw-r--r-- | doc/devhelp/Makefile.in | 95 | ||||
| -rw-r--r-- | doc/devhelp/libxml2-valid.html | 2 | ||||
| -rw-r--r-- | doc/examples/Makefile.in | 195 | ||||
| -rw-r--r-- | doc/examples/examples.xml | 729 | ||||
| -rw-r--r-- | doc/libxml2-api.xml | 10 | ||||
| -rw-r--r-- | doc/libxml2.xsa | 37 | ||||
| -rw-r--r-- | doc/news.html | 19 | ||||
| -rw-r--r-- | doc/xml.html | 20 |
9 files changed, 484 insertions, 765 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 56ec810..2310c52 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,21 +45,22 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -100,12 +97,14 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ HTML_OBJ = @HTML_OBJ@ HTTP_OBJ = @HTTP_OBJ@ ICONV_LIBS = @ICONV_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -124,6 +123,7 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MODULE_EXTENSION = @MODULE_EXTENSION@ MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@ MV = @MV@ @@ -196,8 +196,6 @@ WITH_MODULES = @WITH_MODULES@ WITH_OUTPUT = @WITH_OUTPUT@ WITH_PATTERN = @WITH_PATTERN@ WITH_PUSH = @WITH_PUSH@ -WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ -WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_READER = @WITH_READER@ WITH_REGEXPS = @WITH_REGEXPS@ WITH_RUN_DEBUG = @WITH_RUN_DEBUG@ @@ -207,8 +205,6 @@ WITH_SCHEMATRON = @WITH_SCHEMATRON@ WITH_THREADS = @WITH_THREADS@ WITH_TREE = @WITH_TREE@ WITH_TRIO = @WITH_TRIO@ -WITH_TRIO_SOURCES_FALSE = @WITH_TRIO_SOURCES_FALSE@ -WITH_TRIO_SOURCES_TRUE = @WITH_TRIO_SOURCES_TRUE@ WITH_VALID = @WITH_VALID@ WITH_WRITER = @WITH_WRITER@ WITH_XINCLUDE = @WITH_XINCLUDE@ @@ -227,19 +223,13 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -251,29 +241,40 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = devhelp examples # The top-level SGML file. @@ -338,13 +339,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -419,8 +416,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -521,23 +517,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/html $(distdir)/tutorial $(distdir)/tutorial/images $(distdir)/tutorial/images/callouts - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -551,7 +545,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -559,6 +553,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -569,7 +565,7 @@ all-am: Makefile $(MANS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -601,8 +597,7 @@ clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -616,12 +611,20 @@ info-am: install-data-am: install-data-local install-man +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: install-man1 +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -641,26 +644,27 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-man - -uninstall-info: uninstall-info-recursive +uninstall-am: uninstall-man uninstall-man: uninstall-man1 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-local clean-recursive \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-exec \ - install-exec-am install-info install-info-am install-man \ - install-man1 install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-local \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + clean-local ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-man uninstall-man1 all: web $(top_builddir)/NEWS libxml2.xsa $(man_MANS) diff --git a/doc/devhelp/Makefile.in b/doc/devhelp/Makefile.in index 0e0e053..169521d 100644 --- a/doc/devhelp/Makefile.in +++ b/doc/devhelp/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -49,8 +45,6 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -87,12 +81,14 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ HTML_OBJ = @HTML_OBJ@ HTTP_OBJ = @HTTP_OBJ@ ICONV_LIBS = @ICONV_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -111,6 +107,7 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MODULE_EXTENSION = @MODULE_EXTENSION@ MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@ MV = @MV@ @@ -183,8 +180,6 @@ WITH_MODULES = @WITH_MODULES@ WITH_OUTPUT = @WITH_OUTPUT@ WITH_PATTERN = @WITH_PATTERN@ WITH_PUSH = @WITH_PUSH@ -WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ -WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_READER = @WITH_READER@ WITH_REGEXPS = @WITH_REGEXPS@ WITH_RUN_DEBUG = @WITH_RUN_DEBUG@ @@ -194,8 +189,6 @@ WITH_SCHEMATRON = @WITH_SCHEMATRON@ WITH_THREADS = @WITH_THREADS@ WITH_TREE = @WITH_TREE@ WITH_TRIO = @WITH_TRIO@ -WITH_TRIO_SOURCES_FALSE = @WITH_TRIO_SOURCES_FALSE@ -WITH_TRIO_SOURCES_TRUE = @WITH_TRIO_SOURCES_TRUE@ WITH_VALID = @WITH_VALID@ WITH_WRITER = @WITH_WRITER@ WITH_XINCLUDE = @WITH_XINCLUDE@ @@ -214,19 +207,13 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -238,29 +225,40 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2 HTML_FILES = index.html general.html $(HTML_MODULES) HTML_MODULES = \ @@ -358,10 +356,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -370,22 +364,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -430,7 +423,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -444,12 +437,20 @@ info-am: install-data-am: install-data-local +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -468,17 +469,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-exec \ - install-exec-am install-info install-info-am install-man \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am + uninstall uninstall-am all: libxml2.devhelp $(HTML_FILES) diff --git a/doc/devhelp/libxml2-valid.html b/doc/devhelp/libxml2-valid.html index 3b23e67..3480214 100644 --- a/doc/devhelp/libxml2-valid.html +++ b/doc/devhelp/libxml2-valid.html @@ -101,6 +101,7 @@ int <a href="#xmlIsRef">xmlIsRef</a> (<a href="libxml2-tree.html#xmlDocPtr">xm <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> <a href="#xmlCopyDocElementContent">xmlCopyDocElementContent</a> (<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlElementContentPtr">xmlElementContentPtr</a> cur); <a href="libxml2-tree.html#xmlIDPtr">xmlIDPtr</a> <a href="#xmlAddID">xmlAddID</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value, <br/> <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr); void <a href="#xmlFreeRefTable">xmlFreeRefTable</a> (<a href="libxml2-valid.html#xmlRefTablePtr">xmlRefTablePtr</a> table); +int <a href="#xmlValidateNamesValue">xmlValidateNamesValue</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value); int <a href="#xmlRemoveID">xmlRemoveID</a> (<a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr); void <a href="#xmlFreeElementTable">xmlFreeElementTable</a> (<a href="libxml2-valid.html#xmlElementTablePtr">xmlElementTablePtr</a> table); void <a href="#xmlFreeIDTable">xmlFreeIDTable</a> (<a href="libxml2-valid.html#xmlIDTablePtr">xmlIDTablePtr</a> table); @@ -112,7 +113,6 @@ int <a href="#xmlRemoveRef">xmlRemoveRef</a> (<a href="libxml2-tree.html#xmlDo typedef void <a href="#xmlValidityWarningFunc">xmlValidityWarningFunc</a> (void * ctx, <br/> const char * msg, <br/> ... ...); int <a href="#xmlValidatePopElement">xmlValidatePopElement</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlNodePtr">xmlNodePtr</a> elem, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * qname); void <a href="#xmlFreeEnumeration">xmlFreeEnumeration</a> (<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur); -int <a href="#xmlValidateNamesValue">xmlValidateNamesValue</a> (const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * value); <a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> <a href="#xmlCopyEnumeration">xmlCopyEnumeration</a> (<a href="libxml2-tree.html#xmlEnumerationPtr">xmlEnumerationPtr</a> cur); <a href="libxml2-tree.html#xmlAttributePtr">xmlAttributePtr</a> <a href="#xmlGetDtdAttrDesc">xmlGetDtdAttrDesc</a> (<a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * elem, <br/> const <a href="libxml2-xmlstring.html#xmlChar">xmlChar</a> * name); int <a href="#xmlValidateDtd">xmlValidateDtd</a> (<a href="libxml2-valid.html#xmlValidCtxtPtr">xmlValidCtxtPtr</a> ctxt, <br/> <a href="libxml2-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br/> <a href="libxml2-tree.html#xmlDtdPtr">xmlDtdPtr</a> dtd); diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in index 5fd6a3a..314343a 100644 --- a/doc/examples/Makefile.in +++ b/doc/examples/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -56,45 +52,91 @@ am_io1_OBJECTS = io1.$(OBJEXT) io1_OBJECTS = $(am_io1_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/libxml2.la $(am__DEPENDENCIES_1) +io1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(io1_LDFLAGS) \ + $(LDFLAGS) -o $@ am_io2_OBJECTS = io2.$(OBJEXT) io2_OBJECTS = $(am_io2_OBJECTS) +io2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(io2_LDFLAGS) \ + $(LDFLAGS) -o $@ am_parse1_OBJECTS = parse1.$(OBJEXT) parse1_OBJECTS = $(am_parse1_OBJECTS) +parse1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(parse1_LDFLAGS) \ + $(LDFLAGS) -o $@ am_parse2_OBJECTS = parse2.$(OBJEXT) parse2_OBJECTS = $(am_parse2_OBJECTS) +parse2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(parse2_LDFLAGS) \ + $(LDFLAGS) -o $@ am_parse3_OBJECTS = parse3.$(OBJEXT) parse3_OBJECTS = $(am_parse3_OBJECTS) +parse3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(parse3_LDFLAGS) \ + $(LDFLAGS) -o $@ am_parse4_OBJECTS = parse4.$(OBJEXT) parse4_OBJECTS = $(am_parse4_OBJECTS) +parse4_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(parse4_LDFLAGS) \ + $(LDFLAGS) -o $@ am_reader1_OBJECTS = reader1.$(OBJEXT) reader1_OBJECTS = $(am_reader1_OBJECTS) +reader1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(reader1_LDFLAGS) \ + $(LDFLAGS) -o $@ am_reader2_OBJECTS = reader2.$(OBJEXT) reader2_OBJECTS = $(am_reader2_OBJECTS) +reader2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(reader2_LDFLAGS) \ + $(LDFLAGS) -o $@ am_reader3_OBJECTS = reader3.$(OBJEXT) reader3_OBJECTS = $(am_reader3_OBJECTS) +reader3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(reader3_LDFLAGS) \ + $(LDFLAGS) -o $@ am_reader4_OBJECTS = reader4.$(OBJEXT) reader4_OBJECTS = $(am_reader4_OBJECTS) +reader4_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(reader4_LDFLAGS) \ + $(LDFLAGS) -o $@ am_testWriter_OBJECTS = testWriter.$(OBJEXT) testWriter_OBJECTS = $(am_testWriter_OBJECTS) +testWriter_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(testWriter_LDFLAGS) $(LDFLAGS) -o $@ am_tree1_OBJECTS = tree1.$(OBJEXT) tree1_OBJECTS = $(am_tree1_OBJECTS) +tree1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tree1_LDFLAGS) \ + $(LDFLAGS) -o $@ am_tree2_OBJECTS = tree2.$(OBJEXT) tree2_OBJECTS = $(am_tree2_OBJECTS) +tree2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tree2_LDFLAGS) \ + $(LDFLAGS) -o $@ am_xpath1_OBJECTS = xpath1.$(OBJEXT) xpath1_OBJECTS = $(am_xpath1_OBJECTS) +xpath1_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xpath1_LDFLAGS) \ + $(LDFLAGS) -o $@ am_xpath2_OBJECTS = xpath2.$(OBJEXT) xpath2_OBJECTS = $(am_xpath2_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +xpath2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(xpath2_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(io1_SOURCES) $(io2_SOURCES) $(parse1_SOURCES) \ $(parse2_SOURCES) $(parse3_SOURCES) $(parse4_SOURCES) \ $(reader1_SOURCES) $(reader2_SOURCES) $(reader3_SOURCES) \ @@ -109,8 +151,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -147,12 +187,14 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ FTP_OBJ = @FTP_OBJ@ +GREP = @GREP@ HAVE_ISINF = @HAVE_ISINF@ HAVE_ISNAN = @HAVE_ISNAN@ HTML_DIR = @HTML_DIR@ HTML_OBJ = @HTML_OBJ@ HTTP_OBJ = @HTTP_OBJ@ ICONV_LIBS = @ICONV_LIBS@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -171,6 +213,7 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MODULE_EXTENSION = @MODULE_EXTENSION@ MODULE_PLATFORM_LIBS = @MODULE_PLATFORM_LIBS@ MV = @MV@ @@ -243,8 +286,6 @@ WITH_MODULES = @WITH_MODULES@ WITH_OUTPUT = @WITH_OUTPUT@ WITH_PATTERN = @WITH_PATTERN@ WITH_PUSH = @WITH_PUSH@ -WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@ -WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@ WITH_READER = @WITH_READER@ WITH_REGEXPS = @WITH_REGEXPS@ WITH_RUN_DEBUG = @WITH_RUN_DEBUG@ @@ -254,8 +295,6 @@ WITH_SCHEMATRON = @WITH_SCHEMATRON@ WITH_THREADS = @WITH_THREADS@ WITH_TREE = @WITH_TREE@ WITH_TRIO = @WITH_TRIO@ -WITH_TRIO_SOURCES_FALSE = @WITH_TRIO_SOURCES_FALSE@ -WITH_TRIO_SOURCES_TRUE = @WITH_TRIO_SOURCES_TRUE@ WITH_VALID = @WITH_VALID@ WITH_WRITER = @WITH_WRITER@ WITH_XINCLUDE = @WITH_XINCLUDE@ @@ -274,19 +313,13 @@ XPTR_OBJ = @XPTR_OBJ@ XSLTPROC = @XSLTPROC@ Z_CFLAGS = @Z_CFLAGS@ Z_LIBS = @Z_LIBS@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -298,29 +331,40 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ # Beware this is autogenerated by index.py INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ @@ -429,49 +473,49 @@ clean-noinstPROGRAMS: done io1$(EXEEXT): $(io1_OBJECTS) $(io1_DEPENDENCIES) @rm -f io1$(EXEEXT) - $(LINK) $(io1_LDFLAGS) $(io1_OBJECTS) $(io1_LDADD) $(LIBS) + $(io1_LINK) $(io1_OBJECTS) $(io1_LDADD) $(LIBS) io2$(EXEEXT): $(io2_OBJECTS) $(io2_DEPENDENCIES) @rm -f io2$(EXEEXT) - $(LINK) $(io2_LDFLAGS) $(io2_OBJECTS) $(io2_LDADD) $(LIBS) + $(io2_LINK) $(io2_OBJECTS) $(io2_LDADD) $(LIBS) parse1$(EXEEXT): $(parse1_OBJECTS) $(parse1_DEPENDENCIES) @rm -f parse1$(EXEEXT) - $(LINK) $(parse1_LDFLAGS) $(parse1_OBJECTS) $(parse1_LDADD) $(LIBS) + $(parse1_LINK) $(parse1_OBJECTS) $(parse1_LDADD) $(LIBS) parse2$(EXEEXT): $(parse2_OBJECTS) $(parse2_DEPENDENCIES) @rm -f parse2$(EXEEXT) - $(LINK) $(parse2_LDFLAGS) $(parse2_OBJECTS) $(parse2_LDADD) $(LIBS) + $(parse2_LINK) $(parse2_OBJECTS) $(parse2_LDADD) $(LIBS) parse3$(EXEEXT): $(parse3_OBJECTS) $(parse3_DEPENDENCIES) @rm -f parse3$(EXEEXT) - $(LINK) $(parse3_LDFLAGS) $(parse3_OBJECTS) $(parse3_LDADD) $(LIBS) + $(parse3_LINK) $(parse3_OBJECTS) $(parse3_LDADD) $(LIBS) parse4$(EXEEXT): $(parse4_OBJECTS) $(parse4_DEPENDENCIES) @rm -f parse4$(EXEEXT) - $(LINK) $(parse4_LDFLAGS) $(parse4_OBJECTS) $(parse4_LDADD) $(LIBS) + $(parse4_LINK) $(parse4_OBJECTS) $(parse4_LDADD) $(LIBS) reader1$(EXEEXT): $(reader1_OBJECTS) $(reader1_DEPENDENCIES) @rm -f reader1$(EXEEXT) - $(LINK) $(reader1_LDFLAGS) $(reader1_OBJECTS) $(reader1_LDADD) $(LIBS) + $(reader1_LINK) $(reader1_OBJECTS) $(reader1_LDADD) $(LIBS) reader2$(EXEEXT): $(reader2_OBJECTS) $(reader2_DEPENDENCIES) @rm -f reader2$(EXEEXT) - $(LINK) $(reader2_LDFLAGS) $(reader2_OBJECTS) $(reader2_LDADD) $(LIBS) + $(reader2_LINK) $(reader2_OBJECTS) $(reader2_LDADD) $(LIBS) reader3$(EXEEXT): $(reader3_OBJECTS) $(reader3_DEPENDENCIES) @rm -f reader3$(EXEEXT) - $(LINK) $(reader3_LDFLAGS) $(reader3_OBJECTS) $(reader3_LDADD) $(LIBS) + $(reader3_LINK) $(reader3_OBJECTS) $(reader3_LDADD) $(LIBS) reader4$(EXEEXT): $(reader4_OBJECTS) $(reader4_DEPENDENCIES) @rm -f reader4$(EXEEXT) - $(LINK) $(reader4_LDFLAGS) $(reader4_OBJECTS) $(reader4_LDADD) $(LIBS) + $(reader4_LINK) $(reader4_OBJECTS) $(reader4_LDADD) $(LIBS) testWriter$(EXEEXT): $(testWriter_OBJECTS) $(testWriter_DEPENDENCIES) @rm -f testWriter$(EXEEXT) - $(LINK) $(testWriter_LDFLAGS) $(testWriter_OBJECTS) $(testWriter_LDADD) $(LIBS) + $(testWriter_LINK) $(testWriter_OBJECTS) $(testWriter_LDADD) $(LIBS) tree1$(EXEEXT): $(tree1_OBJECTS) $(tree1_DEPENDENCIES) @rm -f tree1$(EXEEXT) - $(LINK) $(tree1_LDFLAGS) $(tree1_OBJECTS) $(tree1_LDADD) $(LIBS) + $(tree1_LINK) $(tree1_OBJECTS) $(tree1_LDADD) $(LIBS) tree2$(EXEEXT): $(tree2_OBJECTS) $(tree2_DEPENDENCIES) @rm -f tree2$(EXEEXT) - $(LINK) $(tree2_LDFLAGS) $(tree2_OBJECTS) $(tree2_LDADD) $(LIBS) + $(tree2_LINK) $(tree2_OBJECTS) $(tree2_LDADD) $(LIBS) xpath1$(EXEEXT): $(xpath1_OBJECTS) $(xpath1_DEPENDENCIES) @rm -f xpath1$(EXEEXT) - $(LINK) $(xpath1_LDFLAGS) $(xpath1_OBJECTS) $(xpath1_LDADD) $(LIBS) + $(xpath1_LINK) $(xpath1_OBJECTS) $(xpath1_LDADD) $(LIBS) xpath2$(EXEEXT): $(xpath2_OBJECTS) $(xpath2_DEPENDENCIES) @rm -f xpath2$(EXEEXT) - $(LINK) $(xpath2_LDFLAGS) $(xpath2_OBJECTS) $(xpath2_LDADD) $(LIBS) + $(xpath2_LINK) $(xpath2_OBJECTS) $(xpath2_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -496,22 +540,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpath2.Po@am__quote@ .c.o: -@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 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @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 +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @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 +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -522,10 +566,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -575,22 +615,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -638,7 +677,7 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -652,12 +691,20 @@ info-am: install-data-am: install-data-local +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -678,19 +725,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am + tags uninstall uninstall-am rebuild: examples.xml index.html diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml index 22f730c..31b8525 100644 --- a/doc/examples/examples.xml +++ b/doc/examples/examples.xml @@ -1,53 +1,4 @@ <examples> - <example filename='io1.c'> - <synopsis>Example of custom Input/Output</synopsis> - <purpose>Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.</purpose> - <usage>io1</usage> - <test>io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp</test> - <author>Daniel Veillard</author> - <copy>see Copyright for the status of this software. </copy> - <section>InputOutput</section> - <includes> - <include><libxml/parser.h></include> - <include><libxml/xmlIO.h></include> - <include><libxml/xinclude.h></include> - <include><libxml/tree.h></include> - </includes> - <uses> - <function line='143' file='tree' name='xmlDocDump'/> - <function line='158' file='xmlmemory' name='xmlMemoryDump'/> - <function line='149' file='tree' name='xmlFreeDoc'/> - <function line='154' file='parser' name='xmlCleanupParser'/> - <macro line='117' file='xmlversion' name='LIBXML_TEST_VERSION'/> - <function line='134' file='xinclude' name='xmlXIncludeProcess'/> - <function line='117' file='xmlIO' name='xmlRegisterInputCallbacks'/> - <function line='124' file='parser' name='xmlReadMemory'/> - <typedef line='105' file='tree' name='xmlDocPtr'/> - </uses> - </example> - <example filename='io2.c'> - <synopsis>Output to char buffer</synopsis> - <purpose>Demonstrate the use of xmlDocDumpMemory to output document to a character buffer</purpose> - <usage>io2</usage> - <test>io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp</test> - <author>John Fleck</author> - <copy>see Copyright for the status of this software. </copy> - <section>InputOutput</section> - <includes> - <include><libxml/parser.h></include> - </includes> - <uses> - <function line='29' file='tree' name='xmlNodeSetContent'/> - <function line='36' file='tree' name='xmlDocDumpFormatMemory'/> - <variable line='42' file='globals' name='xmlFree'/> - <function line='30' file='tree' name='xmlDocSetRootElement'/> - <typedef line='20' file='tree' name='xmlDocPtr'/> - <function line='43' file='tree' name='xmlFreeDoc'/> - <typedef line='19' file='tree' name='xmlNodePtr'/> - <function line='27' file='tree' name='xmlNewDoc'/> - <function line='28' file='tree' name='xmlNewNode'/> - </uses> - </example> <example filename='parse1.c'> <synopsis>Parse an XML file to a tree and free it</synopsis> <purpose>Demonstrate the use of xmlReadFile() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree</purpose> @@ -69,76 +20,6 @@ <function line='26' file='parser' name='xmlReadFile'/> </uses> </example> - <example filename='parse2.c'> - <synopsis>Parse and validate an XML file to a tree and free the result</synopsis> - <purpose>Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.</purpose> - <usage>parse2 test2.xml</usage> - <test>parse2 test2.xml</test> - <author>Daniel Veillard</author> - <copy>see Copyright for the status of this software. </copy> - <section>Parsing</section> - <includes> - <include><libxml/tree.h></include> - <include><libxml/parser.h></include> - </includes> - <uses> - <function line='47' file='parser' name='xmlFreeParserCtxt'/> - <enum line='35' file='parser' name='XML_PARSE_DTDVALID'/> - <function line='29' file='parser' name='xmlNewParserCtxt'/> - <typedef line='25' file='tree' name='xmlParserCtxtPtr'/> - <function line='35' file='parser' name='xmlCtxtReadFile'/> - <function line='66' file='parser' name='xmlCleanupParser'/> - <macro line='61' file='xmlversion' name='LIBXML_TEST_VERSION'/> - <function line='44' file='tree' name='xmlFreeDoc'/> - <typedef line='26' file='tree' name='xmlDocPtr'/> - <function line='70' file='xmlmemory' name='xmlMemoryDump'/> - </uses> - </example> - <example filename='parse3.c'> - <synopsis>Parse an XML document in memory to a tree and free it</synopsis> - <purpose>Demonstrate the use of xmlReadMemory() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree</purpose> - <usage>parse3</usage> - <test>parse3</test> - <author>Daniel Veillard</author> - <copy>see Copyright for the status of this software. </copy> - <section>Parsing</section> - <includes> - <include><libxml/tree.h></include> - <include><libxml/parser.h></include> - </includes> - <uses> - <function line='33' file='parser' name='xmlReadMemory'/> - <function line='58' file='xmlmemory' name='xmlMemoryDump'/> - <function line='54' file='parser' name='xmlCleanupParser'/> - <macro line='49' file='xmlversion' name='LIBXML_TEST_VERSION'/> - <function line='38' file='tree' name='xmlFreeDoc'/> - <typedef line='27' file='tree' name='xmlDocPtr'/> - </uses> - </example> - <example filename='parse4.c'> - <synopsis>Parse an XML document chunk by chunk to a tree and free it</synopsis> - <purpose>Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree</purpose> - <usage>parse4 test3.xml</usage> - <test>parse4 test3.xml</test> - <author>Daniel Veillard</author> - <copy>see Copyright for the status of this software. </copy> - <section>Parsing</section> - <includes> - <include><libxml/tree.h></include> - <include><libxml/parser.h></include> - </includes> - <uses> - <function line='94' file='parser' name='xmlFreeParserCtxt'/> - <function line='86' file='parser' name='xmlParseChunk'/> - <function line='103' file='tree' name='xmlFreeDoc'/> - <function line='135' file='xmlmemory' name='xmlMemoryDump'/> - <function line='67' file='parser' name='xmlCreatePushParserCtxt'/> - <function line='131' file='parser' name='xmlCleanupParser'/> - <macro line='120' file='xmlversion' name='LIBXML_TEST_VERSION'/> - <typedef line='45' file='tree' name='xmlParserCtxtPtr'/> - <typedef line='47' file='tree' name='xmlDocPtr'/> - </uses> - </example> <example filename='reader1.c'> <synopsis>Parse an XML file with an xmlReader</synopsis> <purpose>Demonstrate the use of xmlReaderForFile() to parse an XML file and dump the informations about the nodes found in the process. (Note that the XMLReader functions require libxml2 version later than 2.6.)</purpose> @@ -167,33 +48,63 @@ <function line='62' file='xmlreader' name='xmlReaderForFile'/> </uses> </example> - <example filename='reader2.c'> - <synopsis>Parse and validate an XML file with an xmlReader</synopsis> - <purpose>Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)</purpose> - <usage>reader2 <valid_xml_filename></usage> - <test>reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp</test> + <example filename='xpath2.c'> + <synopsis>Load a document, locate subelements with XPath, modify said elements and save the resulting document.</synopsis> + <purpose>Shows how to make a full round-trip from a load/edit/save</purpose> + <usage>xpath2 <xml-file> <xpath-expr> <new-value></usage> + <test>xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp</test> + <author>Aleksey Sanin and Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>XPath</section> + <includes> + <include><libxml/parser.h></include> + <include><libxml/xpath.h></include> + <include><libxml/xpathInternals.h></include> + <include><libxml/tree.h></include> + </includes> + <uses> + <function line='162' file='tree' name='xmlNodeSetContent'/> + <function line='127' file='tree' name='xmlDocDump'/> + <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/> + <function line='56' file='xmlmemory' name='xmlMemoryDump'/> + <function line='110' file='xpath' name='xmlXPathEvalExpression'/> + <function line='95' file='parser' name='xmlParseFile'/> + <function line='123' file='xpath' name='xmlXPathFreeObject'/> + <function line='102' file='xpath' name='xmlXPathNewContext'/> + <function line='51' file='parser' name='xmlCleanupParser'/> + <macro line='45' file='xmlversion' name='LIBXML_TEST_VERSION'/> + <typedef line='87' file='xpath' name='xmlXPathContextPtr'/> + <function line='124' file='xpath' name='xmlXPathFreeContext'/> + <function line='41' file='parser' name='xmlInitParser'/> + <function line='131' file='tree' name='xmlFreeDoc'/> + <enum line='180' file='tree' name='XML_NAMESPACE_DECL'/> + <typedef line='86' file='tree' name='xmlDocPtr'/> + </uses> + </example> + <example filename='io1.c'> + <synopsis>Example of custom Input/Output</synopsis> + <purpose>Demonstrate the use of xmlRegisterInputCallbacks to build a custom I/O layer, this is used in an XInclude method context to show how dynamic document can be built in a clean way.</purpose> + <usage>io1</usage> + <test>io1 > io1.tmp ; diff io1.tmp io1.res ; rm -f io1.tmp</test> <author>Daniel Veillard</author> <copy>see Copyright for the status of this software. </copy> - <section>xmlReader</section> + <section>InputOutput</section> <includes> - <include><libxml/xmlreader.h></include> + <include><libxml/parser.h></include> + <include><libxml/xmlIO.h></include> + <include><libxml/xinclude.h></include> + <include><libxml/tree.h></include> </includes> <uses> - <function line='45' file='xmlstring' name='xmlStrlen'/> - <function line='38' file='xmlreader' name='xmlTextReaderNodeType'/> - <typedef line='60' file='xmlreader' name='xmlTextReaderPtr'/> - <function line='34' file='xmlreader' name='xmlTextReaderConstValue'/> - <enum line='70' file='parser' name='XML_PARSE_NOENT'/> - <function line='37' file='xmlreader' name='xmlTextReaderDepth'/> - <enum line='71' file='parser' name='XML_PARSE_DTDVALID'/> - <enum line='69' file='parser' name='XML_PARSE_DTDATTR'/> - <function line='84' file='xmlreader' name='xmlFreeTextReader'/> - <function line='30' file='xmlreader' name='xmlTextReaderConstName'/> - <function line='41' file='xmlreader' name='xmlTextReaderHasValue'/> - <function line='76' file='xmlreader' name='xmlTextReaderRead'/> - <function line='40' file='xmlreader' name='xmlTextReaderIsEmptyElement'/> - <function line='68' file='xmlreader' name='xmlReaderForFile'/> - <function line='81' file='xmlreader' name='xmlTextReaderIsValid'/> + <function line='143' file='tree' name='xmlDocDump'/> + <function line='158' file='xmlmemory' name='xmlMemoryDump'/> + <function line='149' file='tree' name='xmlFreeDoc'/> + <function line='154' file='parser' name='xmlCleanupParser'/> + <macro line='117' file='xmlversion' name='LIBXML_TEST_VERSION'/> + <function line='134' file='xinclude' name='xmlXIncludeProcess'/> + <function line='117' file='xmlIO' name='xmlRegisterInputCallbacks'/> + <function line='124' file='parser' name='xmlReadMemory'/> + <typedef line='105' file='tree' name='xmlDocPtr'/> </uses> </example> <example filename='reader3.c'> @@ -208,33 +119,18 @@ <include><libxml/xmlreader.h></include> </includes> <uses> + <function line='106' file='parser' name='xmlCleanupParser'/> <typedef line='31' file='xmlreader' name='xmlTextReaderPtr'/> + <function line='110' file='xmlmemory' name='xmlMemoryDump'/> + <function line='99' file='tree' name='xmlFreeDoc'/> <function line='65' file='xmlreader' name='xmlFreeTextReader'/> + <macro line='90' file='xmlversion' name='LIBXML_TEST_VERSION'/> <function line='95' file='tree' name='xmlDocDump'/> <function line='51' file='xmlreader' name='xmlTextReaderRead'/> <function line='61' file='xmlreader' name='xmlTextReaderCurrentDoc'/> <function line='42' file='xmlreader' name='xmlTextReaderPreservePattern'/> <function line='37' file='xmlreader' name='xmlReaderForFile'/> - </uses> - </example> - <example filename='reader4.c'> - <synopsis>Parse multiple XML files reusing an xmlReader</synopsis> - <purpose>Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context. (Note that the XMLReader functions require libxml2 version later than 2.6.)</purpose> - <usage>reader4 <filename> [ filename ... ]</usage> - <test>reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp</test> - <author>Graham Bennett</author> - <copy>see Copyright for the status of this software. </copy> - <section>xmlReader</section> - <includes> - <include><libxml/xmlreader.h></include> - </includes> - <uses> - <typedef line='54' file='xmlreader' name='xmlTextReaderPtr'/> - <function line='83' file='xmlreader' name='xmlReaderNewFile'/> - <function line='104' file='xmlreader' name='xmlFreeTextReader'/> - <function line='26' file='xmlreader' name='xmlTextReaderRead'/> - <function line='97' file='xmlreader' name='xmlTextReaderCurrentDoc'/> - <function line='72' file='xmlreader' name='xmlReaderForFile'/> + <typedef line='76' file='tree' name='xmlDocPtr'/> </uses> </example> <example filename='testWriter.c'> @@ -256,7 +152,9 @@ <function line='925' file='xmlwriter' name='xmlTextWriterWriteComment'/> <function line='1156' file='encoding' name='xmlFindCharEncodingHandler'/> <variable line='1166' file='globals' name='xmlMalloc'/> + <typedef line='879' file='tree' name='xmlDocPtr'/> <typedef line='341' file='tree' name='xmlBufferPtr'/> + <function line='58' file='xmlmemory' name='xmlMemoryDump'/> <macro line='885' file='parser' name='XML_DEFAULT_VERSION'/> <function line='901' file='tree' name='xmlDocSetRootElement'/> <function line='1127' file='xmlwriter' name='xmlFreeTextWriter'/> @@ -265,8 +163,10 @@ <function line='1111' file='xmlwriter' name='xmlTextWriterEndElement'/> <function line='76' file='xmlwriter' name='xmlNewTextWriterFilename'/> <function line='959' file='xmlwriter' name='xmlTextWriterWriteFormatComment'/> + <function line='54' file='parser' name='xmlCleanupParser'/> <function line='1073' file='xmlwriter' name='xmlTextWriterWriteFormatElement'/> <typedef line='1151' file='encoding' name='xmlCharEncodingHandlerPtr'/> + <function line='1131' file='tree' name='xmlFreeDoc'/> <typedef line='880' file='tree' name='xmlNodePtr'/> <function line='949' file='xmlwriter' name='xmlTextWriterWriteAttribute'/> <function line='632' file='xmlwriter' name='xmlNewTextWriterDoc'/> @@ -275,6 +175,7 @@ <function line='904' file='xmlwriter' name='xmlNewTextWriterTree'/> <function line='355' file='xmlwriter' name='xmlNewTextWriterMemory'/> <variable line='1180' file='globals' name='xmlFree'/> + <macro line='40' file='xmlversion' name='LIBXML_TEST_VERSION'/> <function line='613' file='tree' name='xmlBufferFree'/> <typedef line='878' file='xmlwriter' name='xmlTextWriterPtr'/> <function line='1103' file='xmlwriter' name='xmlTextWriterWriteElement'/> @@ -296,6 +197,7 @@ <uses> <enum line='36' file='tree' name='XML_ELEMENT_NODE'/> <function line='74' file='tree' name='xmlDocGetRootElement'/> + <function line='79' file='tree' name='xmlFreeDoc'/> <function line='67' file='parser' name='xmlReadFile'/> </uses> </example> @@ -323,6 +225,111 @@ <function line='39' file='tree' name='xmlNewDoc'/> </uses> </example> + <example filename='parse2.c'> + <synopsis>Parse and validate an XML file to a tree and free the result</synopsis> + <purpose>Create a parser context for an XML file, then parse and validate the file, creating a tree, check the validation result and xmlFreeDoc() to free the resulting tree.</purpose> + <usage>parse2 test2.xml</usage> + <test>parse2 test2.xml</test> + <author>Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>Parsing</section> + <includes> + <include><libxml/tree.h></include> + <include><libxml/parser.h></include> + </includes> + <uses> + <function line='47' file='parser' name='xmlFreeParserCtxt'/> + <enum line='35' file='parser' name='XML_PARSE_DTDVALID'/> + <function line='29' file='parser' name='xmlNewParserCtxt'/> + <typedef line='25' file='tree' name='xmlParserCtxtPtr'/> + <function line='35' file='parser' name='xmlCtxtReadFile'/> + <typedef line='26' file='tree' name='xmlDocPtr'/> + </uses> + </example> + <example filename='reader2.c'> + <synopsis>Parse and validate an XML file with an xmlReader</synopsis> + <purpose>Demonstrate the use of xmlReaderForFile() to parse an XML file validating the content in the process and activating options like entities substitution, and DTD attributes defaulting. (Note that the XMLReader functions require libxml2 version later than 2.6.)</purpose> + <usage>reader2 <valid_xml_filename></usage> + <test>reader2 test2.xml > reader1.tmp ; diff reader1.tmp reader1.res ; rm reader1.tmp</test> + <author>Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>xmlReader</section> + <includes> + <include><libxml/xmlreader.h></include> + </includes> + <uses> + <function line='45' file='xmlstring' name='xmlStrlen'/> + <function line='38' file='xmlreader' name='xmlTextReaderNodeType'/> + <typedef line='60' file='xmlreader' name='xmlTextReaderPtr'/> + <function line='34' file='xmlreader' name='xmlTextReaderConstValue'/> + <enum line='70' file='parser' name='XML_PARSE_NOENT'/> + <function line='37' file='xmlreader' name='xmlTextReaderDepth'/> + <enum line='71' file='parser' name='XML_PARSE_DTDVALID'/> + <enum line='69' file='parser' name='XML_PARSE_DTDATTR'/> + <function line='84' file='xmlreader' name='xmlFreeTextReader'/> + <function line='30' file='xmlreader' name='xmlTextReaderConstName'/> + <function line='41' file='xmlreader' name='xmlTextReaderHasValue'/> + <function line='76' file='xmlreader' name='xmlTextReaderRead'/> + <function line='40' file='xmlreader' name='xmlTextReaderIsEmptyElement'/> + <function line='68' file='xmlreader' name='xmlReaderForFile'/> + <function line='81' file='xmlreader' name='xmlTextReaderIsValid'/> + </uses> + </example> + <example filename='reader4.c'> + <synopsis>Parse multiple XML files reusing an xmlReader</synopsis> + <purpose>Demonstrate the use of xmlReaderForFile() and xmlReaderNewFile to parse XML files while reusing the reader object and parser context. (Note that the XMLReader functions require libxml2 version later than 2.6.)</purpose> + <usage>reader4 <filename> [ filename ... ]</usage> + <test>reader4 test1.xml test2.xml test3.xml > reader4.tmp ; diff reader4.tmp reader4.res ; rm reader4.tmp</test> + <author>Graham Bennett</author> + <copy>see Copyright for the status of this software. </copy> + <section>xmlReader</section> + <includes> + <include><libxml/xmlreader.h></include> + </includes> + <uses> + <typedef line='54' file='xmlreader' name='xmlTextReaderPtr'/> + <function line='83' file='xmlreader' name='xmlReaderNewFile'/> + <function line='104' file='xmlreader' name='xmlFreeTextReader'/> + <function line='26' file='xmlreader' name='xmlTextReaderRead'/> + <function line='97' file='xmlreader' name='xmlTextReaderCurrentDoc'/> + <function line='72' file='xmlreader' name='xmlReaderForFile'/> + </uses> + </example> + <example filename='parse4.c'> + <synopsis>Parse an XML document chunk by chunk to a tree and free it</synopsis> + <purpose>Demonstrate the use of xmlCreatePushParserCtxt() and xmlParseChunk() to read an XML file progressively into a tree and and xmlFreeDoc() to free the resulting tree</purpose> + <usage>parse4 test3.xml</usage> + <test>parse4 test3.xml</test> + <author>Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>Parsing</section> + <includes> + <include><libxml/tree.h></include> + <include><libxml/parser.h></include> + </includes> + <uses> + <function line='94' file='parser' name='xmlFreeParserCtxt'/> + <function line='86' file='parser' name='xmlParseChunk'/> + <function line='67' file='parser' name='xmlCreatePushParserCtxt'/> + <typedef line='45' file='tree' name='xmlParserCtxtPtr'/> + </uses> + </example> + <example filename='parse3.c'> + <synopsis>Parse an XML document in memory to a tree and free it</synopsis> + <purpose>Demonstrate the use of xmlReadMemory() to read an XML file into a tree and and xmlFreeDoc() to free the resulting tree</purpose> + <usage>parse3</usage> + <test>parse3</test> + <author>Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>Parsing</section> + <includes> + <include><libxml/tree.h></include> + <include><libxml/parser.h></include> + </includes> + <uses> + <function line='33' file='parser' name='xmlReadMemory'/> + </uses> + </example> <example filename='xpath1.c'> <synopsis>Evaluate XPath expression and prints result node set.</synopsis> <purpose>Shows how to evaluate XPath expression and register known namespaces in XPath context.</purpose> @@ -356,396 +363,24 @@ <enum line='217' file='tree' name='XML_NAMESPACE_DECL'/> </uses> </example> - <example filename='xpath2.c'> - <synopsis>Load a document, locate subelements with XPath, modify said elements and save the resulting document.</synopsis> - <purpose>Shows how to make a full round-trip from a load/edit/save</purpose> - <usage>xpath2 <xml-file> <xpath-expr> <new-value></usage> - <test>xpath2 test3.xml '//discarded' discarded > xpath2.tmp ; diff xpath2.tmp xpath2.res ; rm xpath2.tmp</test> - <author>Aleksey Sanin and Daniel Veillard</author> + <example filename='io2.c'> + <synopsis>Output to char buffer</synopsis> + <purpose>Demonstrate the use of xmlDocDumpMemory to output document to a character buffer</purpose> + <usage>io2</usage> + <test>io2 > io2.tmp ; diff io2.tmp io2.res ; rm -f io2.tmp</test> + <author>John Fleck</author> <copy>see Copyright for the status of this software. </copy> - <section>XPath</section> + <section>InputOutput</section> <includes> <include><libxml/parser.h></include> - <include><libxml/xpath.h></include> - <include><libxml/xpathInternals.h></include> - <include><libxml/tree.h></include> </includes> <uses> - <function line='162' file='tree' name='xmlNodeSetContent'/> - <function line='127' file='tree' name='xmlDocDump'/> - <typedef line='88' file='xpath' name='xmlXPathObjectPtr'/> - <function line='110' file='xpath' name='xmlXPathEvalExpression'/> - <function line='95' file='parser' name='xmlParseFile'/> - <function line='123' file='xpath' name='xmlXPathFreeObject'/> - <function line='102' file='xpath' name='xmlXPathNewContext'/> - <typedef line='87' file='xpath' name='xmlXPathContextPtr'/> - <function line='124' file='xpath' name='xmlXPathFreeContext'/> - <function line='41' file='parser' name='xmlInitParser'/> - <enum line='180' file='tree' name='XML_NAMESPACE_DECL'/> + <function line='29' file='tree' name='xmlNodeSetContent'/> + <function line='36' file='tree' name='xmlDocDumpFormatMemory'/> + <variable line='42' file='globals' name='xmlFree'/> + <function line='30' file='tree' name='xmlDocSetRootElement'/> + <typedef line='19' file='tree' name='xmlNodePtr'/> + <function line='27' file='tree' name='xmlNewDoc'/> + <function line='28' file='tree' name='xmlNewNode'/> </uses> </example> - <symbols> - <symbol name='LIBXML_TEST_VERSION'> - <ref filename='io1.c'/> - <ref filename='parse1.c'/> - <ref filename='parse2.c'/> - <ref filename='parse3.c'/> - <ref filename='parse4.c'/> - <ref filename='reader1.c'/> - </symbol> - <symbol name='XML_DEFAULT_VERSION'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='XML_ELEMENT_NODE'> - <ref filename='tree1.c'/> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='XML_NAMESPACE_DECL'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='XML_PARSE_DTDATTR'> - <ref filename='reader2.c'/> - </symbol> - <symbol name='XML_PARSE_DTDVALID'> - <ref filename='parse2.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='XML_PARSE_NOENT'> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlAddChild'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlBufferCreate'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlBufferFree'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlBufferPtr'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlCharEncodingHandlerPtr'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlCleanupParser'> - <ref filename='io1.c'/> - <ref filename='parse1.c'/> - <ref filename='parse2.c'/> - <ref filename='parse3.c'/> - <ref filename='parse4.c'/> - <ref filename='reader1.c'/> - </symbol> - <symbol name='xmlCreateIntSubset'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlCreatePushParserCtxt'> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlCtxtReadFile'> - <ref filename='parse2.c'/> - </symbol> - <symbol name='xmlDocDump'> - <ref filename='io1.c'/> - <ref filename='reader3.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlDocDumpFormatMemory'> - <ref filename='io2.c'/> - </symbol> - <symbol name='xmlDocGetRootElement'> - <ref filename='tree1.c'/> - </symbol> - <symbol name='xmlDocPtr'> - <ref filename='io1.c'/> - <ref filename='io2.c'/> - <ref filename='parse1.c'/> - <ref filename='parse2.c'/> - <ref filename='parse3.c'/> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlDocSetRootElement'> - <ref filename='io2.c'/> - <ref filename='testWriter.c'/> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlFindCharEncodingHandler'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlFree'> - <ref filename='io2.c'/> - <ref filename='testWriter.c'/> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='xmlFreeDoc'> - <ref filename='io1.c'/> - <ref filename='io2.c'/> - <ref filename='parse1.c'/> - <ref filename='parse2.c'/> - <ref filename='parse3.c'/> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlFreeParserCtxt'> - <ref filename='parse2.c'/> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlFreeTextReader'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - <ref filename='reader3.c'/> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlFreeTextWriter'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlInitParser'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlMalloc'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlMemoryDump'> - <ref filename='io1.c'/> - <ref filename='parse1.c'/> - <ref filename='parse2.c'/> - <ref filename='parse3.c'/> - <ref filename='parse4.c'/> - <ref filename='reader1.c'/> - </symbol> - <symbol name='xmlNewChild'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlNewDoc'> - <ref filename='io2.c'/> - <ref filename='testWriter.c'/> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlNewDocNode'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlNewNode'> - <ref filename='io2.c'/> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlNewParserCtxt'> - <ref filename='parse2.c'/> - </symbol> - <symbol name='xmlNewProp'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlNewText'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlNewTextWriterDoc'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlNewTextWriterFilename'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlNewTextWriterMemory'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlNewTextWriterTree'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlNodePtr'> - <ref filename='io2.c'/> - <ref filename='testWriter.c'/> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='xmlNodeSetContent'> - <ref filename='io2.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlNsPtr'> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='xmlParseChunk'> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlParseFile'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlParserCtxtPtr'> - <ref filename='parse2.c'/> - <ref filename='parse4.c'/> - </symbol> - <symbol name='xmlReadFile'> - <ref filename='parse1.c'/> - <ref filename='tree1.c'/> - </symbol> - <symbol name='xmlReadMemory'> - <ref filename='io1.c'/> - <ref filename='parse3.c'/> - </symbol> - <symbol name='xmlReaderForFile'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - <ref filename='reader3.c'/> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlReaderNewFile'> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlRealloc'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlRegisterInputCallbacks'> - <ref filename='io1.c'/> - </symbol> - <symbol name='xmlSaveFileEnc'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlSaveFormatFileEnc'> - <ref filename='tree2.c'/> - </symbol> - <symbol name='xmlStrchr'> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='xmlStrdup'> - <ref filename='xpath1.c'/> - </symbol> - <symbol name='xmlStrlen'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderConstName'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderConstValue'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderCurrentDoc'> - <ref filename='reader3.c'/> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlTextReaderDepth'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderHasValue'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderIsEmptyElement'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderIsValid'> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderNodeType'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - </symbol> - <symbol name='xmlTextReaderPreservePattern'> - <ref filename='reader3.c'/> - </symbol> - <symbol name='xmlTextReaderPtr'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - <ref filename='reader3.c'/> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlTextReaderRead'> - <ref filename='reader1.c'/> - <ref filename='reader2.c'/> - <ref filename='reader3.c'/> - <ref filename='reader4.c'/> - </symbol> - <symbol name='xmlTextWriterEndDocument'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterEndElement'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterPtr'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterStartDocument'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterStartElement'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterWriteAttribute'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterWriteComment'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterWriteElement'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterWriteFormatComment'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlTextWriterWriteFormatElement'> - <ref filename='testWriter.c'/> - </symbol> - <symbol name='xmlXIncludeProcess'> - <ref filename='io1.c'/> - </symbol> - <symbol name='xmlXPathContextPtr'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathEvalExpression'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathFreeContext'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathFreeObject'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathNewContext'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathObjectPtr'> - <ref filename='xpath1.c'/> - <ref filename='xpath2.c'/> - </symbol> - <symbol name='xmlXPathRegisterNs'> - <ref filename='xpath1.c'/> - </symbol> - </symbols> - <sections> - <section name='InputOutput'> - <example filename='io1.c'/> - <example filename='io2.c'/> - </section> - <section name='Parsing'> - <example filename='parse1.c'/> - <example filename='parse2.c'/> - <example filename='parse3.c'/> - <example filename='parse4.c'/> - </section> - <section name='Tree'> - <example filename='tree1.c'/> - <example filename='tree2.c'/> - </section> - <section name='XPath'> - <example filename='xpath1.c'/> - <example filename='xpath2.c'/> - </section> - <section name='xmlReader'> - <example filename='reader1.c'/> - <example filename='reader2.c'/> - <example filename='reader3.c'/> - <example filename='reader4.c'/> - </section> - <section name='xmlWriter'> - <example filename='testWriter.c'/> - </section> - </sections> -</examples> diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 4e031bc..df478d6 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -1211,13 +1211,13 @@ <exports symbol='XML_SCHEMA_TYPE_SIMPLE' type='enum'/> <exports symbol='XML_SCHEMAS_NCNAME' type='enum'/> <exports symbol='XML_SCHEMAS_LONG' type='enum'/> - <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/> + <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/> <exports symbol='XML_SCHEMAS_BOOLEAN' type='enum'/> <exports symbol='XML_SCHEMAS_ENTITY' type='enum'/> <exports symbol='XML_SCHEMA_TYPE_GROUP' type='enum'/> <exports symbol='XML_SCHEMAS_GYEARMONTH' type='enum'/> <exports symbol='XML_SCHEMAS_BASE64BINARY' type='enum'/> - <exports symbol='XML_SCHEMA_TYPE_ANY_ATTRIBUTE' type='enum'/> + <exports symbol='XML_SCHEMA_FACET_FRACTIONDIGITS' type='enum'/> <exports symbol='XML_SCHEMA_FACET_WHITESPACE' type='enum'/> <exports symbol='XML_SCHEMAS_IDREF' type='enum'/> <exports symbol='XML_SCHEMA_TYPE_ATTRIBUTE' type='enum'/> @@ -1744,6 +1744,7 @@ <exports symbol='xmlCopyDocElementContent' type='function'/> <exports symbol='xmlAddID' type='function'/> <exports symbol='xmlFreeRefTable' type='function'/> + <exports symbol='xmlValidateNamesValue' type='function'/> <exports symbol='xmlRemoveID' type='function'/> <exports symbol='xmlFreeElementTable' type='function'/> <exports symbol='xmlFreeIDTable' type='function'/> @@ -1755,7 +1756,6 @@ <exports symbol='xmlValidityWarningFunc' type='function'/> <exports symbol='xmlValidatePopElement' type='function'/> <exports symbol='xmlFreeEnumeration' type='function'/> - <exports symbol='xmlValidateNamesValue' type='function'/> <exports symbol='xmlCopyEnumeration' type='function'/> <exports symbol='xmlGetDtdAttrDesc' type='function'/> <exports symbol='xmlValidateDtd' type='function'/> @@ -3452,15 +3452,15 @@ <exports symbol='XPATH_ENCODING_ERROR' type='enum'/> <exports symbol='XPTR_RESOURCE_ERROR' type='enum'/> <exports symbol='XPATH_NUMBER' type='enum'/> - <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/> + <exports symbol='XPATH_POINT' type='enum'/> <exports symbol='XPATH_USERS' type='enum'/> <exports symbol='XPATH_UNDEF_PREFIX_ERROR' type='enum'/> <exports symbol='XPATH_UNKNOWN_FUNC_ERROR' type='enum'/> + <exports symbol='XPATH_INVALID_CTXT_SIZE' type='enum'/> <exports symbol='XPATH_RANGE' type='enum'/> <exports symbol='XPTR_SYNTAX_ERROR' type='enum'/> <exports symbol='XPATH_LOCATIONSET' type='enum'/> <exports symbol='XPATH_INVALID_CTXT' type='enum'/> - <exports symbol='XPATH_POINT' type='enum'/> <exports symbol='XPATH_INVALID_ARITY' type='enum'/> <exports symbol='XPATH_STRING' type='enum'/> <exports symbol='XPATH_INVALID_PREDICATE_ERROR' type='enum'/> diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa index d20f6a4..c9fb529 100644 --- a/doc/libxml2.xsa +++ b/doc/libxml2.xsa @@ -8,32 +8,19 @@ </vendor> <product id="libxml2"> <name>libxml2</name> - <version>2.6.29</version> - <last-release> Jun 12 2007</last-release> + <version>2.6.30</version> + <last-release> Aug 23 2007</last-release> <info-url>http://xmlsoft.org/</info-url> - <changes> - Portability: patches from Andreas Stricke for WinCEi, - fix compilation warnings (William Brack), avoid warnings on Apple OS/X - (Wendy Doyle and Mark Rowe), Windows compilation and threading - improvements (Rob Richards), compilation against old Python versions, - new GNU tar changes (Ryan Hill) - - Documentation: xmlURIUnescapeString comment, - - Bugfixes: xmlBufferAdd problem (Richard Jones), 'make valgrind' - flag fix (Richard Jones), regexp interpretation of \, - htmlCreateDocParserCtxt (Jean-Daniel Dupas), configure.in - typo (Bjorn Reese), entity content failure, xmlListAppend() fix - (Georges-André Silber), XPath number serialization (William Brack), - nanohttp gzipped stream fix (William Brack and Alex Cornejo), - xmlCharEncFirstLine typo (Mark Rowe), uri bug (François Delyon), - XPath string value of PI nodes (William Brack), XPath node set - sorting bugs (William Brack), avoid outputting namespace decl - dups in the writer (Rob Richards), xmlCtxtReset bug, UTF-8 encoding - error handling, recustion on next in catalogs, fix a Relax-NG crash, - workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes, - invalid character in attribute detection bug, big comments before - internal subset streaming bug, HTML parsing of attributes with : in - the name, IDness of name in HTML (Dagfinn I. Mannsåker) - - Improvement: keep URI query parts in raw form (Richard Jones), - embed tag support in HTML (Michael Day) + <changes> - Portability: Solaris crash on error handling, windows path fixes + (Roland Schwarz and Rob Richards), mingw build (Roland Schwarz) + - Bugfixes: xmlXPathNodeSetSort problem (William Brack), leak when + reusing a writer for a new document (Dodji Seketeli), Schemas + xsi:nil handling patch (Frank Gross), relative URI build problem + (Patrik Fimml), crash in xmlDocFormatDump, invalid char in comment + detection bug, fix disparity with xmlSAXUserParseMemory, automata + generation for complex regexp counts problems, Schemas IDC import + problems (Frank Gross), xpath predicate evailation error handling + (William Brack) </changes> </product> diff --git a/doc/news.html b/doc/news.html index 867b81a..f320d17 100644 --- a/doc/news.html +++ b/doc/news.html @@ -12,7 +12,24 @@ to help those</p><ul><li>More testing on RelaxNG</li> <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML Schemas</a></li> </ul><p>The <a href="ChangeLog.html">change log</a> describes the recents commits -to the <a href="http://svn.gnome.org/viewcvs/libxml2/trunk/">SVN</a> code base.</p><p>Here is the list of public releases:</p><h3>2.6.30: Aug 23 2007</h3><ul><li>Portability: Solaris crash on error handling, windows path fixes +to the <a href="http://svn.gnome.org/viewcvs/libxml2/trunk/">SVN</a> code base.</p><p>Here is the list of public releases:</p><h3>2.6.31: Jan 11 2008</h3><ul><li>Security fix: missing of checks in UTF-8 parsing</li> + <li>Bug fixes: regexp bug, dump attribute from XHTML document, fix + xmlFree(NULL) to not crash in debug mode, Schematron parsing crash + (Rob Richards), global lock free on Windows (Marc-Antoine Ruel), + XSD crash due to double free (Rob Richards), indentation fix in + xmlTextWriterFullEndElement (Felipe Pena), error in attribute type + parsing if attribute redeclared, avoid crash in hash list scanner if + deleting elements, column counter bug fix (Christian Schmidt), + HTML embed element saving fix (Stefan Behnel), avoid -L/usr/lib + output from xml2-config (Fred Crozat), avoid an xmllint crash + (Stefan Kost), don't stop HTML parsing on out of range chars. + </li> + <li>Code cleanup: fix open() call third argument, regexp cut'n paste + copy error, unused variable in __xmlGlobalInitMutexLock (Hannes Eder), + some make distcheck realted fixes (John Carr)</li> + <li>Improvements: HTTP Header: includes port number (William Brack), + testURI --debug option, </li> +</ul><h3>2.6.30: Aug 23 2007</h3><ul><li>Portability: Solaris crash on error handling, windows path fixes (Roland Schwarz and Rob Richards), mingw build (Roland Schwarz)</li> <li>Bugfixes: xmlXPathNodeSetSort problem (William Brack), leak when reusing a writer for a new document (Dodji Seketeli), Schemas diff --git a/doc/xml.html b/doc/xml.html index 1a44244..355dbed 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -739,6 +739,26 @@ to the <a href="http://svn.gnome.org/viewcvs/libxml2/trunk/">SVN</a> code base.< <p>Here is the list of public releases:</p> +<h3>2.6.31: Jan 11 2008</h3> +<ul> + <li>Security fix: missing of checks in UTF-8 parsing</li> + <li>Bug fixes: regexp bug, dump attribute from XHTML document, fix + xmlFree(NULL) to not crash in debug mode, Schematron parsing crash + (Rob Richards), global lock free on Windows (Marc-Antoine Ruel), + XSD crash due to double free (Rob Richards), indentation fix in + xmlTextWriterFullEndElement (Felipe Pena), error in attribute type + parsing if attribute redeclared, avoid crash in hash list scanner if + deleting elements, column counter bug fix (Christian Schmidt), + HTML embed element saving fix (Stefan Behnel), avoid -L/usr/lib + output from xml2-config (Fred Crozat), avoid an xmllint crash + (Stefan Kost), don't stop HTML parsing on out of range chars. + </li> + <li>Code cleanup: fix open() call third argument, regexp cut'n paste + copy error, unused variable in __xmlGlobalInitMutexLock (Hannes Eder), + some make distcheck realted fixes (John Carr)</li> + <li>Improvements: HTTP Header: includes port number (William Brack), + testURI --debug option, </li> +</ul> <h3>2.6.30: Aug 23 2007</h3> <ul> <li>Portability: Solaris crash on error handling, windows path fixes |