Merge "Rebase for libxslt-1.1.29" into tizen_base

4 files changed, 694 insertions, 98 deletions

diff --git a/tests/docbook/BUGS b/tests/docbook/BUGS
deleted file mode 100644
index 5723ffd3..00000000
--- a/tests/docbook/BUGS
+++ /dev/null
@@ -1,6 +0,0 @@
-The fo stylesheet is probably not in perfect sync with the html stylesheet
-
-Using Equations w/o titles results in incorrectly numbered
-  equations with titles.  Use InformalEquation instead.
-
-The 'char' alignment in tables is not supported
diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am
index 8dd336a9..09e7239b 100644
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -7,7 +7,7 @@ tests:
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
-	$(MAKE) CHECKER='valgrind -q' tests
+	$(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests
 
 $(top_builddir)/xsltproc/xsltproc:
 	@(cd ../../xsltproc ; $(MAKE) xsltproc)
diff --git a/tests/docbook/Makefile.in b/tests/docbook/Makefile.in
new file mode 100644
index 00000000..7047918d
--- /dev/null
+++ b/tests/docbook/Makefile.in
@@ -0,0 +1,693 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = tests/docbook
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog README TODO
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CRYPTO_TESTDIR = @CRYPTO_TESTDIR@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@
+EXSLT_LIBDIR = @EXSLT_LIBDIR@
+EXSLT_LIBS = @EXSLT_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
+FGREP = @FGREP@
+GREP = @GREP@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXSLT_MAJOR_VERSION = @LIBEXSLT_MAJOR_VERSION@
+LIBEXSLT_MICRO_VERSION = @LIBEXSLT_MICRO_VERSION@
+LIBEXSLT_MINOR_VERSION = @LIBEXSLT_MINOR_VERSION@
+LIBEXSLT_VERSION = @LIBEXSLT_VERSION@
+LIBEXSLT_VERSION_EXTRA = @LIBEXSLT_VERSION_EXTRA@
+LIBEXSLT_VERSION_INFO = @LIBEXSLT_VERSION_INFO@
+LIBEXSLT_VERSION_NUMBER = @LIBEXSLT_VERSION_NUMBER@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
+LIBXML_SRC = @LIBXML_SRC@
+LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
+LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
+LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
+LIBXSLT_MICRO_VERSION = @LIBXSLT_MICRO_VERSION@
+LIBXSLT_MINOR_VERSION = @LIBXSLT_MINOR_VERSION@
+LIBXSLT_VERSION = @LIBXSLT_VERSION@
+LIBXSLT_VERSION_EXTRA = @LIBXSLT_VERSION_EXTRA@
+LIBXSLT_VERSION_INFO = @LIBXSLT_VERSION_INFO@
+LIBXSLT_VERSION_NUMBER = @LIBXSLT_VERSION_NUMBER@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MV = @MV@
+M_LIBS = @M_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PYTHON = @PYTHON@
+PYTHONSODV = @PYTHONSODV@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
+PYTHON_SUBDIR = @PYTHON_SUBDIR@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RELDATE = @RELDATE@
+RM = @RM@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TAR = @TAR@
+THREAD_LIBS = @THREAD_LIBS@
+VERSION = @VERSION@
+VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@
+WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
+WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
+WITH_CRYPTO = @WITH_CRYPTO@
+WITH_DEBUGGER = @WITH_DEBUGGER@
+WITH_MEM_DEBUG = @WITH_MEM_DEBUG@
+WITH_MODULES = @WITH_MODULES@
+WITH_TRIO = @WITH_TRIO@
+WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@
+XMLLINT = @XMLLINT@
+XML_CONFIG = @XML_CONFIG@
+XSLTPROC = @XSLTPROC@
+XSLTPROCDV = @XSLTPROCDV@
+XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@
+XSLT_LIBDIR = @XSLT_LIBDIR@
+XSLT_LIBS = @XSLT_LIBS@
+XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@
+XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+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_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = README VERSION
+CLEANFILES = .memdump
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/docbook/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tests/docbook/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am dist-hook distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am 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 \
+	tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+tests:
+	@echo '## Running docbook tests'
+	$(MAKE) single
+	$(MAKE) xtchunk
+
+valgrind:
+	@echo '## Running the regression tests under Valgrind'
+	$(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests
+
+$(top_builddir)/xsltproc/xsltproc:
+	@(cd ../../xsltproc ; $(MAKE) xsltproc)
+
+full: tests htmltests xhtmltests fotests
+
+#
+# a single tests to check that stuff ain't broken
+#
+single:
+	@$(MKDIR_P) result/html
+	@$(MKDIR_P) result/fo
+	@$(MKDIR_P) result/xhtml
+	@(echo > .memdump)
+	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
+	  echo -n "`basename $$i` : html " ; \
+	  out=result/html/`basename $$i .xml`.tst; \
+	  html=result/html/`basename $$i .xml`.html; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/html/docbook.xsl $$i > $$out ; \
+	    if [ -f $(srcdir)/$$html ] ; then \
+		grep -v id < $(srcdir)/$$html > $$html.noid ; \
+		grep -v id < $$out > $$out.noid ; \
+		diff $$html.noid $$out.noid ; \
+		rm -f $$html.noid $$out.noid ; \
+	    else \
+		mv $$out $(srcdir)/$$html ; \
+	    fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+		echo result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f $$out ; \
+	  echo -n "fo " ; \
+	  out=result/fo/`basename $$i .xml`.tst; \
+	  fo=result/fo/`basename $$i .xml`.fo; \
+	  msg=result/fo/`basename $$i .xml`.msg; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/fo/docbook.xsl $$i > $$out 2> $$msg ; \
+	  if [ -f $(srcdir)/$$fo ] ; then \
+	      grep -v id < $(srcdir)/$$fo > $$fo.noid ; \
+	      grep -v id < $$out > $$out.noid ; \
+	      diff $$fo.noid $$out.noid ; \
+	      rm -f $$fo.noid $$out.noid ; \
+	  else \
+		mv $$out $(srcdir)/$$fo ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+		echo result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f $$out $$msg ; \
+	  echo -n "xhtml " ; \
+	  out=result/xhtml/`basename $$i .xml`.tst; \
+	  xhtml=result/xhtml/`basename $$i .xml`.xhtml; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
+	  if [ -f $(srcdir)/$$xhtml ] ; then \
+	      grep -v id < $(srcdir)/$$xhtml > $$xhtml.noid ; \
+	      grep -v id < $$out > $$out.noid ; \
+	      diff $$xhtml.noid $$out.noid ; \
+	      rm -f $$xhtml.noid $$out.noid ; \
+	  else \
+		mv $$out $(srcdir)/$$xhtml ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+		echo result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f $$out ; \
+	  done )
+	@echo
+
+xtchunk:
+	@$(MKDIR_P) result/html
+	@$(MKDIR_P) result/xtchunk
+	@(echo > .memdump)
+	@echo -n html-chunking
+	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
+	  base=`basename $$i .xml` ; \
+	  html=result/html/$$base.html; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		-o result/xtchunk/html/gdp-handbook \
+		$(srcdir)/html/xtchunk.xsl $$i 2> $$base.err ; \
+	    if [ -f $(srcdir)/result/html/$$base.err ] ; then \
+		diff $(srcdir)/result/html/$$base.err $$base.err ; \
+		rm $$base.err ; \
+	    else \
+		mv $$base.err $(srcdir)/result/html/$$base.err ; \
+	    fi ; \
+	    for html in result/xtchunk/html/*.html ; do \
+	      orig=result/xtchunk/html/\`basename $$html .html\`.orig ;\
+	      if [ -f $(srcdir)/$$orig ] ; then \
+		  grep -v id < $$html > $$html.noid ; \
+		  grep -v id < $(srcdir)/$$orig > $$orig.noid ; \
+		  diff $$orig.noid $$html.noid ; \
+		  rm -f $$html.noid $$orig.noid $$html; \
+	      else \
+		  mv $$html $(srcdir)/$$orig ; \
+		fi ; \
+	    done ; \
+	    grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+		echo result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f result/xtchunk/html/gdp-handbook ; \
+	  done )
+	@echo
+
+#
+# The full set of tests
+#
+htmltests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/html
+	@(echo > .memdump)
+	@echo "##"
+	@echo "## HTML stylesheets regression tests"
+	@echo "##"
+	@(for i in $(srcdir)/test/*.xml ; do \
+	  echo $$i ; \
+	  out=result/html/`basename $$i .xml`.tst; \
+	  html=result/html/`basename $$i .xml`.html; \
+	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/html/docbook.xsl $$i > $$out ; \
+	  if [ -f $(srcdir)/$$html ] ; then \
+	      grep -v id < $(srcdir)/$$html > $$html.noid ; \
+	      grep -v id < $$out > $$out.noid ; \
+	      diff $$html.noid $$out.noid ; \
+	      rm -f $$html.noid $$out.noid ; \
+	  else mv $$out $(srcdir)/$$html ; fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
+	  rm -f $$out ; done )
+
+fotests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/fo
+	@(echo > .memdump)
+	@echo "##"
+	@echo "## XSL FO stylesheets regression tests"
+	@echo "##"
+	@(for i in $(srcdir)/test/*.xml ; do \
+	  echo $$i ; \
+	  out=result/fo/`basename $$i .xml`.tst; \
+	  fo=result/fo/`basename $$i .xml`.fo; \
+	  msg=result/fo/`basename $$i .xml`.msg; \
+	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/fo/docbook.xsl $$i > $$out  2> $$msg ; \
+	  if [ -f $(srcdir)/$$fo ] ; then \
+	      grep -v id < $(srcdir)/$$fo > $$fo.noid ; \
+	      grep -v id < $$out > $$out.noid ; \
+	      diff $$fo.noid $$out.noid ; \
+	      rm -f $$fo.noid $$out.noid ; \
+	  else mv $$out $(srcdir)/$$fo ; fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
+	  rm -f $$out $$msg ; \
+	  done )
+
+xhtmltests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/xhtml
+	@(echo > .memdump)
+	@echo "##"
+	@echo "## XHTML stylesheets regression tests"
+	@echo "##"
+	@(for i in $(srcdir)/test/*.xml ; do \
+	  echo $$i ; \
+	  out=result/xhtml/`basename $$i .xml`.tst; \
+	  xhtml=result/xhtml/`basename $$i .xml`.xhtml; \
+	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
+	  if [ -f $(srcdir)/$$xhtml ] ; then \
+	      grep -v id < $(srcdir)/$$xhtml > $$xhtml.noid ; \
+	      grep -v id < $$out > $$out.noid ; \
+	      diff $$xhtml.noid $$out.noid ; \
+	      rm -f $$xhtml.noid $$out.noid ; \
+	  else mv $$out $(srcdir)/$$xhtml ; fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
+	  rm -f $$out ; done )
+
+dist-hook:
+	@(cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/tests/docbook/WhatsNew b/tests/docbook/WhatsNew
deleted file mode 100644
index a06abeff..00000000
--- a/tests/docbook/WhatsNew
+++ /dev/null
@@ -1,91 +0,0 @@
-Changes since version 1.39 (2001-05-24)
-
-Changes to docbook/*
-
-  | 2001-06-14  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* VERSION: Version 1.40 released.
-  | 
-
-Changes to docbook/common/*
-
-  | 2001-06-14  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* subtitles.xsl: Support subtitle on article
-  | 
-
-Changes to docbook/fo/*
-
-  | 2001-06-14  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* sections.xsl: Bug fix: section autolabelling wasn't working
-  | 	  in division bodies
-  | 
-  | 	* titlepage.templates.xml: Changed text-alignment on centered
-  | 	  titles to be 'center' rather than 'justify'
-  | 
-  | 	* xref.xsl: Added anchor template
-  | 
-  | 2001-06-13  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* graphics.xsl, param.xsl: Support Arbortext extensions--at
-  | 	  the moment, just to turn off the url() stuff in external
-  | 	  graphic references
-  | 
-  | 	* titlepage.xsl: Bug fix: make a single author in an
-  | 	  authorgroup work correctly
-  | 
-  | 2001-06-08  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* callout.xsl, inline.xsl, synop.xsl: Fixed some
-  | 	  unparameterized references to specific font families
-  | 
-  | 2001-06-04  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* block.xsl: Made blockquote indent more reasonable
-  | 
-  | 	* graphics.xsl: Omit the url() wrapper around external-graphic
-  | 	  srcs for FOP and PT
-  | 
-
-Changes to docbook/html/*
-
-  | 2001-06-13  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* chunk-common.xsl: Make sure the root element gets processed
-  | 	  correctly so that it generates the right titlepage
-  | 
-  | 	* component.xsl: Don't output ID attributes on DIVs with
-  | 	  required titles since they conflict with the NAME attributes
-  | 	  on the subsequently output A tags.
-  | 
-  | 	* docbook.xsl: Pass the current node to user.head.content
-  | 
-  | 	* index.xsl: Updated comment
-  | 
-  | 2001-06-07  Jirka Kosek <kosek@users.sourceforge.net>
-  | 
-  | 	* lists.xsl: Things preceding steps in procedure are placed
-  | 	  before OL list.
-  | 
-  | 2001-06-04  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* lists.xsl: Fixed typo in compact list support; backed out
-  | 	  procedure step changes
-  | 
-  | 	* sections.xsl: Fixed CSS typo; clear: all should be clear:
-  | 	  both
-  | 
-  | 2001-06-02  Jirka Kosek <kosek@users.sourceforge.net>
-  | 
-  | 	* lists.xsl: Fixed bug #424926. Things preceding steps in
-  | 	  procedure are not placed inside OL list.
-  | 
-
-Changes to docbook/extensions/saxon63/com/nwalsh/saxon/*
-
-  | 2001-06-13  Norman Walsh <nwalsh@users.sourceforge.net>
-  | 
-  | 	* Table.java: Fix API for Saxon 6.3; I missed one
-  | 
-