23 files changed, 918 insertions, 1217 deletions
diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in
index 6d35bb2..c76a8c5 100644
--- a/utilities/diatheke/Makefile.in
+++ b/utilities/diatheke/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.
@@ -17,6 +16,51 @@
 
 
 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,15 +81,16 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = diatheke$(EXEEXT)
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/cgi/Makefile.am
+DIST_COMMON = $(srcdir)/cgi/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) \
+	README
 subdir = utilities/diatheke
 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
@@ -60,28 +105,77 @@ am_diatheke_OBJECTS = diatheke.$(OBJEXT) corediatheke.$(OBJEXT) \
 diatheke_OBJECTS = $(am_diatheke_OBJECTS)
 diatheke_LDADD = $(LDADD)
 diatheke_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_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 = $(diatheke_SOURCES)
 DIST_SOURCES = $(diatheke_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
+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
 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@
@@ -91,6 +185,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@
@@ -116,9 +212,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@
@@ -139,6 +232,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -151,20 +245,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@
@@ -201,7 +304,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -263,6 +365,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)/cgi/Makefile.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -274,14 +377,19 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -302,7 +410,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -315,9 +424,10 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) 
+
+diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) $(EXTRA_diatheke_DEPENDENCIES) 
 	@rm -f diatheke$(EXEEXT)
-	$(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -334,25 +444,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlcgi.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
@@ -360,26 +470,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; \
@@ -391,15 +490,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
@@ -408,6 +503,21 @@ 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
@@ -459,10 +569,15 @@ 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:
 
 clean-generic:
@@ -546,19 +661,19 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS 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-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/utilities/diatheke/README b/utilities/diatheke/README
index 5f1a793..7421a6d 100644
--- a/utilities/diatheke/README
+++ b/utilities/diatheke/README
@@ -1,4 +1,4 @@
-Diatheke Suite release 4.0
+Diatheke Suite
 by Chris Little <chrislit@crosswire.org>
 
 This suite is intended for use with libraries and modules from
@@ -7,10 +7,10 @@ the SWORD Project, available at http://www.crosswire.org/
 The latest versions of this suite and its components are available
 at http://www.crosswire.org/sword/diatheke
 
-Version 4.0 of this suite consists of the following components:
+This suite consists of the following components:
 
-Diatheke 4.0 - a command line utility, good for lots of stuff
-Diatheke/CGI 4.0 - a PERL CGI module interface to Diatheke 4.0
+Diatheke - a command line utility, good for lots of stuff
+Diatheke/CGI - a PERL CGI module interface to Diatheke 4.0
 
 --------------------------------------------------------------------
 INSTALLING Diatheke/CGI
@@ -47,29 +47,36 @@ default page to create a custom index.html for your users.
 ----------------------------------------------------------------------
 VERSION HISTORY
 
-4.0	July 8, 2001.
+4.6     July 16, 2013
+	Updated for Sword 1.7.0.
+
+4.5
+
+4.0	July 8, 2001
 	Updated to Sword 1.5.2 with innumerable bug fixes.
 	Now builds properly for Win32 using VC++.
 	Diatheke/Tcl and HANDiatheke were omitted, for the moment
 	from this release, but are still available in the CVS.
 
-3.0	March 31, 2001.
+3.0	March 31, 2001
 	Self-generating HTML page for the lazy (Diatheke/CGI).
 	Localization support. (Diatheke and Diatheke/CGI).
 
-2.5	Now supports ThML.  Numerous bugfixes.  December 10, 2000.
+2.5	December 10, 2000
+	Now supports ThML.  Numerous bugfixes.
 	Includes Diatheke 3.0, Diatheke/CGI 3.0, Diatheke/Tcl 3.0,
 	and HANDiatheke 3.0 (initial version, but version-synced)
 
-2.0	First public release, including Diatheke 2.0, Diatheke/CGI
-	2.0, and Diatheke/Tcl 2.5.  October 23, 1999.
+2.0	October 23, 1999.
+	First public release, including Diatheke 2.0, Diatheke/CGI
+	2.0, and Diatheke/Tcl 2.5.
 
 -----------------------------------------------------------------------
 COPYRIGHT
 
 The Diatheke Suite and its components, Diatheke, Diatheke/CGI, and
-Diatheke/Tcl are Copyright 1999, 2000, 2001 by CrossWire Bible Society.
-HANDiatheke is Copyright 2000, 2001 by CrossWire Bible Society.
+Diatheke/Tcl are Copyright 1999-2013 by CrossWire Bible Society.
+HANDiatheke is Copyright 2000-2001 by CrossWire Bible Society.
 The Diatheke Suite and all of its components are licensed through
 the GNU General Public License and are intended for free distribution.
 See http://www.gnu.org/copyleft/gpl.html for details.
diff --git a/utilities/diatheke/cgi/dia-def.pl b/utilities/diatheke/cgi/dia-def.pl
index 206aaa6..d50ef9b 100755
--- a/utilities/diatheke/cgi/dia-def.pl
+++ b/utilities/diatheke/cgi/dia-def.pl
@@ -1,21 +1,25 @@
 #!/usr/bin/perl
 
-# *
-# * Copyright 2009 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.
-# *
-
+#******************************************************************************
+#
+#  dia-def.pl -	
+#
+# $Id: dia-def.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2000-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.
+#
 
 #change this variable to hostname of your server
 @values = split(/\&/,$ENV{'QUERY_STRING'});
diff --git a/utilities/diatheke/cgi/diatheke.pl b/utilities/diatheke/cgi/diatheke.pl
index 8150d2c..c15bdf6 100755
--- a/utilities/diatheke/cgi/diatheke.pl
+++ b/utilities/diatheke/cgi/diatheke.pl
@@ -11,21 +11,26 @@
 ###          server: http://www.crosswire.org/swordweb/
 ########################################################################
 
-# *
-# * Copyright 2009 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.
-# *
+#******************************************************************************
+#
+#  diatheke.pl -
+#
+# $Id: diatheke.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2000-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.
+#
 
 
 # Typical Linux/Unix settings
diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp
index 9b4a8f1..37f9448 100644
--- a/utilities/diatheke/corediatheke.cpp
+++ b/utilities/diatheke/corediatheke.cpp
@@ -1,9 +1,10 @@
-// Diatheke 4.2 by Chris Little <chrislit@crosswire.org>
-// Copyright 1999-2009 by CrossWire Bible Society
-// http://www.crosswire.org/sword/diatheke
-
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  corediatheke.cpp -	
+ *
+ * $Id: corediatheke.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -19,6 +20,11 @@
  *
  */
 
+/******************************************************************************
+ * Diatheke by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
 #include "corediatheke.h"
 #include <regex.h>
 #include <list>
@@ -64,40 +70,40 @@ void systemquery(const char * key, ostream* output){
 		if (types) *output << "Biblical Texts:\n";
 		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
 			target = it->second;
-			if (!strcmp(target->Type(), "Biblical Texts")) {
-				if (names) *output << target->Name();
+			if (!strcmp(target->getType(), "Biblical Texts")) {
+				if (names) *output << target->getName();
 				if (names && descriptions) *output << " : ";
-				if (descriptions) *output << target->Description();
+				if (descriptions) *output << target->getDescription();
 				*output << endl;
 			}
 		}
 		if (types) *output << "Commentaries:\n";
 		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
 			target = it->second;
-			if (!strcmp(target->Type(), "Commentaries")) {
-				if (names) *output << target->Name();
+			if (!strcmp(target->getType(), "Commentaries")) {
+				if (names) *output << target->getName();
 				if (names && descriptions) *output << " : ";
-				if (descriptions) *output << target->Description();
+				if (descriptions) *output << target->getDescription();
 				*output << endl;
 			}
 		}
 		if (types) *output << "Dictionaries:\n";
 		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
 			target = it->second;
-			if (!strcmp(target->Type(), "Lexicons / Dictionaries")) {
-				if (names) *output << target->Name();
+			if (!strcmp(target->getType(), "Lexicons / Dictionaries")) {
+				if (names) *output << target->getName();
 				if (names && descriptions) *output << " : ";
-				if (descriptions) *output << target->Description();
+				if (descriptions) *output << target->getDescription();
 				*output << endl;
 			}
 		}
 		if (types) *output << "Generic books:\n";
 		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
 			target = it->second;
-			if (!strcmp(target->Type(), "Generic Books")) {
-				if (names) *output << target->Name();
+			if (!strcmp(target->getType(), "Generic Books")) {
+				if (names) *output << target->getName();
 				if (names && descriptions) *output << " : ";
-				if (descriptions) *output << target->Description();
+				if (descriptions) *output << target->getDescription();
 				*output << endl;
 			}
 		}
@@ -105,7 +111,7 @@ void systemquery(const char * key, ostream* output){
 	}
 }
 
-void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed short variants = 0) {
+void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed char variants = 0) {
 	static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat,
 		((OP_BIDI & optionfilters) == OP_BIDI),
 		((OP_ARSHAPE & optionfilters) == OP_ARSHAPE));
@@ -140,14 +146,14 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 		return;
 	}
 	target = (*it).second;
-	SWKey *p = target->CreateKey();
+	SWKey *p = target->createKey();
         VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
 	if (!parser) {
         	delete p;
 	        parser = new VerseKey();
 	}
 
-	if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
+	if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
 		if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) {
 			if (!::stricmp((char *)(*eit).second.c_str(), "GBF"))
 				inputformat = FMT_GBF;
@@ -180,7 +186,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 	    *output << "Other";
 	  }
 	  *output << ";";
-	  *output << target->Type();
+	  *output << target->getType();
 	  *output << ";";
 	  delete parser;
 	  return;
@@ -188,83 +194,53 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 
 	if (searchtype)
 		querytype = QT_SEARCH;
-	else if (!strcmp(target->Type(), "Biblical Texts"))
+	else if (!strcmp(target->getType(), "Biblical Texts"))
 		querytype = QT_BIBLE;
-	else if (!strcmp(target->Type(), "Commentaries"))
+	else if (!strcmp(target->getType(), "Commentaries"))
 		querytype = QT_COMM;
-	else if (!strcmp(target->Type(), "Lexicons / Dictionaries"))
+	else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
 		querytype = QT_LD;
-	else if (!strcmp(target->Type(), "Generic Books"))
+	else if (!strcmp(target->getType(), "Generic Books"))
 		querytype = QT_LD;
 
-	if (optionfilters & OP_FOOTNOTES)
-		manager.setGlobalOption("Footnotes","On");
-	else
-		manager.setGlobalOption("Footnotes","Off");
-	if (optionfilters & OP_HEADINGS)
-		manager.setGlobalOption("Headings","On");
-	else
-		manager.setGlobalOption("Headings","Off");
-	if (optionfilters & OP_STRONGS)
-		manager.setGlobalOption("Strong's Numbers","On");
-	else
-		manager.setGlobalOption("Strong's Numbers","Off");
-	if (optionfilters & OP_MORPH)
-		manager.setGlobalOption("Morphological Tags","On");
-	else
-		manager.setGlobalOption("Morphological Tags","Off");
-	if (optionfilters & OP_CANTILLATION)
-		manager.setGlobalOption("Hebrew Cantillation","On");
-	else
-		manager.setGlobalOption("Hebrew Cantillation","Off");
-	if (optionfilters & OP_HEBREWPOINTS)
-		manager.setGlobalOption("Hebrew Vowel Points","On");
-	else
-		manager.setGlobalOption("Hebrew Vowel Points","Off");
-	if (optionfilters & OP_GREEKACCENTS)
-		manager.setGlobalOption("Greek Accents","On");
-	else
-		manager.setGlobalOption("Greek Accents","Off");
-	if (optionfilters & OP_LEMMAS)
-		manager.setGlobalOption("Lemmas","On");
-	else
-		manager.setGlobalOption("Lemmas","Off");
-	if (optionfilters & OP_SCRIPREF)
-		manager.setGlobalOption("Cross-references","On");
-	else
-		manager.setGlobalOption("Cross-references","Off");
-	if (optionfilters & OP_RED)
-		manager.setGlobalOption("Words of Christ in Red","On");
-	else
-		manager.setGlobalOption("Words of Christ in Red","Off");
-	if (optionfilters & OP_VARIANTS && variants) {
-			if (variants == -1)
-                manager.setGlobalOption("Variants", "All Readings");
-			else if (variants == 1)
-				manager.setGlobalOption("Variants", "Secondary Readings");
+	manager.setGlobalOption("Footnotes", (optionfilters & OP_FOOTNOTES) ? "On": "Off");
+	manager.setGlobalOption("Headings", (optionfilters & OP_HEADINGS) ? "On": "Off");
+	manager.setGlobalOption("Strong's Numbers", (optionfilters & OP_STRONGS) ? "On": "Off");
+	manager.setGlobalOption("Morphological Tags", (optionfilters & OP_MORPH) ? "On": "Off");
+	manager.setGlobalOption("Hebrew Cantillation", (optionfilters & OP_CANTILLATION) ? "On": "Off");
+	manager.setGlobalOption("Hebrew Vowel Points", (optionfilters & OP_HEBREWPOINTS) ? "On": "Off");
+	manager.setGlobalOption("Greek Accents", (optionfilters & OP_GREEKACCENTS) ? "On": "Off");
+	manager.setGlobalOption("Lemmas", (optionfilters & OP_LEMMAS) ? "On": "Off");
+	manager.setGlobalOption("Cross-references", (optionfilters & OP_SCRIPREF) ? "On": "Off");
+	manager.setGlobalOption("Words of Christ in Red", (optionfilters & OP_REDLETTERWORDS) ? "On": "Off");
+	manager.setGlobalOption("Arabic Vowel Points", (optionfilters & OP_ARABICPOINTS) ? "On": "Off");
+	manager.setGlobalOption("Glosses", (optionfilters & OP_GLOSSES) ? "On": "Off");
+	manager.setGlobalOption("Transliterated Forms", (optionfilters & OP_XLIT) ? "On": "Off");
+	manager.setGlobalOption("Enumerations", (optionfilters & OP_ENUM) ? "On": "Off");
+
+	manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off");
+	
+
+	if ((optionfilters & OP_VARIANTS) && variants) {
+		if (variants == -1)
+			manager.setGlobalOption("Textual Variants", "All Readings");
+		else if (variants == 1)
+			manager.setGlobalOption("Textual Variants", "Secondary Reading");
 	}
 	else
-		manager.setGlobalOption("Variants", "Primary Readings");
+		manager.setGlobalOption("Textual Variants", "Primary Reading");
 
-	if (optionfilters & OP_TRANSLITERATOR && script)
-                manager.setGlobalOption("Transliteration", script);
-	else
-		manager.setGlobalOption("Transliteration", "Off");
-	if (optionfilters & OP_ARABICPOINTS)
-		manager.setGlobalOption("Arabic Vowel Points","On");
-	else
-		manager.setGlobalOption("Arabic Vowel Points","Off");
 
 	if (querytype == QT_SEARCH) {
 
 	        //this test is just to determine if we've got SWKeys or VerseKeys
-	        if (!strcmp(target->Type(), "Biblical Texts"))
+	        if (!strcmp(target->getType(), "Biblical Texts"))
 		  querytype = QT_BIBLE;
-		else if (!strcmp(target->Type(), "Commentaries"))
+		else if (!strcmp(target->getType(), "Commentaries"))
 		  querytype = QT_BIBLE;
-		else if (!strcmp(target->Type(), "Lexicons / Dictionaries"))
+		else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
 		  querytype = QT_LD;
-		else if (!strcmp(target->Type(), "Generic Books"))
+		else if (!strcmp(target->getType(), "Generic Books"))
 		  querytype = QT_LD;
 
 		//do search stuff
@@ -277,13 +253,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 		*output << "\"-- ";
 
  		if (range) {
- 			ListKey scope = parser->ParseVerseList(range, "Gen 1:1", true);
- 			listkey = target->Search(ref, st, REG_ICASE, &scope);
+ 			ListKey scope = parser->parseVerseList(range, "Gen 1:1", true);
+ 			listkey = target->search(ref, st, REG_ICASE, &scope);
  		}
- 		else listkey = target->Search(ref, st, REG_ICASE);
+ 		else listkey = target->search(ref, st, REG_ICASE);
 
 		if (strlen((const char*)listkey)) {
-		  if (!listkey.Error()) {
+		  if (!listkey.popError()) {
 		    if (outputformat == FMT_CGI) *output << "<entry>";
 		    if (querytype == QT_BIBLE) {
 		      *parser = listkey;
@@ -293,7 +269,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 		    if (outputformat == FMT_CGI) *output << "</entry>";
 		  }
 		  listkey++;
-		  while (!listkey.Error()) {
+		  while (!listkey.popError()) {
 		    *output << " ; ";
 		    if (outputformat == FMT_CGI) *output << "<entry>";
 		    if (querytype == QT_BIBLE) {
@@ -307,17 +283,17 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 		  *output << " -- ";
 
 		  char *temp = new char[10];
-		  sprintf(temp, "%u", listkey.Count());
+		  sprintf(temp, "%u", listkey.getCount());
 		  *output << temp;
 		  delete [] temp;
 
 		  *output << " matches total (";
-		  *output << target->Name();
+		  *output << target->getName();
 		  *output << ")\n";
 		}
 		else {
 		  *output << "none (";
-		  *output << target->Name();
+		  *output << target->getName();
 		  *output << ")\n";
 		}
 	}
@@ -327,7 +303,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 
 		target->setKey(ref);
 
-		const char * text = (const char *) *target;
+		SWBuf text = target->renderText();
 
 		if (outputformat == FMT_RTF) {
 			*output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 ";
@@ -337,13 +313,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 				*output << "Times New Roman";
 			*output << ";}}";
 		}
-		else if (outputformat == FMT_HTML) {
+		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
 			*output << "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">";
 		}
 
-		if (strlen(text)) {
-			*output << (char*)target->KeyText();
-			if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+		if (text.length()) {
+			*output << (char*)target->getKeyText();
+			if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 				*output << ": <font face=\"";
 				*output << font;
 				*output << "\">";
@@ -355,7 +331,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 				*output << ": ";
 			}
 			*output << text;
-			if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+			if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 				*output << "</font>";
 			}
 			else if (outputformat == FMT_RTF) {
@@ -363,7 +339,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 			}
 
 			*output << "(";
-			*output << target->Name();
+			*output << target->getName();
 			*output << ")\n";
 		}
 
@@ -376,14 +352,14 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 	else if (querytype == QT_BIBLE || querytype == QT_COMM) {
 		//do commentary/Bible stuff
 
-		if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
+		if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
 			if ((eit = (*sit).second.find("Font")) != (*sit).second.end()) {
 				font = (char *)(*eit).second.c_str();
 				if (strlen(font) == 0) font = 0;
 			}
 		}
 
- 		listkey = parser->ParseVerseList(ref, "Gen1:1", true);
+ 		listkey = parser->parseVerseList(ref, "Gen1:1", true);
 		int i;
 
 		if (outputformat == FMT_RTF) {
@@ -394,18 +370,18 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 				*output << "Times New Roman";
 			*output << ";}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}}";
 		}
-		else if (outputformat == FMT_HTML) {
+		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
 			*output << "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">";
 		}
 
-		for (i = 0; i < listkey.Count() && maxverses; i++) {
-			VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i));
+		for (i = 0; i < listkey.getCount() && maxverses; i++) {
+			VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i));
 			if (element && element->isBoundSet()) {
-			  target->Key(element->LowerBound());
-				*parser = element->UpperBound();
-				while (maxverses && target->Key() <= *parser) {
-					*output << (char*)target->KeyText();
-					if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+			  target->setKey(element->getLowerBound());
+				*parser = element->getUpperBound();
+				while (maxverses && *target->getKey() <= *parser) {
+					*output << (char*)target->getKeyText();
+					if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 						*output << ": <font face=\"";
 						*output << font;
 						*output << "\">";
@@ -416,15 +392,15 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 					else {
 						*output << ": ";
 					}
-					*output << (const char*)*target;
-					if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+					*output << target->renderText();
+					if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 						*output << "</font>";
 					}
 					else if (outputformat == FMT_RTF) {
 						*output << "}";
 					}
 
-					if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI))
+					if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI))
 						*output << "<br />";
 					else if (outputformat == FMT_OSIS)
 						*output << "<milestone type=\"line\"/>";
@@ -435,16 +411,16 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 
 					*output << "\n";
 
-					if (target->Key() == *parser)
+					if (*target->getKey() == *parser)
 					  break;
 					maxverses--;
 					(*target)++;
 				}
 			}
 			else {
-				target->Key(*listkey.GetElement(i));
-				*output << (char*)target->KeyText();
-				if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+				target->setKey(*listkey.getElement(i));
+				*output << (char*)target->getKeyText();
+				if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 					*output << ": <font face=\"";
 					*output << font;
 					*output << "\">";
@@ -455,15 +431,15 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 				else {
 					*output << ": ";
 				}
-				*output << (const char*)*target;
-				if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+				*output << target->renderText();
+				if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
 					*output << "</font>";
 				}
 				else if (outputformat == FMT_RTF) {
 					*output << "}";
 				}
 
-				if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI))
+				if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI))
 					*output << "<br />";
 				else if (outputformat == FMT_OSIS)
 					*output << "<milestone type=\"line\"/>";
@@ -478,7 +454,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
 		}
 
 		*output << "(";
-		*output << target->Name();
+		*output << target->getName();
 		*output << ")\n";
 
 		if (outputformat == FMT_RTF) {
diff --git a/utilities/diatheke/corediatheke.h b/utilities/diatheke/corediatheke.h
index 2ad4801..833825e 100644
--- a/utilities/diatheke/corediatheke.h
+++ b/utilities/diatheke/corediatheke.h
@@ -1,9 +1,10 @@
-// Diatheke 4.2 by Chris Little <chrislit@crosswire.org>
-// Copyright 1999-2009 by CrossWire Bible Society
-// http://www.crosswire.org/sword/diatheke
-
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  corediatheke.h -	
+ *
+ * $Id: corediatheke.h 2900 2013-07-16 07:48:52Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -19,6 +20,11 @@
  *
  */
 
+/******************************************************************************
+ * Diatheke 4.5 by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
 #include <stdio.h>
 #include <iostream>
 
@@ -34,26 +40,30 @@
 
 #define OP_NONE 0
 #define OP_STRONGS 1
-#define OP_FOOTNOTES 2
-#define OP_HEADINGS 4
-#define OP_MORPH 8
-#define OP_CANTILLATION 16
-#define OP_HEBREWPOINTS 32
-#define OP_GREEKACCENTS 64
-#define OP_TRANSLITERATOR 128
-#define OP_LEMMAS 256
-#define OP_SCRIPREF 512
-#define OP_ARSHAPE 1024
-#define OP_BIDI 2048
-#define OP_VARIANTS 4096
-#define OP_RED 8192
-#define OP_ARABICPOINTS 16384
+#define OP_FOOTNOTES (1<<1)
+#define OP_HEADINGS (1<<2)
+#define OP_MORPH (1<<3)
+#define OP_CANTILLATION (1<<4)
+#define OP_HEBREWPOINTS (1<<5)
+#define OP_GREEKACCENTS (1<<6)
+#define OP_TRANSLITERATOR (1<<7)
+#define OP_LEMMAS (1<<8)
+#define OP_SCRIPREF (1<<9)
+#define OP_ARSHAPE (1<<10)
+#define OP_BIDI (1<<11)
+#define OP_VARIANTS (1<<12)
+#define OP_REDLETTERWORDS (1<<13)
+#define OP_ARABICPOINTS (1<<14)
+#define OP_GLOSSES (1<<15)
+#define OP_XLIT (1<<16)
+#define OP_ENUM (1<<17)
+
 #define ST_NONE 0
-#define ST_REGEX 1 //0
-#define ST_PHRASE 2  // -1
+#define ST_REGEX 1     //  0
+#define ST_PHRASE 2    // -1
 #define ST_MULTIWORD 3 // -2
 
 using namespace std;
 
 int hasalpha (char * string);
-void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed short variants); 
+void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed char variants); 
diff --git a/utilities/diatheke/diafiltmgr.cpp b/utilities/diatheke/diafiltmgr.cpp
index 83b41ef..be091a9 100644
--- a/utilities/diatheke/diafiltmgr.cpp
+++ b/utilities/diatheke/diafiltmgr.cpp
@@ -1,7 +1,10 @@
 /******************************************************************************
- *  diafiltmgr.cpp
  *
- * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ *  diafiltmgr.cpp -	DiathekeFilterMgr
+ *
+ * $Id: diafiltmgr.cpp 2843 2013-06-29 11:22:27Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -23,7 +26,6 @@
 #include <gbfthml.h>
 #include <thmlhtml.h>
 #include <gbfhtml.h>
-#include <plainhtml.h>
 #include <thmlhtmlhref.h>
 #include <gbfhtmlhref.h>
 #include <thmlrtf.h>
@@ -62,22 +64,22 @@ DiathekeFilterMgr::~DiathekeFilterMgr() {
 }
 
 void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section) {
-        switch (module->Markup()) {
+        switch (module->getMarkup()) {
         case FMT_THML:
                 if (fromthml)
-                        module->AddRenderFilter(fromthml);
+                        module->addRenderFilter(fromthml);
                 break;
         case FMT_GBF:
                 if (fromgbf)
-                        module->AddRenderFilter(fromgbf);
+                        module->addRenderFilter(fromgbf);
                 break;
         case FMT_PLAIN:
                 if (fromplain)
-                        module->AddRenderFilter(fromplain);
+                        module->addRenderFilter(fromplain);
                 break;
         case FMT_OSIS:
                 if (fromosis)
-                        module->AddRenderFilter(fromosis);
+                        module->addRenderFilter(fromosis);
                 break;
         }
 	EncodingFilterMgr::AddRenderFilters(module, section);
@@ -97,19 +99,19 @@ char DiathekeFilterMgr::Markup(char mark) {
                 CreateFilters(markup);
 
                 for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
-                        switch (module->second->Markup()) {
+                        switch (module->second->getMarkup()) {
                         case FMT_THML:
                                 if (oldthml != fromthml) {
                                         if (oldthml) {
                                                 if (!fromthml) {
-                                                        module->second->RemoveRenderFilter(oldthml);
+                                                        module->second->removeRenderFilter(oldthml);
                                                 }
                                                 else {
-                                                        module->second->ReplaceRenderFilter(oldthml, fromthml);
+                                                        module->second->replaceRenderFilter(oldthml, fromthml);
                                                 }
                                         }
                                         else if (fromthml) {
-                                                module->second->AddRenderFilter(fromthml);
+                                                module->second->addRenderFilter(fromthml);
                                         }
                                 }
                                 break;
@@ -117,14 +119,14 @@ char DiathekeFilterMgr::Markup(char mark) {
                                 if (oldgbf != fromgbf) {
                                         if (oldgbf) {
                                                 if (!fromgbf) {
-                                                        module->second->RemoveRenderFilter(oldgbf);
+                                                        module->second->removeRenderFilter(oldgbf);
                                                 }
                                                 else {
-                                                        module->second->ReplaceRenderFilter(oldgbf, fromgbf);
+                                                        module->second->replaceRenderFilter(oldgbf, fromgbf);
                                                 }
                                         }
                                         else if (fromgbf) {
-                                                module->second->AddRenderFilter(fromgbf);
+                                                module->second->addRenderFilter(fromgbf);
                                         }
                                         break;
                                 }
@@ -132,14 +134,14 @@ char DiathekeFilterMgr::Markup(char mark) {
                                 if (oldplain != fromplain) {
                                         if (oldplain) {
                                                 if (!fromplain) {
-                                                        module->second->RemoveRenderFilter(oldplain);
+                                                        module->second->removeRenderFilter(oldplain);
                                                 }
                                                 else {
-                                                        module->second->ReplaceRenderFilter(oldplain, fromplain);
+                                                        module->second->replaceRenderFilter(oldplain, fromplain);
                                                 }
                                         }
                                         else if (fromplain) {
-                                                module->second->AddRenderFilter(fromplain);
+                                                module->second->addRenderFilter(fromplain);
                                         }
                                         break;
                                 }
@@ -147,14 +149,14 @@ char DiathekeFilterMgr::Markup(char mark) {
                                 if (oldosis != fromosis) {
                                         if (oldosis) {
                                                 if (!fromosis) {
-                                                        module->second->RemoveRenderFilter(oldosis);
+                                                        module->second->removeRenderFilter(oldosis);
                                                 }
                                                 else {
-                                                        module->second->ReplaceRenderFilter(oldosis, fromosis);
+                                                        module->second->replaceRenderFilter(oldosis, fromosis);
                                                 }
                                         }
                                         else if (fromosis) {
-                                                module->second->AddRenderFilter(fromosis);
+                                                module->second->addRenderFilter(fromosis);
                                         }
                                         break;
                                 }
@@ -200,7 +202,7 @@ void DiathekeFilterMgr::CreateFilters(char markup) {
                         fromosis = NULL;
                         break;
                 case FMT_HTML:
-                        fromplain = new PLAINHTML();
+                        fromplain = NULL;
                         fromthml = new ThMLHTML();
                         fromgbf = new GBFHTML();
                         fromosis = NULL;
diff --git a/utilities/diatheke/diafiltmgr.h b/utilities/diatheke/diafiltmgr.h
index 0acdf1a..120fc6e 100644
--- a/utilities/diatheke/diafiltmgr.h
+++ b/utilities/diatheke/diafiltmgr.h
@@ -1,7 +1,10 @@
 /******************************************************************************
- *  diafiltmgr.h 
  *
- * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ *  diafiltmgr.h -	DiathekeFilterMgr
+ *
+ * $Id: diafiltmgr.h 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/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp
index 30add7b..159e3a5 100644
--- a/utilities/diatheke/diatheke.cpp
+++ b/utilities/diatheke/diatheke.cpp
@@ -1,9 +1,10 @@
-// Diatheke 4.5 by Chris Little <chrislit@crosswire.org>
-// Copyright 1999-2009 by CrossWire Bible Society
-// http://www.crosswire.org/sword/diatheke
-
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  diatheke.cpp -	
+ *
+ * $Id: diatheke.cpp 2903 2013-07-16 11:11:18Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -19,6 +20,11 @@
  *
  */
 
+/******************************************************************************
+ * Diatheke 4.6 by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
 #include "corediatheke.h"
 #include "diathekemgr.h"
 #include "diafiltmgr.h"
@@ -31,14 +37,14 @@ using std::cout;
 
 void printsyntax() { 
 	//if we got this far without exiting, something went wrong, so print syntax
-	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.5\n");
-	fprintf (stderr, "Copyright 1999-2009 by the CrossWire Bible Society\n");
+	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.6\n");
+	fprintf (stderr, "Copyright 1999-2013 by the CrossWire Bible Society\n");
 	fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n");
-	fprintf (stderr, "usage: \n  ");
- 	fprintf (stderr, "diatheke <-b module_name> [-s search_type] [-r search_range]\n");
-	fprintf (stderr, "[-o option_filters] [-m maximum_verses] [-f output_format]\n");
-	fprintf (stderr, "[-e output_encoding] [-t script] [-v variant#(-1=all|0|1)]\n");
-	fprintf (stderr, "[-l locale] <-k query_key>\n");
+	fprintf (stderr, "\n");
+	fprintf (stderr, "usage:  diatheke <-b module_name> [-s search_type] [-r search_range]\n");
+	fprintf (stderr, "    [-o option_filters] [-m maximum_verses] [-f output_format]\n");
+	fprintf (stderr, "    [-e output_encoding] [-v variant#(-1=all|0|1)]\n");
+	fprintf (stderr, "    [-l locale] <-k query_key>\n");
 	fprintf (stderr, "\n");
 	fprintf (stderr, "If <book> is \"system\" you may use these system keys: \"modulelist\",\n");
 	fprintf (stderr, "\"modulelistnames\", and \"localelist\".");
@@ -48,15 +54,18 @@ void printsyntax() {
 	fprintf (stderr, "  f (Footnotes), m (Morphology), h (Section Headings),\n");
 	fprintf (stderr, "  c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n");
 	fprintf (stderr, "  l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping),\n");
-	fprintf (stderr, "  b (Bi-Directional Reordering), x (Red Words of Christ)\n");
+	fprintf (stderr, "  b (Bi-Directional Reordering), w (Red Words of Christ),\n");
+	fprintf (stderr, "  g (Glosses/Ruby), e (Word Enumerations),\n");
+	fprintf (stderr, "  x (Encoded Transliterations), t (Algorithmic Transliterations via ICU)\n");
 
 	fprintf (stderr, "Maximum verses may be any integer value\n");
-	fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, OSIS, CGI, and plain (def)\n");
+	fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, HTMLHREF, XHTML, OSIS,\n");
+	fprintf (stderr, "  CGI, and plain (def)\n");
 	fprintf (stderr, "Valid output_encoding values are: Latin1, UTF8 (def), UTF16, HTML, and RTF\n");
 	fprintf (stderr, "Valid locale values depend on installed locales. en is default.\n");
 	fprintf (stderr, "The query_key must be the last argument because all following\n");
-	fprintf (stderr, "  arguments are added to the key.\n\n");
-
+	fprintf (stderr, "  arguments are added to the key.\n");
+	fprintf (stderr, "\n");
 	fprintf (stderr, "Example usage:\n");
 	fprintf (stderr, "  diatheke -b KJV -o fmnx -k Jn 3:16\n");
 	fprintf (stderr, "  diatheke -b WHNU -t Latin -o mn -k Mt 24\n");
@@ -68,9 +77,10 @@ int main(int argc, char **argv)
 	int maxverses = -1;
 	unsigned char outputformat = FMT_PLAIN, searchtype = ST_NONE, outputencoding = ENC_UTF8;
 	unsigned long optionfilters = OP_NONE;
- 	char *text = 0, *locale = 0, *ref = 0, *script = 0, *range = 0;
+ 	char *text = 0, *locale = 0, *ref = 0, *range = 0;
+	char script[] = "Latin"; // for the moment, only this target script is supported
 	signed short variants = 0;
-	
+
 	char runquery = 0; // used to check that we have enough arguments to perform a legal query
 	// (a querytype & text = 1 and a ref = 2)
 	
@@ -141,10 +151,18 @@ int main(int argc, char **argv)
 					optionfilters |= OP_ARSHAPE;
 				if (strchr(argv[i+1], 'b'))
 					optionfilters |= OP_BIDI;
-				if (strchr(argv[i+1], 'x'))
-					optionfilters |= OP_RED;
+				if (strchr(argv[i+1], 'w'))
+					optionfilters |= OP_REDLETTERWORDS;
 				if (strchr(argv[i+1], 'p'))
 					optionfilters |= OP_ARABICPOINTS;
+				if (strchr(argv[i+1], 'g'))
+					optionfilters |= OP_GLOSSES;
+				if (strchr(argv[i+1], 'x'))
+					optionfilters |= OP_XLIT;
+				if (strchr(argv[i+1], 'e'))
+					optionfilters |= OP_ENUM;
+				if (strchr(argv[i+1], 't'))
+					optionfilters |= OP_TRANSLITERATOR;
 				i++;
 			}
 		}
@@ -170,6 +188,10 @@ int main(int argc, char **argv)
 					outputformat = FMT_HTML;
 					i++;
 				}
+				else if (!::stricmp("xhtml", argv[i+1])) {
+					outputformat = FMT_XHTML;
+					i++;
+				}
 				else if (!::stricmp("rtf", argv[i+1])) {
 					outputformat = FMT_RTF;
 					i++;
@@ -226,6 +248,7 @@ int main(int argc, char **argv)
 				i++;
 			}
 		}
+		/*
 		else if (!::stricmp("-t", argv[i])) {
 			if (i+1 <= argc) {
 				script = argv[i+1];
@@ -233,6 +256,7 @@ int main(int argc, char **argv)
 				i++;
 			}
 		}
+		*/
 	}
 	
 	
diff --git a/utilities/diatheke/diatheke.sln b/utilities/diatheke/diatheke.sln
new file mode 100644
index 0000000..9d360da
--- /dev/null
+++ b/utilities/diatheke/diatheke.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32
+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32
+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32
+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/utilities/diatheke/diatheke.vcproj b/utilities/diatheke/diatheke.vcproj
deleted file mode 100644
index 3aa55b9..0000000
--- a/utilities/diatheke/diatheke.vcproj
+++ /dev/null
@@ -1,709 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="diatheke"
-	ProjectGUID="{891A765C-5503-4FED-B427-7AE1413DB264}"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/diatheke.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../include/internal/regex"
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;SWUSINGDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/diatheke.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
-				OutputFile=".\Debug/diatheke.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/Debug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/diatheke.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/diatheke.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/diatheke.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../include/internal/regex"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;SWUSINGDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/diatheke.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				BrowseInformation="1"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
-				OutputFile=".\Release/diatheke.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/Release"
-				ProgramDatabaseFile=".\Release/diatheke.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/diatheke.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug with ICU|Win32"
-			OutputDirectory=".\ICUDebug"
-			IntermediateDirectory=".\ICUDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\ICUDebug/diatheke.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include,../../include/internal/regex"
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\ICUDebug/diatheke.pch"
-				AssemblerListingLocation=".\ICUDebug/"
-				ObjectFile=".\ICUDebug/"
-				ProgramDataBaseFileName=".\ICUDebug/"
-				BrowseInformation="1"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
-				OutputFile=".\ICUDebug/diatheke.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICUDebug"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\ICUDebug/diatheke.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\ICUDebug/diatheke.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release with ICU|Win32"
-			OutputDirectory=".\ICURelease"
-			IntermediateDirectory=".\ICURelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\ICURelease/diatheke.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\ICURelease/diatheke.pch"
-				AssemblerListingLocation=".\ICURelease/"
-				ObjectFile=".\ICURelease/"
-				ProgramDataBaseFileName=".\ICURelease/"
-				BrowseInformation="1"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
-				OutputFile=".\ICURelease/diatheke.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"
-				ProgramDatabaseFile=".\ICURelease/diatheke.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\ICURelease/diatheke.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="corediatheke.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="diafiltmgr.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="diatheke.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="diathekemgr.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="gbfcgi.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="osiscgi.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="thmlcgi.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release with ICU|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="corediatheke.h"
-				>
-			</File>
-			<File
-				RelativePath="diafiltmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="diathekemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="gbfcgi.h"
-				>
-			</File>
-			<File
-				RelativePath="osiscgi.h"
-				>
-			</File>
-			<File
-				RelativePath="thmlcgi.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/utilities/diatheke/diatheke.vcxproj b/utilities/diatheke/diatheke.vcxproj
new file mode 100644
index 0000000..7f698c1
--- /dev/null
+++ b/utilities/diatheke/diatheke.vcxproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{891A765C-5503-4FED-B427-7AE1413DB264}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/diatheke.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/diatheke.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\Debug/diatheke.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/diatheke.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/diatheke.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/diatheke.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/diatheke.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\Release/diatheke.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\Release/diatheke.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/diatheke.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="corediatheke.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="diafiltmgr.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="diatheke.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="diathekemgr.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="gbfcgi.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="osiscgi.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="thmlcgi.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="corediatheke.h" />
+    <ClInclude Include="diafiltmgr.h" />
+    <ClInclude Include="diathekemgr.h" />
+    <ClInclude Include="gbfcgi.h" />
+    <ClInclude Include="osiscgi.h" />
+    <ClInclude Include="thmlcgi.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/utilities/diatheke/diathekemgr.cpp b/utilities/diatheke/diathekemgr.cpp
index 93351c0..a64b570 100644
--- a/utilities/diatheke/diathekemgr.cpp
+++ b/utilities/diatheke/diathekemgr.cpp
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  diathekemgr.cpp -	DiathekeMgr
+ *
+ * $Id: diathekemgr.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
@@ -79,10 +84,10 @@ void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section)
 
 #ifdef _ICU_
 	if (shape) {
-		module->AddRenderFilter(arshaping);
+		module->addRenderFilter(arshaping);
 	}
 	if (bidi && rtl) {
-		module->AddRenderFilter(bidireorder);
+		module->addRenderFilter(bidireorder);
 	}
 #endif
 	SWMgr::AddRenderFilters(module, section);
@@ -103,7 +108,7 @@ void DiathekeMgr::AddGlobalOptions (SWModule * module, ConfigEntMap & section,
 
         SWMgr::AddGlobalOptions(module, section, start, end);
 #ifdef _ICU_
-        module->AddOptionFilter(transliterator);
+        module->addOptionFilter(transliterator);
 #endif
 };
 
diff --git a/utilities/diatheke/diathekemgr.h b/utilities/diatheke/diathekemgr.h
index 6225bbf..4ad7367 100644
--- a/utilities/diatheke/diathekemgr.h
+++ b/utilities/diatheke/diathekemgr.h
@@ -1,5 +1,10 @@
-/*
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+/******************************************************************************
+ *
+ *  diathekemgr.h -	DiathekeMgr
+ *
+ * $Id: diathekemgr.h 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/utilities/diatheke/gbfcgi.cpp b/utilities/diatheke/gbfcgi.cpp
index 5112c46..3c8ef00 100644
--- a/utilities/diatheke/gbfcgi.cpp
+++ b/utilities/diatheke/gbfcgi.cpp
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                         gbfcgi.cpp  -   GBF to Diatheke/CGI format
- *                            -------------------
- *   begin                    : 2001-11-12
- *   copyright            : 2001 by CrossWire Bible Society
  *
+ *  gbfcgi.cpp -	GBF to Diatheke/CGI format
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: gbfcgi.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
@@ -23,10 +22,26 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <map>
 #include "gbfcgi.h"
 
 SWORD_NAMESPACE_START
 
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		DualStringMap properties;
+	};
+}
+
+
+BasicFilterUserData *GBFCGI::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
 GBFCGI::GBFCGI() {
 	setTokenStart("<");
 	setTokenEnd(">");
@@ -64,7 +79,8 @@ GBFCGI::GBFCGI() {
 }
 
 
-bool GBFCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) {
+bool GBFCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+	MyUserData *userData = (MyUserData *) baseUserData;
 	unsigned long i;
 	if (!substituteToken(buf, token)) {
 		if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
@@ -113,12 +129,12 @@ bool GBFCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData)
 
 		else if (!strncmp(token, "RB", 2)) {
 			buf += "<i>";
-			userData["hasFootnotePreTag"] = "true";
+			userData->properties["hasFootnotePreTag"] = "true";
 		}
 
 		else if (!strncmp(token, "RF", 2)) {
-			if(userData["hasFootnotePreTag"] == "true") {
-				userData["hasFootnotePreTag"] = "false";
+			if(userData->properties["hasFootnotePreTag"] == "true") {
+				userData->properties["hasFootnotePreTag"] = "false";
 				buf += "</i> ";
 			}
 			buf += "<font color=\"#800000\"><small> (";
diff --git a/utilities/diatheke/gbfcgi.h b/utilities/diatheke/gbfcgi.h
index 71ded1a..3f21dd2 100644
--- a/utilities/diatheke/gbfcgi.h
+++ b/utilities/diatheke/gbfcgi.h
@@ -1,11 +1,10 @@
-/**************************************************************************
- *                         gbfcgi.h  -  description
- *                            -------------------
- *   begin                : 2001-11-12
- *   copyright            : 2001 by CrossWire Bible Society
+/***************************************************************************
  *
+ *  gbfcgi.h -	GBF to Diatheke/CGI format
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: gbfcgi.h 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
@@ -25,18 +24,16 @@
 #define GBFCGI_H
 
 #include <swbasicfilter.h>
-#include <swbuf.h>
 #include <defs.h>
-#include <map>
 
 SWORD_NAMESPACE_START
 
-typedef std::map<SWBuf, SWBuf> DualStringMap;
 /** this filter converts GBF text to Diatheke/CGI format
  */
 class GBFCGI : public SWBasicFilter {
 protected:
-	virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
 public:
   GBFCGI ();
 };
diff --git a/utilities/diatheke/osiscgi.cpp b/utilities/diatheke/osiscgi.cpp
index 86c7ed0..90949dd 100644
--- a/utilities/diatheke/osiscgi.cpp
+++ b/utilities/diatheke/osiscgi.cpp
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                    osiscgi.cpp  -  OSIS to Diatheke/CGI format
- *                            -------------------
- *   begin                : 2003-10-21
- *   copyright            : 2003 by CrossWire Bible Society
  *
+ *  osiscgi.cpp -	OSISCGI: OSIS to Diatheke/CGI format filter
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: osiscgi.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
diff --git a/utilities/diatheke/osiscgi.h b/utilities/diatheke/osiscgi.h
index d64e805..13925d6 100644
--- a/utilities/diatheke/osiscgi.h
+++ b/utilities/diatheke/osiscgi.h
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                  osiscgi.h  -  OSIS to Diatheke/CGI format
- *                            -------------------
- *   begin                : 2003-10-21
- *   copyright            : 2003 by CrossWire Bible Society
  *
+ *  osiscgi.h -	OSISCGI: OSIS to Diatheke/CGI format filter
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: osiscgi.h 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
diff --git a/utilities/diatheke/soap/sapouni.cgi b/utilities/diatheke/soap/sapouni.cgi
index 5412d23..e44d891 100755
--- a/utilities/diatheke/soap/sapouni.cgi
+++ b/utilities/diatheke/soap/sapouni.cgi
@@ -1,7 +1,12 @@
 #!/usr/bin/perl
 
+# /****************************************************************************
 # *
-# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+# *  sapouni.cgi -	CGI SOAP interface to diatheke
+# *
+# * $Id: sapouni.cgi 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
@@ -15,6 +20,7 @@
 # * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # * General Public License for more details.
 # *
+# */
 
 #version 1.0
 
diff --git a/utilities/diatheke/soap/soapatheke.pl b/utilities/diatheke/soap/soapatheke.pl
index c45fd98..5031feb 100755
--- a/utilities/diatheke/soap/soapatheke.pl
+++ b/utilities/diatheke/soap/soapatheke.pl
@@ -1,23 +1,25 @@
 #!/usr/bin/perl
 
-# *
-# * Copyright 2009 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.
-# *
-
-
-## This is a test app and has no other purpose.
+#******************************************************************************
+#
+#  soapatheke.pl -	This is a demo SOAP app and has no other purpose.
+#
+# $Id: soapatheke.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-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.
+#
 
 use SOAP::Lite;
 
diff --git a/utilities/diatheke/tcl/makebooklist.pl b/utilities/diatheke/tcl/makebooklist.pl
index 26ef54f..5b24258 100644..100755
--- a/utilities/diatheke/tcl/makebooklist.pl
+++ b/utilities/diatheke/tcl/makebooklist.pl
@@ -1,109 +1,114 @@
-#!/bin/perl
-
-# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>
-
-# Copyright 1999-2009 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.
-
-@booklist = `diatheke -b system -k modulelist`;
-
-open TCL, ">:utf8", "biblebot-diatheke-books.tcl";
-
-print TCL "# Diatheke/Tcl 5.0 by Chris Little <chrislit\@crosswire.org>\n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n#	CrossWire Bible Society\n#	P. O. Box 2528\n#	Tempe, AZ  85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n";
-
-foreach $line (@booklist) {
-    $line =~ s/[\r\n]+$//;
-    if ($line =~ /^Biblical Texts:/) {
-	$mode = "bible";
-    }
-    elsif ($line =~ /^Commentaries:/) {
-	$mode = "comm";
-    }
-    elsif ($line =~ /^Dictionaries:/) {
-	$mode = "dict";
-    }
-    elsif ($line =~ /^Generic books:/) {
-	$mode = "genbook";
-    }
-    elsif ($line =~ /^([^:]+) : (.+)/) {
-	$bookid = $1;
-	$bookdesc = $2;
-	if ($mode eq "bible") {
-	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
-	    print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
-
-	    if ($count_bible != 0) {
-		$putservtext_bible .= ", ";
-	    }
-	    if (($count_bible != 0) && ($count_bible % 5 == 0)) {
-		$putservtext_bible .= "\n";
-	    }
-	    $count_bible++;
-	    $putservtext_bible .= "$bookdesc (!$bookid)";
-	}
-	elsif ($mode eq "comm") {
-	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
-
-	    if ($count_comm != 0) {
-		$putservtext_comm .= ", ";
-	    }
-	    if (($count_comm != 0) && ($count_comm % 5 == 0)) {
-		$putservtext_comm .= "\n";
-	    }
-	    $count_comm++;
-	    $putservtext_comm .= "$bookdesc (!$bookid)";
-	}
-	elsif ($mode eq "dict") {
-	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
-
-	    if ($count_dict != 0) {
-		$putservtext_dict .= ", ";
-	    }
-	    if (($count_dict != 0) && ($count_dict % 5 == 0)) {
-		$putservtext_dict .= "\n";
-	    }
-	    $count_dict++;
-	    $putservtext_dict .= "$bookdesc (!$bookid)";
-	}
-	elsif ($mode eq "genbook") {
-	    # do nothing until diatheke supports genbooks
-	}
-    }
-}
-
-$putservtext_bible = "\n$putservtext_bible";
-$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
-$putservtext_bible =~ s/, \"/,\"/gs;
-$putservtext_bible .= "\"\n";
-$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible";
-$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n";
-
-$putservtext_comm = "\n$putservtext_comm";
-$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
-$putservtext_comm =~ s/, \"/,\"/gs;
-$putservtext_comm .= "\"\n";
-$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm";
-$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n";
-
-$putservtext_dict = "\n$putservtext_dict";
-$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
-$putservtext_dict =~ s/, \"/,\"/gs;
-$putservtext_dict .= "\"\n";
-$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict";
-$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n";
-
-print TCL $putservtext_bible;
-print TCL $putservtext_comm;
-print TCL $putservtext_dict;
-
+#!/bin/perl
+
+#******************************************************************************
+#
+#  makebooklist.pl -
+#
+# $Id: makebooklist.pl 2841 2013-06-29 10:58:08Z 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.
+#
+
+@booklist = `diatheke -b system -k modulelist`;
+
+open TCL, ">:utf8", "biblebot-diatheke-books.tcl";
+
+print TCL "# Diatheke/Tcl 5.0 by Chris Little <chrislit\@crosswire.org>\n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n#	CrossWire Bible Society\n#	P. O. Box 2528\n#	Tempe, AZ  85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n";
+
+foreach $line (@booklist) {
+    $line =~ s/[\r\n]+$//;
+    if ($line =~ /^Biblical Texts:/) {
+	$mode = "bible";
+    }
+    elsif ($line =~ /^Commentaries:/) {
+	$mode = "comm";
+    }
+    elsif ($line =~ /^Dictionaries:/) {
+	$mode = "dict";
+    }
+    elsif ($line =~ /^Generic books:/) {
+	$mode = "genbook";
+    }
+    elsif ($line =~ /^([^:]+) : (.+)/) {
+	$bookid = $1;
+	$bookdesc = $2;
+	if ($mode eq "bible") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+	    print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_bible != 0) {
+		$putservtext_bible .= ", ";
+	    }
+	    if (($count_bible != 0) && ($count_bible % 5 == 0)) {
+		$putservtext_bible .= "\n";
+	    }
+	    $count_bible++;
+	    $putservtext_bible .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "comm") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_comm != 0) {
+		$putservtext_comm .= ", ";
+	    }
+	    if (($count_comm != 0) && ($count_comm % 5 == 0)) {
+		$putservtext_comm .= "\n";
+	    }
+	    $count_comm++;
+	    $putservtext_comm .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "dict") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_dict != 0) {
+		$putservtext_dict .= ", ";
+	    }
+	    if (($count_dict != 0) && ($count_dict % 5 == 0)) {
+		$putservtext_dict .= "\n";
+	    }
+	    $count_dict++;
+	    $putservtext_dict .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "genbook") {
+	    # do nothing until diatheke supports genbooks
+	}
+    }
+}
+
+$putservtext_bible = "\n$putservtext_bible";
+$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_bible =~ s/, \"/,\"/gs;
+$putservtext_bible .= "\"\n";
+$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible";
+$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n";
+
+$putservtext_comm = "\n$putservtext_comm";
+$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_comm =~ s/, \"/,\"/gs;
+$putservtext_comm .= "\"\n";
+$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm";
+$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n";
+
+$putservtext_dict = "\n$putservtext_dict";
+$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_dict =~ s/, \"/,\"/gs;
+$putservtext_dict .= "\"\n";
+$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict";
+$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n";
+
+print TCL $putservtext_bible;
+print TCL $putservtext_comm;
+print TCL $putservtext_dict;
+
diff --git a/utilities/diatheke/thmlcgi.cpp b/utilities/diatheke/thmlcgi.cpp
index 1bcc5ba..9b85c35 100644
--- a/utilities/diatheke/thmlcgi.cpp
+++ b/utilities/diatheke/thmlcgi.cpp
@@ -1,11 +1,10 @@
-/***************************************************************************
- *                    thmlcgi.cpp  -  ThML to Diatheke/CGI format
- *                            -------------------
- *   begin                : 2001-11-12
- *   copyright            : 2001 by CrossWire Bible Society
+/******************************************************************************
  *
+ *  thmlcgi.cpp -	ThMLCGI: ThML to Diatheke/CGI format filter
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: thmlcgi.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
@@ -23,11 +22,26 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "thmlcgi.h"
+#include <map>
 #include <utilstr.h>
+#include "thmlcgi.h"
 
 SWORD_NAMESPACE_START
 
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		DualStringMap properties;
+	};
+}
+
+BasicFilterUserData *ThMLCGI::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
 ThMLCGI::ThMLCGI() {
 	setTokenStart("<");
 	setTokenEnd(">");
@@ -39,7 +53,8 @@ ThMLCGI::ThMLCGI() {
 }
 
 
-bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData) {
+bool ThMLCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+	MyUserData *userData = (MyUserData *) baseUserData;
 	unsigned long i;
 	if (!substituteToken(buf, token)) {
 	// manually process if it wasn't a simple substitution
@@ -109,7 +124,7 @@ bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData
 		}
 
 		else if (!strncmp(token, "scripRef p", 10) || !strncmp(token, "scripRef v", 10)) {
-        		userData["inscriptRef"] = "true";
+        		userData->properties["inscriptRef"] = "true";
 			buf += "<a href=\"!DIATHEKE_URL!";
 			for (i = 9; i < strlen(token); i++) {
 			  if (!strncmp(token+i, "version=\"", 9)) {
@@ -133,47 +148,47 @@ bool ThMLCGI::handleToken(SWBuf &buf, const char *token, DualStringMap &userData
 
 		// we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
 		else if (!strcmp(token, "scripRef")) {
-			userData["inscriptRef"] = "false";
+			userData->properties["inscriptRef"] = "false";
 			// let's stop text from going to output
-			userData["suspendTextPassThru"] = "true";
+			userData->properties["suspendTextPassThru"] = "true";
 		}
 
 		// we've ended a scripRef 
 		else if (!strcmp(token, "/scripRef")) {
-			if (userData["inscriptRef"] == "true") { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
-				userData["inscriptRef"] = "false";
+			if (userData->properties["inscriptRef"] == "true") { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
+				userData->properties["inscriptRef"] = "false";
 				buf += "</a>";
 			}
 			
 			else { // like "<scripRef>John 3:16</scripRef>"
 				buf += "<a href=\"!DIATHEKE_URL!verse=";
 
-				char* vref = (char*)userData["lastTextNode"].c_str();
+				char* vref = (char*)userData->properties["lastTextNode"].c_str();
 				while (*vref) {
 				  if (*vref == ' ') buf += '+';
 				  else buf += *vref;
 				  vref++;
 				}
 				buf += "\">";
-				buf += userData["lastTextNode"].c_str();
+				buf += userData->properties["lastTextNode"].c_str();
 				// let's let text resume to output again
-				userData["suspendTextPassThru"] = "false";	
+				userData->properties["suspendTextPassThru"] = "false";	
 				buf += "</a>";
 			}
 		}
 
 		else if (!strncmp(token, "div class=\"sechead\"", 19)) {
-		        userData["SecHead"] = "true";
+		        userData->properties["SecHead"] = "true";
 			buf += "<br /><b><i>";
 		}
 		else if (!strncmp(token, "div class=\"title\"", 19)) {
-		        userData["SecHead"] = "true";
+		        userData->properties["SecHead"] = "true";
 			buf += "<br /><b><i>";
 		}
 		else if (!strncmp(token, "/div", 4)) {
-		        if (userData["SecHead"] == "true") {
+		        if (userData->properties["SecHead"] == "true") {
 			        buf += "</i></b><br />";
-				userData["SecHead"] = "false";
+				userData->properties["SecHead"] = "false";
 			}
 		}
 
diff --git a/utilities/diatheke/thmlcgi.h b/utilities/diatheke/thmlcgi.h
index bfdee35..9380656 100644
--- a/utilities/diatheke/thmlcgi.h
+++ b/utilities/diatheke/thmlcgi.h
@@ -1,11 +1,10 @@
-/***************************************************************************
- *                  thmlcgi.h  -  OSIS to Diatheke/CGI format
- *                            -------------------
- *   begin                : 2001-11-12
- *   copyright            : 2001 by CrossWire Bible Society
+/******************************************************************************
  *
+ *  thmlcgi.h -	ThMLCGI: ThML to Diatheke/CGI format filter
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: thmlcgi.h 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
@@ -25,18 +24,16 @@
 #define THMLCGI_H
 
 #include <swbasicfilter.h>
-#include <map>
-
 #include <defs.h>
 
 SWORD_NAMESPACE_START
 
-typedef std::map<SWBuf, SWBuf> DualStringMap;
 /** this filter converts ThML text to Diatheke/CGI format
  */
 class ThMLCGI : public SWBasicFilter {
 protected:
-	virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
 public:
 	ThMLCGI();
 };