merge expat 2.0.1. Tested by simon@

13 files changed, 19 insertions, 857 deletions

diff --git a/lib/expat/buildconf.sh b/lib/expat/buildconf.sh
deleted file mode 100644
index 2fc5932a3..000000000
--- a/lib/expat/buildconf.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-
-#--------------------------------------------------------------------------
-# autoconf 2.52 or newer
-#
-ac_version="`${AUTOCONF:-autoconf} --version 2> /dev/null | head -1 | sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`"
-if test -z "$ac_version"; then
-  echo "ERROR: autoconf not found."
-  echo "       You need autoconf version 2.52 or newer installed."
-  exit 1
-fi
-IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "52" || test "$1" -lt "2"; then
-  echo "ERROR: autoconf version $ac_version found."
-  echo "       You need autoconf version 2.52 or newer installed."
-  exit 1
-fi
-
-echo "found: autoconf version $ac_version (ok)"
-
-#--------------------------------------------------------------------------
-# libtool 1.4 or newer
-#
-
-#
-# find libtoolize, or glibtoolize on MacOS X
-#
-libtoolize=`conftools/PrintPath glibtoolize libtoolize`
-if [ "x$libtoolize" = "x" ]; then
-  echo "ERROR: libtoolize not found."
-  echo "       You need libtool version 1.4 or newer installed"
-  exit 1
-fi
-
-lt_pversion="`$libtoolize --version 2> /dev/null | sed -e 's/^[^0-9]*//'`"
-
-# convert something like 1.4p1 to 1.4.p1
-lt_version="`echo $lt_pversion | sed -e 's/\([a-z]*\)$/.\1/'`"
-
-IFS=.; set $lt_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "4"; then
-  echo "ERROR: libtool version $lt_pversion found."
-  echo "       You need libtool version 1.4 or newer installed"
-  exit 1
-fi
-
-echo "found: libtool version $lt_pversion (ok)"
-
-#--------------------------------------------------------------------------
-
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the buildconf script.
-(cd conftools/; rm -f ltmain.sh ltconfig)
-
-#
-# Create the libtool helper files
-#
-echo "Copying libtool helper files ..."
-
-#
-# Note: we don't use --force (any more) since we have a special
-# config.guess/config.sub that we want to ensure is used.
-#
-# --copy to avoid symlinks; we want originals for the distro
-# --automake to make it shut up about "things to do"
-#
-$libtoolize --copy --automake
-
-#
-# Find the libtool.m4 file. The developer/packager can set the LIBTOOL_M4
-# environment variable to specify its location. If that variable is not
-# set, then we'll assume a "standard" libtool installation and try to
-# derive its location.
-#
-ltpath=`dirname $libtoolize`
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-cp $ltfile conftools/libtool.m4
-
-echo "Using libtool.m4 from ${ltfile}."
-
-#--------------------------------------------------------------------------
-
-### for a little while... remove stray aclocal.m4 files from
-### developers' working copies. we no longer use it. (nothing else
-### will remove it, and leaving it creates big problems)
-rm -f aclocal.m4
-
-#
-# Generate the autoconf header template (expat_config.h.in) and ./configure
-#
-echo "Creating expat_config.h.in ..."
-${AUTOHEADER:-autoheader}
-
-echo "Creating configure ..."
-### do some work to toss config.cache?
-${AUTOCONF:-autoconf}
-
-# toss this; it gets created by autoconf on some systems
-rm -rf autom4te*.cache
-
-# exit with the right value, so any calling script can continue
-exit 0
diff --git a/lib/expat/conftools/.cvsignore b/lib/expat/conftools/.cvsignore
deleted file mode 100644
index 159a91484..000000000
--- a/lib/expat/conftools/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-libtool.m4
-ltconfig
-ltmain.sh
diff --git a/lib/expat/examples/.cvsignore b/lib/expat/examples/.cvsignore
deleted file mode 100644
index 88a46969c..000000000
--- a/lib/expat/examples/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-elements
-elements.plg
-outline
-outline.plg
-Debug
-Release
-.libs
diff --git a/lib/expat/expat.spec b/lib/expat/expat.spec
deleted file mode 100644
index 3d28d259a..000000000
--- a/lib/expat/expat.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-%define version 1.95.8
-%define release 1
-
-Summary: Expat is an XML 1.0 parser written in C.
-Name: expat
-Version: %{version}
-Release: %{release}
-Copyright: MIT/X
-Group: Utilities/parsers
-URL: http://www.libexpat.org/
-Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}-buildroot
-
-%description
-Expat is an XML 1.0 parser written in C by James Clark.  It aims to be
-fully conforming. It is not a validating XML parser.
-
-%prep
-%setup
-
-%build
-./configure
-make lib xmlwf
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/lib
-mkdir -p $RPM_BUILD_ROOT/usr/include
-make install prefix=$RPM_BUILD_ROOT/usr
-install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
-
-%files
-%doc COPYING Changes MANIFEST README doc/reference.html doc/style.css doc/*.png
-/usr/bin/xmlwf
-/usr/lib
-/usr/include/expat.h
-/usr/include/expat_external.h
-/usr/man/man1/xmlwf.1.gz
-
-%changelog
-* Fri Jul 16 2004 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.8-1]
-- Update for the 1.95.8 release.
-- Add the expat_external.h header to the installed files.
-
-* Tue Oct 21 2003 Fred L. Drake, Jr. <fdrake@acm.org>
-- Update list of documentation files; we missed a .png file in the
-  previous release.
-
-* Mon Oct 20 2003 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.7-1]
-- Updated for the 1.95.7 release.
-
-* Sat Jan 25 2003 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.6-1]
-- Updated for the 1.95.6 release.
-
-* Wed Sep  4 2002 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.5-1]
-- Updated for the 1.95.5 release.
-- Updated URL for Expat home page to point to www.libexpat.org.
-- Added "Valid XHTML 1.0" icon to the installed documentation.
-
-* Sat Jun 29 2002 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.4-1]
-- Updated for the 1.95.4 release.
-
-* Fri May 17 2002 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.3-1]
-- Updated for the 1.95.3 release.
-- Added xmlwf man page to the list of files.
-
-* Wed Jul 25 2001 Fred L. Drake, Jr. <fdrake@acm.org>
-[Release 1.95.2-1]
-- Updated for the 1.95.2 release.
-
-* Sun Feb 18 2001 Sean Reifschneider <jafo-rpms@tummy.com>
-[Release 1.95.1-1tummy]
-- Updated to 1.95.1 release.
-- Removed the "/usr/include/expat" directory for headers, as it now uses
-  "expat.h" instead of "xmlparser.h".
-
-* Thu Jan 25 2001 Sean Reifschneider <jafo-rpms@tummy.com>
-[Release 1.1-3tummy]
-- Moved xmlparse.h into "/usr/include/expat" directory to prevent conflict
-  with w3c-libwww-devel package.
-
-* Wed Sep  6 2000 Sean Reifschneider <jafo-rpms@tummy.com>
-- Modified to install into /usr.
-- Modified to use RPM_BUILD_ROOT instead of writing directly to install
-  location.
diff --git a/lib/expat/gennmtab/.cvsignore b/lib/expat/gennmtab/.cvsignore
deleted file mode 100644
index f966c45cf..000000000
--- a/lib/expat/gennmtab/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Debug
-Release
-gennmtab.plg
diff --git a/lib/expat/gennmtab/gennmtab.c b/lib/expat/gennmtab/gennmtab.c
deleted file mode 100644
index 8a4ff3472..000000000
--- a/lib/expat/gennmtab/gennmtab.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#include <string.h>
-#include <stdio.h>
-#include <stddef.h>
-
-struct range {
-  int start;
-  int end;
-};
-
-struct range nmstrt[] = {
-  { '_' },
-  { ':' },
-  /* BaseChar */
-  { 0x0041, 0x005a },
-  { 0x0061, 0x007a },
-  { 0x00c0, 0x00d6 },
-  { 0x00d8, 0x00f6 },
-  { 0x00f8, 0x00ff },
-  { 0x0100, 0x0131 },
-  { 0x0134, 0x013e },
-  { 0x0141, 0x0148 },
-  { 0x014a, 0x017e },
-  { 0x0180, 0x01c3 },
-  { 0x01cd, 0x01f0 },
-  { 0x01f4, 0x01f5 },
-  { 0x01fa, 0x0217 },
-  { 0x0250, 0x02a8 },
-  { 0x02bb, 0x02c1 },
-  { 0x0386 },
-  { 0x0388, 0x038a },
-  { 0x038c },
-  { 0x038e, 0x03a1 },
-  { 0x03a3, 0x03ce },
-  { 0x03d0, 0x03d6 },
-  { 0x03da },
-  { 0x03dc },
-  { 0x03de },
-  { 0x03e0 },
-  { 0x03e2, 0x03f3 },
-  { 0x0401, 0x040c },
-  { 0x040e, 0x044f },
-  { 0x0451, 0x045c },
-  { 0x045e, 0x0481 },
-  { 0x0490, 0x04c4 },
-  { 0x04c7, 0x04c8 },
-  { 0x04cb, 0x04cc },
-  { 0x04d0, 0x04eb },
-  { 0x04ee, 0x04f5 },
-  { 0x04f8, 0x04f9 },
-  { 0x0531, 0x0556 },
-  { 0x0559 },
-  { 0x0561, 0x0586 },
-  { 0x05d0, 0x05ea },
-  { 0x05f0, 0x05f2 },
-  { 0x0621, 0x063a },
-  { 0x0641, 0x064a },
-  { 0x0671, 0x06b7 },
-  { 0x06ba, 0x06be },
-  { 0x06c0, 0x06ce },
-  { 0x06d0, 0x06d3 },
-  { 0x06d5 },
-  { 0x06e5, 0x06e6 },
-  { 0x0905, 0x0939 },
-  { 0x093d },
-  { 0x0958, 0x0961 },
-  { 0x0985, 0x098c },
-  { 0x098f, 0x0990 },
-  { 0x0993, 0x09a8 },
-  { 0x09aa, 0x09b0 },
-  { 0x09b2 },
-  { 0x09b6, 0x09b9 },
-  { 0x09dc, 0x09dd },
-  { 0x09df, 0x09e1 },
-  { 0x09f0, 0x09f1 },
-  { 0x0a05, 0x0a0a },
-  { 0x0a0f, 0x0a10 },
-  { 0x0a13, 0x0a28 },
-  { 0x0a2a, 0x0a30 },
-  { 0x0a32, 0x0a33 },
-  { 0x0a35, 0x0a36 },
-  { 0x0a38, 0x0a39 },
-  { 0x0a59, 0x0a5c },
-  { 0x0a5e },
-  { 0x0a72, 0x0a74 },
-  { 0x0a85, 0x0a8b },
-  { 0x0a8d },
-  { 0x0a8f, 0x0a91 },
-  { 0x0a93, 0x0aa8 },
-  { 0x0aaa, 0x0ab0 },
-  { 0x0ab2, 0x0ab3 },
-  { 0x0ab5, 0x0ab9 },
-  { 0x0abd },
-  { 0x0ae0 },
-  { 0x0b05, 0x0b0c },
-  { 0x0b0f, 0x0b10 },
-  { 0x0b13, 0x0b28 },
-  { 0x0b2a, 0x0b30 },
-  { 0x0b32, 0x0b33 },
-  { 0x0b36, 0x0b39 },
-  { 0x0b3d },
-  { 0x0b5c, 0x0b5d },
-  { 0x0b5f, 0x0b61 },
-  { 0x0b85, 0x0b8a },
-  { 0x0b8e, 0x0b90 },
-  { 0x0b92, 0x0b95 },
-  { 0x0b99, 0x0b9a },
-  { 0x0b9c },
-  { 0x0b9e, 0x0b9f },
-  { 0x0ba3, 0x0ba4 },
-  { 0x0ba8, 0x0baa },
-  { 0x0bae, 0x0bb5 },
-  { 0x0bb7, 0x0bb9 },
-  { 0x0c05, 0x0c0c },
-  { 0x0c0e, 0x0c10 },
-  { 0x0c12, 0x0c28 },
-  { 0x0c2a, 0x0c33 },
-  { 0x0c35, 0x0c39 },
-  { 0x0c60, 0x0c61 },
-  { 0x0c85, 0x0c8c },
-  { 0x0c8e, 0x0c90 },
-  { 0x0c92, 0x0ca8 },
-  { 0x0caa, 0x0cb3 },
-  { 0x0cb5, 0x0cb9 },
-  { 0x0cde },
-  { 0x0ce0, 0x0ce1 },
-  { 0x0d05, 0x0d0c },
-  { 0x0d0e, 0x0d10 },
-  { 0x0d12, 0x0d28 },
-  { 0x0d2a, 0x0d39 },
-  { 0x0d60, 0x0d61 },
-  { 0x0e01, 0x0e2e },
-  { 0x0e30 },
-  { 0x0e32, 0x0e33 },
-  { 0x0e40, 0x0e45 },
-  { 0x0e81, 0x0e82 },
-  { 0x0e84 },
-  { 0x0e87, 0x0e88 },
-  { 0x0e8a },
-  { 0x0e8d },
-  { 0x0e94, 0x0e97 },
-  { 0x0e99, 0x0e9f },
-  { 0x0ea1, 0x0ea3 },
-  { 0x0ea5 },
-  { 0x0ea7 },
-  { 0x0eaa, 0x0eab },
-  { 0x0ead, 0x0eae },
-  { 0x0eb0 },
-  { 0x0eb2, 0x0eb3 },
-  { 0x0ebd },
-  { 0x0ec0, 0x0ec4 },
-  { 0x0f40, 0x0f47 },
-  { 0x0f49, 0x0f69 },
-  { 0x10a0, 0x10c5 },
-  { 0x10d0, 0x10f6 },
-  { 0x1100 },
-  { 0x1102, 0x1103 },
-  { 0x1105, 0x1107 },
-  { 0x1109 },
-  { 0x110b, 0x110c },
-  { 0x110e, 0x1112 },
-  { 0x113c },
-  { 0x113e },
-  { 0x1140 },
-  { 0x114c },
-  { 0x114e },
-  { 0x1150 },
-  { 0x1154, 0x1155 },
-  { 0x1159 },
-  { 0x115f, 0x1161 },
-  { 0x1163 },
-  { 0x1165 },
-  { 0x1167 },
-  { 0x1169 },
-  { 0x116d, 0x116e },
-  { 0x1172, 0x1173 },
-  { 0x1175 },
-  { 0x119e },
-  { 0x11a8 },
-  { 0x11ab },
-  { 0x11ae, 0x11af },
-  { 0x11b7, 0x11b8 },
-  { 0x11ba },
-  { 0x11bc, 0x11c2 },
-  { 0x11eb },
-  { 0x11f0 },
-  { 0x11f9 },
-  { 0x1e00, 0x1e9b },
-  { 0x1ea0, 0x1ef9 },
-  { 0x1f00, 0x1f15 },
-  { 0x1f18, 0x1f1d },
-  { 0x1f20, 0x1f45 },
-  { 0x1f48, 0x1f4d },
-  { 0x1f50, 0x1f57 },
-  { 0x1f59 },
-  { 0x1f5b },
-  { 0x1f5d },
-  { 0x1f5f, 0x1f7d },
-  { 0x1f80, 0x1fb4 },
-  { 0x1fb6, 0x1fbc },
-  { 0x1fbe },
-  { 0x1fc2, 0x1fc4 },
-  { 0x1fc6, 0x1fcc },
-  { 0x1fd0, 0x1fd3 },
-  { 0x1fd6, 0x1fdb },
-  { 0x1fe0, 0x1fec },
-  { 0x1ff2, 0x1ff4 },
-  { 0x1ff6, 0x1ffc },
-  { 0x2126 },
-  { 0x212a, 0x212b },
-  { 0x212e },
-  { 0x2180, 0x2182 },
-  { 0x3041, 0x3094 },
-  { 0x30a1, 0x30fa },
-  { 0x3105, 0x312c },
-  { 0xac00, 0xd7a3 },
-  /* Ideographic */
-  { 0x4e00, 0x9fa5 },
-  { 0x3007 },
-  { 0x3021, 0x3029 },
-};
-
-/* name chars that are not name start chars */
-struct range name[] = {
-  { '.' },
-  { '-' },
-  /* CombiningChar */
-  { 0x0300, 0x0345 },
-  { 0x0360, 0x0361 },
-  { 0x0483, 0x0486 },
-  { 0x0591, 0x05a1 },
-  { 0x05a3, 0x05b9 },
-  { 0x05bb, 0x05bd },
-  { 0x05bf },
-  { 0x05c1, 0x05c2 },
-  { 0x05c4 },
-  { 0x064b, 0x0652 },
-  { 0x0670 },
-  { 0x06d6, 0x06dc },
-  { 0x06dd, 0x06df },
-  { 0x06e0, 0x06e4 },
-  { 0x06e7, 0x06e8 },
-  { 0x06ea, 0x06ed },
-  { 0x0901, 0x0903 },
-  { 0x093c },
-  { 0x093e, 0x094c },
-  { 0x094d },
-  { 0x0951, 0x0954 },
-  { 0x0962, 0x0963 },
-  { 0x0981, 0x0983 },
-  { 0x09bc },
-  { 0x09be },
-  { 0x09bf },
-  { 0x09c0, 0x09c4 },
-  { 0x09c7, 0x09c8 },
-  { 0x09cb, 0x09cd },
-  { 0x09d7 },
-  { 0x09e2, 0x09e3 },
-  { 0x0a02 },
-  { 0x0a3c },
-  { 0x0a3e },
-  { 0x0a3f },
-  { 0x0a40, 0x0a42 },
-  { 0x0a47, 0x0a48 },
-  { 0x0a4b, 0x0a4d },
-  { 0x0a70, 0x0a71 },
-  { 0x0a81, 0x0a83 },
-  { 0x0abc },
-  { 0x0abe, 0x0ac5 },
-  { 0x0ac7, 0x0ac9 },
-  { 0x0acb, 0x0acd },
-  { 0x0b01, 0x0b03 },
-  { 0x0b3c },
-  { 0x0b3e, 0x0b43 },
-  { 0x0b47, 0x0b48 },
-  { 0x0b4b, 0x0b4d },
-  { 0x0b56, 0x0b57 },
-  { 0x0b82, 0x0b83 },
-  { 0x0bbe, 0x0bc2 },
-  { 0x0bc6, 0x0bc8 },
-  { 0x0bca, 0x0bcd },
-  { 0x0bd7 },
-  { 0x0c01, 0x0c03 },
-  { 0x0c3e, 0x0c44 },
-  { 0x0c46, 0x0c48 },
-  { 0x0c4a, 0x0c4d },
-  { 0x0c55, 0x0c56 },
-  { 0x0c82, 0x0c83 },
-  { 0x0cbe, 0x0cc4 },
-  { 0x0cc6, 0x0cc8 },
-  { 0x0cca, 0x0ccd },
-  { 0x0cd5, 0x0cd6 },
-  { 0x0d02, 0x0d03 },
-  { 0x0d3e, 0x0d43 },
-  { 0x0d46, 0x0d48 },
-  { 0x0d4a, 0x0d4d },
-  { 0x0d57 },
-  { 0x0e31 },
-  { 0x0e34, 0x0e3a },
-  { 0x0e47, 0x0e4e },
-  { 0x0eb1 },
-  { 0x0eb4, 0x0eb9 },
-  { 0x0ebb, 0x0ebc },
-  { 0x0ec8, 0x0ecd },
-  { 0x0f18, 0x0f19 },
-  { 0x0f35 },
-  { 0x0f37 },
-  { 0x0f39 },
-  { 0x0f3e },
-  { 0x0f3f },
-  { 0x0f71, 0x0f84 },
-  { 0x0f86, 0x0f8b },
-  { 0x0f90, 0x0f95 },
-  { 0x0f97 },
-  { 0x0f99, 0x0fad },
-  { 0x0fb1, 0x0fb7 },
-  { 0x0fb9 },
-  { 0x20d0, 0x20dc },
-  { 0x20e1 },
-  { 0x302a, 0x302f },
-  { 0x3099 },
-  { 0x309a },
-  /* Digit */
-  { 0x0030, 0x0039 },
-  { 0x0660, 0x0669 },
-  { 0x06f0, 0x06f9 },
-  { 0x0966, 0x096f },
-  { 0x09e6, 0x09ef },
-  { 0x0a66, 0x0a6f },
-  { 0x0ae6, 0x0aef },
-  { 0x0b66, 0x0b6f },
-  { 0x0be7, 0x0bef },
-  { 0x0c66, 0x0c6f },
-  { 0x0ce6, 0x0cef },
-  { 0x0d66, 0x0d6f },
-  { 0x0e50, 0x0e59 },
-  { 0x0ed0, 0x0ed9 },
-  { 0x0f20, 0x0f29 },
-  /* Extender */
-  { 0xb7 },
-  { 0x02d0 },
-  { 0x02d1 },
-  { 0x0387 },
-  { 0x0640 },
-  { 0x0e46 },
-  { 0x0ec6 },
-  { 0x3005 },
-  { 0x3031, 0x3035 },
-  { 0x309d, 0x309e },
-  { 0x30fc, 0x30fe },
-};
-
-static void
-setTab(char *tab, struct range *ranges, size_t nRanges)
-{
-  size_t i;
-  int j;
-  for (i = 0; i < nRanges; i++) {
-    if (ranges[i].end) {
-      for (j = ranges[i].start; j <= ranges[i].end; j++)
-        tab[j] = 1;
-    }
-    else
-      tab[ranges[i].start] = 1;
-  }
-}
-
-static void
-printTabs(char *tab)
-{ 
-  int nBitmaps = 2;
-  int i, j, k;
-  unsigned char pageIndex[512];
-
-  printf(
-"static const unsigned namingBitmap[] = {\n\
-0x00000000, 0x00000000, 0x00000000, 0x00000000,\n\
-0x00000000, 0x00000000, 0x00000000, 0x00000000,\n\
-0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\n\
-0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\n");
-  for (i = 0; i < 512; i++) {
-    int kind = tab[i*256];
-    for (j = 1; j < 256; j++)
-      if (tab[i*256 +j] != kind) {
-        kind = -1;
-        break;
-      }
-    if (i >= 256 &&  memcmp(tab + (i - 256)*256, tab + i*256, 256) == 0)
-      pageIndex[i] = pageIndex[i - 256];
-    else if (kind == -1) { 
-      pageIndex[i] = nBitmaps++;
-      for (j = 0; j < 8; j++) {
-        unsigned val = 0;
-        for (k = 0; k < 32; k++) {
-          if (tab[i*256 + j*32 +k])
-            val |= (1 << k);
-        }
-        printf("0x%08X,", val);
-        putchar((((j + 1) & 3) == 0) ? '\n' : ' ');
-      }
-    }
-    else
-      pageIndex[i] = kind;
-  }
-  printf("};\n");
-  printf("static const unsigned char nmstrtPages[] = {\n");
-  for (i = 0; i < 512; i++) {
-    if (i == 256)
-      printf("};\nstatic const unsigned char namePages[] = {\n");
-    printf("0x%02X,", pageIndex[i]);
-    putchar((((i + 1) & 7) == 0) ? '\n' : ' ');
-  }
-  printf("};\n");
-}
-
-int
-main()
-{ 
-  char tab[2*65536];
-  memset(tab, 0, 65536);
-  setTab(tab, nmstrt, sizeof(nmstrt)/sizeof(nmstrt[0]));
-  memcpy(tab + 65536, tab, 65536);
-  setTab(tab + 65536, name, sizeof(name)/sizeof(name[0]));
-  printTabs(tab);
-  return 0;
-}
diff --git a/lib/expat/gennmtab/gennmtab.dsp b/lib/expat/gennmtab/gennmtab.dsp
deleted file mode 100644
index 97e6e2bfd..000000000
--- a/lib/expat/gennmtab/gennmtab.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="gennmtab" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=gennmtab - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "gennmtab.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "gennmtab.mak" CFG="gennmtab - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "gennmtab - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "gennmtab - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "gennmtab - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Release"

-# PROP BASE Intermediate_Dir ".\Release"

-# PROP BASE Target_Dir "."

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\Release"

-# PROP Intermediate_Dir ".\Release"

-# PROP Target_Dir "."

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x809 /d "NDEBUG"

-# ADD RSC /l 0x809 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "gennmtab - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Debug"

-# PROP BASE Intermediate_Dir ".\Debug"

-# PROP BASE Target_Dir "."

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\Debug"

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "."

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x809 /d "_DEBUG"

-# ADD RSC /l 0x809 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-

-!ENDIF 

-

-# Begin Target

-

-# Name "gennmtab - Win32 Release"

-# Name "gennmtab - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\gennmtab.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/lib/expat/lib/.cvsignore b/lib/expat/lib/.cvsignore
deleted file mode 100644
index 9c9cf881a..000000000
--- a/lib/expat/lib/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-Makefile
-.libs
-*.lo
-expat.h
-Debug
-Debug-w
-Release
-Release-w
-expat.ncb
-expat.opt
-expat.plg
-Debug_static
-Debug-w_static
-Release_static
-Release-w_static
-expat_static.plg
-expatw.plg
-expatw_static.plg
diff --git a/lib/expat/lib/expat.h b/lib/expat/lib/expat.h
index cf113eeaf..20a8278f7 100644
--- a/lib/expat/lib/expat.h
+++ b/lib/expat/lib/expat.h
@@ -983,7 +983,8 @@ enum XML_FeatureEnum {
   XML_FEATURE_MIN_SIZE,
   XML_FEATURE_SIZEOF_XML_CHAR,
   XML_FEATURE_SIZEOF_XML_LCHAR,
-  XML_FEATURE_NS
+  XML_FEATURE_NS,
+  XML_FEATURE_LARGE_SIZE
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1004,7 +1005,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 0
-#define XML_MICRO_VERSION 0
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }
diff --git a/lib/expat/lib/expatw_static.dsp b/lib/expat/lib/expatw_static.dsp
index 94b524add..344cac7b9 100644
--- a/lib/expat/lib/expatw_static.dsp
+++ b/lib/expat/lib/expatw_static.dsp
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release-w_static"

-# PROP Intermediate_Dir "Release-w_static"

+# PROP Output_Dir "..\win32\bin\Release"

+# PROP Intermediate_Dir "..\win32\tmp\Release-w_static"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FD /c

@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"Release-w_static\libexpatwMT.lib"

+# ADD LIB32 /nologo /out:"..\win32\bin\Release\libexpatwMT.lib"

 

 !ELSEIF  "$(CFG)" == "expatw_static - Win32 Debug"

 

@@ -61,11 +61,12 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug-w_static"

-# PROP Intermediate_Dir "Debug-w_static"

+# PROP Output_Dir "..\win32\bin\Debug"

+# PROP Intermediate_Dir "..\win32\tmp\Debug-w_static"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D 

+"_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x1009 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -74,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"Debug-w_static\libexpatwMT.lib"

+# ADD LIB32 /nologo /out:"..\win32\bin\Debug\libexpatwMT.lib"

 

 !ENDIF 

 

@@ -97,6 +98,14 @@ SOURCE=.\xmlrole.c
 

 SOURCE=.\xmltok.c

 # End Source File

+# Begin Source File

+

+SOURCE=.\xmltok_impl.c

+# End Source File

+# Begin Source File

+

+SOURCE=.\xmltok_ns.c

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/lib/expat/make-release.sh b/lib/expat/make-release.sh
deleted file mode 100644
index 818d41b18..000000000
--- a/lib/expat/make-release.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/bash
-#
-# make-release.sh: make an Expat release
-#
-# USAGE: make-release.sh tagname
-#
-# Note: tagname may be HEAD to just grab the head revision (e.g. for testing)
-#
-
-#CVSROOT=':ext:cvs.libexpat.org:/cvsroot/expat'
-CVSROOT=':pserver:anonymous@cvs.libexpat.org:/cvsroot/expat'
-
-if test $# != 1; then
-  echo "USAGE: $0 tagname"
-  exit 1
-fi
-
-tmpdir=expat-release.$$
-if test -e $tmpdir; then
-  echo "ERROR: oops. chose the $tmpdir subdir, but it exists."
-  exit 1
-fi
-
-echo "Checking out into temporary area: $tmpdir"
-cvs -fq -d "$CVSROOT" export -r "$1" -d $tmpdir expat || exit 1
-
-echo ""
-echo "----------------------------------------------------------------------"
-echo "Preparing $tmpdir for release (running buildconf.sh)"
-(cd $tmpdir && ./buildconf.sh) || exit 1
-
-# figure out the release version
-vsn="`$tmpdir/conftools/get-version.sh $tmpdir/lib/expat.h`"
-
-echo ""
-echo "Release version: $vsn"
-
-if test "$1" = HEAD ; then
-  distdir=expat-`date '+%Y-%m-%d'`
-else
-  distdir=expat-$vsn
-fi
-if test -e $distdir; then
-  echo "ERROR: for safety, you must manually remove $distdir."
-  rm -rf $tmpdir
-  exit 1
-fi
-mkdir $distdir || exit 1
-
-CPOPTS=-Pp
-if (cp --version 2>/dev/null | grep -q 'Free Software Foundation') ; then
-  # If we're using GNU cp, we can avoid the warnings about forward
-  # compatibility of the options.
-  CPOPTS='--parents --preserve'
-fi
-
-echo ""
-echo "----------------------------------------------------------------------"
-echo "Building $distdir based on the MANIFEST:"
-files="`sed -e 's/[ 	]:.*$//' $tmpdir/MANIFEST`"
-for file in $files; do
-  echo "Copying $file..."
-  (cd $tmpdir && cp $CPOPTS $file ../$distdir) || exit 1
-done
-
-echo ""
-echo "----------------------------------------------------------------------"
-echo "Removing (temporary) checkout directory..."
-rm -rf $tmpdir
-
-tarball=$distdir.tar.gz
-echo "Constructing $tarball..."
-tar cf - $distdir | gzip -9 > $tarball || exit $?
-rm -r $distdir
-
-echo "Done."
diff --git a/lib/expat/tests/.cvsignore b/lib/expat/tests/.cvsignore
deleted file mode 100644
index 7cec7b527..000000000
--- a/lib/expat/tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-runtests
-runtestspp
-xmlts.zip
-XML-Test-Suite
-.libs
diff --git a/lib/expat/win32/.cvsignore b/lib/expat/win32/.cvsignore
deleted file mode 100644
index e7546777b..000000000
--- a/lib/expat/win32/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-expat.IAB
-expat.IAD
-expat.IMB
-expat.IMD
-expat.PFI
-expat.PO
-expat.PR
-expat.PRI
-expat.PS
-expat.WK3