22 files changed, 937 insertions, 279 deletions
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 0c2ef307..467b0507 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -114,7 +114,7 @@ EXTRA_DIST = \
     bug-107.out bug-107.xsl \
     bug-108.out bug-108.xsl \
     bug-109.out bug-109.xsl \
-    bug-110.out bug-110.xsl \
+    bug-110.out bug-110.xsl bug-110.err \
     bug-111.out bug-111.xsl \
     bug-112.out bug-112.xsl \
     bug-113.out bug-113.xsl \
@@ -188,16 +188,24 @@ EXTRA_DIST = \
     bug-178.out bug-178.xsl \
     bug-179.out bug-179.xsl \
     bug-180.out bug-180.xsl bug-180.err \
+    bug-181.out bug-181.xsl \
+    bug-182.out bug-182.xsl \
+    bug-183.out bug-183.xsl \
+    bug-184.out bug-184.xsl bug-184.err \
+    bug-185.out bug-185.xsl bug-185.err \
+    bug-186.out bug-186.xsl \
+    bug-187.out bug-187.xsl bug-187.err \
     character.out character.xsl \
     character2.out character2.xsl \
     itemschoose.out itemschoose.xsl \
-    inner.xsl date_add.xsl
+    inner.xsl \
+    date_add.out date_add.xsl
 
 CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
-	$(MAKE) CHECKER='valgrind -q' tests
+	$(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests
 
 test tests: $(top_builddir)/xsltproc/xsltproc
 	@echo '## Running general tests'
diff --git a/tests/general/Makefile.in b/tests/general/Makefile.in
new file mode 100644
index 00000000..84d2fa81
--- /dev/null
+++ b/tests/general/Makefile.in
@@ -0,0 +1,768 @@
+# 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/general
+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
+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 = \
+    bug-1-.out bug-1-.xsl \
+    bug-2-.out bug-2-.xsl \
+    bug-3-.out bug-3-.xsl \
+    bug-4-.out bug-4-.xsl \
+    bug-5-.out bug-5-.xsl \
+    bug-6-.out bug-6-.xsl \
+    bug-7-.out bug-7-.xsl \
+    bug-8-.out bug-8-.xsl \
+    bug-9-.out bug-9-.xsl \
+    bug-10-.out bug-10-.xsl \
+    bug-11-.out bug-11-.xsl \
+    bug-12-.out bug-12-.xsl \
+    bug-13-.out bug-13-.xsl \
+    bug-14-.out bug-14-.xsl \
+    bug-15-.out bug-15-.xsl \
+    bug-16-.out bug-16-.xsl \
+    bug-17-.out bug-17-.xsl \
+    bug-18-.out bug-18-.xsl \
+    bug-19-.out bug-19-.xsl \
+    bug-20-.out bug-20-.xsl \
+    bug-21-.out bug-21-.xsl \
+    bug-22-.out bug-22-.xsl \
+    bug-23-.out bug-23-.xsl \
+    bug-24-.out bug-24-.xsl \
+    bug-25-.out bug-25-.xsl \
+    bug-26-.out bug-26-.xsl \
+    bug-27-.out bug-27-.xsl \
+    bug-28-.out bug-28-.xsl \
+    bug-29-.out bug-29-.xsl \
+    bug-30-.out bug-30-.xsl \
+    bug-31-.out bug-31-.xsl \
+    bug-32-.out bug-32-.xsl \
+    bug-33-.out bug-33-.xsl \
+    bug-35-.out bug-35-.xsl \
+    bug-36-.out bug-36-.xsl \
+    bug-36-inc.out bug-36-inc.xsl \
+    bug-37-.out bug-37-.xsl \
+    bug-37-inc.out bug-37-inc.xsl \
+    array.out array.xsl \
+    bug-38-.out bug-38-.xsl \
+    bug-39-.out bug-39-.xsl \
+    bug-40-.out bug-40-.xsl \
+    bug-41-.out bug-41-.xsl \
+    bug-42-.out bug-42-.xsl \
+    bug-43-.out bug-43-.xsl \
+    bug-44-.out bug-44-.xsl \
+    bug-45-.out bug-45-.xsl \
+    bug-46-.out bug-46-.xsl \
+    bug-47-.out bug-47-.xsl \
+    bug-48-.out bug-48-.xsl \
+    bug-49-.out bug-49-.xsl \
+    bug-50-.out bug-50-.xsl \
+    bug-52.out bug-52.xsl \
+    bug-53.out bug-53.xsl \
+    bug-54.out bug-54.xsl \
+    bug-55.out bug-55.xsl \
+    bug-56.out bug-56.xsl \
+    bug-57.out bug-57.xsl \
+    bug-59.out bug-59.xsl \
+    bug-60.out bug-60.xsl bug-60.err \
+    bug-61.out bug-61.xsl \
+    bug-62-inc.out bug-62-inc.xsl \
+    bug-62.out bug-62.xsl \
+    bug-63.out bug-63.xsl \
+    bug-64.out bug-64.xsl \
+    bug-65.ent bug-65.out bug-65.xsl \
+    bug-66.out bug-66.xsl \
+    bug-68.out bug-68.xsl \
+    bug-69.out bug-69.xsl \
+    bug-70.out bug-70.xsl \
+    bug-71.out bug-71.xsl \
+    bug-72.out bug-72.xsl \
+    bug-73.out bug-73.xsl \
+    bug-74.out bug-74.xsl \
+    bug-75.out bug-75.xsl \
+    bug-76.out bug-76.xsl \
+    bug-77.out bug-77.xsl \
+    bug-78.out bug-78.xsl \
+    bug-79.out bug-79.xsl \
+    bug-80.out bug-80.xsl \
+    bug-81.out bug-81.xsl \
+    bug-82.out bug-82.xsl \
+    bug-83.out bug-83.xsl \
+    bug-84.out bug-84.xsl \
+    bug-86.out bug-86.xsl \
+    bug-87.out bug-87.xsl \
+    bug-88.out bug-88.xsl \
+    bug-89.out bug-89.xsl \
+    bug-90.out bug-90.xsl \
+    bug-91.out bug-91.xsl \
+    bug-92.out bug-92.xsl \
+    bug-93.out bug-93.xsl \
+    bug-93-inc.out bug-93-inc.xsl \
+    bug-94.out bug-94.xsl \
+    bug-95.out bug-95.xsl \
+    bug-96.out bug-96.xsl \
+    bug-97.out bug-97.xsl \
+    bug-98.out bug-98.xsl \
+    bug-99.out bug-99.xsl \
+    bug-100.out bug-100.xsl \
+    bug-101.out bug-101.xsl \
+    bug-102.out bug-102.xsl \
+    bug-102-inc.out bug-102-inc.xsl \
+    bug-103.out bug-103.xsl \
+    bug-104.out bug-104.xsl \
+    bug-105.out bug-105.xsl \
+    bug-106.out bug-106.xsl \
+    bug-107.out bug-107.xsl \
+    bug-108.out bug-108.xsl \
+    bug-109.out bug-109.xsl \
+    bug-110.out bug-110.xsl bug-110.err \
+    bug-111.out bug-111.xsl \
+    bug-112.out bug-112.xsl \
+    bug-113.out bug-113.xsl \
+    bug-114.out bug-114.xsl \
+    bug-115.out bug-115.xsl \
+    bug-116.out bug-116.xsl \
+    bug-117.out bug-117.xsl \
+    bug-118.out bug-118.xsl \
+    bug-119.out bug-119.xsl \
+    bug-120.out bug-120.xsl \
+    bug-121.out bug-121.xsl \
+    bug-122.out bug-122.xsl \
+    bug-123.out bug-123.xsl \
+    bug-124.out bug-124.xsl \
+    bug-125.out bug-125.xsl \
+    bug-126.out bug-126.xsl \
+    bug-127.out bug-127.xsl \
+    bug-128.out bug-128.xsl \
+    bug-129.out bug-129.xsl \
+    bug-130.out bug-130.xsl \
+    bug-130-imp1.imp bug-130-imp2.imp bug-130-imp3.imp bug-130-imp4.imp \
+    bug-131.out bug-131.xsl bug-131-imp.imp \
+    bug-132.out bug-132.xsl \
+    bug-133.out bug-133.xsl \
+    bug-134.out bug-134.xsl \
+    bug-135.out bug-135.xsl \
+    bug-136.out bug-136.xsl \
+    bug-137.imp  bug-137.out  bug-137.xsl \
+    bug-138.out bug-138.xsl \
+    bug-139.out bug-139.xsl \
+    bug-140.out bug-140.xsl \
+    bug-141.out bug-141.xsl \
+    bug-142.out bug-142.xsl \
+    bug-143.out bug-143.xsl \
+    bug-144.out bug-144.xsl \
+    bug-145.out bug-145.xsl bug-145.err \
+    bug-146.out bug-146.xsl \
+    bug-147.out bug-147.xsl \
+    bug-147-1.imp bug-147-2.imp bug-147-3.imp \
+    bug-147-4.imp bug-147-5.imp bug-147-6.imp \
+    bug-148.out bug-148.xsl \
+    bug-149.out bug-149.xsl \
+    bug-150.out bug-150.xsl \
+    bug-151.out bug-151.xsl \
+    bug-152.out bug-152.xsl \
+    bug-153.out bug-153.xsl \
+    bug-154.out bug-154.xsl \
+    bug-155.out bug-155.xsl \
+    bug-156.err bug-156.out bug-156.xsl \
+    bug-156.imp1.imp bug-156.imp2.imp \
+    bug-157.err bug-157.out bug-157.xsl \
+    bug-158.out bug-158.xsl \
+    bug-159.out bug-159.xsl \
+    bug-160.out bug-160.xsl \
+    bug-161.out bug-161.xsl \
+    bug-163.out bug-163.xsl \
+    bug-164.out bug-164.xsl \
+    bug-165.out bug-165.xsl bug-165.err \
+    bug-166.out bug-166.xsl \
+    bug-167.out bug-167.xsl \
+    bug-168.out bug-168.xsl \
+    bug-169.out bug-169.xsl bug-169.imp \
+    bug-170.out bug-170.xsl \
+    bug-171.out bug-171.xsl \
+    bug-172.out bug-172.xsl \
+    bug-173.out bug-173.xsl \
+    bug-174.out bug-174.xsl bug-174.err \
+    bug-175.out bug-175.xsl bug-175.err \
+    bug-176.out bug-176.xsl \
+    bug-177.out bug-177.xsl \
+    bug-178.out bug-178.xsl \
+    bug-179.out bug-179.xsl \
+    bug-180.out bug-180.xsl bug-180.err \
+    bug-181.out bug-181.xsl \
+    bug-182.out bug-182.xsl \
+    bug-183.out bug-183.xsl \
+    bug-184.out bug-184.xsl bug-184.err \
+    bug-185.out bug-185.xsl bug-185.err \
+    bug-186.out bug-186.xsl \
+    bug-187.out bug-187.xsl bug-187.err \
+    character.out character.xsl \
+    character2.out character2.xsl \
+    itemschoose.out itemschoose.xsl \
+    inner.xsl \
+    date_add.out date_add.xsl
+
+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/general/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tests/general/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
+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 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
+
+
+$(top_builddir)/xsltproc/xsltproc:
+	@(cd ../../xsltproc ; $(MAKE) xsltproc)
+
+valgrind:
+	@echo '## Running the regression tests under Valgrind'
+	$(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests
+
+test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running general tests'
+	@(echo > .memdump)
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	  if [ -d $$i ] ; then continue ; fi ; \
+	  doc=`basename $$i .xml` ; \
+	  for j in $(srcdir)/$$doc*.xsl ; do \
+	  if [ ! -f $$j ] ; then continue ; fi ; \
+	  if [ -d $$j ] ; then continue ; fi ; \
+	  name=`basename $$j .xsl`; \
+	  out=$(srcdir)/"$$name".out; \
+	  err=$(srcdir)/"$$name".err; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  	> result.$$name 2>err.$$name; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
+	  done ; done)
+	@echo '## Running general tests without dictionaries'
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	  if [ -d $$i ] ; then continue ; fi ; \
+	  doc=`basename $$i .xml` ; \
+	  for j in $(srcdir)/$$doc*.xsl ; do \
+	  if [ ! -f $$j ] ; then continue ; fi ; \
+	  if [ -d $$j ] ; then continue ; fi ; \
+	  name=`basename $$j .xsl`; \
+	  out=$(srcdir)/"$$name".out; \
+	  err=$(srcdir)/"$$name".err; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict $$j $$i \
+	  	> result.$$name 2>err.$$name; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo "$$log" ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
+	  done ; done)
+
+# 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/general/itemschoose.out.out b/tests/general/bug-110.err
index e69de29b..e69de29b 100644
--- a/tests/general/itemschoose.out.out
+++ b/tests/general/bug-110.err
diff --git a/tests/general/bug-180.err b/tests/general/bug-180.err
index e45b36e8..e0e568ec 100644
--- a/tests/general/bug-180.err
+++ b/tests/general/bug-180.err
@@ -1,4 +1,2 @@
 runtime error: file ./bug-180.xsl line 4 element copy-of
 Variable 'xxx' has not been declared.
-XPath error : Stack usage errror
-xmlXPathCompiledEval: 1 objects left on the stack.
diff --git a/tests/general/bug-181.out b/tests/general/bug-181.out
new file mode 100644
index 00000000..730387a6
--- /dev/null
+++ b/tests/general/bug-181.out
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<Urmel>
+  <E>1. * zwei <F>drei</F> zwei eins</E>
+  <E a="b">2. * zwei <F>drei</F> zwei eins</E>
+</Urmel>
diff --git a/tests/general/bug-181.xsl b/tests/general/bug-181.xsl
new file mode 100644
index 00000000..0c4de713
--- /dev/null
+++ b/tests/general/bug-181.xsl
@@ -0,0 +1,13 @@
+<xsl:transform version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="E/text()[ 1 ]">
+    <xsl:value-of select="substring-before( . , ' ')"/>
+    <xsl:text> * </xsl:text>
+    <xsl:value-of select="substring-after( . , ' ')"/>
+  </xsl:template>
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+</xsl:transform>
diff --git a/tests/general/bug-182.out b/tests/general/bug-182.out
new file mode 100644
index 00000000..93ab15e2
--- /dev/null
+++ b/tests/general/bug-182.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<body><p>b[2]:  b 2 </p><p>text()[2]:  text 2 </p></body>
diff --git a/tests/general/bug-182.xsl b/tests/general/bug-182.xsl
new file mode 100644
index 00000000..cebf2ea4
--- /dev/null
+++ b/tests/general/bug-182.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<!-- Known to fail with libxml2 2.9.0 and 2.9.1. -->
+
+<xsl:template match="node()"/>
+
+<xsl:template match="text()[2]">
+  <p>text()[2]: <xsl:value-of select="."/></p>
+</xsl:template>
+<xsl:template match="b[2]">
+  <p>b[2]: <xsl:value-of select="."/></p>
+</xsl:template>
+
+<xsl:template match="/">
+  <body>
+    <xsl:apply-templates select="/root/body/node()"/>
+  </body>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/tests/general/bug-183.out b/tests/general/bug-183.out
new file mode 100644
index 00000000..e38fb433
--- /dev/null
+++ b/tests/general/bug-183.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<result>hello</result>
diff --git a/tests/general/bug-183.xsl b/tests/general/bug-183.xsl
new file mode 100644
index 00000000..429951fe
--- /dev/null
+++ b/tests/general/bug-183.xsl
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:key name="index" match="val" use="current()/@k"/>
+<xsl:template match="/">
+    <result>
+        <xsl:value-of select="key('index', 'one')"/>
+    </result>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/tests/general/bug-184.err b/tests/general/bug-184.err
new file mode 100644
index 00000000..ec5e9124
--- /dev/null
+++ b/tests/general/bug-184.err
@@ -0,0 +1,5 @@
+runtime error: file ./bug-184.xsl line 5 element value-of
+Variable 'nonexistent' has not been declared.
+xmlXPathCompiledEval: 1 objects left on the stack.
+runtime error: file ./bug-184.xsl line 5 element value-of
+XPath evaluation returned no result.
diff --git a/tests/general/bug-184.out b/tests/general/bug-184.out
new file mode 100644
index 00000000..e829790a
--- /dev/null
+++ b/tests/general/bug-184.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<result/>
diff --git a/tests/general/bug-184.xsl b/tests/general/bug-184.xsl
new file mode 100644
index 00000000..6ab96766
--- /dev/null
+++ b/tests/general/bug-184.xsl
@@ -0,0 +1,8 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <!-- Known to fail with libxml2 2.9.1 and below. -->
+    <xsl:template match="/">
+        <result>
+            <xsl:value-of select="generate-id()=generate-id(key('none', $nonexistent))"/>
+        </result>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/tests/general/bug-185.err b/tests/general/bug-185.err
new file mode 100644
index 00000000..d7bbe927
--- /dev/null
+++ b/tests/general/bug-185.err
@@ -0,0 +1,3 @@
+runtime error: file ./bug-185.xsl line 7 element copy-of
+document() : XPointer does not select a node set: #xpointer(id('X')/range-to(id('Y')))
+no result for ./../docs/bug-185.xml
diff --git a/tests/general/bug-185.out b/tests/general/bug-185.out
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/general/bug-185.out
diff --git a/tests/general/bug-185.xsl b/tests/general/bug-185.xsl
new file mode 100644
index 00000000..1c5c7d1c
--- /dev/null
+++ b/tests/general/bug-185.xsl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:template match="in">
+    <annotation>
+      <xsl:copy-of select="."/>
+      <value>
+        <xsl:copy-of select="document(.)"/>
+      </value>
+    </annotation>
+  </xsl:template>
+  <xsl:template match="@*|node()">
+    <xsl:apply-templates/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/tests/general/bug-186.out b/tests/general/bug-186.out
new file mode 100644
index 00000000..01a59f83
--- /dev/null
+++ b/tests/general/bug-186.out
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+1111
+1111
+
diff --git a/tests/general/bug-186.xsl b/tests/general/bug-186.xsl
new file mode 100644
index 00000000..9c491ddb
--- /dev/null
+++ b/tests/general/bug-186.xsl
@@ -0,0 +1,7 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:template match="*/*">
+  <xsl:for-each select="namespace::*">
+   <xsl:number/>
+  </xsl:for-each>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/tests/general/bug-187.err b/tests/general/bug-187.err
new file mode 100644
index 00000000..15346928
--- /dev/null
+++ b/tests/general/bug-187.err
@@ -0,0 +1,6 @@
+error
+xsl-number : negative value
+error
+xsl-number : negative value
+error
+xsl-number : negative value
diff --git a/tests/general/bug-187.out b/tests/general/bug-187.out
new file mode 100644
index 00000000..dd1645d6
--- /dev/null
+++ b/tests/general/bug-187.out
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<result>
+  <number>4</number>
+  <number>0</number>
+  <number>9007199254740992</number>
+  <number>d</number>
+  <number>0</number>
+  <number>0</number>
+  <number>bktxhsoghkkf</number>
+  <number>IV</number>
+  <number>0</number>
+  <number>0</number>
+  <number>9007199254740992</number>
+</result>
diff --git a/tests/general/bug-187.xsl b/tests/general/bug-187.xsl
new file mode 100644
index 00000000..7a10a370
--- /dev/null
+++ b/tests/general/bug-187.xsl
@@ -0,0 +1,42 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output indent="yes"/>
+    <xsl:template match="/">
+        <result>
+            <number>
+                <xsl:number format="1" value="3.51"/>
+            </number>
+            <number>
+                <xsl:number format="1" value="-123.456"/>
+            </number>
+            <number>
+                <!-- 2 ** 53 -->
+                <xsl:number format="1" value="9007199254740992"/>
+            </number>
+            <number>
+                <xsl:number format="a" value="3.51"/>
+            </number>
+            <number>
+                <xsl:number format="a" value="-123.456"/>
+            </number>
+            <number>
+                <xsl:number format="a" value="0"/>
+            </number>
+            <number>
+                <xsl:number format="a" value="9007199254740992"/>
+            </number>
+            <number>
+                <xsl:number format="I" value="3.51"/>
+            </number>
+            <number>
+                <xsl:number format="I" value="-123.456"/>
+            </number>
+            <number>
+                <xsl:number format="I" value="0"/>
+            </number>
+            <number>
+                <xsl:number format="I" value="9007199254740992"/>
+            </number>
+        </result>
+    </xsl:template>
+</xsl:stylesheet>
+
diff --git a/tests/general/bug-58.xsl b/tests/general/bug-58.xsl
deleted file mode 100644
index b7a14958..00000000
--- a/tests/general/bug-58.xsl
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:msxsl="http://exslt.org/common" extension-element-prefixes="msxsl">
-  <xsl:output method="html" version="1.0" encoding="iso-8859-1" indent="yes"/>
-  
-  <xsl:param name="document-name"/>
-  
-  <xsl:variable name="stylesheet-tree" >
-    <stylesheet href="{$document-name}">
-      <xsl:apply-templates select="/" mode="tree-building"/>
-    </stylesheet>
-  </xsl:variable>
-  
-  <xsl:template match="/">
-    <html xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:spec="http://www.macaw.nl/namespaces/creaim/html-specials" xmlns:fml="http://www.macaw.nl/namespaces/creaim/formsML">
-      <head>
-        <title>Documentation for: <xsl:value-of select="$document-name"/></title>
-        <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style"/>
-        <script >
-          <xsl:comment>
-            function toggleElm(elmid)
-            {
-              var elmstyle = document.all(elmid).style;
-              //alert(document.all(elmid).nodeName);
-              if (elmstyle.display == "none")
-              {
-                elmstyle.display = "";
-              }else{
-                elmstyle.display = "none";
-              }
-              //alert(elmstyle.display);
-            }
-          </xsl:comment>
-        </script>
-      </head>
-      <body>
-       <h1>Documentation for: <xsl:value-of select="$document-name"/></h1>
-       <xsl:for-each select="xsl:stylesheet/preceding::comment()">
-         <xsl:value-of select="self::comment()" disable-output-escaping="yes"/><br/>
-       </xsl:for-each>
-       <h2>Import/Include tree</h2>
-      <xsl:call-template name="display-stylesheet-tree">
-      </xsl:call-template>
-       <h2>Parameters</h2>
-      <xsl:apply-templates select="xsl:stylesheet/xsl:param"/>
-       <h2>Global variables</h2>
-      <xsl:apply-templates select="xsl:stylesheet/xsl:variable"/>
-       <h2>Templates</h2>
-      <xsl:apply-templates select="xsl:stylesheet/xsl:template"/>
-       <h2>Other top-level elements</h2>
-      <xsl:apply-templates select="xsl:stylesheet/xsl:decimal-format|xsl:stylesheet/xsl:atribute-set|xsl:stylesheet/xsl:key|xsl:stylesheet/xsl:output|xsl:stylesheet/xsl:namespace-alias|xsl:stylesheet/xsl:preserve-space|xsl:stylesheet/xsl:strip-space"/>
-      </body>
-    </html>
-  </xsl:template>
-  
-  <xsl:template match="xsl:stylesheet/xsl:*">
-  
-  <a name="elmxsl_{translate(local-name(), ':.', '__')}|{@name}|{@match}"></a>
-    <xsl:call-template name="display-xsl-element">
-      <xsl:with-param  name="elm" select="self::*"/>
-    </xsl:call-template>
-    <xsl:if test="msxsl:node-set($stylesheet-tree)/stylesheet/stylesheet[@method='import']/descendant::xsl:*[name()=name(current())][@match=current()/@match][(@mode=current()/@mode) or (not(@mode) and not(current()/@mode))]">
-       Overriding identical match pattern: <xsl:apply-templates select="msxsl:node-set($stylesheet-tree)/stylesheet/stylesheet[@method='import']/descendant::xsl:*[name()=name(current())][@match=current()/@match][1]" mode="refer-to"/>
-      <br/>
-     </xsl:if> 
-    <xsl:if test="msxsl:node-set($stylesheet-tree)/stylesheet/stylesheet[@method='import']/descendant::xsl:*[name()=name(current())][@name=current()/@name][(@mode=current()/@mode) or (not(@mode) and not(current()/@mode))]">
-       Overriding identical name: <xsl:apply-templates select="msxsl:node-set($stylesheet-tree)/stylesheet/stylesheet[@method='import']/descendant::xsl:*[name()=name(current())][@name=current()/@name][1]" mode="refer-to"/>
-      <br/>
-     </xsl:if> 
-     <xsl:variable name="comments-before-this-element" select="preceding-sibling::comment()"/>
-     <xsl:variable name="previous-element-id">
-       <xsl:choose>
-         <xsl:when test="preceding-sibling::*">
-           <xsl:value-of select="generate-id(preceding-sibling::*[1])"/>
-         </xsl:when>
-         <xsl:otherwise>
-           <xsl:value-of select="generate-id(parent::*)"/>
-         </xsl:otherwise>
-       </xsl:choose>
-     </xsl:variable>
-     <xsl:variable name="comments-before-previous-element" select="/descendant::*[generate-id() = $previous-element-id]/preceding-sibling::comment()"/>
-     <xsl:variable name="comments-between" select="$comments-before-this-element[count(.|$comments-before-previous-element) != count($comments-before-previous-element)] "/>
-     <xsl:for-each select="msxsl:node-set($comments-between)">
-       <xsl:value-of select="self::comment()" disable-output-escaping="yes"/><br/>
-     </xsl:for-each>
-
-     <a>
-      <xsl:attribute name="href">javascript:toggleElm('code<xsl:value-of select="generate-id()"/>')</xsl:attribute>
-      View code
-     </a>
-     <PRE STYLE="border-style:solid;display:none;">
-       <xsl:attribute name="id">code<xsl:value-of select="generate-id()"/></xsl:attribute>
-       <xsl:apply-templates select="self::*" mode="code-output" />
-     </PRE>
-
-     <hr/>
-  </xsl:template>
-  
-  <xsl:template match="/" mode="tree-building">
-    <xsl:param name="included-from"/>
-    <xsl:apply-templates select="descendant::xsl:template|descendant::xsl:variable|descendant::xsl:param" mode="tree-building">
-      <xsl:with-param name="included-from" select="$included-from"/>
-    </xsl:apply-templates>
-     <xsl:for-each select="descendant::xsl:import">
-       <stylesheet method="import">
-         <xsl:attribute name="href"><xsl:value-of  select="@href"/></xsl:attribute>
-         <xsl:apply-templates select="document(@href)" mode="tree-building"/>
-       </stylesheet>
-     </xsl:for-each>
-     <xsl:for-each select="descendant::xsl:include">
-       <stylesheet method="include"><xsl:attribute name="href"><xsl:value-of  select="@href"/></xsl:attribute></stylesheet>
-       <xsl:attribute name="href"><xsl:value-of  select="@href"/></xsl:attribute>
-       <xsl:apply-templates select="document(@href)" mode="tree-building">
-         <xsl:with-param name="included-from" select="@href"/>
-       </xsl:apply-templates>
-     </xsl:for-each>
-  </xsl:template>
-  
-  <xsl:template match="xsl:template|xsl:variable|xsl:param|@mode|@match|@name" mode="tree-building" >
-    <xsl:param name="included-from"/>
-    <xsl:copy>
-      <xsl:if test="$included-from"><xsl:attribute name="included-from" ><xsl:value-of select="$included-from"/></xsl:attribute></xsl:if>
-      <xsl:apply-templates select="@mode|@match|@name" mode="tree-building"/>
-    </xsl:copy>
-  
-  </xsl:template>
-
-  <xsl:template match="xsl:template|xsl:variable|xsl:param" mode="refer-to" >
-
-     <xsl:call-template name="link-to-stylesheet">
-       <xsl:with-param name="linking-text">
-        <xsl:call-template name="display-xsl-element-inline"/>
-        in <xsl:value-of select="parent::stylesheet/@href"/>
-       </xsl:with-param>
-     </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="display-xsl-element">
-    <xsl:param name="elm"/>
-     &lt;
-     <span class="xsl-elm"><xsl:value-of select="name($elm)"/></span><br/>
-     <xsl:for-each select="@*">
-       <span style="margin-left:20"><xsl:call-template name="display-attribute"></xsl:call-template><br/></span>
-     </xsl:for-each>
-
-     &gt;<br/>
-    <xsl:for-each select="xsl:param">
-    Parameter: <xsl:call-template name="display-xsl-element-inline"/><br/>
-    </xsl:for-each>
-     
-  </xsl:template>
-  
-  <xsl:template name="display-xsl-element-inline">
-    <xsl:param name="elm" select="current()"/>
-     &lt;<span class="xsl-elm"><xsl:value-of select="name(msxsl:node-set($elm))"/></span>
-     <xsl:for-each select="@*">
-       <xsl:text> </xsl:text>
-       <xsl:call-template name="display-attribute"></xsl:call-template>
-     </xsl:for-each>
-
-     &gt;
-     
-  </xsl:template>
-  <xsl:template name="display-attribute">
-    <xsl:param name="attr" select="current()"/>
-     <span class="xsl-attr-name"><xsl:value-of select="name(msxsl:node-set($attr))"/></span> <xsl:text>=</xsl:text>
-
-     <span class="xsl-attr-value"><xsl:value-of select="msxsl:node-set($attr)"/></span> 
-  </xsl:template>
-
-  <xsl:template name="display-stylesheet-tree">
-    <xsl:value-of select="$document-name"/><br/>
-    <xsl:for-each select="msxsl:node-set($stylesheet-tree)/stylesheet/descendant::stylesheet">
-      <span style="margin-left:{20*(count(ancestor::*)+1)}">
-      <xsl:value-of select="@method"/>: 
-      <xsl:call-template name="link-to-stylesheet"/>
-      </span><br/>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="filename-for-stylesheet-name">
-    <xsl:param name="stylesheet-name"></xsl:param>
-    <xsl:value-of select="translate($stylesheet-name, './\', '___')"/>
-    <xsl:text>.htm</xsl:text>
-  </xsl:template>
-
-
-  <xsl:template name="link-to-stylesheet">
-    <xsl:param name="node" select="current()"/>
-    <xsl:param name="linking-text" />
-    <xsl:variable name="local-linking-text">
-      <xsl:choose>
-      <xsl:when test="$linking-text"><xsl:copy-of select="$linking-text"/></xsl:when>
-       <xsl:otherwise><xsl:value-of select="$node/ancestor-or-self::stylesheet[1]/@href"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <a>
-    <xsl:attribute name="href">
-    <xsl:call-template name="filename-for-stylesheet-name"><xsl:with-param name="stylesheet-name" select="$node/ancestor-or-self::stylesheet[1]/@href"/>
-    </xsl:call-template>
-     <xsl:if test="not(local-name($node) = 'stylesheet')">
-       <xsl:text>#elmxsl_</xsl:text><xsl:value-of select="translate(local-name($node), ':.', '__')"/>|<xsl:value-of select="$node/@name"/>|<xsl:value-of select="$node/@match"/>
-     </xsl:if>
-    </xsl:attribute>
-     <xsl:copy-of select="$local-linking-text"/>
-    </a>
-  </xsl:template>
-
-
-    
-  <xsl:template match="text()" priority="1" mode="code-output">
-    <xsl:value-of select="self::text()" />
-  </xsl:template>
-
-  <xsl:template match="*" mode="code-output">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:apply-templates select="current()" mode="show-name"/>
-    <xsl:apply-templates select="@*" mode="code-output"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates select="node()" mode="code-output"/>
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:apply-templates select="current()" mode="show-name"/>
-    <xsl:text>&gt;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="@*" mode="code-output">
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name()"/>
-    <xsl:text>=&quot;</xsl:text><xsl:value-of select="current()"/><xsl:text>&quot;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="xsl:*/@*" mode="code-output">
-    <xsl:text> </xsl:text>
-    <span class="xsl-attr-name">
-      <xsl:value-of select="name()"/>
-    </span>
-    <span class="xsl-attr-value">
-      <xsl:text>=&quot;</xsl:text><xsl:value-of select="current()"/><xsl:text>&quot;</xsl:text>
-    </span>
-  </xsl:template>
-
-  <xsl:template match="xsl:call-template/@name" mode="code-output">
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name()"/>
-    <xsl:text>=&quot;</xsl:text>
-    <xsl:call-template name="link-to-stylesheet">
-    <xsl:with-param name="node" select="msxsl:node-set($stylesheet-tree)/descendant::xsl:template[@name=current()][1]"/>
-    <xsl:with-param name="linking-text" select="string(current())"/>
-    </xsl:call-template>
-    <xsl:text>&quot;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="comment()" mode="code-output">
-    <span class="xsl-comment">
-    <xsl:text><![CDATA[<!--]]></xsl:text>
-    <xsl:value-of select="current()"/>
-    <xsl:text><![CDATA[-->]]></xsl:text>
-    </span>
-  </xsl:template>
-
-  <xsl:template match="*" mode="show-name">
-    <xsl:value-of select="name()"/>
-  </xsl:template>
-
-  <xsl:template match="xsl:*" mode="show-name">
-    <a class="xsl-elm" target="_blank">
-      <xsl:attribute name="href">http://www.vbxml.com/xsl/elmxsl_<xsl:value-of select="translate(local-name(), ':.', '__')"/>.asp</xsl:attribute>
-    <xsl:value-of select="name()"/>
-    </a>
-  </xsl:template>
-
-
-
-</xsl:stylesheet>