Imported Upstream version 1.7.2+dfsg

53 files changed, 2007 insertions, 698 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1f7ff40..130af8a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,7 +12,10 @@
 # more about how these tests work.
 # 
 
+MESSAGE(STATUS "\n-- CONFIGURING LIBRARY TESTS")
+
 SET(test_PROGRAMS
+	bibliotest
 	casttest
 	ciphertest
 	complzss
diff --git a/tests/Makefile.am b/tests/Makefile.am
index afdf311..ad09283 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,16 +1,18 @@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
 if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
 endif
 LDADD = $(top_builddir)/lib/libsword.la
 
 SUBDIRS = cppunit
 
-noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest vtreekeytest versemgrtest listtest casttest \
-modtest compnone complzss localetest introtest indextest configtest keycast \
-romantest testblocks filtertest rawldidxtest lextest swaptest \
- swbuftest xmltest webiftest striptest
+noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest \
+			vtreekeytest versemgrtest listtest casttest modtest \
+			compnone complzss localetest introtest indextest \
+			configtest keycast romantest testblocks filtertest \
+			rawldidxtest lextest swaptest swbuftest xmltest \
+			webiftest striptest osistest bibliotest
 
 if HAVE_ICU
 ICUPROG = icutest translittest tlitmgrtest
@@ -66,7 +68,8 @@ swbuftest_SOURCES = swbuftest.cpp
 webiftest_SOURCES = webiftest.cpp
 striptest_SOURCES = striptest.cpp
 xmltest_SOURCES = xmltest.cpp
-
+osistest_SOURCES = osistest.cpp
+bibliotest_SOURCES = bibliotest.cpp
 
 EXTRA_DIST = 
 include bcppmake/Makefile.am
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ebace29..63fec25 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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@
@@ -46,17 +90,19 @@ noinst_PROGRAMS = utf8norm$(EXEEXT) ciphertest$(EXEEXT) \
 	testblocks$(EXEEXT) filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \
 	lextest$(EXEEXT) swaptest$(EXEEXT) swbuftest$(EXEEXT) \
 	xmltest$(EXEEXT) webiftest$(EXEEXT) striptest$(EXEEXT) \
-	$(am__EXEEXT_1) $(am__EXEEXT_2)
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am \
-	$(srcdir)/tmp/Makefile.am
+	osistest$(EXEEXT) bibliotest$(EXEEXT) $(am__EXEEXT_1) \
+	$(am__EXEEXT_2)
+DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \
+	$(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
-	$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -67,6 +113,14 @@ CONFIG_CLEAN_VPATH_FILES =
 @HAVE_ICU_TRUE@	tlitmgrtest$(EXEEXT)
 @HAVE_LIBZ_TRUE@am__EXEEXT_2 = compzip$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
+am_bibliotest_OBJECTS = bibliotest.$(OBJEXT)
+bibliotest_OBJECTS = $(am_bibliotest_OBJECTS)
+bibliotest_LDADD = $(LDADD)
+bibliotest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_casttest_OBJECTS = casttest.$(OBJEXT)
 casttest_OBJECTS = $(am_casttest_OBJECTS)
 casttest_LDADD = $(LDADD)
@@ -137,6 +191,10 @@ am_modtest_OBJECTS = modtest.$(OBJEXT)
 modtest_OBJECTS = $(am_modtest_OBJECTS)
 modtest_LDADD = $(LDADD)
 modtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_osistest_OBJECTS = osistest.$(OBJEXT)
+osistest_OBJECTS = $(am_osistest_OBJECTS)
+osistest_LDADD = $(LDADD)
+osistest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
 am_parsekey_OBJECTS = parsekey.$(OBJEXT)
 parsekey_OBJECTS = $(am_parsekey_OBJECTS)
 parsekey_LDADD = $(LDADD)
@@ -199,59 +257,107 @@ am_xmltest_OBJECTS = xmltest.$(OBJEXT)
 xmltest_OBJECTS = $(am_xmltest_OBJECTS)
 xmltest_LDADD = $(LDADD)
 xmltest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+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 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(casttest_SOURCES) $(ciphertest_SOURCES) \
-	$(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) \
-	$(configtest_SOURCES) $(filtertest_SOURCES) $(icutest_SOURCES) \
-	$(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \
-	$(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \
-	$(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \
-	$(parsekey_SOURCES) $(rawldidxtest_SOURCES) \
-	$(romantest_SOURCES) $(striptest_SOURCES) $(swaptest_SOURCES) \
-	$(swbuftest_SOURCES) $(testblocks_SOURCES) \
-	$(tlitmgrtest_SOURCES) $(translittest_SOURCES) \
-	$(utf8norm_SOURCES) $(versekeytest_SOURCES) \
-	$(versemgrtest_SOURCES) $(vtreekeytest_SOURCES) \
-	$(webiftest_SOURCES) $(xmltest_SOURCES)
-DIST_SOURCES = $(casttest_SOURCES) $(ciphertest_SOURCES) \
-	$(complzss_SOURCES) $(compnone_SOURCES) \
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \
+	$(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \
+	$(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) \
+	$(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) \
+	$(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) \
+	$(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) \
+	$(modtest_SOURCES) $(osistest_SOURCES) $(parsekey_SOURCES) \
+	$(rawldidxtest_SOURCES) $(romantest_SOURCES) \
+	$(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
+	$(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \
+	$(translittest_SOURCES) $(utf8norm_SOURCES) \
+	$(versekeytest_SOURCES) $(versemgrtest_SOURCES) \
+	$(vtreekeytest_SOURCES) $(webiftest_SOURCES) \
+	$(xmltest_SOURCES)
+DIST_SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \
+	$(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \
 	$(am__compzip_SOURCES_DIST) $(configtest_SOURCES) \
 	$(filtertest_SOURCES) $(am__icutest_SOURCES_DIST) \
 	$(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \
 	$(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \
 	$(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \
-	$(parsekey_SOURCES) $(rawldidxtest_SOURCES) \
-	$(romantest_SOURCES) $(striptest_SOURCES) $(swaptest_SOURCES) \
-	$(swbuftest_SOURCES) $(testblocks_SOURCES) \
-	$(am__tlitmgrtest_SOURCES_DIST) \
+	$(osistest_SOURCES) $(parsekey_SOURCES) \
+	$(rawldidxtest_SOURCES) $(romantest_SOURCES) \
+	$(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
+	$(testblocks_SOURCES) $(am__tlitmgrtest_SOURCES_DIST) \
 	$(am__translittest_SOURCES_DIST) $(utf8norm_SOURCES) \
 	$(versekeytest_SOURCES) $(versemgrtest_SOURCES) \
 	$(vtreekeytest_SOURCES) $(webiftest_SOURCES) \
 	$(xmltest_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-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
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-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 \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -283,7 +389,9 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -293,6 +401,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
 CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
 CLUCENE_LIBS = @CLUCENE_LIBS@
 CPP = @CPP@
@@ -318,9 +428,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GENCCODE = @GENCCODE@
-GENCMN = @GENCMN@
-GENRB = @GENRB@
 GREP = @GREP@
 ICU_CONFIG = @ICU_CONFIG@
 ICU_IOLIBS = @ICU_IOLIBS@
@@ -341,6 +448,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -353,20 +461,29 @@ 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@
-PKGDATA = @PKGDATA@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
 VERSION = @VERSION@
 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_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -403,7 +520,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -430,7 +546,7 @@ with_icu = @with_icu@
 with_icusword = @with_icusword@
 with_zlib = @with_zlib@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include $(am__append_1)
+AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1)
 LDADD = $(top_builddir)/lib/libsword.la
 SUBDIRS = cppunit
 @HAVE_ICU_FALSE@ICUPROG = 
@@ -469,6 +585,8 @@ swbuftest_SOURCES = swbuftest.cpp
 webiftest_SOURCES = webiftest.cpp
 striptest_SOURCES = striptest.cpp
 xmltest_SOURCES = xmltest.cpp
+osistest_SOURCES = osistest.cpp
+bibliotest_SOURCES = bibliotest.cpp
 EXTRA_DIST = $(swbcppdir)/filtertest.bpf $(swbcppdir)/filtertest.bpr \
 	$(swbcppdir)/libsword.bpf $(swbcppdir)/libsword.bpr \
 	$(swbcppdir)/mgrtest.bpf $(swbcppdir)/mgrtest.bpr \
@@ -504,6 +622,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
+$(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -522,102 +641,142 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-casttest$(EXEEXT): $(casttest_OBJECTS) $(casttest_DEPENDENCIES) 
+
+bibliotest$(EXEEXT): $(bibliotest_OBJECTS) $(bibliotest_DEPENDENCIES) $(EXTRA_bibliotest_DEPENDENCIES) 
+	@rm -f bibliotest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(bibliotest_OBJECTS) $(bibliotest_LDADD) $(LIBS)
+
+casttest$(EXEEXT): $(casttest_OBJECTS) $(casttest_DEPENDENCIES) $(EXTRA_casttest_DEPENDENCIES) 
 	@rm -f casttest$(EXEEXT)
-	$(CXXLINK) $(casttest_OBJECTS) $(casttest_LDADD) $(LIBS)
-ciphertest$(EXEEXT): $(ciphertest_OBJECTS) $(ciphertest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(casttest_OBJECTS) $(casttest_LDADD) $(LIBS)
+
+ciphertest$(EXEEXT): $(ciphertest_OBJECTS) $(ciphertest_DEPENDENCIES) $(EXTRA_ciphertest_DEPENDENCIES) 
 	@rm -f ciphertest$(EXEEXT)
-	$(CXXLINK) $(ciphertest_OBJECTS) $(ciphertest_LDADD) $(LIBS)
-complzss$(EXEEXT): $(complzss_OBJECTS) $(complzss_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(ciphertest_OBJECTS) $(ciphertest_LDADD) $(LIBS)
+
+complzss$(EXEEXT): $(complzss_OBJECTS) $(complzss_DEPENDENCIES) $(EXTRA_complzss_DEPENDENCIES) 
 	@rm -f complzss$(EXEEXT)
-	$(CXXLINK) $(complzss_OBJECTS) $(complzss_LDADD) $(LIBS)
-compnone$(EXEEXT): $(compnone_OBJECTS) $(compnone_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(complzss_OBJECTS) $(complzss_LDADD) $(LIBS)
+
+compnone$(EXEEXT): $(compnone_OBJECTS) $(compnone_DEPENDENCIES) $(EXTRA_compnone_DEPENDENCIES) 
 	@rm -f compnone$(EXEEXT)
-	$(CXXLINK) $(compnone_OBJECTS) $(compnone_LDADD) $(LIBS)
-compzip$(EXEEXT): $(compzip_OBJECTS) $(compzip_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(compnone_OBJECTS) $(compnone_LDADD) $(LIBS)
+
+compzip$(EXEEXT): $(compzip_OBJECTS) $(compzip_DEPENDENCIES) $(EXTRA_compzip_DEPENDENCIES) 
 	@rm -f compzip$(EXEEXT)
-	$(CXXLINK) $(compzip_OBJECTS) $(compzip_LDADD) $(LIBS)
-configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(compzip_OBJECTS) $(compzip_LDADD) $(LIBS)
+
+configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES) $(EXTRA_configtest_DEPENDENCIES) 
 	@rm -f configtest$(EXEEXT)
-	$(CXXLINK) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS)
-filtertest$(EXEEXT): $(filtertest_OBJECTS) $(filtertest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS)
+
+filtertest$(EXEEXT): $(filtertest_OBJECTS) $(filtertest_DEPENDENCIES) $(EXTRA_filtertest_DEPENDENCIES) 
 	@rm -f filtertest$(EXEEXT)
-	$(CXXLINK) $(filtertest_OBJECTS) $(filtertest_LDADD) $(LIBS)
-icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(filtertest_OBJECTS) $(filtertest_LDADD) $(LIBS)
+
+icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) $(EXTRA_icutest_DEPENDENCIES) 
 	@rm -f icutest$(EXEEXT)
-	$(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS)
-indextest$(EXEEXT): $(indextest_OBJECTS) $(indextest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS)
+
+indextest$(EXEEXT): $(indextest_OBJECTS) $(indextest_DEPENDENCIES) $(EXTRA_indextest_DEPENDENCIES) 
 	@rm -f indextest$(EXEEXT)
-	$(CXXLINK) $(indextest_OBJECTS) $(indextest_LDADD) $(LIBS)
-introtest$(EXEEXT): $(introtest_OBJECTS) $(introtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(indextest_OBJECTS) $(indextest_LDADD) $(LIBS)
+
+introtest$(EXEEXT): $(introtest_OBJECTS) $(introtest_DEPENDENCIES) $(EXTRA_introtest_DEPENDENCIES) 
 	@rm -f introtest$(EXEEXT)
-	$(CXXLINK) $(introtest_OBJECTS) $(introtest_LDADD) $(LIBS)
-keycast$(EXEEXT): $(keycast_OBJECTS) $(keycast_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(introtest_OBJECTS) $(introtest_LDADD) $(LIBS)
+
+keycast$(EXEEXT): $(keycast_OBJECTS) $(keycast_DEPENDENCIES) $(EXTRA_keycast_DEPENDENCIES) 
 	@rm -f keycast$(EXEEXT)
-	$(CXXLINK) $(keycast_OBJECTS) $(keycast_LDADD) $(LIBS)
-keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(keycast_OBJECTS) $(keycast_LDADD) $(LIBS)
+
+keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) $(EXTRA_keytest_DEPENDENCIES) 
 	@rm -f keytest$(EXEEXT)
-	$(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS)
-lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS)
+
+lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) $(EXTRA_lextest_DEPENDENCIES) 
 	@rm -f lextest$(EXEEXT)
-	$(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS)
-listtest$(EXEEXT): $(listtest_OBJECTS) $(listtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS)
+
+listtest$(EXEEXT): $(listtest_OBJECTS) $(listtest_DEPENDENCIES) $(EXTRA_listtest_DEPENDENCIES) 
 	@rm -f listtest$(EXEEXT)
-	$(CXXLINK) $(listtest_OBJECTS) $(listtest_LDADD) $(LIBS)
-localetest$(EXEEXT): $(localetest_OBJECTS) $(localetest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(listtest_OBJECTS) $(listtest_LDADD) $(LIBS)
+
+localetest$(EXEEXT): $(localetest_OBJECTS) $(localetest_DEPENDENCIES) $(EXTRA_localetest_DEPENDENCIES) 
 	@rm -f localetest$(EXEEXT)
-	$(CXXLINK) $(localetest_OBJECTS) $(localetest_LDADD) $(LIBS)
-mgrtest$(EXEEXT): $(mgrtest_OBJECTS) $(mgrtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(localetest_OBJECTS) $(localetest_LDADD) $(LIBS)
+
+mgrtest$(EXEEXT): $(mgrtest_OBJECTS) $(mgrtest_DEPENDENCIES) $(EXTRA_mgrtest_DEPENDENCIES) 
 	@rm -f mgrtest$(EXEEXT)
-	$(CXXLINK) $(mgrtest_OBJECTS) $(mgrtest_LDADD) $(LIBS)
-modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(mgrtest_OBJECTS) $(mgrtest_LDADD) $(LIBS)
+
+modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) $(EXTRA_modtest_DEPENDENCIES) 
 	@rm -f modtest$(EXEEXT)
-	$(CXXLINK) $(modtest_OBJECTS) $(modtest_LDADD) $(LIBS)
-parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(modtest_OBJECTS) $(modtest_LDADD) $(LIBS)
+
+osistest$(EXEEXT): $(osistest_OBJECTS) $(osistest_DEPENDENCIES) $(EXTRA_osistest_DEPENDENCIES) 
+	@rm -f osistest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(osistest_OBJECTS) $(osistest_LDADD) $(LIBS)
+
+parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) $(EXTRA_parsekey_DEPENDENCIES) 
 	@rm -f parsekey$(EXEEXT)
-	$(CXXLINK) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS)
-rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS)
+
+rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) $(EXTRA_rawldidxtest_DEPENDENCIES) 
 	@rm -f rawldidxtest$(EXEEXT)
-	$(CXXLINK) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS)
-romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS)
+
+romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) $(EXTRA_romantest_DEPENDENCIES) 
 	@rm -f romantest$(EXEEXT)
-	$(CXXLINK) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS)
-striptest$(EXEEXT): $(striptest_OBJECTS) $(striptest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS)
+
+striptest$(EXEEXT): $(striptest_OBJECTS) $(striptest_DEPENDENCIES) $(EXTRA_striptest_DEPENDENCIES) 
 	@rm -f striptest$(EXEEXT)
-	$(CXXLINK) $(striptest_OBJECTS) $(striptest_LDADD) $(LIBS)
-swaptest$(EXEEXT): $(swaptest_OBJECTS) $(swaptest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(striptest_OBJECTS) $(striptest_LDADD) $(LIBS)
+
+swaptest$(EXEEXT): $(swaptest_OBJECTS) $(swaptest_DEPENDENCIES) $(EXTRA_swaptest_DEPENDENCIES) 
 	@rm -f swaptest$(EXEEXT)
-	$(CXXLINK) $(swaptest_OBJECTS) $(swaptest_LDADD) $(LIBS)
-swbuftest$(EXEEXT): $(swbuftest_OBJECTS) $(swbuftest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(swaptest_OBJECTS) $(swaptest_LDADD) $(LIBS)
+
+swbuftest$(EXEEXT): $(swbuftest_OBJECTS) $(swbuftest_DEPENDENCIES) $(EXTRA_swbuftest_DEPENDENCIES) 
 	@rm -f swbuftest$(EXEEXT)
-	$(CXXLINK) $(swbuftest_OBJECTS) $(swbuftest_LDADD) $(LIBS)
-testblocks$(EXEEXT): $(testblocks_OBJECTS) $(testblocks_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(swbuftest_OBJECTS) $(swbuftest_LDADD) $(LIBS)
+
+testblocks$(EXEEXT): $(testblocks_OBJECTS) $(testblocks_DEPENDENCIES) $(EXTRA_testblocks_DEPENDENCIES) 
 	@rm -f testblocks$(EXEEXT)
-	$(CXXLINK) $(testblocks_OBJECTS) $(testblocks_LDADD) $(LIBS)
-tlitmgrtest$(EXEEXT): $(tlitmgrtest_OBJECTS) $(tlitmgrtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(testblocks_OBJECTS) $(testblocks_LDADD) $(LIBS)
+
+tlitmgrtest$(EXEEXT): $(tlitmgrtest_OBJECTS) $(tlitmgrtest_DEPENDENCIES) $(EXTRA_tlitmgrtest_DEPENDENCIES) 
 	@rm -f tlitmgrtest$(EXEEXT)
-	$(CXXLINK) $(tlitmgrtest_OBJECTS) $(tlitmgrtest_LDADD) $(LIBS)
-translittest$(EXEEXT): $(translittest_OBJECTS) $(translittest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(tlitmgrtest_OBJECTS) $(tlitmgrtest_LDADD) $(LIBS)
+
+translittest$(EXEEXT): $(translittest_OBJECTS) $(translittest_DEPENDENCIES) $(EXTRA_translittest_DEPENDENCIES) 
 	@rm -f translittest$(EXEEXT)
-	$(CXXLINK) $(translittest_OBJECTS) $(translittest_LDADD) $(LIBS)
-utf8norm$(EXEEXT): $(utf8norm_OBJECTS) $(utf8norm_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(translittest_OBJECTS) $(translittest_LDADD) $(LIBS)
+
+utf8norm$(EXEEXT): $(utf8norm_OBJECTS) $(utf8norm_DEPENDENCIES) $(EXTRA_utf8norm_DEPENDENCIES) 
 	@rm -f utf8norm$(EXEEXT)
-	$(CXXLINK) $(utf8norm_OBJECTS) $(utf8norm_LDADD) $(LIBS)
-versekeytest$(EXEEXT): $(versekeytest_OBJECTS) $(versekeytest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(utf8norm_OBJECTS) $(utf8norm_LDADD) $(LIBS)
+
+versekeytest$(EXEEXT): $(versekeytest_OBJECTS) $(versekeytest_DEPENDENCIES) $(EXTRA_versekeytest_DEPENDENCIES) 
 	@rm -f versekeytest$(EXEEXT)
-	$(CXXLINK) $(versekeytest_OBJECTS) $(versekeytest_LDADD) $(LIBS)
-versemgrtest$(EXEEXT): $(versemgrtest_OBJECTS) $(versemgrtest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(versekeytest_OBJECTS) $(versekeytest_LDADD) $(LIBS)
+
+versemgrtest$(EXEEXT): $(versemgrtest_OBJECTS) $(versemgrtest_DEPENDENCIES) $(EXTRA_versemgrtest_DEPENDENCIES) 
 	@rm -f versemgrtest$(EXEEXT)
-	$(CXXLINK) $(versemgrtest_OBJECTS) $(versemgrtest_LDADD) $(LIBS)
-vtreekeytest$(EXEEXT): $(vtreekeytest_OBJECTS) $(vtreekeytest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(versemgrtest_OBJECTS) $(versemgrtest_LDADD) $(LIBS)
+
+vtreekeytest$(EXEEXT): $(vtreekeytest_OBJECTS) $(vtreekeytest_DEPENDENCIES) $(EXTRA_vtreekeytest_DEPENDENCIES) 
 	@rm -f vtreekeytest$(EXEEXT)
-	$(CXXLINK) $(vtreekeytest_OBJECTS) $(vtreekeytest_LDADD) $(LIBS)
-webiftest$(EXEEXT): $(webiftest_OBJECTS) $(webiftest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(vtreekeytest_OBJECTS) $(vtreekeytest_LDADD) $(LIBS)
+
+webiftest$(EXEEXT): $(webiftest_OBJECTS) $(webiftest_DEPENDENCIES) $(EXTRA_webiftest_DEPENDENCIES) 
 	@rm -f webiftest$(EXEEXT)
-	$(CXXLINK) $(webiftest_OBJECTS) $(webiftest_LDADD) $(LIBS)
-xmltest$(EXEEXT): $(xmltest_OBJECTS) $(xmltest_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) $(webiftest_OBJECTS) $(webiftest_LDADD) $(LIBS)
+
+xmltest$(EXEEXT): $(xmltest_OBJECTS) $(xmltest_DEPENDENCIES) $(EXTRA_xmltest_DEPENDENCIES) 
 	@rm -f xmltest$(EXEEXT)
-	$(CXXLINK) $(xmltest_OBJECTS) $(xmltest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(xmltest_OBJECTS) $(xmltest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -625,6 +784,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibliotest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/casttest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ciphertest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complzss.Po@am__quote@
@@ -642,6 +802,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localetest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgrtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osistest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsekey.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawldidxtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/romantest.Po@am__quote@
@@ -659,25 +820,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltest.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -686,22 +847,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -716,57 +880,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -782,12 +901,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -799,15 +913,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -816,6 +926,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -852,13 +977,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -893,10 +1015,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:
@@ -979,12 +1106,11 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__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-noinstPROGRAMS ctags ctags-recursive distclean \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am 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-dvi \
@@ -994,8 +1120,8 @@ uninstall-am:
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/bibliotest.cpp b/tests/bibliotest.cpp
new file mode 100644
index 0000000..821ee87
--- /dev/null
+++ b/tests/bibliotest.cpp
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  bibliotest.cpp -	
+ *
+ * $Id: bibliotest.cpp 2940 2013-08-03 06:53:35Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#include <swmgr.h>
+#include <swtext.h>
+#include <versekey.h>
+#include <iostream>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWMgr mymgr;
+	ModMap::iterator it;
+	if ( argc > 1 ) {
+		SWModule *module = mymgr.Modules[argv[1]];
+		std::cout << module->getBibliography() << "\n";
+		return 0;
+	}
+	else {
+		std::cout << "Usage: bibliography <ModuleName>"<< "\n";
+		return 1;
+	}
+}
diff --git a/tests/casttest.cpp b/tests/casttest.cpp
index ceec51e..37388e9 100644
--- a/tests/casttest.cpp
+++ b/tests/casttest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  casttest.cpp -	
+ *
+ * $Id: casttest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/ciphertest.cpp b/tests/ciphertest.cpp
index f34f994..5c5936a 100644
--- a/tests/ciphertest.cpp
+++ b/tests/ciphertest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  ciphertest.cpp -	
+ *
+ * $Id: ciphertest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -30,7 +35,7 @@ int main(int argc, char **argv) {
 	}
 
 	
-	int encipher = atoi(argv[2]);
+	long encipher = atoi(argv[2]);
 
 	SWFilter *filter = new CipherFilter(argv[1]);
 
diff --git a/tests/complzss.cpp b/tests/complzss.cpp
index 4bf9dd5..923354b 100644
--- a/tests/complzss.cpp
+++ b/tests/complzss.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  complzss.cpp -	
+ *
+ * $Id: complzss.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/compnone.cpp b/tests/compnone.cpp
index 452b191..b8e982d 100644
--- a/tests/compnone.cpp
+++ b/tests/compnone.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  compnone.cpp -	
+ *
+ * $Id: compnone.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/compzip.cpp b/tests/compzip.cpp
index 58900bf..7dd0cf2 100644
--- a/tests/compzip.cpp
+++ b/tests/compzip.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  compzip.cpp -	
+ *
+ * $Id: compzip.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/configtest.cpp b/tests/configtest.cpp
index 4e68d93..d196f07 100644
--- a/tests/configtest.cpp
+++ b/tests/configtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  configtest.cpp -	
+ *
+ * $Id: configtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/cppunit/Makefile.in b/tests/cppunit/Makefile.in
index 737ba61..e6d5aa9 100644
--- a/tests/cppunit/Makefile.in
+++ b/tests/cppunit/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+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@
@@ -37,13 +81,14 @@ target_triplet = @target@
 @HAVE_CPPUNIT_TRUE@TESTS = LibSword$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_1)
 subdir = tests/cppunit
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
-	$(top_srcdir)/m4/colored-echo.m4 $(top_srcdir)/m4/cppunit.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -58,32 +103,283 @@ am_LibSword_OBJECTS = LibSword-main.$(OBJEXT) \
 LibSword_OBJECTS = $(am_LibSword_OBJECTS)
 LibSword_LDADD = $(LDADD)
 LibSword_DEPENDENCIES = $(top_builddir)/lib/libsword.la
-LibSword_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LibSword_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(LibSword_CXXFLAGS) \
 	$(CXXFLAGS) $(LibSword_LDFLAGS) $(LDFLAGS) -o $@
+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 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(LibSword_SOURCES)
 DIST_SOURCES = $(LibSword_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)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -93,6 +389,8 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
 CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
 CLUCENE_LIBS = @CLUCENE_LIBS@
 CPP = @CPP@
@@ -118,9 +416,6 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GENCCODE = @GENCCODE@
-GENCMN = @GENCMN@
-GENRB = @GENRB@
 GREP = @GREP@
 ICU_CONFIG = @ICU_CONFIG@
 ICU_IOLIBS = @ICU_IOLIBS@
@@ -141,6 +436,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -153,20 +449,29 @@ 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@
-PKGDATA = @PKGDATA@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
 VERSION = @VERSION@
 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_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -203,7 +508,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -237,7 +541,7 @@ swcppunitpdir = $(top_srcdir)/tests/cppunit
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -277,9 +581,10 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-LibSword$(EXEEXT): $(LibSword_OBJECTS) $(LibSword_DEPENDENCIES) 
+
+LibSword$(EXEEXT): $(LibSword_OBJECTS) $(LibSword_DEPENDENCIES) $(EXTRA_LibSword_DEPENDENCIES) 
 	@rm -f LibSword$(EXEEXT)
-	$(LibSword_LINK) $(LibSword_OBJECTS) $(LibSword_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(LibSword_LINK) $(LibSword_OBJECTS) $(LibSword_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -294,95 +599,95 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-versekey_test.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 LibSword-main.o: main.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.o -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='LibSword-main.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.o -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='LibSword-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
 
 LibSword-main.obj: main.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.obj -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='LibSword-main.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.obj -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='LibSword-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
 
 LibSword-stringmgr_test.o: stringmgr_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.o -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='stringmgr_test.cpp' object='LibSword-stringmgr_test.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.o -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
 
 LibSword-stringmgr_test.obj: stringmgr_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.obj -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='stringmgr_test.cpp' object='LibSword-stringmgr_test.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.obj -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
 
 LibSword-swbuf_test.o: swbuf_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.o -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='swbuf_test.cpp' object='LibSword-swbuf_test.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.o -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
 
 LibSword-swbuf_test.obj: swbuf_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.obj -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='swbuf_test.cpp' object='LibSword-swbuf_test.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.obj -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
 
 LibSword-url_test.o: url_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.o -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='url_test.cpp' object='LibSword-url_test.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.o -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
 
 LibSword-url_test.obj: url_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.obj -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='url_test.cpp' object='LibSword-url_test.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.obj -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
 
 LibSword-versekey_test.o: versekey_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.o -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='versekey_test.cpp' object='LibSword-versekey_test.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.o -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
 
 LibSword-versekey_test.obj: versekey_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.obj -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='versekey_test.cpp' object='LibSword-versekey_test.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.obj -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -390,26 +695,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -421,15 +715,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -438,101 +728,187 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+LibSword.log: LibSword$(EXEEXT)
+	@p='LibSword$(EXEEXT)'; \
+	b='LibSword'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -580,11 +956,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -668,9 +1052,9 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am 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-dvi install-dvi-am install-exec \
@@ -680,7 +1064,7 @@ uninstall-am:
 	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
+	recheck tags tags-am uninstall uninstall-am
 
 
 #all: check
diff --git a/tests/cppunit/main.cpp b/tests/cppunit/main.cpp
index e528619..9c740d5 100644
--- a/tests/cppunit/main.cpp
+++ b/tests/cppunit/main.cpp
@@ -1,10 +1,10 @@
 /******************************************************************************
  *
- * LibSword tests
+ *  main.cpp -	LibSword tests
  *
- * $Id: main.cpp 2327 2009-04-22 11:42:33Z scribe $
+ * $Id: main.cpp 2833 2013-06-29 06:40:28Z chrislit $
  *
- * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/cppunit/stringmgr_test.cpp b/tests/cppunit/stringmgr_test.cpp
index 652534c..3383b52 100644
--- a/tests/cppunit/stringmgr_test.cpp
+++ b/tests/cppunit/stringmgr_test.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  stringmgr_test.cpp -	
+ *
+ * $Id: stringmgr_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/cppunit/swbuf_test.cpp b/tests/cppunit/swbuf_test.cpp
index d49fa61..9e6df3d 100644
--- a/tests/cppunit/swbuf_test.cpp
+++ b/tests/cppunit/swbuf_test.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  swbuf_test.cpp -	
+ *
+ * $Id: swbuf_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/cppunit/url_test.cpp b/tests/cppunit/url_test.cpp
index 093dad2..18cf6a8 100644
--- a/tests/cppunit/url_test.cpp
+++ b/tests/cppunit/url_test.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  url_test.cpp -	
+ *
+ * $Id: url_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/cppunit/versekey_test.cpp b/tests/cppunit/versekey_test.cpp
index 63b6fd2..1c204b7 100644
--- a/tests/cppunit/versekey_test.cpp
+++ b/tests/cppunit/versekey_test.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  versekey_test.cpp -	
+ *
+ * $Id: versekey_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp
index 8aa750c..c6cfd4e 100644
--- a/tests/filtertest.cpp
+++ b/tests/filtertest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  filtertest.cpp -	
+ *
+ * $Id: filtertest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -20,6 +25,7 @@
 #include <filemgr.h>
 #include <papyriplain.h>
 #include <utf8utf16.h>
+#include <rtfhtml.h>
 #include <sysdata.h>
 //#include <swmgr.h>
 #ifndef NO_SWORD_NAMESPACE
@@ -29,12 +35,13 @@ using namespace std;
 
 
 int main(int argc, char **argv) {
-	UTF8UTF16 filter;
+//	UTF8UTF16 filter;
+	RTFHTML filter;
 //	PapyriPlain filter;
 //
 	FileDesc *fd = (argc > 1) ? FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY) : 0;
 
-	SWBuf lineBuffer = "This is t<e>xt which has papy-\nri markings in it.\n  L[et's be] sure it gets--\n cleaned up well for s(earching)";
+	SWBuf lineBuffer = "T\\u12345?his is t<e>xt which has papy-\nri markings in it.\n  L[et's be] sure it gets--\n cleaned up well for s(earching)";
 
 	if (argc > 1 && !strcmp(argv[1], "-v")) {
 		std::cout << "Original:\n\n";
@@ -52,23 +59,24 @@ int main(int argc, char **argv) {
 		fd = FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY);
 	}
 
-	cout << "\xff\xfe";	// UTF16LE file signature
+//	cout << "\xff\xfe";	// UTF16LE file signature
 
 	while (!fd || FileMgr::getLine(fd, lineBuffer)) {
 		lineBuffer += "\n";
 		filter.processText(lineBuffer);
 
-/*	Simply way to output byte stream
+//	Simply way to output byte stream
 		for (unsigned int i = 0; i < lineBuffer.size(); ++i) {
 			std::cout << lineBuffer[i];
 		}
-*/
+/*
 //	Example showing safe to cast to u16 stream
 		unsigned int size = lineBuffer.size() / 2;
 		__u16 *wcharBuf = (__u16 *)lineBuffer.getRawData();
 		for (unsigned int i = 0; i < size; ++i) {
 			std::wcout << (wchar_t)wcharBuf[i];	// must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t *
 		}
+*/
 		if (!fd) break;
 	}
 
diff --git a/tests/icutest.cpp b/tests/icutest.cpp
index 3f525b7..e1f6038 100644
--- a/tests/icutest.cpp
+++ b/tests/icutest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *   icutest.cpp -	
+ *
+ * $Id: icutest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/indextest.cpp b/tests/indextest.cpp
index 4f44f95..6d0a670 100644
--- a/tests/indextest.cpp
+++ b/tests/indextest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  indextest.cpp -	
+ *
+ * $Id: indextest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -30,10 +35,10 @@ int main(int argc, char **argv) {
 
 	if (bbe) {
 		VerseKey vk;
-		vk.Persist(1);
+		vk.setPersist(true);
 		bbe->setKey(vk);
-		for (; !bbe->Error(); (*bbe)++ ) {
-			std::cout << vk.Index() << std::endl; 
+		for (; !bbe->popError(); (*bbe)++ ) {
+			std::cout << vk.getIndex() << std::endl; 
 		}
 	}
 	return 0;
diff --git a/tests/installmgrtest.cpp b/tests/installmgrtest.cpp
index 4d3ce96..aa3acfd 100644
--- a/tests/installmgrtest.cpp
+++ b/tests/installmgrtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  installmgrtest.cpp -	
+ *
+ * $Id: installmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -26,4 +31,3 @@ int main(int argc, char **argv) {
 	inst.Refresh();
 
 }
-
diff --git a/tests/introtest.cpp b/tests/introtest.cpp
index ea75f44..462b1c6 100644
--- a/tests/introtest.cpp
+++ b/tests/introtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  introtest.cpp -	
+ *
+ * $Id: introtest.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -30,90 +35,90 @@ int main(int argc, char **argv) {
 	RawText mod(".");
 
 	VerseKey vk;
-	vk.Headings(1);
-	vk.AutoNormalize(0);
-	vk.Persist(1);
+	vk.setIntros(true);
+	vk.setAutoNormalize(false);
+	vk.setPersist(true);
 	mod.setKey(vk);
 
-	vk.Verse(0);
-	vk.Chapter(0);
-	vk.Book(0);
-	vk.Testament(0);
+	vk.setVerse(0);
+	vk.setChapter(0);
+	vk.setBook(0);
+	vk.setTestament(0);
 
 	mod << "Module heading text";
 
-	vk.Verse(0);
-	vk.Chapter(0);
-	vk.Book(0);
-	vk.Testament(1);
+	vk.setVerse(0);
+	vk.setChapter(0);
+	vk.setBook(0);
+	vk.setTestament(1);
 
 	mod << "OT heading text";
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(0);
-	vk.Verse(0);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(0);
+	vk.setVerse(0);
 
 	mod << "Gen heading text";
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(1);
-	vk.Verse(0);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(0);
 
 	mod << "Gen 1 heading text";
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(1);
-	vk.Verse(1);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(1);
 
 	mod << "Gen 1:1 text";
 
 	
-	vk.Testament(0);
-	vk.Book(0);
-	vk.Chapter(0);
-	vk.Verse(0);
+	vk.setTestament(0);
+	vk.setBook(0);
+	vk.setChapter(0);
+	vk.setVerse(0);
 
-	std::cout << "Module heading text ?= " << (const char*)mod << std::endl;
+	std::cout << "Module heading text ?= " << mod.renderText() << std::endl;
 
-	vk.Testament(1);
-	vk.Book(0);
-	vk.Chapter(0);
-	vk.Verse(0);
+	vk.setTestament(1);
+	vk.setBook(0);
+	vk.setChapter(0);
+	vk.setVerse(0);
 
-	std::cout << "OT heading text ?= " << (const char*)mod << std::endl;
+	std::cout << "OT heading text ?= " << mod.renderText() << std::endl;
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(0);
-	vk.Verse(0);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(0);
+	vk.setVerse(0);
 
-	std::cout << "Gen heading text ?= " << (const char*)mod << std::endl;
+	std::cout << "Gen heading text ?= " << mod.renderText() << std::endl;
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(1);
-	vk.Verse(0);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(0);
 
-	std::cout << "Gen 1 heading text ?= " << (const char*)mod << std::endl;
+	std::cout << "Gen 1 heading text ?= " << mod.renderText() << std::endl;
 
-	vk.Testament(1);
-	vk.Book(1);
-	vk.Chapter(1);
-	vk.Verse(1);
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(1);
 
-	std::cout << "Gen 1:1 text ?= " << (const char*)mod << std::endl;
+	std::cout << "Gen 1:1 text ?= " << mod.renderText() << std::endl;
 
 	  /* old introtest
 	SWModule *mhc = mymgr.Modules["MHC"];
 
 	if (mhc) {
 		VerseKey vk;
-		vk.Headings(1);
-		vk.AutoNormalize(0);
-		vk.Persist(1);
+		vk.setIntros(true);
+		vk.setAutoNormalize(false);
+		vk.setPersist(true);
 		vk = "jas 0:0";
 		std::cout << vk << ":\n";
 		mhc->setKey(vk);
diff --git a/tests/keycast.cpp b/tests/keycast.cpp
index 3818279..2da50c9 100644
--- a/tests/keycast.cpp
+++ b/tests/keycast.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  keycast.cpp -	
+ *
+ * $Id: keycast.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/keytest.cpp b/tests/keytest.cpp
index 6b22007..9fbc841 100644
--- a/tests/keytest.cpp
+++ b/tests/keytest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  keytest.cpp -	
+ *
+ * $Id: keytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -47,15 +52,15 @@ int main(int argc, char **argv)
 		bla = "James    1:19";
 	else	bla = argv[2];
 
-	std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
 	std::cout << " (.Index(Index()+1))\n";
 
 	max = (argc < 4) ? 10 : atoi(argv[3]);
 
 	for (loop = 0; loop < max; loop++) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")";
-		bla.Index(index+1);
+		bla.setIndex(index+1);
 		std::cout << "-> " << (const char *)bla << "\n";
 	}
 
@@ -66,37 +71,37 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")";
-		bla.Index(index-1);
+		bla.setIndex(index-1);
 		std::cout << "-> " << (const char *)bla << "\n";
 	}
 
 	std::cout << "-----------------\n";
-	bla.Headings(true);
-	std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+	bla.setIntros(true);
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
 	std::cout << " key++\n";
 
 	if (argc < 2) 
 		bla = "Matthew  1:5";
 	else	bla = argv[2];
 
-	for (loop = 0; loop < max && !bla.Error(); loop++,bla++) {
-		index = bla.Index();
+	for (loop = 0; loop < max && !bla.popError(); loop++,bla++) {
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
 	std::cout << "-----------------\n";
-	bla.Headings(true);
-	std::cout << "\n Headings: " << (bool)bla.Headings() << "\n";
+	bla.setIntros(true);
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
 	std::cout << " key--\n";
 
 	if (argc < 2) 
 		bla = "Matthew  1:5";
 	else	bla = argv[2];
 
-	for (loop = max; loop && !bla.Error(); loop--, bla--) {
-		index = bla.Index();
+	for (loop = max; loop && !bla.popError(); loop--, bla--) {
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -107,7 +112,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla--) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -118,7 +123,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla++) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -129,7 +134,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla++) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -137,14 +142,14 @@ int main(int argc, char **argv)
 	std::cout << "-----------------\n";
 	std::cout << "-------- Headings ---------\n";
 
-	bla.Headings(1);
+	bla.setIntros(true);
 
 	if (argc < 2) 
 		bla = "Matthew  1:5";
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla--) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -155,7 +160,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla--) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -166,7 +171,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla++) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -177,7 +182,7 @@ int main(int argc, char **argv)
 	else	bla = argv[2];
 
 	for (loop = max; loop; loop--, bla++) {
-		index = bla.Index();
+		index = bla.getIndex();
 		std::cout << (const char *)bla << "(" << index << ")\n";
 	}
 
@@ -187,23 +192,23 @@ int main(int argc, char **argv)
 	bla = "Revelation of John 23:19";
 	std::cout << "bla = \"Revelation of John 23:19\"\n";
 	std::cout << "(const char *)bla = " << (const char *)bla << "\n";
-	std::cout << "bla.Error() = " << (int)bla.Error() << " \n";
+	std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
 	std::cout << "bla++ \n";
 	bla++;
-	std::cout << "bla.Error() = " << (int)bla.Error() << " \n";
+	std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
 
-	bla.Headings(0);
-	for (bla = BOTTOM; !bla.Error(); bla.Book(bla.Book()-1))
+	bla.setIntros(false);
+	for (bla = BOTTOM; !bla.popError(); bla.setBook(bla.getBook()-1))
 		std::cout << (const char *)bla << "\n";
-	bla.Testament(1);
+	bla.setTestament(1);
 	bla = BOTTOM;
-	std::cout << bla.TestamentIndex() << "\n";
-	std::cout << bla.Index() << "\n";
+	std::cout << bla.getTestamentIndex() << "\n";
+	std::cout << bla.getIndex() << "\n";
 	std::cout << bla << "\n";
-	bla.Testament(2);
+	bla.setTestament(2);
 	bla = BOTTOM;
-	std::cout << bla.TestamentIndex() << "\n";
-	std::cout << bla.Index() << "\n";
+	std::cout << bla.getTestamentIndex() << "\n";
+	std::cout << bla.getIndex() << "\n";
 	std::cout << bla << "\n";
 	return 0;
 }
diff --git a/tests/lextest.cpp b/tests/lextest.cpp
index 4d1f084..8cf1535 100644
--- a/tests/lextest.cpp
+++ b/tests/lextest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  lextest.cpp -	
+ *
+ * $Id: lextest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/listtest.cpp b/tests/listtest.cpp
index 0bcfeed..50df61e 100644
--- a/tests/listtest.cpp
+++ b/tests/listtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  listtest.cpp -	
+ *
+ * $Id: listtest.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -31,15 +36,15 @@ int main(int argc, char **argv)
 	SWKey text;
 	VerseKey vk("jn 1:1", "jn 1:12");
 	vk = "jas 1:19";
-	cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set");
+	cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
 	text = (const char *)vk;
 	cout << "\nshould be jn 1.12: " << text << "\n";
 	vk = "mat 1:19";
-	cout << "\nError should be set: " << ((vk.Error()) ? "set":"not set");
+	cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
 	text = (const char *)vk;
 	cout << "\nshould be jn 1.1: " << text << "\n";
 	vk = "jn 1:7";
-	cout << "\nError should not be set: " << ((vk.Error()) ? "set":"not set");
+	cout << "\nError should not be set: " << ((vk.popError()) ? "set":"not set");
 	text = (const char *)vk;
 	cout << "\nshould be jn 1.7: " << text << "\n";
 
@@ -59,13 +64,13 @@ int main(int argc, char **argv)
 	lk2 << lk;
 	lk2 << vk2;
 	lk2 << "test2";
-	for (lk2 = TOP; !lk2.Error(); lk2++) {
+	for (lk2 = TOP; !lk2.popError(); lk2++) {
 		cout << (const char *) lk2 << "\n";
 	}
 
 	cout << "\n\n---------\n";
 
-	lk2 = VerseKey().ParseVerseList("1jn-2jn;mk1.9", 0, true);
+	lk2 = VerseKey().parseVerseList("1jn-2jn;mk1.9", 0, true);
 
 	// c-tor not bound setting, just parsing to jn.1.1
 	VerseKey yoyo("john");
@@ -91,23 +96,23 @@ int main(int argc, char **argv)
 
 */
 
-	for (lk2 = TOP; !lk2.Error(); lk2++)
+	for (lk2 = TOP; !lk2.popError(); lk2++)
 		cout << (const char *) lk2 << "\n";
 
-	lk.ClearList();
+	lk.clear();
 	lk << "john 3:16";
-	cout << "\nCount should be 1: " << lk.Count();
+	cout << "\nCount should be 1: " << lk.getCount();
 
-	lk = vk.ParseVerseList("mat;mark;luke", vk, true);
+	lk = vk.parseVerseList("mat;mark;luke", vk, true);
 	lk = (VerseKey)"mark 3:16";
-	cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set");
+	cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
 	lk = (VerseKey)"john 3:16";
-	cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set");
-	lk = vk.ParseVerseList("mk 3:16", vk, true);
+	cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
+	lk = vk.parseVerseList("mk 3:16", vk, true);
 	lk = (VerseKey)"john 3:16";
-	cout << "\nError should be set: " << ((lk.Error()) ? "set":"not set");
+	cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
 	lk = (VerseKey)"mark 3:16";
-	cout << "\nError should not be set: " << ((lk.Error()) ? "set":"not set");
+	cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
 
 	cout << "\n\n";
 	return 0;
diff --git a/tests/localetest.cpp b/tests/localetest.cpp
index e1a0e7e..26f6b28 100644
--- a/tests/localetest.cpp
+++ b/tests/localetest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  localetest.cpp -	
+ *
+ * $Id: localetest.cpp 3005 2014-01-09 04:06:11Z greg.hellings $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -28,9 +33,9 @@ int main(int argc, char **argv) {
 		exit(-1);
 	}
 
-	LocaleMgr lm;
+	LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
 
-	std::cout << lm.translate(argv[2], argv[1]) << "\n";
+	std::cout << lm->translate(argv[2], argv[1]) << "\n";
 
 /*
 	VerseKey bla;
diff --git a/tests/mgrtest.cpp b/tests/mgrtest.cpp
index acebf88..dbc9f14 100644
--- a/tests/mgrtest.cpp
+++ b/tests/mgrtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  mgrtest.cpp -	
+ *
+ * $Id: mgrtest.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -41,21 +46,21 @@ int main(int argc, char **argv) {
 	ModMap::iterator it;
 
 	for (it = mymgr.Modules.begin(); it != mymgr.Modules.end(); it++) {
-		std::cout << "[" << (*it).second->Name() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->Description() << "]\n";
+		std::cout << "[" << (*it).second->getName() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->getDescription() << "]\n";
 		std::cout << "AbsoluteDataPath = " << it->second->getConfigEntry("AbsoluteDataPath") << "\n";
 		std::cout << "Has Feature HebrewDef = " << it->second->getConfig().has("Feature", "HebrewDef") << "\n";
-		if ((!strcmp((*it).second->Type(), "Biblical Texts")) || (!strcmp((*it).second->Type(), "Commentaries"))) {
+		if ((!strcmp((*it).second->getType(), "Biblical Texts")) || (!strcmp((*it).second->getType(), "Commentaries"))) {
 			it->second->setKey("James 1:19");
-			std::cout << (const char *) *(*it).second << "\n\n";
+			std::cout << (*it).second->renderText() << "\n\n";
 		}
 	}
 
 	SWModule *mhc = mymgr.Modules["MHC"];
 
 	if (mhc) {
-		std::cout << "MHC, Lang = " << mhc->Lang() << "\n\n";
-		for (mhc->Key("Gen 1:1"); mhc->Key() < (VerseKey) "Gen 1:10"; (*mhc)++)
-			std::cout << (const char *) *mhc << "\n";
+		std::cout << "MHC, Lang = " << mhc->getLanguage() << "\n\n";
+		for (mhc->setKey("Gen 1:1"); *mhc->getKey() < (VerseKey) "Gen 1:10"; (*mhc)++)
+			std::cout << mhc->renderText() << "\n";
 	}
 
 	if (sysConf)
diff --git a/tests/modtest.cpp b/tests/modtest.cpp
index 7b946ee..8f03f0e 100644
--- a/tests/modtest.cpp
+++ b/tests/modtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  modtest.cpp -	
+ *
+ * $Id: modtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -28,11 +33,11 @@ int main(int argc, char **argv) {
 	ModMap::iterator it;
 	SWModule *module = mymgr.Modules["KJV"];
 	VerseKey parser;
-	ListKey lk = parser.ParseVerseList("mal4:6-rev", parser, true);
-	lk.Persist(1);
-	module->SetKey(lk);
+	ListKey lk = parser.parseVerseList("mal4:6-rev", parser, true);
+	lk.setPersist(true);
+	module->setKey(lk);
 
 	(*module) = TOP;
-	std::cout << module->KeyText() << "\n";
+	std::cout << module->getKeyText() << "\n";
 	return 0;
 }
diff --git a/tests/osistest.cpp b/tests/osistest.cpp
new file mode 100644
index 0000000..210f749
--- /dev/null
+++ b/tests/osistest.cpp
@@ -0,0 +1,111 @@
+/******************************************************************************
+ *
+ *  osistest.cpp -	
+ *
+ * $Id: osistest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 20122013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <markupfiltmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+using namespace std;
+using namespace sword;
+
+
+void outputCurrentVerse(SWModule *module) {
+
+	module->renderText();
+
+	cout << "Key:\n";
+	cout << module->getKeyText() << "\n";
+	cout << "-------\n";
+
+	cout << "Preverse Header 0:\nRaw:\n";
+	SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << header << endl;
+	cout << "-------\n";
+	cout << "Rendered Header:\n";
+	cout << module->renderText(header) << endl;
+	cout << "-------\n";
+	cout << "CSS:\n";
+	cout << module->getRenderHeader() << endl;
+	cout << "-------\n";
+	cout << "RenderText:\n";
+	cout << module->renderText() << endl;
+	cout << "-------\n";
+	cout << "-------\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		cerr << "\nusage: " << *argv << " <modName>\n" << endl;
+		exit(-1);
+	}
+
+	SWMgr library(new MarkupFilterMgr(FMT_XHTML));
+	library.setGlobalOption("Headings", "On");
+
+	SWModule *module = library.getModule(argv[1]);
+
+	if (!module) {
+		cerr << "\nCouldn't file modules: " << argv[1] << "\n" << endl;
+		exit(-2);
+	}
+
+	module->setKey("Ps.3.1");
+	outputCurrentVerse(module);
+
+	module->setKey("Mark.1.14");
+	outputCurrentVerse(module);
+
+
+	cout << "\nWhitespace tests around headings:\n";
+	((VerseKey *)module->getKey())->setIntros(true);
+	*module = TOP;
+	// module heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// testament heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// book heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// chapter heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// verse body
+	module->renderText();
+	SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << module->renderText(header) << endl;
+	cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n";
+	(*module)++;
+	// verse body
+	module->renderText();
+	header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << module->renderText(header) << endl;
+	cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n";
+
+	return 0;
+}
diff --git a/tests/outputcps.cpp b/tests/outputcps.cpp
index 88e3688..5fe74fe 100644
--- a/tests/outputcps.cpp
+++ b/tests/outputcps.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  outputcps.cpp -	
+ *
+ * $Id: outputcps.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/parsekey.cpp b/tests/parsekey.cpp
index 3e53b82..03802fc 100644
--- a/tests/parsekey.cpp
+++ b/tests/parsekey.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  parsekey.cpp -	
+ *
+ * $Id: parsekey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -26,8 +31,8 @@ using namespace sword;
 #endif
 
 int main(int argc, char **argv) {
-	if ((argc < 2) || (argc > 7)) {
-		std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse]\n";
+	if ((argc < 2) || (argc > 8)) {
+		std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse 1|0] [intros 1|0]\n";
 		exit(-1);
 	}
 
@@ -42,14 +47,20 @@ int main(int argc, char **argv) {
 
 	const char *context = (argc > 4) ? argv[4] : "gen.1.1";
 
+	bool echo = (argc > 5) ? !strcmp(argv[5], "1") : false;
+	bool inSetTest = (argc > 6) ? !strcmp(argv[6], "1") : false;
+	bool intros = (argc > 7) ? !strcmp(argv[7], "1") : false;
+
+	DefaultVSKey.setIntros(intros);
+
 	SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
 	DefaultVSKey.validateCurrentLocale();
 
 	DefaultVSKey = context;
-	
-	ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true);
 
-	if ((argc > 5) && (argv[5][0] == '1')) {
+	ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true);
+
+	if (echo) {
 		for (int i = 1; i < argc; i++) {
 			if (i > 1) std::cout << " ";
 			std::cout << argv[i];
@@ -63,9 +74,9 @@ int main(int argc, char **argv) {
 	}
 */
 
-	if (argc > 6) {
-		verses.setText(argv[4]);
-		std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n";
+	if (inSetTest) {
+		verses.setText(context);
+		std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n";
 	}
 	
 	return 0;
diff --git a/tests/rawldidxtest.cpp b/tests/rawldidxtest.cpp
index 4aad6b8..bd47f0e 100644
--- a/tests/rawldidxtest.cpp
+++ b/tests/rawldidxtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  rawldidxtest.cpp -	
+ *
+ * $Id: rawldidxtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/refsystest.cpp b/tests/refsystest.cpp
index 502d429..e41acf9 100644
--- a/tests/refsystest.cpp
+++ b/tests/refsystest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  refsystest.cpp -	
+ *
+ * $Id: refsystest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/romantest.cpp b/tests/romantest.cpp
index 7f57257..cb0e026 100644
--- a/tests/romantest.cpp
+++ b/tests/romantest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  romantest.cpp -	
+ *
+ * $Id: romantest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/striptest.cpp b/tests/striptest.cpp
index e7eecaa..8013481 100644
--- a/tests/striptest.cpp
+++ b/tests/striptest.cpp
@@ -1,3 +1,25 @@
+/******************************************************************************
+ *
+ *  striptest.cpp -	
+ *
+ * $Id: striptest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
 #include <swmgr.h>
 #include <swmodule.h>
 #include <iostream>
@@ -20,13 +42,13 @@ int main(int argc, char **argv) {
 	    library.setGlobalOption(*it, "Off");
 	}
 	book->setKey(keyText.c_str());
-	SWBuf entryStripped = book->StripText();
-	cout << "Module: " << book->Description() << "\t Key: " << book->getKeyText() << "\n";
+	SWBuf entryStripped = book->stripText();
+	cout << "Module: " << book->getDescription() << "\t Key: " << book->getKeyText() << "\n";
 	cout << "RawEntry:\n" << book->getRawEntry() << "\n";
 	cout << "StripText:\n" << entryStripped << "\n";
 	cout << "Search Target: " << searchText << "\n";
-	cout << "Search Target StripText: " << book->StripText(searchText) << "\n";
-	cout << "Found: " << ((strstr(entryStripped.c_str(), book->StripText(searchText))) ? "true":"false") << endl; 
+	cout << "Search Target StripText: " << book->stripText(searchText) << "\n";
+	cout << "Found: " << ((strstr(entryStripped.c_str(), book->stripText(searchText))) ? "true":"false") << endl; 
 
 	return 0;
 }
diff --git a/tests/swaptest.cpp b/tests/swaptest.cpp
index 040a233..f3713d0 100644
--- a/tests/swaptest.cpp
+++ b/tests/swaptest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  swaptest.cpp -	
+ *
+ * $Id: swaptest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/swbuftest.cpp b/tests/swbuftest.cpp
index 512df09..2703efd 100644
--- a/tests/swbuftest.cpp
+++ b/tests/swbuftest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  swbuftest.cpp -	
+ *
+ * $Id: swbuftest.cpp 2982 2013-09-15 13:33:03Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -21,6 +26,8 @@
 #define BASEI 102400000L
 
 #include <swbuf.h>
+#include <utilstr.h>
+
 typedef sword::SWBuf StringType;
 
 //#include <string>
@@ -28,6 +35,8 @@ typedef sword::SWBuf StringType;
 
 using std::cout;
 using std::cerr;
+using sword::utf8ToWChar;
+using sword::wcharToUTF8;
 
 void markTime() {
 	static clock_t start = clock();
@@ -132,6 +141,8 @@ void insertStringTest() {
 }
 
 int main(int argc, char **argv) {
+
+	bool showTimings = !(argc > 1 && !strcmp(argv[1], "--no-timings"));
 	StringType x;
 	cout << "x should be (): (" << x << ")\n";
 	cout << "size should be 0: " << x.size() << "\n";
@@ -152,6 +163,11 @@ int main(int argc, char **argv) {
 	cout << "Prefix should be (prefix): " << prefixTest.stripPrefix(':') << "\n";
 	cout << "Value should be (value): " << prefixTest << "\n";
 
+	x = utf8ToWChar("ⲉⲛⲧⲁⲡⲛⲟⲩⲧⲉ");
+	cout << (wchar_t *)x.getRawData() << "\n";
+	x = wcharToUTF8((wchar_t *)x.getRawData());
+	cout << x << "\n";
+
 //	y.appendFormatted(" from %d %s running %02.05f miles", 4, "dogs", 1.9f);
 //	cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles): (" << y << ")\n";
 //	y += '!';
@@ -159,18 +175,18 @@ int main(int argc, char **argv) {
 //	y.append(y.c_str(),5);
 //	cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles!hello): (" << y << ")\n";
 
-	markTime();
+	if (showTimings) markTime();
 	appendChTest();
-	markTime();
+	if (showTimings) markTime();
 	appendStringTest();
-	markTime();
+	if (showTimings) markTime();
 	subscriptTest();
-	markTime();
+	if (showTimings) markTime();
 	ctorAssignTest();
-	markTime();
+	if (showTimings) markTime();
 	compareTest();
-	markTime();
+	if (showTimings) markTime();
 	insertStringTest();
-	markTime();
+	if (showTimings) markTime();
 }
 
diff --git a/tests/testblocks.cpp b/tests/testblocks.cpp
index f0f6e84..96e2253 100644
--- a/tests/testblocks.cpp
+++ b/tests/testblocks.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  testblocks.cpp -	
+ *
+ * $Id: testblocks.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/testsuite/osis.good b/tests/testsuite/osis.good
new file mode 100644
index 0000000..87c58c3
--- /dev/null
+++ b/tests/testsuite/osis.good
@@ -0,0 +1,106 @@
+SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest
+Key:
+Psalms 3:1
+-------
+Preverse Header 0:
+Raw:
+<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="paragraph"/> <lg sID="gen14"/> 
+-------
+Rendered Header:
+ <h3>A Psalm of David, when he fled from Absalom his son.</h3>
+
+<br />
+ 
+-------
+CSS:
+		.divineName { font-variant: small-caps; }
+		.wordsOfJesus { color: red; }
+		.transChangeSupplied { font-style: italic; }
+		.small, .sub, .sup { font-size: .83em }
+		.sub             { vertical-align: sub }
+		.sup             { vertical-align: super }
+		.indent1         { margin-left: 10px }
+		.indent2         { margin-left: 20px }
+		.indent3         { margin-left: 30px }
+		.indent4         { margin-left: 40px }
+	
+-------
+RenderText:
+ <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br />
+<span class="line indent0">many <span class="transChangeSupplied">are</span> they that rise up against me.</span><br />
+
+-------
+-------
+
+Key:
+Mark 1:14
+-------
+Preverse Header 0:
+Raw:
+<div sID="gen22" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen23" type="paragraph"/> 
+-------
+Rendered Header:
+ <h3>The Beginning of the Ministry of Jesus</h3>
+
+<h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+
+<br />
+
+-------
+CSS:
+		.divineName { font-variant: small-caps; }
+		.wordsOfJesus { color: red; }
+		.transChangeSupplied { font-style: italic; }
+		.small, .sub, .sup { font-size: .83em }
+		.sub             { vertical-align: sub }
+		.sup             { vertical-align: super }
+		.indent1         { margin-left: 10px }
+		.indent2         { margin-left: 20px }
+		.indent3         { margin-left: 30px }
+		.indent4         { margin-left: 40px }
+	
+-------
+RenderText:
+ Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, 
+-------
+-------
+
+
+Whitespace tests around headings:
+
+
+ <h1 class="bookHeader">Old Testament</h1>
+
+ <h1 class="bookHeader">THE FIRST BOOK OF MOSES CALLED GENESIS</h1>
+
+ <h1 class="bookHeader">Introduction and Outline</h1>
+
+<br />
+This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br />
+<br />
+<ul>
+ 	<li><span class="sup">1</span>Creation of Heaven and Earth, 1:1-2:4a</li>
+	<li><span class="sup">2</span>Creation of Man and Woman, 2:4b-25</li>
+	<li><span class="sub">3</span>Fall, 3:1-24</li>
+	<li>...</li>
+</ul>
+ <br />
+Tables work like this: <table><tbody>
+ 	<tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr>
+ 	<tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr>
+ 	<tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr>
+ </tbody></table>
+<br />
+
+  <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2>
+
+
+ <h3>Creation of the Heavens and the Earth</h3>
+
+<br />
+
+[ Genesis 1:1 ]  In the beginning God created the heaven and the earth.  <br />
+
+<br />
+
+[ Genesis 1:2 ] Text of verse 2.
diff --git a/tests/testsuite/osis.sh b/tests/testsuite/osis.sh
new file mode 100755
index 0000000..689e64d
--- /dev/null
+++ b/tests/testsuite/osis.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+rm -rf osis/
+mkdir -p osis/mods.d
+mkdir -p osis/modules
+
+cat > osis/mods.d/osisreference.conf <<!
+[OSISReference]
+DataPath=./modules/
+ModDrv=zText
+Encoding=UTF-8
+BlockType=BOOK
+CompressType=ZIP
+SourceType=OSIS
+Lang=en
+GlobalOptionFilter=OSISStrongs
+GlobalOptionFilter=OSISMorph
+GlobalOptionFilter=OSISFootnotes
+GlobalOptionFilter=OSISHeadings
+GlobalOptionFilter=OSISRedLetterWords
+Feature=StrongsNumbers
+!
+
+../../utilities/osis2mod osis/modules/ osisReference.xml -z 2>&1 | grep -v \$Rev
+
+cd osis && ../../osistest OSISReference
diff --git a/tests/testsuite/osisReference.xml b/tests/testsuite/osisReference.xml
new file mode 100644
index 0000000..d07f774
--- /dev/null
+++ b/tests/testsuite/osisReference.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<osis
+  xmlns="http://www.bibletechnologies.net/2003/OSIS/namespace"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.bibletechnologies.net/2003/OSIS/namespace
+  http://www.bibletechnologies.net/osisCore.2.1.1.xsd">
+
+<osisText osisIDWork="KJV" osisRefWork="defaultReferenceScheme" xml:lang="en">
+
+<header>
+  <work osisWork="KJV">
+    <title>King James Version (1769) with Strongs Numbers and Morphology</title>
+    <identifier type="OSIS">Bible.KJV</identifier>
+    <scope>Gen-Rev</scope>
+    <refSystem>Bible.KJV</refSystem>
+  </work>
+  <work osisWork="defaultReferenceScheme">
+    <refSystem>Bible.KJV</refSystem>
+  </work>
+  <work osisWork="strong">
+    <refSystem>Dict.Strongs</refSystem>
+  </work>
+  <work osisWork="robinson">
+    <refSystem>Dict.Robinsons</refSystem>
+  </work>
+  <work osisWork="osmorph">
+    <refSystem>Dict.osmorph</refSystem>
+  </work>
+  <work osisWork="oslemma">
+    <refSystem>Dict.oslemma</refSystem>
+  </work>
+</header>
+<div type="bookGroup">
+ <title>Old Testament</title>
+ <div type="book" osisID="Gen">
+  <title type="main">THE FIRST BOOK OF MOSES CALLED GENESIS</title>
+  <div type="section">
+   <title>Introduction and Outline</title>
+    <p>
+     This is the <hi type="bold">Book of Genesis</hi>, the <hi type="italic">first</hi> book in the Bible. It may be outlined as follows:
+    </p>
+    <p>
+     <list>
+      <item><hi type="super">1</hi>Creation of Heaven and Earth, 1:1-2:4a</item>
+      <item><hi type="super">2</hi>Creation of Man and Woman, 2:4b-25</item>
+      <item><hi type="sub">3</hi>Fall, 3:1-24</item>
+      <item>...</item>
+     </list>
+    </p>
+    <p>
+     Tables work like this:
+     <table>
+      <row>
+       <cell><hi type="bold">Column 1 Label</hi></cell>
+       <cell><hi type="bold">Column 2 Label</hi></cell>
+      </row>
+      <row>
+       <cell>Column 1, Row 1</cell>
+       <cell>Column 2, Row 1</cell>
+      </row>
+      <row>
+       <cell>Column 1, Row 2</cell>
+       <cell>Column 2, Row 2</cell>
+      </row>
+     </table>
+    </p>
+  </div>
+  <chapter sID="Gen.1" osisID="Gen.1"/>
+   <div type="majorSection">
+    <title>From Creation to Abraham (1:1–11:9)</title>
+    <div type="section">
+     <title>Creation of the Heavens and the Earth</title>
+     <p>
+      <verse sID="Gen.1.1" osisID="Gen.1.1"/>
+       <w lemma="strong:H07225">In the beginning</w> 
+       <w lemma="strong:H0430">God</w> 
+       <w lemma="strong:H0853 strong:H01254">created</w> 
+       <w lemma="strong:H8064">the heaven</w> 
+       <w lemma="strong:H0853">and</w> 
+       <w lemma="strong:H0776">the earth</w>.
+      <verse eID="Gen.1.1"/>
+     </p>
+     <p>
+      <verse sID="Gen.1.2" osisID="Gen.1.2"/>Text of verse 2.<verse eID="Gen.1.2"/>
+      <verse sID="Gen.1.3" osisID="Gen.1.3"/>
+       Text of verse 3.
+       <note type="crossReference" n="a" osisID="Gen.1.3!crossReference.a" osisRef="Gen.1.3">
+       <reference osisRef="2Cor.4.6">2 Cor 4:6</reference>
+       </note>
+      <verse eID="Gen.1.3"/>
+      <verse sID="Gen.1.4" osisID="Gen.1.4"/>
+       And God saw the light, that 
+       <transChange type="added">it was</transChange> good: 
+       and God divided the light from the darkness.
+       <note type="study">the light from…: Heb. between the light and between the darkness</note>
+      <verse eID="Gen.1.4"/>
+      <verse sID="Gen.1.5" osisID="Gen.1.5"/>
+       <w lemma="oslemma:וְ oslemma:קרא" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַיִּקְרָ֨א</w>
+       <w lemma="oslemma:אֱלֹהִים" morph="osmorph:Ncmp">אֱלֹהִ֤ים</w>
+       <w lemma="oslemma:לְ oslemma:הַ oslemma:אֹור" morph="osmorph:R osmorph:Td osmorph:Ncms" src="1 2 3">לָאֹור֙</w>
+       <w lemma="oslemma:יֹום" morph="osmorph:Ncms">יֹ֔ום</w>
+       <w lemma="oslemma:וְ oslemma:לְ oslemma:הַ oslemma:חֹשֶׁכְ" morph="osmorph:Cc osmorph:R osmorph:Td osmorph:Ncms" src="1 2 3 4">וְלַחֹ֖שֶׁךְ</w>
+       <w lemma="oslemma:קרא" morph="osmorph:Vqp3ms">קָ֣רָא</w>
+       <w lemma="oslemma:לַיְלָה" morph="osmorph:Ncms">לָ֑יְלָה</w>
+       <w lemma="oslemma:וְ oslemma:היה" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַֽיְהִי־</w><w lemma="oslemma:עֶרֶב" morph="osmorph:Ncms">עֶ֥רֶב</w>
+       <w lemma="oslemma:וְ oslemma:היה" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַֽיְהִי־</w><w lemma="oslemma:בֹּקֶר" morph="osmorph:Ncms">בֹ֖קֶר</w>
+       <w lemma="oslemma:יֹום" morph="osmorph:Ncms">יֹ֥ום</w>
+       <w lemma="oslemma:אֶחָד" morph="osmorph:Acms">אֶחָֽד</w>׃
+       <w lemma="oslemma:פ" morph="osmorph:M">פ</w>
+      <verse eID="Gen.1.5"/>
+     </p>
+  <chapter eID="Gen.1"/>
+    </div>
+   </div>
+ </div>
+ <div type="book" osisID="Ps">
+  <title type="main">THE BOOK OF PSALMS</title>
+  <chapter sID="Ps.3" osisID="Ps.3"/>
+   <title type="chapter">PSALM 3.</title>
+   <div type="section">
+   <title type="psalm" canonical="true">A Psalm of David, when he fled from Absalom his son.</title>
+    <p>
+     <lg>
+      <verse sID="Ps.3.1" osisID="Ps.3.1"/>
+       <l level="1"><seg><divineName>Lord</divineName></seg>, how are they increased that trouble me!</l>
+       <l level="1">many <transChange type="added">are</transChange> they that rise up against me.</l>
+      <verse eID="Ps.3.1"/>
+      <verse sID="Ps.3.2" osisID="Ps.3.2"/>
+       <l level="1">Many <transChange type="added">there be</transChange> which say of my soul,</l>
+       <l level="1"><transChange type="added">There is</transChange> no help for him in God.</l>
+       <l type="selah">Selah.</l> 
+      <verse eID="Ps.3.2"/>
+      <verse sID="Ps.3.3" osisID="Ps.3.3"/>
+       
+      <verse eID="Ps.3.3"/>
+     </lg>
+    </p>
+   </div>
+  <chapter eID="Ps.3"/>
+ </div>
+</div>
+<div type="bookGroup">
+ <title>New Testament</title>
+ <div type="book" osisID="Mark">
+  <title type="main">THE GOSPEL ACCORDING TO <abbr expansion="Saint">ST.</abbr> MARK</title>
+  <chapter sID="Mark.1" osisID="Mark.1"/>
+   <verse sID="Mark.1.13" osisID="Mark.1.13"/>
+And He was in the wilderness forty days being tempted by Satan; and He was with the wild beasts, and the angels were ministering to Him.
+   <verse eID="Mark.1.13"/>
+   <div type="section">
+    <title>The Beginning of the Ministry of Jesus</title>
+    <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; 
+     <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; 
+     <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>)
+    </title>
+    <p>
+     <verse sID="Mark.1.14" osisID="Mark.1.14"/>
+      <w src="2" lemma="strong:G1161" morph="robinson:CONJ">Now</w> 
+      <w src="1" lemma="strong:G3326" morph="robinson:PREP">after</w> that 
+      <w src="5 6" lemma="strong:G3588 strong:G2491" morph="robinson:T-ASM robinson:N-ASM">John</w> 
+      <w src="4" lemma="strong:G3860" morph="robinson:V-APN">was put in prison</w>, 
+      <w src="8 9" lemma="strong:G3588 strong:G2424" morph="robinson:T-NSM robinson:N-NSM">Jesus</w> 
+      <w src="7" lemma="strong:G2064" morph="robinson:V-2AAI-3S">came</w> 
+      <w src="10" lemma="strong:G1519" morph="robinson:PREP">into</w> 
+      <w src="11 12" lemma="strong:G3588 strong:G1056" morph="robinson:T-ASF robinson:N-ASF">Galilee</w>, 
+      <w src="13" lemma="strong:G2784" morph="robinson:V-PAP-NSM">preaching</w> 
+      <w src="14 15" lemma="strong:G3588 strong:G2098" morph="robinson:T-ASN robinson:N-ASN">the gospel</w> 
+      <w src="16 17" lemma="strong:G3588 strong:G932" morph="robinson:T-GSF robinson:N-GSF">of the kingdom</w> 
+      <w src="18 19" lemma="strong:G3588 strong:G2316" morph="robinson:T-GSM robinson:N-GSM">of God</w>,
+      <w src="3" lemma="strong:G3588" morph="robinson:T-ASN"></w>
+     <verse eID="Mark.1.14"/>
+     <verse sID="Mark.1.15" osisID="Mark.1.15"/>
+      And saying, 
+      <q who="Jesus">The time is fulfilled, and the kingdom of God is at hand: repent ye, and believe the <seg type="x-variant" subType="x-1">gospel</seg>
+<seg type="x-variant" subType="x-2">good news</seg>.</q>
+     <verse eID="Mark.1.15"/>
+    </p>
+   </div>
+  <chapter eID="Mark.1"/>
+ </div>
+</div>
+</osisText>
+</osis>
diff --git a/tests/testsuite/sword.conf b/tests/testsuite/sword.conf
new file mode 100644
index 0000000..a8ae13b
--- /dev/null
+++ b/tests/testsuite/sword.conf
@@ -0,0 +1,2 @@
+[Install]
+LocalePath=../..
diff --git a/tests/testsuite/versekeytest.good b/tests/testsuite/versekeytest.good
index 08b233c..5540c6a 100644
--- a/tests/testsuite/versekeytest.good
+++ b/tests/testsuite/versekeytest.good
@@ -1,3 +1,9 @@
+Should be: [ Testament 1 Heading ]
+[ Testament 1 Heading ]
+
+Should be: [ Testament 1 Heading ]
+[ Testament 1 Heading ]
+
 single
 multiple
 x: Amos 1:5
@@ -10,6 +16,9 @@ Error: 1: Acts 28:31
 
 Normalization on; headings on ====
 
+jn.3.50: John 4:13
+++: John 4:14
+--: John 4:13
 MAXVERSE: John 4:54
 MAXCHAPTER: John 21:1
 TOP: [ Module Heading ]
@@ -18,6 +27,9 @@ BOTTOM: Revelation of John 22:21
 Normalization off; headings on ====
 
 jn.3.50: John 3:50
+++: John 3:51
+--: John 3:50
+MAXVERSE: John 3:36
 MAXCHAPTER: John 21:1
 TOP: [ Module Heading ]
 BOTTOM: Revelation of John 22:21
@@ -35,6 +47,9 @@ BOTTOM: Revelation of John 22:21
 Normalization off; headings off ====
 
 jn.3.50: John 3:50
+++: John 3:51
+--: John 3:50
+MAXVERSE: John 3:36
 MAXCHAPTER: John 21:1
 TOP: Genesis 1:1
 BOTTOM: Revelation of John 22:21
diff --git a/tests/testsuite/verseparsing.good b/tests/testsuite/verseparsing.good
index b7292d1..ee46d68 100644
--- a/tests/testsuite/verseparsing.good
+++ b/tests/testsuite/verseparsing.good
@@ -1,3 +1,5 @@
+jn.1.1-2.5,9,3;7.9 en KJV ge 1: John 1:1-John 2:5; John 2:9; John 2:3; John 7:9
+jn.1.1-2.5 en KJV ge 1: John 1:1-John 2:5
 1jn.2.3 en KJV ge 1: I John 2:3
 1 jn.2.3 en KJV ge 1: I John 2:3
 Ijn.2.3 en KJV ge 1: I John 2:3
@@ -54,15 +56,22 @@ I. jn 2:3 en KJV ge 1: I John 2:3
 1Jn 1:1 ;3:10 en KJV ge 1: I John 1:1; I John 3:10
 1Jn 1:1 ; 3:10 en KJV ge 1: I John 1:1; I John 3:10
 1Jn 1:1a ; 3:10b en KJV ge 1: I John 1:1a; I John 3:10b
-1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-Revelation of John 22:21; I John 3:10b-I John 3:11
-1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d; I John 3:13
+1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-I John 1:2a; I John 3:10b-I John 3:11
+1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d-I John 3:12e; I John 3:13
+Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a en KJV ge 1: Luke 2:45b-Luke 3:1a; Luke 3:1b-Luke 3:7; Luke 3:8-Luke 3:14; Luke 3:15-Luke 3:21a
 1Jn1.1f; 3:10ff en KJV ge 1: I John 1:1-I John 1:2; I John 3:10-I John 3:24
 1Jn1.1ff;3:10f en KJV ge 1: I John 1:1-I John 1:10; I John 3:10-I John 3:11
 1Jn1.1,8ff; 3:10-12,14f,17ff en KJV ge 1: I John 1:1; I John 1:8-I John 1:10; I John 3:10-I John 3:12; I John 3:14-I John 3:15; I John 3:17-I John 3:24
+1Jn2.3f. en KJV ge 1: I John 2:3-I John 2:4
+1Jn2.3ff. en KJV ge 1: I John 2:3-I John 2:29
 Song of 3:5 en KJV ge 1: Song of Solomon 3:5
 Song of Sol 3:5 en KJV ge 1: Song of Solomon 3:5
 Revelation of John 1:1 en KJV ge 1: Revelation of John 1:1
-
+Matt.Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt.Subscriptio en KJV ge 1 0 1: Matthew 1:0
+Matt Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt  Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt  subsc en KJV ge 1 0 1: Matthew 1:0
 Gen en KJV ge 1: Genesis 1:1-Genesis 50:26
 Genes en KJV ge 1: Genesis 1:1-Genesis 50:26
 Exod en KJV ge 1: Exodus 1:1-Exodus 40:38
diff --git a/tests/testsuite/verseparsing.sh b/tests/testsuite/verseparsing.sh
index d405f0f..aa6ae25 100755
--- a/tests/testsuite/verseparsing.sh
+++ b/tests/testsuite/verseparsing.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #******************************************************************************
 #
-# $Id: verseparsing.sh 2573 2010-10-17 21:15:48Z scribe $
+# $Id: verseparsing.sh 2796 2013-04-11 16:18:45Z scribe $
 #
 # Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
 #	CrossWire Bible Society
@@ -18,6 +18,9 @@
 # General Public License for more details.
 #
 
+../parsekey "jn.1.1-2.5,9,3;7.9" en KJV ge 1
+../parsekey "jn.1.1-2.5" en KJV ge 1
+
 ../parsekey "1jn.2.3" en KJV ge 1
 ../parsekey "1 jn.2.3" en KJV ge 1
 ../parsekey "Ijn.2.3" en KJV ge 1
@@ -82,19 +85,31 @@
 ../parsekey "1Jn 1:1 ; 3:10" en KJV ge 1
 ../parsekey "1Jn 1:1a ; 3:10b" en KJV ge 1
 
-### These two are not quite right yet
+### Suffix parsing
 ../parsekey "1Jn 1:1-2a; 3:10b-11" en KJV ge 1
 ../parsekey "1Jn 1:1c;3:10d-12e,13" en KJV ge 1
+../parsekey "Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a" en KJV ge 1
 
 ../parsekey "1Jn1.1f; 3:10ff" en KJV ge 1
 ../parsekey "1Jn1.1ff;3:10f" en KJV ge 1
 ../parsekey "1Jn1.1,8ff; 3:10-12,14f,17ff" en KJV ge 1
+../parsekey "1Jn2.3f." en KJV ge 1
+../parsekey "1Jn2.3ff." en KJV ge 1
 
 ### check for 'f' in book name which might trigger 'and following'
 ../parsekey "Song of 3:5" en KJV ge 1
 ../parsekey "Song of Sol 3:5" en KJV ge 1
 ../parsekey "Revelation of John 1:1" en KJV ge 1
 
+### check for 'inscriptio' and 'subscriptio' special chapters which parse to Book 0:0 and Book 1:0 respectively (for INTF)
+../parsekey "Matt.Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt.Subscriptio" en KJV ge 1 0 1
+../parsekey "Matt Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt  Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt  subsc" en KJV ge 1 0 1
+
+
+
 en_abbrevs="
 Gen Genes Exod Ex Exo Lev Le Levi Num Nu Numb Deut Deu De Josh Jos Joshu
 Judg Jdg Judge Ruth Ru Rut 1Sam 1Sa 1Samu 2Sam 2Sa 2Samu 1Kgs 1Ki 1King
diff --git a/tests/tlitmgrtest.cpp b/tests/tlitmgrtest.cpp
index 4278f22..d7c0b1b 100644
--- a/tests/tlitmgrtest.cpp
+++ b/tests/tlitmgrtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  tlitmgrtest.cpp -	
+ *
+ * $Id: tlitmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/translittest.cpp b/tests/translittest.cpp
index 90596c7..a0ec9d3 100644
--- a/tests/translittest.cpp
+++ b/tests/translittest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  translittest.cpp -	
+ *
+ * $Id: translittest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp
index 1f1e7f2..a992a2e 100644
--- a/tests/utf8norm.cpp
+++ b/tests/utf8norm.cpp
@@ -1,3 +1,25 @@
+/******************************************************************************
+ *
+ *  utf8norm.cpp -	
+ *
+ * $Id: utf8norm.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
+
 #include <iostream>
 #include <utilstr.h>
 #include <swbuf.h>
diff --git a/tests/versekeytest.cpp b/tests/versekeytest.cpp
index 02cfe75..4ae064e 100644
--- a/tests/versekeytest.cpp
+++ b/tests/versekeytest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  versekeytest.cpp -	
+ *
+ * $Id: versekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -31,11 +36,46 @@ using namespace sword;
 using std::cout;
 using std::endl;
 
+class _System {
+public:
+class Out {
+public:
+	void println(const char *x) { cout << x << endl; }
+	void println(int x) { cout << x << endl; }
+} out;
+} System;
+
 int main(int argc, char **argv) {
+		VerseKey vk;
+/*
+		vk.setTestament(2);
+		vk.setBook(4);
+		vk.setChapter(3);
+		vk.setVerse(1);
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		vk.setVersificationSystem("KJVA");
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		System.out.println("decrementing...");
+		vk.setVersificationSystem("KJV");
+		vk.decrement();
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		vk.setVersificationSystem("KJVA");
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+*/
+
+
 /*
 VerseKey currentVerse;
-currentVerse.AutoNormalize(0);
-currentVerse.Headings(1);
+currentVerse.setAutoNormalize(true);
+currentVerse.setIntros(true);
 currentVerse.Persist(1);
 currentVerse = "jn2";
 cout << currentVerse << endl;
@@ -44,18 +84,25 @@ cout << currentVerse << endl;
 	SWModule *mod = mgr.getModule("KJVgb");
 */
 	VerseKey *parser = new VerseKey(); //(VerseKey *)mod->CreateKey();
+	parser->setIntros(true);
 
-	ListKey scope = parser->ParseVerseList("amos 2:2", *parser, true);
+	ListKey result = parser->parseVerseList("[ Testament 1 Heading ]");
+	cout << "Should be: [ Testament 1 Heading ]\n" << result << "\n\n";
 
-	cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
+	parser->setText("[ Testament 1 Heading ]");
+	cout << "Should be: [ Testament 1 Heading ]\n" << *parser << "\n\n";
 
-	scope = parser->ParseVerseList("amos", *parser, true);
+	result.clear();
+
+	ListKey scope = parser->parseVerseList("amos 2:2", *parser, true);
 
 	cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
 
-	scope = parser->ParseVerseList("amos", *parser, true);
+	scope = parser->parseVerseList("amos", *parser, true);
+
+	cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
 
-	ListKey result;
+	scope = parser->parseVerseList("amos", *parser, true);
 
 	scope++;
 	scope++;
@@ -77,28 +124,28 @@ cout << currentVerse << endl;
 	std::cout << result.getText() << "\n";
 
      const char *bounds = "lk,acts";
-     scope = parser->ParseVerseList(bounds, *parser, true);
+     scope = parser->parseVerseList(bounds, *parser, true);
 
      VerseKey boundTest("lk", "acts");
 
      boundTest.setText("Is.1.13");
-     std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
      boundTest.setText("1Sam.21.1");
-     std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
      boundTest.setText("acts.5.1");
-     std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
      boundTest.setText("rom.5.1");
-     std::cout << "Error: " << (int)boundTest.Error() << ": " << boundTest << "\n";
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
 
 
      *x = "Is.1.13";
      scope = *x;
-//     if (scope == x) std::cout << "Error restricting bounds: " << x.getText() << " is in " << bounds << "\n";
-     if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+     if (scope == *x) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+     if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
 
      *x = "1Sam.21.1";
      scope = *x;
-     if (!scope.Error()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+     if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
 
 /*
 	VerseKey *y = (VerseKey *)mod->CreateKey();
@@ -118,21 +165,18 @@ cout << currentVerse << endl;
 	(*mod)--;
 	cout << mod->getKeyText() << "\n";
 */
-	VerseKey vk;
 
 	cout << "\nNormalization on; headings on ====\n\n";
 
-	vk.AutoNormalize(1);
-	vk.Headings(1);
+	vk.setAutoNormalize(true);
+	vk.setIntros(true);
 
 	vk = "jn3.50";
-/* TODO: these report 1 number off from what I think they should report 
 	cout << "jn.3.50: " << vk << "\n";
 	vk++;
 	cout << "++: " << vk << "\n";
 	vk--;
 	cout << "--: " << vk << "\n";
-*/
 	vk = MAXVERSE;
 	cout << "MAXVERSE: " << vk << "\n";
 	vk = MAXCHAPTER;
@@ -144,19 +188,17 @@ cout << currentVerse << endl;
 
 	cout << "\nNormalization off; headings on ====\n\n";
 	
-	vk.AutoNormalize(0);
-	vk.Headings(1);
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);
 
 	vk = "jn3.50";
 	cout << "jn.3.50: " << vk << "\n";
-/* TODO: These probably are undefined and likely to be ok
 	vk++;
 	cout << "++: " << vk << "\n";
 	vk--;
 	cout << "--: " << vk << "\n";
 	vk = MAXVERSE;
 	cout << "MAXVERSE: " << vk << "\n";
-*/
 	vk = MAXCHAPTER;
 	cout << "MAXCHAPTER: " << vk << "\n";
 	vk = TOP;
@@ -166,8 +208,8 @@ cout << currentVerse << endl;
 
 	cout << "\nNormalization on; headings off ====\n\n";
 	
-	vk.AutoNormalize(1);
-	vk.Headings(0);
+	vk.setAutoNormalize(true);
+	vk.setIntros(false);
 
 	vk = "jn3.50";
 	cout << "jn.3.50: " << vk << "\n";
@@ -186,19 +228,17 @@ cout << currentVerse << endl;
 
 	cout << "\nNormalization off; headings off ====\n\n";
 	
-	vk.AutoNormalize(0);
-	vk.Headings(0);
+	vk.setAutoNormalize(false);
+	vk.setIntros(false);
 
 	vk = "jn3.50";
 	cout << "jn.3.50: " << vk << "\n";
-/* TODO: These probably are undefined and likely to be ok
 	vk++;
 	cout << "++: " << vk << "\n";
 	vk--;
 	cout << "--: " << vk << "\n";
 	vk = MAXVERSE;
 	cout << "MAXVERSE: " << vk << "\n";
-*/
 	vk = MAXCHAPTER;
 	cout << "MAXCHAPTER: " << vk << "\n";
 	vk = TOP;
@@ -208,11 +248,11 @@ cout << currentVerse << endl;
 
 	VerseKey yo = "jn.3.16";
 	VerseKey yo2 = yo++;
-	cout << yo2 << ": " << (int)yo2.Error() <<  endl;
+	cout << yo2 << ": " << (int)yo2.popError() <<  endl;
 
 	VerseKey vkey;
 	VerseKey tmpkey = "1sam 1:1";
-	vkey.AutoNormalize(1);                          // line 147
+	vkey.setAutoNormalize(true);
 	vkey = tmpkey;
 	int chapter = (vkey.getChapter()-1);
 	vkey.setChapter(chapter);
diff --git a/tests/versemgrtest.cpp b/tests/versemgrtest.cpp
index 8d5ec98..1b51763 100644
--- a/tests/versemgrtest.cpp
+++ b/tests/versemgrtest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  versemgrtest.cpp -	
+ *
+ * $Id: versemgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -19,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <versemgr.h>
+#include <versificationmgr.h>
 #ifndef NO_SWORD_NAMESPACE
 using namespace sword;
 #endif
@@ -31,10 +36,10 @@ int main(int argc, char **argv) {
 
 	const char *v11n = (argc > 1) ? argv[1] : "KJV";
 
-	VerseMgr *vmgr = VerseMgr::getSystemVerseMgr();
-	const VerseMgr::System *system = vmgr->getVersificationSystem(v11n);
+	VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr();
+	const VersificationMgr::System *system = vmgr->getVersificationSystem(v11n);
 	int bookCount = system->getBookCount();
-	const VerseMgr::Book *lastBook = system->getBook(bookCount-1);
+	const VersificationMgr::Book *lastBook = system->getBook(bookCount-1);
 	int chapMax = lastBook->getChapterMax();
 	int verseMax = lastBook->getVerseMax(chapMax);
 	long offsetMax = system->getOffsetFromVerse(bookCount-1, chapMax, verseMax);
diff --git a/tests/vtreekeytest.cpp b/tests/vtreekeytest.cpp
index 50418f9..3443bd1 100644
--- a/tests/vtreekeytest.cpp
+++ b/tests/vtreekeytest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  vtreekeytest.cpp -	
+ *
+ * $Id: vtreekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -36,12 +41,12 @@ int main(int argc, char **argv) {
 	SWMgr mgr;
 	SWModule *mod = mgr.getModule("KJVgb");
 
-	VerseKey *key1 = (VerseKey *)mod->CreateKey();
+	VerseKey *key1 = (VerseKey *)mod->createKey();
 
-	key1->Testament(2);
-	key1->Book(4);
-	key1->Chapter(2);
-	key1->Verse(3);
+	key1->setTestament(2);
+	key1->setBook(4);
+	key1->setChapter(2);
+	key1->setVerse(3);
 
 	cout << "\n" << key1->getText() << ":\n\n";
 
@@ -54,7 +59,7 @@ int main(int argc, char **argv) {
 
 	cout << "\n" << keys2.getRangeText() << ":\n\n";
 
-	keys = key1->ParseVerseList("Lk.4.5");
+	keys = key1->parseVerseList("Lk.4.5");
 
 	cout << "\n" << key1->getText() << ":\n\n";
 
@@ -70,18 +75,18 @@ int main(int argc, char **argv) {
 
 
 	cout << "\nListkey persist key iteration test\n\n";
-	keys = key1->ParseVerseList("mat1", 0, true);
+	keys = key1->parseVerseList("mat1", 0, true);
 
-	for (keys = TOP; !keys.Error(); keys++) {
+	for (keys = TOP; !keys.popError(); keys++) {
 		cout << "\n" << keys.getText() << ":\n" << endl;
 	}
 
 
-	keys.Persist(1);
+	keys.setPersist(true);
 
 	mod->setKey(keys);
 
-	for ((*mod) = TOP; !mod->Error(); (*mod)++) {
+	for ((*mod) = TOP; !mod->popError(); (*mod)++) {
 		cout << "\n" << mod->getKeyText() << ":\n" << endl;
 	}
 
diff --git a/tests/webiftest.cpp b/tests/webiftest.cpp
index 7b3bc4e..3e5cba6 100644
--- a/tests/webiftest.cpp
+++ b/tests/webiftest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  webiftest.cpp -	
+ *
+ * $Id: webiftest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -53,7 +58,7 @@ int main(int argc, char **argv) {
 		module = mgr.Modules.begin()->second;
 	}
 	module->setKey(keyName);
-	std::cout << module->RenderText() << std::endl<< std::endl<< std::endl;
+	std::cout << module->renderText() << std::endl<< std::endl<< std::endl;
 
 	//------------------------
 
@@ -66,7 +71,7 @@ int main(int argc, char **argv) {
 	}
 
 	module->setKey(keyName);
-	std::cout << module->RenderText() << std::endl;
+	std::cout << module->renderText() << std::endl;
 
 	return 0;
 }
diff --git a/tests/xmltest.cpp b/tests/xmltest.cpp
index d8e8eda..158017d 100644
--- a/tests/xmltest.cpp
+++ b/tests/xmltest.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  xmltest.cpp -	
+ *
+ * $Id: xmltest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528