18 files changed, 1264 insertions, 1234 deletions
diff --git a/bindings/swig/deprecations.i b/bindings/swig/deprecations.i
index bab0381..fa883a7 100644
--- a/bindings/swig/deprecations.i
+++ b/bindings/swig/deprecations.i
@@ -10,10 +10,12 @@
 %ignore sword::VerseTreeKey::operator const char *;
 %ignore sword::XMLTag::operator const char *;
 
-%ignore sword::StatusReporter::statusUpdate;
 
 %ignore sword::SWDisplay::Display(SWModule&);
 
+%ignore sword::StatusReporter::statusUpdate(double ,double);
+%feature("nodirector") sword::StatusReporter::statusUpdate(double ,double);
+
 %ignore sword::SWKey::Error();
 %ignore sword::SWKey::Persist() const;
 %ignore sword::SWKey::Persist(signed char);
@@ -60,3 +62,20 @@
 %ignore sword::VerseKey::TestamentIndex() const;
 %ignore sword::VerseKey::UpperBound;
 %ignore sword::VerseKey::Verse;
+
+%ignore sword::SWMgr::CreateMods(bool);
+%ignore sword::SWMgr::DeleteMods();
+%ignore sword::SWMgr::AddGlobalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddLocalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddEncodingFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddRenderFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddRawFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::getHomeDir();
+%ignore sword::SWMgr::Load();
+
+%ignore sword::SWConfig::Sections;
+%ignore sword::SWConfig::filename;
+%ignore sword::SWConfig::Load();
+%ignore sword::SWConfig::Save();
diff --git a/bindings/swig/package/aclocal.m4 b/bindings/swig/package/aclocal.m4
index 094585c..0c2ed70 100644
--- a/bindings/swig/package/aclocal.m4
+++ b/bindings/swig/package/aclocal.m4
@@ -220,21 +220,6 @@ m4_popdef([pkg_default])
 m4_popdef([pkg_description])
 ]) dnl PKG_NOARCH_INSTALLDIR
 
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/bindings/swig/package/config.guess b/bindings/swig/package/config.guess
index 1804e9f..b79252d 100755
--- a/bindings/swig/package/config.guess
+++ b/bindings/swig/package/config.guess
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -26,7 +24,7 @@ timestamp='2012-12-29'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner. 
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -52,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -857,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -884,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -955,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1235,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
diff --git a/bindings/swig/package/config.sub b/bindings/swig/package/config.sub
index 52f04bc..c765b34 100755
--- a/bindings/swig/package/config.sub
+++ b/bindings/swig/package/config.sub
@@ -1,10 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-12-29'
+timestamp='2013-04-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -70,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -256,7 +252,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
@@ -290,16 +286,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -369,7 +366,7 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
@@ -407,12 +404,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -1354,7 +1352,7 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1500,9 +1498,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1594,6 +1589,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/bindings/swig/package/configure b/bindings/swig/package/configure
index b05da08..685f159 100755
--- a/bindings/swig/package/configure
+++ b/bindings/swig/package/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2875 .
+# From configure.ac Revision: 3063 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for swordbindings 1.6.2.
 #
@@ -6664,7 +6664,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -6682,10 +6682,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
+	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -6704,10 +6701,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
+	  ppc*-*linux*|powerpc*-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
diff --git a/bindings/swig/package/configure.ac b/bindings/swig/package/configure.ac
index a8e1806..f7995e3 100644
--- a/bindings/swig/package/configure.ac
+++ b/bindings/swig/package/configure.ac
@@ -4,7 +4,7 @@
 AC_INIT([swordbindings],[1.6.2])
 AC_CONFIG_SRCDIR(sword.i)
 AC_PREREQ(2.59)
-AC_REVISION($Revision: 2875 $)
+AC_REVISION($Revision: 3063 $)
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/bindings/swig/package/deprecations.i b/bindings/swig/package/deprecations.i
index bab0381..fa883a7 100644
--- a/bindings/swig/package/deprecations.i
+++ b/bindings/swig/package/deprecations.i
@@ -10,10 +10,12 @@
 %ignore sword::VerseTreeKey::operator const char *;
 %ignore sword::XMLTag::operator const char *;
 
-%ignore sword::StatusReporter::statusUpdate;
 
 %ignore sword::SWDisplay::Display(SWModule&);
 
+%ignore sword::StatusReporter::statusUpdate(double ,double);
+%feature("nodirector") sword::StatusReporter::statusUpdate(double ,double);
+
 %ignore sword::SWKey::Error();
 %ignore sword::SWKey::Persist() const;
 %ignore sword::SWKey::Persist(signed char);
@@ -60,3 +62,20 @@
 %ignore sword::VerseKey::TestamentIndex() const;
 %ignore sword::VerseKey::UpperBound;
 %ignore sword::VerseKey::Verse;
+
+%ignore sword::SWMgr::CreateMods(bool);
+%ignore sword::SWMgr::DeleteMods();
+%ignore sword::SWMgr::AddGlobalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddLocalOptions(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddEncodingFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddRenderFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::AddStripFilters(SWModule *, ConfigEntMap &, ConfigEntMap::iterator, ConfigEntMap::iterator);
+%ignore sword::SWMgr::AddRawFilters(SWModule *, ConfigEntMap &);
+%ignore sword::SWMgr::getHomeDir();
+%ignore sword::SWMgr::Load();
+
+%ignore sword::SWConfig::Sections;
+%ignore sword::SWConfig::filename;
+%ignore sword::SWConfig::Load();
+%ignore sword::SWConfig::Save();
diff --git a/bindings/swig/package/m4/libtool.m4 b/bindings/swig/package/m4/libtool.m4
index f12cfdf..56666f0 100644
--- a/bindings/swig/package/m4/libtool.m4
+++ b/bindings/swig/package/m4/libtool.m4
@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
+	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
+	  ppc*-*linux*|powerpc*-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
diff --git a/bindings/swig/package/rendercallback.h b/bindings/swig/package/rendercallback.h
index bfb54fc..b00b973 100755
--- a/bindings/swig/package/rendercallback.h
+++ b/bindings/swig/package/rendercallback.h
@@ -215,7 +215,7 @@ public:
 	bool osisQToTick;
 	bool inBold;
 	bool inXRefNote;
-	bool BiblicalText;
+	bool isBiblicalText;
 	int suspendLevel;
 	SWBuf wordsOfChristStart;
 	SWBuf wordsOfChristEnd;
@@ -240,8 +240,8 @@ public sword::BasicFilterUserData
 {
 public:
 	SWBuf inscriptRef;
-	bool SecHead;
-	bool BiblicalText;
+	bool inSecHead;
+	bool isBiblicalText;
 	SWBuf version;
 	XMLTag startTag;	
 
diff --git a/bindings/swig/package/swconfig.i b/bindings/swig/package/swconfig.i
index b1f6834..4479093 100644
--- a/bindings/swig/package/swconfig.i
+++ b/bindings/swig/package/swconfig.i
@@ -5,21 +5,21 @@
 %ignore sword::SWConfig::operator[];
 %ignore sword::SWConfig::operator+=;
 %ignore sword::SWConfig::sections;
-%ignore sword::SWConfig::Sections;
+%ignore sword::SWConfig::getSections();
 
 %include "swconfig.h"
 
 
 %extend sword::SWConfig {
   void set(const char* group, const char* entry, const char* value) {
-	self->Sections[group][entry] = value;
+	self->getSection(group)[entry] = value;
   };
   const char* get(const char* group, const char* entry) {
-	return self->Sections[group][entry].c_str();
+	return self->getSection(group)[entry].c_str();
   };
   PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */
   *getSections() {
-    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections;
+    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->getSections();
   }
 }
 
diff --git a/bindings/swig/package/sword.i b/bindings/swig/package/sword.i
index a963fa1..2991b91 100644
--- a/bindings/swig/package/sword.i
+++ b/bindings/swig/package/sword.i
@@ -1,13 +1,13 @@
 #define SWDLLEXPORT  
 
+%include "deprecations.i"
+
 %module "Sword"
 %module(directors="1") Sword;
 
 /* Ignore warnings about Unknown base class */
 %warnfilter(401);
 
-%include "deprecations.i"
-
 #ifdef SWIGPYTHON
 %include "directors.i"
 #endif
diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt
index b661654..bbf7561 100644
--- a/bindings/swig/python/CMakeLists.txt
+++ b/bindings/swig/python/CMakeLists.txt
@@ -44,11 +44,9 @@ ADD_CUSTOM_TARGET(swordswig ALL
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
 # Allow user installation to custom directory
-IF(SWORD_PYTHON_INSTALL_DIR)
-	SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR}")
-ELSE(SWORD_PYTHON_INSTALL_DIR)
-	SET(SETUP_ARGS "--home=${CMAKE_INSTALL_PREFIX}")
-ENDIF(SWORD_PYTHON_INSTALL_DIR)
+IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "")
+	SET(SETUP_ARGS "\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"")
+ENDIF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "")
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in"
 	       "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")
 
diff --git a/bindings/swig/rendercallback.h b/bindings/swig/rendercallback.h
index bfb54fc..b00b973 100755
--- a/bindings/swig/rendercallback.h
+++ b/bindings/swig/rendercallback.h
@@ -215,7 +215,7 @@ public:
 	bool osisQToTick;
 	bool inBold;
 	bool inXRefNote;
-	bool BiblicalText;
+	bool isBiblicalText;
 	int suspendLevel;
 	SWBuf wordsOfChristStart;
 	SWBuf wordsOfChristEnd;
@@ -240,8 +240,8 @@ public sword::BasicFilterUserData
 {
 public:
 	SWBuf inscriptRef;
-	bool SecHead;
-	bool BiblicalText;
+	bool inSecHead;
+	bool isBiblicalText;
 	SWBuf version;
 	XMLTag startTag;	
 
diff --git a/bindings/swig/swconfig.i b/bindings/swig/swconfig.i
index b1f6834..4479093 100644
--- a/bindings/swig/swconfig.i
+++ b/bindings/swig/swconfig.i
@@ -5,21 +5,21 @@
 %ignore sword::SWConfig::operator[];
 %ignore sword::SWConfig::operator+=;
 %ignore sword::SWConfig::sections;
-%ignore sword::SWConfig::Sections;
+%ignore sword::SWConfig::getSections();
 
 %include "swconfig.h"
 
 
 %extend sword::SWConfig {
   void set(const char* group, const char* entry, const char* value) {
-	self->Sections[group][entry] = value;
+	self->getSection(group)[entry] = value;
   };
   const char* get(const char* group, const char* entry) {
-	return self->Sections[group][entry].c_str();
+	return self->getSection(group)[entry].c_str();
   };
   PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */
   *getSections() {
-    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections;
+    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->getSections();
   }
 }
 
diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i
index a963fa1..2991b91 100644
--- a/bindings/swig/sword.i
+++ b/bindings/swig/sword.i
@@ -1,13 +1,13 @@
 #define SWDLLEXPORT  
 
+%include "deprecations.i"
+
 %module "Sword"
 %module(directors="1") Sword;
 
 /* Ignore warnings about Unknown base class */
 %warnfilter(401);
 
-%include "deprecations.i"
-
 #ifdef SWIGPYTHON
 %include "directors.i"
 #endif
diff --git a/bindings/swig/vstudio/SwigSword.csproj b/bindings/swig/vstudio/SwigSword.csproj
index 7b40eab..0fb56d1 100644
--- a/bindings/swig/vstudio/SwigSword.csproj
+++ b/bindings/swig/vstudio/SwigSword.csproj
@@ -1,99 +1,99 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F594299C-1C3B-461E-B64A-6167735DCA12}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SwigSword</RootNamespace>
-    <AssemblyName>SwigSword</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="abbrev.cs" />
-    <Compile Include="AttributeListMap.cs" />
-    <Compile Include="AttributeTypeListMap.cs" />
-    <Compile Include="AttributeValueMap.cs" />
-    <Compile Include="EncodingFilterMgr.cs" />
-    <Compile Include="ListKey.cs" />
-    <Compile Include="LocaleMgr.cs" />
-    <Compile Include="LZSSCompress.cs" />
-    <Compile Include="MarkupFilterMgr.cs" />
-    <Compile Include="ModuleMap.cs" />
-    <Compile Include="RawCom.cs" />
-    <Compile Include="RawGenBook.cs" />
-    <Compile Include="RawLD.cs" />
-    <Compile Include="RawLD4.cs" />
-    <Compile Include="RawText.cs" />
-    <Compile Include="sbook.cs" />
-    <Compile Include="StringVector.cs" />
-    <Compile Include="SWBuf.cs" />
-    <Compile Include="SWClass.cs" />
-    <Compile Include="SWCom.cs" />
-    <Compile Include="SWCompress.cs" />
-    <Compile Include="SWConfig.cs" />
-    <Compile Include="SWDisplay.cs" />
-    <Compile Include="SWFilter.cs" />
-    <Compile Include="SWFilterMgr.cs" />
-    <Compile Include="SWGenBook.cs" />
-    <Compile Include="SWKey.cs" />
-    <Compile Include="SWLD.cs" />
-    <Compile Include="SWLocale.cs" />
-    <Compile Include="SWMgr.cs" />
-    <Compile Include="SWModule.cs" />
-    <Compile Include="SWObject.cs" />
-    <Compile Include="SWOptionFilter.cs" />
-    <Compile Include="Sword.cs" />
-    <Compile Include="SwordPINVOKE.cs" />
-    <Compile Include="SWSearchable.cs" />
-    <Compile Include="SWText.cs" />
-    <Compile Include="SW_POSITION.cs" />
-    <Compile Include="TreeKey.cs" />
-    <Compile Include="TreeKeyIdx.cs" />
-    <Compile Include="URL.cs" />
-    <Compile Include="VerseKey.cs" />
-    <Compile Include="VerseTreeKey.cs" />
-    <Compile Include="zCom.cs" />
-    <Compile Include="ZipCompress.cs" />
-    <Compile Include="zLD.cs" />
-    <Compile Include="zText.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F594299C-1C3B-461E-B64A-6167735DCA12}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SwigSword</RootNamespace>
+    <AssemblyName>SwigSword</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="abbrev.cs" />
+    <Compile Include="AttributeListMap.cs" />
+    <Compile Include="AttributeTypeListMap.cs" />
+    <Compile Include="AttributeValueMap.cs" />
+    <Compile Include="EncodingFilterMgr.cs" />
+    <Compile Include="ListKey.cs" />
+    <Compile Include="LocaleMgr.cs" />
+    <Compile Include="LZSSCompress.cs" />
+    <Compile Include="MarkupFilterMgr.cs" />
+    <Compile Include="ModuleMap.cs" />
+    <Compile Include="RawCom.cs" />
+    <Compile Include="RawGenBook.cs" />
+    <Compile Include="RawLD.cs" />
+    <Compile Include="RawLD4.cs" />
+    <Compile Include="RawText.cs" />
+    <Compile Include="sbook.cs" />
+    <Compile Include="StringVector.cs" />
+    <Compile Include="SWBuf.cs" />
+    <Compile Include="SWClass.cs" />
+    <Compile Include="SWCom.cs" />
+    <Compile Include="SWCompress.cs" />
+    <Compile Include="SWConfig.cs" />
+    <Compile Include="SWDisplay.cs" />
+    <Compile Include="SWFilter.cs" />
+    <Compile Include="SWFilterMgr.cs" />
+    <Compile Include="SWGenBook.cs" />
+    <Compile Include="SWKey.cs" />
+    <Compile Include="SWLD.cs" />
+    <Compile Include="SWLocale.cs" />
+    <Compile Include="SWMgr.cs" />
+    <Compile Include="SWModule.cs" />
+    <Compile Include="SWObject.cs" />
+    <Compile Include="SWOptionFilter.cs" />
+    <Compile Include="Sword.cs" />
+    <Compile Include="SwordPINVOKE.cs" />
+    <Compile Include="SWSearchable.cs" />
+    <Compile Include="SWText.cs" />
+    <Compile Include="SW_POSITION.cs" />
+    <Compile Include="TreeKey.cs" />
+    <Compile Include="TreeKeyIdx.cs" />
+    <Compile Include="URL.cs" />
+    <Compile Include="VerseKey.cs" />
+    <Compile Include="VerseTreeKey.cs" />
+    <Compile Include="zCom.cs" />
+    <Compile Include="ZipCompress.cs" />
+    <Compile Include="zLD.cs" />
+    <Compile Include="zText.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
+  -->
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
 </Project>
 \ No newline at end of file
diff --git a/bindings/swig/vstudio/libsword-csharpbindings.sln b/bindings/swig/vstudio/libsword-csharpbindings.sln
index 36cd729..940d4f0 100644
--- a/bindings/swig/vstudio/libsword-csharpbindings.sln
+++ b/bindings/swig/vstudio/libsword-csharpbindings.sln
@@ -1,36 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword_csharpsword", "libsword_csharpsword.vcproj", "{0BD1471F-07D9-441C-9210-40A52770F2A1}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug with ICU|Win32 = Debug with ICU|Win32
-		Debug|Win32 = Debug|Win32
-		Release with ICU|Win32 = Release with ICU|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32
-		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.Build.0 = Debug|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.ActiveCfg = Release|Win32
-		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword_csharpsword", "libsword_csharpsword.vcproj", "{0BD1471F-07D9-441C-9210-40A52770F2A1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug with ICU|Win32 = Debug with ICU|Win32
+		Debug|Win32 = Debug|Win32
+		Release with ICU|Win32 = Release with ICU|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32
+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.Build.0 = Debug|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.ActiveCfg = Release|Win32
+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/bindings/swig/vstudio/libsword_csharpsword.vcproj b/bindings/swig/vstudio/libsword_csharpsword.vcproj
index 4d69c39..565d7a0 100644
--- a/bindings/swig/vstudio/libsword_csharpsword.vcproj
+++ b/bindings/swig/vstudio/libsword_csharpsword.vcproj
@@ -1,966 +1,966 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libsword_csharpsword"
-	ProjectGUID="{0BD1471F-07D9-441C-9210-40A52770F2A1}"
-	RootNamespace="libsword"
-	AssemblyReferenceSearchPaths="&quot;..\..\..\lib\vcppmake\vc8\Release&quot;"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword_csharpsword.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../apps/windoze/CBuilder5/InstallMgr/curl,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWUSINGDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Release/libsword.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug with ICU|Win32"
-			OutputDirectory=".\ICUDebug"
-			IntermediateDirectory=".\ICUDebug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../../icu-sword/source/common,../../../../icu-sword/source/i18n,../../../include,../../../src/utilfuns/win32"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\ICUDebug/libsword.pch"
-				AssemblerListingLocation=".\ICUDebug/"
-				ObjectFile=".\ICUDebug/"
-				ProgramDataBaseFileName=".\ICUDebug/"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libsword.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../include,../../../src/utilfuns/win32"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\Debug/libsword.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libsword.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release with ICU|Win32"
-			OutputDirectory=".\ICURelease"
-			IntermediateDirectory=".\ICURelease"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../../icu-sword/include,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
-				PreprocessorDefinitions="NDEBUG;_ICU_;WIN32;_LIB;REGEX_MALLOC"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=".\ICURelease/libsword.pch"
-				AssemblerListingLocation=".\ICURelease/"
-				ObjectFile=".\ICURelease/"
-				ProgramDataBaseFileName=".\ICURelease/"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libsword.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<ProjectReference
-			ReferencedProjectIdentifier="{97449E5E-F880-4D22-933A-0D2FC32034D4}"
-			RelativePathToProject=".\libsword.vcproj"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Sword Source Files"
-			>
-			<File
-				RelativePath=".\Sword.cxx"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Sword Header Files"
-			>
-			<File
-				RelativePath="..\..\..\include\apocrypha.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\canon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\cdsourcemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\cipherfil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\defs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\echomod.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\encfiltmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\entriesblk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\femain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\filemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\flatapi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ftpparse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbffootnotes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfheadings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfhtml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfhtmlhref.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfmorph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfosis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfplain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfredletterwords.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfrtf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfstrongs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfthml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\gbfwebif.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\Greek2Greek.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\GreekChars.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\greeklexattribs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\hebrewmcim.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\hrefcom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\latin1utf16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\latin1utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\listkey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\localemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\lzsscomprs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\markupfiltmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\multimapwdef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\nullim.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisfootnotes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisheadings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osishtmlhref.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osislemma.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osismorph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osismorphsegmentation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisosis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisplain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisredletterwords.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisrtf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisscripref.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osisstrongs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\osiswebif.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\papyriplain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawcom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawfiles.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawgbf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawgenbook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawld.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawld4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawstr4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawtext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rawverse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\remotesourcemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\roman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\rtfhtml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\sapphire.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\scsuutf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\stringmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\strkey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swbasicfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swcacher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swcipher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swcom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swcomprs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swdisp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swdisprtf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swdisprtfchap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swfiltermgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swgenbook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swinputmeth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swinstallmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swkey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swld.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swlocale.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swlog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swmacs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swmgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swmodule.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swobject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swoptfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swremotemgr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swsearchable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swtext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\swwinlog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\sysdata.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\tbdisp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\teiplain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\teirtf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlfootnotes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlgbf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlheadings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlhtml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlhtmlhref.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmllemma.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlmorph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlosis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlplain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlrtf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlscripref.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlstrongs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlvariants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\thmlwebif.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\treekey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\treekeyidx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\unicodertf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\unixstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\untgz.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\url.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf16utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8arshaping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8bidireorder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8cantillation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8greekaccents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8hebrewpoints.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8arabicpoints.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8html.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8latin1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8nfc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8nfkd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8transliterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utf8utf16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utilfuns.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utilstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\utilxml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\versekey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\versetreekey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zcom.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zipcomprs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zld.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zstr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ztext.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\zverse.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libsword_csharpsword"
+	ProjectGUID="{0BD1471F-07D9-441C-9210-40A52770F2A1}"
+	RootNamespace="libsword"
+	AssemblyReferenceSearchPaths="&quot;..\..\..\lib\vcppmake\vc8\Release&quot;"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword_csharpsword.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../apps/windoze/CBuilder5/InstallMgr/curl,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWUSINGDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/libsword.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug with ICU|Win32"
+			OutputDirectory=".\ICUDebug"
+			IntermediateDirectory=".\ICUDebug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../icu-sword/source/common,../../../../icu-sword/source/i18n,../../../include,../../../src/utilfuns/win32"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\ICUDebug/libsword.pch"
+				AssemblerListingLocation=".\ICUDebug/"
+				ObjectFile=".\ICUDebug/"
+				ProgramDataBaseFileName=".\ICUDebug/"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libsword.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../include,../../../src/utilfuns/win32"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/libsword.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libsword.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release with ICU|Win32"
+			OutputDirectory=".\ICURelease"
+			IntermediateDirectory=".\ICURelease"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="../../../../icu-sword/include,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"
+				PreprocessorDefinitions="NDEBUG;_ICU_;WIN32;_LIB;REGEX_MALLOC"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\ICURelease/libsword.pch"
+				AssemblerListingLocation=".\ICURelease/"
+				ObjectFile=".\ICURelease/"
+				ProgramDataBaseFileName=".\ICURelease/"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libsword.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<ProjectReference
+			ReferencedProjectIdentifier="{97449E5E-F880-4D22-933A-0D2FC32034D4}"
+			RelativePathToProject=".\libsword.vcproj"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Sword Source Files"
+			>
+			<File
+				RelativePath=".\Sword.cxx"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Sword Header Files"
+			>
+			<File
+				RelativePath="..\..\..\include\apocrypha.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\canon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\cdsourcemgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\cipherfil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\echomod.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\encfiltmgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\entriesblk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\femain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\filemgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\flatapi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\ftpparse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbffootnotes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfheadings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfhtml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfhtmlhref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfmorph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfosis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfplain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfredletterwords.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfrtf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfstrongs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfthml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\gbfwebif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\Greek2Greek.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\GreekChars.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\greeklexattribs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\hebrewmcim.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\hrefcom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\latin1utf16.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\latin1utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\listkey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\localemgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\lzsscomprs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\markupfiltmgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\multimapwdef.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\nullim.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisfootnotes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisheadings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osishtmlhref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osislemma.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osismorph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osismorphsegmentation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisosis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisplain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisredletterwords.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisrtf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisscripref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osisstrongs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\osiswebif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\papyriplain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawcom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawfiles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawgbf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawgenbook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawld.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawld4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawstr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawstr4.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawtext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rawverse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\regex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\remotesourcemgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\roman.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\rtfhtml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\sapphire.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\scsuutf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\stringmgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\strkey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swbasicfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swcacher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swcipher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swcom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swcomprs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swconfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swdisp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swdisprtf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swdisprtfchap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swfiltermgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swgenbook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swinputmeth.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swinstallmgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swkey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swld.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swlocale.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swmacs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swmgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swmodule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swobject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swoptfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swremotemgr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swsearchable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swtext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swversion.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\swwinlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\sysdata.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\tbdisp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\teiplain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\teirtf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlfootnotes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlgbf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlheadings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlhtml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlhtmlhref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmllemma.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlmorph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlosis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlplain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlrtf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlscripref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlstrongs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlvariants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\thmlwebif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\treekey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\treekeyidx.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\unicodertf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\unixstr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\untgz.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\url.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf16utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8arshaping.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8bidireorder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8cantillation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8greekaccents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8hebrewpoints.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8arabicpoints.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8html.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8latin1.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8nfc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8nfkd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8transliterator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utf8utf16.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utilfuns.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utilstr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\utilxml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\versekey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\versetreekey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zcom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zconf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zipcomprs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zld.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zlib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zstr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\ztext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\include\zverse.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>