From fdrake@users.sourceforge.net  Thu Sep  7 03:23:52 2000
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 6 Sep 2000 19:23:52 -0700
Subject: [Expat-checkins] CVS: htdocs - Imported sources
Message-ID: <200009070223.TAA08104@slayer.i.sourceforge.net>

Update of /cvsroot/expat/htdocs
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8043

Log Message:

Create a SourceForge "product" from the expat project Web pages.

Status:

Vendor Tag:	htdocs
Release Tags:	start
		
N htdocs/index.html

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

From fdrake@users.sourceforge.net  Thu Sep  7 03:40:32 2000
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 6 Sep 2000 19:40:32 -0700
Subject: [Expat-checkins] CVS: htdocs index.html,1.1.1.1,1.2
Message-ID: <200009070240.TAA26738@slayer.i.sourceforge.net>

Update of /cvsroot/expat/htdocs
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26683

Modified Files:
	index.html 
Log Message:

Point to the mailing lists, not the "Forums".  Forums are just plain weird.

Add a (very) little text describing the overall goal of the project.


Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** index.html	2000/09/07 02:23:49	1.1.1.1
--- index.html	2000/09/07 02:40:29	1.2
***************
*** 25,32 ****
  <ul>
    <li><a href="http://sourceforge.net/projects/expat/">Expat project page</a></li>
!   <li><a href="http://sourceforge.net/forum/?group_id=10127">Forums</a></li>
!   <li><a href="http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/?cvsroot=expat">
! Expat CVS repository<a></li>
  </ul>
  </body>
  </html>
--- 25,40 ----
  <ul>
    <li><a href="http://sourceforge.net/projects/expat/">Expat project page</a></li>
!   <li><a href="http://sourceforge.net/mail/?group_id=10127">Mailing lists</a></li>
!   <li><a href="http://sourceforge.net/cvs/?group_id=10127">CVS
!       repository</a> (<a
!   href="http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/expat/?cvsroot=expat"
!   >browse online</a>)</li>
  </ul>
+ 
+ <p>This project aims to maintain Expat for both current and future
+ users while improving the API to allow more reliable and robust access
+ from "scripting" languages such as Python and Perl.  We invite the
+ community to participate on the mailing lists to help shape the future
+ of Expat.
  </body>
  </html>


From fdrake@users.sourceforge.net  Thu Sep  7 04:25:14 2000
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Wed, 6 Sep 2000 20:25:14 -0700
Subject: [Expat-checkins] CVS: CVSROOT syncmail,1.1,1.2
Message-ID: <200009070325.UAA00714@slayer.i.sourceforge.net>

Update of /cvsroot/expat/CVSROOT
In directory slayer.i.sourceforge.net:/tmp/cvs-serv707

Modified Files:
	syncmail 
Log Message:

Do not attempt to generate diffs of imported sources.


Index: syncmail
===================================================================
RCS file: /cvsroot/expat/CVSROOT/syncmail,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** syncmail	2000/08/25 05:36:45	1.1
--- syncmail	2000/09/07 03:25:11	1.2
***************
*** 165,168 ****
--- 165,170 ----
  
      print 'Mailing %s...' % PEOPLE
+     if specs == ['-', 'Imported', 'sources']:
+         return
      if specs[-3:] == ['-', 'New', 'directory']:
          del specs[-3:]


From coopercc@users.sourceforge.net  Tue Sep 12 18:06:51 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Tue, 12 Sep 2000 10:06:51 -0700
Subject: [Expat-checkins] CVS: htdocs index.html,1.2,1.3
Message-ID: <200009121706.KAA04654@slayer.i.sourceforge.net>

Update of /cvsroot/expat/htdocs
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3979

Modified Files:
	index.html 
Log Message:
Added a link to bug reports page, added Revision comment, and fixed XML errors.


Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** index.html	2000/09/07 02:40:29	1.2
--- index.html	2000/09/12 17:06:46	1.3
***************
*** 1,7 ****
! <?xml version="1.0" encoding="ISO-8859-1"> ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  <title>Expat - XML Parser</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
--- 1,8 ----
! <?xml version="1.0" encoding="ISO-8859-1" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
+ <!-- $Revision$ -->
  <title>Expat - XML Parser</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
***************
*** 30,33 ****
--- 31,35 ----
    href="http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/expat/?cvsroot=expat"
    >browse online</a>)</li>
+   <li><a href="http://sourceforge.net/bugs/?group_id=10127">Bug reports</a></li>
  </ul>
  
***************
*** 36,40 ****
  from "scripting" languages such as Python and Perl.  We invite the
  community to participate on the mailing lists to help shape the future
! of Expat.
  </body>
  </html>
--- 38,42 ----
  from "scripting" languages such as Python and Perl.  We invite the
  community to participate on the mailing lists to help shape the future
! of Expat.</p>
  </body>
  </html>


From coopercc@users.sourceforge.net  Mon Sep 18 17:04:22 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:04:22 -0700
Subject: [Expat-checkins] CVS: expat/lib - New directory
Message-ID: <200009181604.JAA12643@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv12609/lib

Log Message:
Directory /cvsroot/expat/expat/lib added to the repository



From coopercc@users.sourceforge.net  Mon Sep 18 16:53:05 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 08:53:05 -0700
Subject: [Expat-checkins] CVS: expat/doc - New directory
Message-ID: <200009181553.IAA10319@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10294/doc

Log Message:
Directory /cvsroot/expat/expat/doc added to the repository



From coopercc@users.sourceforge.net  Mon Sep 18 16:58:50 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 08:58:50 -0700
Subject: [Expat-checkins] CVS: expat/examples - New directory
Message-ID: <200009181558.IAA11051@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/examples
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11022/examples

Log Message:
Directory /cvsroot/expat/expat/examples added to the repository



From coopercc@users.sourceforge.net  Mon Sep 18 16:59:54 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 08:59:54 -0700
Subject: [Expat-checkins] CVS: expat/conftools - New directory
Message-ID: <200009181559.IAA11198@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/conftools
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11182/conftools

Log Message:
Directory /cvsroot/expat/expat/conftools added to the repository



From coopercc@users.sourceforge.net  Mon Sep 18 17:26:23 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:23 -0700
Subject: [Expat-checkins] CVS: expat/conftools config.guess,NONE,1.1 config.sub,NONE,1.1 install-sh,NONE,1.1 ltconfig,NONE,1.1 ltmain.sh,NONE,1.1 missing,NONE,1.1 mkinstalldirs,NONE,1.1
Message-ID: <200009181626.JAA18345@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/conftools
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/conftools

Added Files:
	config.guess config.sub install-sh ltconfig ltmain.sh missing 
	mkinstalldirs 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
#   Free Software Foundation, Inc.
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
[...1144 lines suppressed...]
	if getsysinfo -f scalar_acc
	then echo c32-convex-bsd
	else echo c2-convex-bsd
	fi
	exit 0 ;;
    c34*)
	echo c34-convex-bsd
	exit 0 ;;
    c38*)
	echo c38-convex-bsd
	exit 0 ;;
    c4*)
	echo c4-convex-bsd
	exit 0 ;;
    esac
fi

#echo '(Unable to guess system type)' 1>&2

exit 1

--- NEW FILE ---
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
#   Free Software Foundation, Inc.
#
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine.  It does not imply ALL GNU software can.
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
[...1229 lines suppressed...]
				vendor=wrs
				;;
			-aux*)
				vendor=apple
				;;
			-hms*)
				vendor=hitachi
				;;
			-mpw* | -macos*)
				vendor=apple
				;;
			-*mint | -*MiNT)
				vendor=atari
				;;
		esac
		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
		;;
esac

echo $basic_machine$os

--- NEW FILE ---
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
#
# Copyright 1991 by the Massachusetts Institute of Technology
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission.  M.I.T. makes no representations about the
# suitability of this software for any purpose.  It is provided "as is"
# without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.  It can only install one file at a time, a restriction
# shared with many OS's install programs.


# set DOITPROG to echo to test this script

# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"


# put in absolute paths if you don't have them in your path; or use env. vars.

mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"

transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""

while [ x"$1" != x ]; do
    case $1 in
	-c) instcmd="$cpprog"
	    shift
	    continue;;

	-d) dir_arg=true
	    shift
	    continue;;

	-m) chmodcmd="$chmodprog $2"
	    shift
	    shift
	    continue;;

	-o) chowncmd="$chownprog $2"
	    shift
	    shift
	    continue;;

	-g) chgrpcmd="$chgrpprog $2"
	    shift
	    shift
	    continue;;

	-s) stripcmd="$stripprog"
	    shift
	    continue;;

	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
	    shift
	    continue;;

	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
	    shift
	    continue;;

	*)  if [ x"$src" = x ]
	    then
		src=$1
	    else
		# this colon is to work around a 386BSD /bin/sh bug
		:
		dst=$1
	    fi
	    shift
	    continue;;
    esac
done

if [ x"$src" = x ]
then
	echo "install:	no input file specified"
	exit 1
else
	true
fi

if [ x"$dir_arg" != x ]; then
	dst=$src
	src=""
	
	if [ -d $dst ]; then
		instcmd=:
		chmodcmd=""
	else
		instcmd=mkdir
	fi
else

# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad 
# if $src (and thus $dsttmp) contains '*'.

	if [ -f $src -o -d $src ]
	then
		true
	else
		echo "install:  $src does not exist"
		exit 1
	fi
	
	if [ x"$dst" = x ]
	then
		echo "install:	no destination specified"
		exit 1
	else
		true
	fi

# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic

	if [ -d $dst ]
	then
		dst="$dst"/`basename $src`
	else
		true
	fi
fi

## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

# Make sure that the destination directory exists.
#  this part is taken from Noah Friedman's mkinstalldirs script

# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='	
'
IFS="${IFS-${defaultIFS}}"

oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"

pathcomp=''

while [ $# -ne 0 ] ; do
	pathcomp="${pathcomp}${1}"
	shift

	if [ ! -d "${pathcomp}" ] ;
        then
		$mkdirprog "${pathcomp}"
	else
		true
	fi

	pathcomp="${pathcomp}/"
done
fi

if [ x"$dir_arg" != x ]
then
	$doit $instcmd $dst &&

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else

# If we're going to rename the final executable, determine the name now.

	if [ x"$transformarg" = x ] 
	then
		dstfile=`basename $dst`
	else
		dstfile=`basename $dst $transformbasename | 
			sed $transformarg`$transformbasename
	fi

# don't allow the sed command to completely eliminate the filename

	if [ x"$dstfile" = x ] 
	then
		dstfile=`basename $dst`
	else
		true
	fi

# Make a temp file name in the proper directory.

	dsttmp=$dstdir/#inst.$$#

# Move or copy the file name to the temp name

	$doit $instcmd $src $dsttmp &&

	trap "rm -f ${dsttmp}" 0 &&

# and set any options; do chmod last to preserve setuid bits

# If any of these fail, we abort the whole thing.  If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.

	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&

# Now rename the file to the real destination.

	$doit $rmcmd -f $dstdir/$dstfile &&
	$doit $mvcmd $dsttmp $dstdir/$dstfile 

fi &&


exit 0

--- NEW FILE ---
#! /bin/sh

# ltconfig - Create a system-specific libtool.
# Copyright (C) 1996-1999 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
[...3075 lines suppressed...]
    ;;
  esac >> confcache
if cmp -s $cache_file confcache; then
  :
else
  if test -w $cache_file; then
    echo "updating cache $cache_file"
    cat confcache > $cache_file
  else
    echo "not updating unwritable cache $cache_file"
  fi
fi
rm -f confcache

exit 0

# Local Variables:
# mode:shell-script
# sh-indentation:2
# End:

--- NEW FILE ---
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun ltconfig.
#
# Copyright (C) 1996-1999 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
[...3985 lines suppressed...]
If FILE is a libtool library, all the files associated with it are deleted.
Otherwise, only FILE itself is deleted using RM."
  ;;

*)
  $echo "$modename: invalid operation mode \`$mode'" 1>&2
  $echo "$help" 1>&2
  exit 1
  ;;
esac

echo
$echo "Try \`$modename --help' for more information about other modes."

exit 0

# Local Variables:
# mode:shell-script
# sh-indentation:2
# End:

--- NEW FILE ---
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.

# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.

if test $# -eq 0; then
  echo 1>&2 "Try \`$0 --help' for more information"
  exit 1
fi

case "$1" in

  -h|--h|--he|--hel|--help)
    echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...

Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.

Options:
  -h, --help      display this help and exit
  -v, --version   output version information and exit

Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
    ;;

  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    echo "missing - GNU libit 0.0"
    ;;

  -*)
    echo 1>&2 "$0: Unknown \`$1' option"
    echo 1>&2 "Try \`$0 --help' for more information"
    exit 1
    ;;

  aclocal)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acinclude.m4' or \`configure.in'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;

  autoconf)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`configure.in'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;

  autoheader)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acconfig.h' or \`configure.in'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
      case "$f" in
      *:*) touch_files="$touch_files "`echo "$f" |
				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
      esac
    done
    touch $touch_files
    ;;

  automake)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
    find . -type f -name Makefile.am -print |
	   sed 's/\.am$/.in/' |
	   while read f; do touch "$f"; done
    ;;

  bison|yacc)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
	case "$LASTARG" in
	*.y)
	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" y.tab.c
	    fi
	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" y.tab.h
	    fi
	  ;;
	esac
    fi
    if [ ! -f y.tab.h ]; then
	echo >y.tab.h
    fi
    if [ ! -f y.tab.c ]; then
	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;

  lex|flex)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
	case "$LASTARG" in
	*.l)
	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
	    if [ -f "$SRCFILE" ]; then
	         cp "$SRCFILE" lex.yy.c
	    fi
	  ;;
	esac
    fi
    if [ ! -f lex.yy.c ]; then
	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;

  makeinfo)
    echo 1>&2 "\
WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    if test -z "$file"; then
      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
    fi
    touch $file
    ;;

  *)
    echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
         system.  You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
         it often tells you about the needed prerequirements for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
    ;;
esac

exit 0

***** Error reading new file: (2, 'No such file or directory')

From coopercc@users.sourceforge.net  Mon Sep 18 17:26:24 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:24 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,NONE,1.1 style.css,NONE,1.1
Message-ID: <200009181626.JAA18353@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/doc

Added Files:
	reference.html style.css 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
                "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>

<!-- Copyright 1999,2000 Clark Cooper <coopercc@netheaven.com>
     All rights reserved.
     This is free software. You may distribute or modify according to
     the terms of the MIT/X License -->
  <title>Expat XML Parser</title>
  <meta name="author" content="Clark Cooper, coopercc@netheaven.com">
  <meta http-equiv="Content-Style-Type" content="text/css">
  <link href="style.css" rel="stylesheet" type="text/css">
</head>
<body>
<h1>Expat XML Parser</h1>

<p>Expat is a library, written in C, for parsing XML documents. It's the
underlying XML parser for the open source Mozilla project, perl's
[...1152 lines suppressed...]

<div class="fcndec"><a name="XML_SetParamEntityParsing"><pre>
int
XML_SetParamEntityParsing(XML_Parser p,
                          enum XML_ParamEntityParsing code)
</pre></a></div>
<div class="fcndef">
This enables parsing of parameter entities, including the external
parameter entity that is the external DTD subset, according to
<code>code</code>.
The choices for <code>code</code> are:
<ul>
<li>XML_PARAM_ENTITY_PARSING_NEVER
<li>XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE
<li>XML_PARAM_ENTITY_PARSING_ALWAYS
</ul>
</div>

</body>
</html>

--- NEW FILE ---
body {
background-color: white
}

.eg {
  padding-left: 1em;
  padding-top: .5em;
  border: solid thin;
  margin: 1em 0;
  background-color: tan;
  margin-left: 5%;
  margin-right: 10%;
}

.handler {
  width: 100%;
  border-top-width: thin;  
  margin-left: 5%;
  margin-bottom: 1em;
}

.handler p {
  margin-left: 3%;
}

.setter {
  font-weight: bold;
}

.signature {
  color: navy;
}

.fcndec {
  width: 100%;
  border-top-width: thin;
  font-weight: bold;
}

.fcndef {
  margin-left: 5%;
  margin-bottom: 2em;
}

dd {
margin-bottom: 2em;
}

From coopercc@users.sourceforge.net  Mon Sep 18 17:26:24 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:24 -0700
Subject: [Expat-checkins] CVS: expat/demo makedemo.bat,1.1,NONE
Message-ID: <200009181626.JAA18349@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/demo
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/demo

Removed Files:
	makedemo.bat 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- makedemo.bat DELETED ---


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:24 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:24 -0700
Subject: [Expat-checkins] CVS: expat/examples Makefile.in,NONE,1.1 outline.c,NONE,1.1
Message-ID: <200009181626.JAA18362@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/examples
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/examples

Added Files:
	Makefile.in outline.c 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
################################################################
# Process this file with top-level configure script to produce Makefile
#
# Copyright 2000 Clark Cooper
#
#  This file is part of EXPAT.
#
#  EXPAT is free software; you can redistribute it and/or modify it
#  under the terms of the License (based on the MIT/X license) contained
#  in the file COPYING that comes with this distribution.
#
# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
#

CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = -lexpat
CFLAGS = @CFLAGS@

all: outline

outline: outline.o
	$(CC) -o outline outline.o $(LDFLAGS) $(LIBS)
--- NEW FILE ---
/*****************************************************************
 * outline.c
 *
 * Copyright 1999, Clark Cooper
 * All rights reserved.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the license contained in the
 * COPYING file that comes with the expat distribution.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 * Read an XML document from standard input and print an element
 * outline on standard output.
 */


#include <stdio.h>
#include <expat.h>

#define BUFFSIZE	8192

char Buff[BUFFSIZE];

int Depth;

void
start(void *data, const char *el, const char **attr) {
  int i;

  for (i = 0; i < Depth; i++)
    printf("  ");

  printf("%s", el);

  for (i = 0; attr[i]; i += 2) {
    printf(" %s='%s'", attr[i], attr[i + 1]);
  }

  printf("\n");
  Depth++;
}  /* End of start handler */

void
end(void *data, const char *el) {
  Depth--;
}  /* End of end handler */

main(int argc, char **argv) {
  XML_Parser p = XML_ParserCreate(NULL);
  if (! p) {
    fprintf(stderr, "Couldn't allocate memory for parser\n");
    exit(-1);
  }

  XML_SetElementHandler(p, start, end);

  for (;;) {
    int done;
    int len;

    len = fread(Buff, 1, BUFFSIZE, stdin);
    if (ferror(stdin)) {
      fprintf(stderr, "Read error\n");
      exit(-1);
    }
    done = feof(stdin);

    if (! XML_Parse(p, Buff, len, done)) {
      fprintf(stderr, "Parse error at line %d:\n%s\n",
	      XML_GetCurrentLineNumber(p),
	      XML_ErrorString(XML_GetErrorCode(p)));
      exit(-1);
    }

    if (done)
      break;
  }
}  /* End of main */



From coopercc@users.sourceforge.net  Mon Sep 18 17:26:25 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:25 -0700
Subject: [Expat-checkins] CVS: expat/xmlec xmlec.c,1.8,NONE
Message-ID: <200009181626.JAA18369@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmlec
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/xmlec

Removed Files:
	xmlec.c 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- xmlec.c DELETED ---


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:25 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:25 -0700
Subject: [Expat-checkins] CVS: expat/xmlparse xmlparse.c,1.111,NONE xmlparse.h,1.43,NONE
Message-ID: <200009181626.JAA18381@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmlparse
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/xmlparse

Removed Files:
	xmlparse.c xmlparse.h 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- xmlparse.c DELETED ---

--- xmlparse.h DELETED ---


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:26 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:26 -0700
Subject: [Expat-checkins] CVS: expat/xmltok ascii.h,1.3,NONE asciitab.h,1.8,NONE iasciitab.h,1.6,NONE latin1tab.h,1.5,NONE utf8tab.h,1.7,NONE xmldef.h,1.11,NONE xmlrole.c,1.18,NONE xmlrole.h,1.11,NONE xmltok.h,1.34,NONE xmltok_impl.c,1.41,NONE xmltok_impl.h,1.9,NONE xmltok_ns.c,1.9,NONE
Message-ID: <200009181626.JAA18386@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmltok
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/xmltok

Removed Files:
	ascii.h asciitab.h iasciitab.h latin1tab.h utf8tab.h xmldef.h 
	xmlrole.c xmlrole.h xmltok.h xmltok_impl.c xmltok_impl.h 
	xmltok_ns.c 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- ascii.h DELETED ---

--- asciitab.h DELETED ---

--- iasciitab.h DELETED ---

--- latin1tab.h DELETED ---

--- utf8tab.h DELETED ---

--- xmldef.h DELETED ---

--- xmlrole.c DELETED ---

--- xmlrole.h DELETED ---

--- xmltok.h DELETED ---

--- xmltok_impl.c DELETED ---

--- xmltok_impl.h DELETED ---

--- xmltok_ns.c DELETED ---


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:27 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:27 -0700
Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,NONE,1.1 xmlfile.c,1.6,1.7 xmlwf.c,1.52,1.53
Message-ID: <200009181626.JAA18399@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmlwf
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/xmlwf

Modified Files:
	xmlfile.c xmlwf.c 
Added Files:
	Makefile.in 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
LIBDIR= ../lib/.libs
INCDIR= ../lib

LDFLAGS= @LDFLAGS@
CFLAGS= @CFLAGS@ -I$(INCDIR)

FILEMAP_OBJ= @FILEMAP_OBJ@
OBJS= xmlwf.o xmlfile.o codepage.o $(FILEMAP_OBJ)
LIBS= -L$(LIBDIR) -lexpat

xmlwf: $(OBJS)
	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** xmlfile.c	2000/05/10 03:13:58	1.6
--- xmlfile.c	2000/09/18 16:26:23	1.7
***************
*** 9,13 ****
  #include <string.h>
  #include <fcntl.h>
! #include "xmlparse.h"
  #include "xmlfile.h"
  #include "xmltchar.h"
--- 9,13 ----
  #include <string.h>
  #include <fcntl.h>
! #include "expat.h"
  #include "xmlfile.h"
  #include "xmltchar.h"

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** xmlwf.c	2000/05/12 05:56:27	1.52
--- xmlwf.c	2000/09/18 16:26:23	1.53
***************
*** 9,13 ****
  #include <string.h>
  
! #include "xmlparse.h"
  #include "codepage.h"
  #include "xmlfile.h"
--- 9,13 ----
  #include <string.h>
  
! #include "expat.h"
  #include "codepage.h"
  #include "xmlfile.h"


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:53 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:53 -0700
Subject: [Expat-checkins] CVS: expat COPYING,NONE,1.1 ChangeLog,NONE,1.1 Makefile.in,NONE,1.1 README,NONE,1.1 aclocal.m4,NONE,1.1 config.hin,NONE,1.1 configure.in,NONE,1.1 .cvsignore,1.2,1.3 Makefile,1.14,NONE copying.txt,1.1,NONE expat.dsw,1.2,NONE expat.html,1.26,NONE files.txt,1.13,NONE makedist.bat,1.1,NONE win32files.txt,1.2,NONE
Message-ID: <200009181626.JAA18513@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754

Modified Files:
	.cvsignore 
Added Files:
	COPYING ChangeLog Makefile.in README aclocal.m4 config.hin 
	configure.in 
Removed Files:
	Makefile copying.txt expat.dsw expat.html files.txt 
	makedist.bat win32files.txt 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                               and Clark Cooper

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--- NEW FILE ---

--- NEW FILE ---
################################################################
# Process this file with top-level configure script to produce Makefile
#
# Copyright 2000 Clark Cooper
#
#  This file is part of EXPAT.
#
#  EXPAT is free software; you can redistribute it and/or modify it
#  under the terms of the License (based on the MIT/X license) contained
#  in the file COPYING that comes with this distribution.
#
# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
#
#  ---
#  I started using automake, but
#		1) it seemed like overkill
#		2) I don't want all the GNU policies
#		3) I wanted more explicit control over what gets built
#
#  So I'm doing my Makefile.in files manually. But a fair part is based
#  on what I learned from perusing the Makefile.in's generated by automake,
#  and the automake authors still get my kudos.
#

SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@

bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include

top_builddir = .


AUTOCONF = autoconf

INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@

NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@

CC = @CC@

LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@

SUBDIRS = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_HEADERS = @CONFIG_HEADERS@
DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
               configure configure.in conftools doc examples xmlwf

DISTDIR = $(PACKAGE)-$(VERSION)
DISTRIBUTION = $(DISTDIR).tar.gz

all: $(SUBDIRS)

.PHONY: all $(SUBDIRS) clean distclean maintainer-clean dist install \
        uninstall distdir

Makefile: Makefile.in config.status
	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status

config.status: configure
	@if test -f $@; then \
		$(SHELL) config.status --recheck ; \
	else \
		$(SHELL) configure ; \
	fi

configure: configure.in
	$(AUTOCONF)

config.h: config.hin config.status
	CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
	$(SHELL) ./config.status

$(SUBDIRS): config.status
	$(MAKE) -C $@


clean:
	@list='$(SUBDIRS)'; for dir in $$list; do \
	  $(MAKE) -C $$dir clean; \
	done

distclean:
	@list='$(SUBDIRS)'; for dir in $$list; do \
	  $(MAKE) -C $$dir distclean; \
	done
	rm -f config.h config.status libtool

maintainer-clean: distclean
	rm -f $(DISTRIBUTION)
	rm -rf $(DISTDIR)

distdir: $(DIST_COMMON) clean
	test -d $(DISTDIR) || mkdir $(DISTDIR)
	@list='$(SUBDIRS)'; for dir in $$list; do \
	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
	  $(MAKE) -C $$dir distdir; \
	done
	@for file in $(DIST_COMMON); do \
	  if test -d $$file; then \
	    cp -prf $$file $(DISTDIR)/$$file; \
	  else \
	    test -f $(DISTDIR)/$$file \
	    || ln $$file $(DISTDIR)/$$file 2> /dev/null \
	    || cp -p $$file $(DISTDIR)/$$file || :; \
	  fi; \
	done    

$(DISTRIBUTION): distdir
	tar cfz $(DISTRIBUTION) $(DISTDIR)	

dist: $(DISTRIBUTION)

install:
	@list='$(SUBDIRS)'; for dir in $$list; do \
	  $(MAKE) -C $$dir install; \
	done

uninstall:
	@list='$(SUBDIRS)'; for dir in $$list; do \
	  $(MAKE) -C $$dir uninstall; \
	done

--- NEW FILE ---

			Expat, Release 2.00

This is expat, the C library for parsing XML, written by James Clark. Expat
is a stream oriented XML parser. This means that you register handlers with
the parser prior to starting the parse. These handlers are called when
the parser discovers the associated structures in the document being parsed.
A start tag is an example of the kind of structures for which you may
register handlers.

Expat is free software. You may copy, distribute, and modify it under the
terms of the License contained in the file, COPYING, distributed with this
package. This license is the same as the MIT/X Consortium license.

To build expat, you first run the configuration shell script in the top
level distribution directory:

	./configure

There are many options which you may provide to configure (which you can
discover by running configure with the --help option.) But the one of most
interest is the one that sets the installation directory. By default,
the configure script will set things up to install libexpat into
/usr/local/lib and expat.h into /usr/local/include. If, for example, you'd
prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include,
you can tell configure about that with:

	./configure --prefix=/home/me/mystuff

After running the configure script, the "make" command will build things and
"make install" will install things into their proper location. Note that
you need to have write permission into the directories into which things
will be installed.

A reference manual is available in the doc/reference.html in this
distribution.

The homepage for this project is http://expat.sourceforge.net. There are
links there to connect you to the bug reports page. If you need to report
a bug when you don't have access to a browser, you may also send a bug
report by email to expat-bugs@lists.sourceforge.net.

Discussion related to the direction of future expat development takes place
on expat-discuss@lists.sourceforge.net. Archives of this list may be found
at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.

--- NEW FILE ---
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful, but
## WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
## General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
##
## As a special exception to the GNU General Public License, if you
## distribute this file as part of a program that contains a
## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program.

# serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl

# Save cache, so that ltconfig can load it
AC_CACHE_SAVE

# Actually configure libtool.  ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|| AC_MSG_ERROR([libtool configure failed])

# Reload cache, that may have been modified by ltconfig
AC_CACHE_LOAD

# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"

# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl

# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
exec 5>>./config.log
])

AC_DEFUN(AC_LIBTOOL_SETUP,
[AC_PREREQ(2.13)dnl
AC_REQUIRE([AC_ENABLE_SHARED])dnl
AC_REQUIRE([AC_ENABLE_STATIC])dnl
AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_LD])dnl
AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
dnl

case "$target" in
NONE) lt_target="$host" ;;
*) lt_target="$target" ;;
esac

# Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
[libtool_flags="$libtool_flags --enable-dlopen"])
ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
[libtool_flags="$libtool_flags --enable-win32-dll"])
AC_ARG_ENABLE(libtool-lock,
  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"

# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case "$lt_target" in
*-*-irix6*)
  # Find out which ABI we are using.
  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
  if AC_TRY_EVAL(ac_compile); then
    case "`/usr/bin/file conftest.o`" in
    *32-bit*)
      LD="${LD-ld} -32"
      ;;
    *N32*)
      LD="${LD-ld} -n32"
      ;;
    *64-bit*)
      LD="${LD-ld} -64"
      ;;
    esac
  fi
  rm -rf conftest*
  ;;

*-*-sco3.2v5*)
  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
  SAVE_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -belf"
  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
    CFLAGS="$SAVE_CFLAGS"
  fi
  ;;

ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw*)
  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  AC_CHECK_TOOL(AS, as, false)
  AC_CHECK_TOOL(OBJDUMP, objdump, false)
  ;;
])
esac
])

# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])

# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])

# AC_ENABLE_SHARED - implement the --enable-shared flag
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
#   `yes'.
AC_DEFUN(AC_ENABLE_SHARED, [dnl
define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(shared,
changequote(<<, >>)dnl
<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
changequote([, ])dnl
[p=${PACKAGE-default}
case "$enableval" in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
*)
  enable_shared=no
  # Look at the argument we got.  We use all the common list separators.
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
  for pkg in $enableval; do
    if test "X$pkg" = "X$p"; then
      enable_shared=yes
    fi
  done
  IFS="$ac_save_ifs"
  ;;
esac],
enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
])

# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)])

# AC_ENABLE_STATIC - implement the --enable-static flag
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
#   `yes'.
AC_DEFUN(AC_ENABLE_STATIC, [dnl
define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(static,
changequote(<<, >>)dnl
<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
changequote([, ])dnl
[p=${PACKAGE-default}
case "$enableval" in
yes) enable_static=yes ;;
no) enable_static=no ;;
*)
  enable_static=no
  # Look at the argument we got.  We use all the common list separators.
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
  for pkg in $enableval; do
    if test "X$pkg" = "X$p"; then
      enable_static=yes
    fi
  done
  IFS="$ac_save_ifs"
  ;;
esac],
enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
])

# AC_DISABLE_STATIC - set the default static flag to --disable-static
AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_STATIC(no)])


# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
#   `yes'.
AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(fast-install,
changequote(<<, >>)dnl
<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
changequote([, ])dnl
[p=${PACKAGE-default}
case "$enableval" in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
*)
  enable_fast_install=no
  # Look at the argument we got.  We use all the common list separators.
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
  for pkg in $enableval; do
    if test "X$pkg" = "X$p"; then
      enable_fast_install=yes
    fi
  done
  IFS="$ac_save_ifs"
  ;;
esac],
enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
])

# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_FAST_INSTALL(no)])

# AC_PROG_LD - find the path to the GNU or non-GNU linker
AC_DEFUN(AC_PROG_LD,
[AC_ARG_WITH(gnu-ld,
[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
ac_prog=ld
if test "$ac_cv_prog_gcc" = yes; then
  # Check if gcc -print-prog-name=ld gives a path.
  AC_MSG_CHECKING([for ld used by GCC])
  ac_prog=`($CC -print-prog-name=ld) 2>&5`
  case "$ac_prog" in
    # Accept absolute paths.
changequote(,)dnl
    [\\/]* | [A-Za-z]:[\\/]*)
      re_direlt='/[^/][^/]*/\.\./'
changequote([,])dnl
      # Canonicalize the path of ld
      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
      done
      test -z "$LD" && LD="$ac_prog"
      ;;
  "")
    # If it fails, then pretend we aren't using GCC.
    ac_prog=ld
    ;;
  *)
    # If it is relative, then search for the first ld in PATH.
    with_gnu_ld=unknown
    ;;
  esac
elif test "$with_gnu_ld" = yes; then
  AC_MSG_CHECKING([for GNU ld])
else
  AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(ac_cv_path_LD,
[if test -z "$LD"; then
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
  for ac_dir in $PATH; do
    test -z "$ac_dir" && ac_dir=.
    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
      ac_cv_path_LD="$ac_dir/$ac_prog"
      # Check to see if the program is GNU ld.  I'd rather use --version,
      # but apparently some GNU ld's only accept -v.
      # Break only if it was the GNU/non-GNU ld that we prefer.
      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
	test "$with_gnu_ld" != no && break
      else
	test "$with_gnu_ld" != yes && break
      fi
    fi
  done
  IFS="$ac_save_ifs"
else
  ac_cv_path_LD="$LD" # Let the user override the test with a path.
fi])
LD="$ac_cv_path_LD"
if test -n "$LD"; then
  AC_MSG_RESULT($LD)
else
  AC_MSG_RESULT(no)
fi
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_PROG_LD_GNU
])

AC_DEFUN(AC_PROG_LD_GNU,
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
  ac_cv_prog_gnu_ld=yes
else
  ac_cv_prog_gnu_ld=no
fi])
])

# AC_PROG_NM - find the path to a BSD-compatible name lister
AC_DEFUN(AC_PROG_NM,
[AC_MSG_CHECKING([for BSD-compatible nm])
AC_CACHE_VAL(ac_cv_path_NM,
[if test -n "$NM"; then
  # Let the user override the test.
  ac_cv_path_NM="$NM"
else
  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
    test -z "$ac_dir" && ac_dir=.
    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
      # Check to see if the nm accepts a BSD-compat flag.
      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
      #   nm: unknown option "B" ignored
      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
	ac_cv_path_NM="$ac_dir/nm -B"
	break
      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
	ac_cv_path_NM="$ac_dir/nm -p"
	break
      else
	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
	continue # so that we can try to find one that supports BSD flags
      fi
    fi
  done
  IFS="$ac_save_ifs"
  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
fi])
NM="$ac_cv_path_NM"
AC_MSG_RESULT([$NM])
])

# AC_CHECK_LIBM - check for math library
AC_DEFUN(AC_CHECK_LIBM,
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case "$lt_target" in
*-*-beos* | *-*-cygwin*)
  # These system don't have libm
  ;;
*-ncr-sysv4.3*)
  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
  ;;
*)
  AC_CHECK_LIB(m, main, LIBM="-lm")
  ;;
esac
])

# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments.  Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
# with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!).  If your package is not
# flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  case "$enable_ltdl_convenience" in
  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
  "") enable_ltdl_convenience=yes
      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
  esac
  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
])

# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure
# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!).  If your package is
# not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_CHECK_LIB(ltdl, main,
  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
  [if test x"$enable_ltdl_install" = xno; then
     AC_MSG_WARN([libltdl not installed, but installation disabled])
   else
     enable_ltdl_install=yes
   fi
  ])
  if test x"$enable_ltdl_install" = x"yes"; then
    ac_configure_args="$ac_configure_args --enable-ltdl-install"
    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
  else
    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
    LIBLTDL="-lltdl"
    INCLTDL=
  fi
])

dnl This is just to silence aclocal about the macro not being used
ifelse([AC_DISABLE_FAST_INSTALL])dnl

--- NEW FILE ---
/*================================================================
** Copyright 2000, Clark Cooper
** All rights reserved.
**
** This is free software. You are permitted to copy, distribute, or modify
** it under the terms of the MIT/X license (contained in the COPYING file
** with this distribution.)
**
**
*/

/* Define to empty if the keyword does not work.  */
#undef const

/* Define if you have a working `mmap' system call.  */
#undef HAVE_MMAP

/* Define to `long' if <sys/types.h> doesn't define.  */
#undef off_t

/* Define to `unsigned' if <sys/types.h> doesn't define.  */
#undef size_t

/* Define if you have the ANSI C header files.  */
#undef STDC_HEADERS

/* Define if your processor stores words with the most significant
   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
#undef WORDS_BIGENDIAN

/* Define if you have the bcopy function.  */
#undef HAVE_BCOPY

/* Define if you have the getpagesize function.  */
#undef HAVE_GETPAGESIZE

/* Define if you have the memmove function.  */
#undef HAVE_MEMMOVE

/* Define if you have the <fcntl.h> header file.  */
#undef HAVE_FCNTL_H

/* Define if you have the <unistd.h> header file.  */
#undef HAVE_UNISTD_H

/* Name of package */
#undef PACKAGE

/* Version number of package */
#undef VERSION

#include <stdlib.h>

#define XML_NS
#define XML_DTD

#ifdef WORDS_BIGENDIAN
#define XML_BYTE_ORDER 21
#else
#define XML_BYTE_ORDER 12
#endif

#ifndef HAVE_MEMMOVE
#ifdef HAVE_BCOPY
#define memmove(d,s,l) bcopy((s),(d),(l))
#else
#define memmove(d,s,l) ;punting on memmove;
#endif
#endif


--- NEW FILE ---
dnl   configuration script for expat
dnl   Process this file with autoconf to produce a configure script.
dnl
dnl   Copyright 2000 Clark Cooper
dnl
dnl   This file is part of EXPAT.
dnl
dnl   EXPAT is free software; you can redistribute it and/or modify it
dnl   under the terms of the License (based on the MIT/X license) contained
dnl   in the file COPYING that comes with this distribution.
dnl

AC_INIT(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)

EXPAT_MAJOR_VERSION=2
EXPAT_MINOR_VERSION=0
EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION
VERSION=$EXPAT_VERSION
PACKAGE=expat

AC_CONFIG_HEADER(config.h:config.hin)
AC_PROG_LIBTOOL

AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(CONFIG_HEADERS)

dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL

dnl Checks for libraries.

dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h unistd.h)

dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_BIGENDIAN
AC_C_CONST
AC_TYPE_OFF_T
AC_TYPE_SIZE_T

dnl Checks for library functions.

AC_FUNC_MEMCMP
AC_FUNC_MMAP
AC_SUBST(FILEMAP_OBJ)
if test -z "$HAVE_MMAP"; then
FILEMAP_OBJ=unixfilemap.o
else
FILEMAP_OBJ=readfilemap.o
fi

AC_CHECK_FUNCS(memmove bcopy)

AC_OUTPUT(Makefile lib/Makefile xmlwf/Makefile examples/Makefile)

Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** .cvsignore	2000/05/12 07:02:22	1.2
--- .cvsignore	2000/09/18 16:26:20	1.3
***************
*** 1,8 ****
! bin
! dbgbin
! Debug
! expat.ncb
! expat.opt
! Release
! expat.zip
! lib
--- 1,11 ----
! Makefile
! configure
! config.cache
! config.log
! config.status
! config.h
! expat-[0-9]*.[0-9]*
! expat*.tar.gz
! libtool
! *~
! 

--- Makefile DELETED ---

--- copying.txt DELETED ---

--- expat.dsw DELETED ---

--- expat.html DELETED ---

--- files.txt DELETED ---

--- makedist.bat DELETED ---

--- win32files.txt DELETED ---


From coopercc@users.sourceforge.net  Mon Sep 18 17:26:25 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 18 Sep 2000 09:26:25 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,NONE,1.1 ascii.h,NONE,1.1 asciitab.h,NONE,1.1 expat.h,NONE,1.1 iasciitab.h,NONE,1.1 latin1tab.h,NONE,1.1 nametab.h,NONE,1.1 utf8tab.h,NONE,1.1 xmldef.h,NONE,1.1 xmlparse.c,NONE,1.1 xmlrole.c,NONE,1.1 xmlrole.h,NONE,1.1 xmltok.c,NONE,1.1 xmltok.h,NONE,1.1 xmltok_impl.c,NONE,1.1 xmltok_impl.h,NONE,1.1 xmltok_ns.c,NONE,1.1
Message-ID: <200009181626.JAA18361@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17754/lib

Added Files:
	Makefile.in ascii.h asciitab.h expat.h iasciitab.h latin1tab.h 
	nametab.h utf8tab.h xmldef.h xmlparse.c xmlrole.c xmlrole.h 
	xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c 
Log Message:
These are the first check-ins for the libexpat task: create configuration
files and setup for building a shareable libexpat.


--- NEW FILE ---
################################################################
# Process this file with top-level configure script to produce Makefile
#
# Copyright 2000 Clark Cooper
#
#  This file is part of EXPAT.
#
#  EXPAT is free software; you can redistribute it and/or modify it
#  under the terms of the License (based on the MIT/X license) contained
#  in the file COPYING that comes with this distribution.
#
# EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
#


SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@

bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include

subdir = lib

DESTDIR =

top_builddir = ..

AUTOCONF = @AUTOCONF@

INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@

host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@

LIBRARY = libexpat.la
SOURCES = xmlparse.c xmltok.c xmlrole.c
OBJECTS = $(SOURCES:.c=.o)
LTOBJECTS = $(SOURCES:.c=.lo)

TEMPLATES = xmltok_impl.c xmltok_ns.c
APIHEADER = expat.h
HEADERS = ascii.h iasciitab.h utf8tab.h xmltok.h asciitab.h latin1tab.h \
          nametab.h xmldef.h xmlrole.h xmltok_impl.h

mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = 

DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON =  Makefile.in


DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEMPLATES) $(APIHEADER) $(HEADERS) 

TAR = gtar
GZIP_ENV = --best

all: $(LIBRARY)

.SUFFIXES: .c .lo .o
.PHONY: all clean distclean maintainer-clean distdir

%.o: %.c
	@echo '$(COMPILE) -c $<'; \
	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-cp .deps/$(*F).pp .deps/$(*F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	    >> .deps/$(*F).P; \
	rm .deps/$(*F).pp

%.lo: %.c
	@echo '$(LTCOMPILE) -c $<'; \
	test -d .deps || mkdir .deps ; \
	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
	  < .deps/$(*F).pp > .deps/$(*F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	    >> .deps/$(*F).P; \
	rm -f .deps/$(*F).pp

Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) \
	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

$(top_builddir)/config.status: $(top_builddir)/configure
	cd $(top_builddir) && $(MAKE) config.status

$(top_builddir)/config.h: $(top_builddir)/config.hin
	cd $(top_builddir) && $(MAKE) config.h

clean:
	rm -f $(LIBRARY) *.o *.lo
	rm -rf .libs _libs

distclean: clean

maintainer-clean: distclean

install: $(LIBRARY) $(APIHEADER)
	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
	$(LIBTOOL)  --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
	$(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)

uninstall:
	$(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY);
	rm -f $(DESTDIR)$(libdir)/$(APIHEADER)

$(LIBRARY): $(LTOBJECTS)
	$(LINK) -rpath $(libdir) $(LDFLAGS) $(LTOBJECTS)

distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

distdir: $(DISTFILES)
	@here=`cd $(top_builddir) && pwd`; \
	top_distdir=`cd $(top_distdir) && pwd`; \
	distdir=`cd $(distdir) && pwd`; \
	for file in $(DISTFILES); do \
	  d=$(srcdir); \
	  if test -d $$d/$$file; then \
	    cp -pr $$d/$$file $(distdir)/$$file; \
	  else \
	    test -f $(distdir)/$$file \
	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	    || cp -p $$d/$$file $(distdir)/$$file || :; \
	  fi; \
	done

xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h $(top_builddir)/config.h

xmlrole.o: xmlrole.c ascii.h xmldef.h xmlrole.h $(top_builddir)/config.h

xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c \
          ascii.h asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h \
          xmldef.h xmltok.h xmltok_impl.h $(top_builddir)/config.h

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#define ASCII_A 0x41
#define ASCII_B 0x42
#define ASCII_C 0x43
#define ASCII_D 0x44
#define ASCII_E 0x45
#define ASCII_F 0x46
#define ASCII_G 0x47
#define ASCII_H 0x48
#define ASCII_I 0x49
#define ASCII_J 0x4A
#define ASCII_K 0x4B
#define ASCII_L 0x4C
#define ASCII_M 0x4D
#define ASCII_N 0x4E
#define ASCII_O 0x4F
#define ASCII_P 0x50
#define ASCII_Q 0x51
#define ASCII_R 0x52
#define ASCII_S 0x53
#define ASCII_T 0x54
#define ASCII_U 0x55
#define ASCII_V 0x56
#define ASCII_W 0x57
#define ASCII_X 0x58
#define ASCII_Y 0x59
#define ASCII_Z 0x5A

#define ASCII_a 0x61
#define ASCII_b 0x62
#define ASCII_c 0x63
#define ASCII_d 0x64
#define ASCII_e 0x65
#define ASCII_f 0x66
#define ASCII_g 0x67
#define ASCII_h 0x68
#define ASCII_i 0x69
#define ASCII_j 0x6A
#define ASCII_k 0x6B
#define ASCII_l 0x6C
#define ASCII_m 0x6D
#define ASCII_n 0x6E
#define ASCII_o 0x6F
#define ASCII_p 0x70
#define ASCII_q 0x71
#define ASCII_r 0x72
#define ASCII_s 0x73
#define ASCII_t 0x74
#define ASCII_u 0x75
#define ASCII_v 0x76
#define ASCII_w 0x77
#define ASCII_x 0x78
#define ASCII_y 0x79
#define ASCII_z 0x7A

#define ASCII_0 0x30
#define ASCII_1 0x31
#define ASCII_2 0x32
#define ASCII_3 0x33
#define ASCII_4 0x34
#define ASCII_5 0x35
#define ASCII_6 0x36
#define ASCII_7 0x37
#define ASCII_8 0x38
#define ASCII_9 0x39

#define ASCII_TAB 0x09
#define ASCII_SPACE 0x20 
#define ASCII_EXCL 0x21
#define ASCII_QUOT 0x22
#define ASCII_AMP 0x26
#define ASCII_APOS 0x27
#define ASCII_MINUS 0x2D
#define ASCII_PERIOD 0x2E
#define ASCII_COLON 0x3A
#define ASCII_SEMI 0x3B
#define ASCII_LT 0x3C
#define ASCII_EQUALS 0x3D
#define ASCII_GT 0x3E
#define ASCII_LSQB 0x5B
#define ASCII_RSQB 0x5D
#define ASCII_UNDERSCORE 0x5F

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML,
/* 0x0C */ BT_NONXML, BT_CR, BT_NONXML, BT_NONXML,
/* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM,
/* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS,
/* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS,
/* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL,
/* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
/* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
/* 0x38 */ BT_DIGIT, BT_DIGIT, BT_COLON, BT_SEMI,
/* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST,
/* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
/* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
/* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB,
/* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT,
/* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
/* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
/* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
/* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER,

--- NEW FILE ---
/*
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#ifndef XmlParse_INCLUDED
#define XmlParse_INCLUDED 1

#ifdef __cplusplus
extern "C" {
#endif

#ifndef XMLPARSEAPI
#define XMLPARSEAPI /* as nothing */
#endif

typedef void *XML_Parser;

#ifdef XML_UNICODE_WCHAR_T

/* XML_UNICODE_WCHAR_T will work only if sizeof(wchar_t) == 2 and wchar_t
uses Unicode. */
/* Information is UTF-16 encoded as wchar_ts */

#ifndef XML_UNICODE
#define XML_UNICODE
#endif

#include <stddef.h>
typedef wchar_t XML_Char;
typedef wchar_t XML_LChar;

#else /* not XML_UNICODE_WCHAR_T */

#ifdef XML_UNICODE

/* Information is UTF-16 encoded as unsigned shorts */
typedef unsigned short XML_Char;
typedef char XML_LChar;

#else /* not XML_UNICODE */

/* Information is UTF-8 encoded. */
typedef char XML_Char;
typedef char XML_LChar;

#endif /* not XML_UNICODE */

#endif /* not XML_UNICODE_WCHAR_T */


/* Constructs a new parser; encoding is the encoding specified by the external
protocol or null if there is none specified. */

XML_Parser XMLPARSEAPI
XML_ParserCreate(const XML_Char *encoding);

/* Constructs a new parser and namespace processor.  Element type names
and attribute names that belong to a namespace will be expanded;
unprefixed attribute names are never expanded; unprefixed element type
names are expanded only if there is a default namespace. The expanded
name is the concatenation of the namespace URI, the namespace separator character,
and the local part of the name.  If the namespace separator is '\0' then
the namespace URI and the local part will be concatenated without any
separator.  When a namespace is not declared, the name and prefix will be
passed through without expansion. */

XML_Parser XMLPARSEAPI
XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);


/* atts is array of name/value pairs, terminated by 0;
   names and values are 0 terminated. */

typedef void (*XML_StartElementHandler)(void *userData,
					const XML_Char *name,
					const XML_Char **atts);

typedef void (*XML_EndElementHandler)(void *userData,
				      const XML_Char *name);

/* s is not 0 terminated. */
typedef void (*XML_CharacterDataHandler)(void *userData,
					 const XML_Char *s,
					 int len);

/* target and data are 0 terminated */
typedef void (*XML_ProcessingInstructionHandler)(void *userData,
						 const XML_Char *target,
						 const XML_Char *data);

/* data is 0 terminated */
typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data);

typedef void (*XML_StartCdataSectionHandler)(void *userData);
typedef void (*XML_EndCdataSectionHandler)(void *userData);

/* This is called for any characters in the XML document for
which there is no applicable handler.  This includes both
characters that are part of markup which is of a kind that is
not reported (comments, markup declarations), or characters
that are part of a construct which could be reported but
for which no handler has been supplied. The characters are passed
exactly as they were in the XML document except that
they will be encoded in UTF-8.  Line boundaries are not normalized.
Note that a byte order mark character is not passed to the default handler.
There are no guarantees about how characters are divided between calls
to the default handler: for example, a comment might be split between
multiple calls. */

typedef void (*XML_DefaultHandler)(void *userData,
				   const XML_Char *s,
				   int len);

/* This is called for the start of the DOCTYPE declaration when the
name of the DOCTYPE is encountered. */
typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
					    const XML_Char *doctypeName);

/* This is called for the start of the DOCTYPE declaration when the
closing > is encountered, but after processing any external subset. */
typedef void (*XML_EndDoctypeDeclHandler)(void *userData);

/* This is called for a declaration of an unparsed (NDATA)
entity.  The base argument is whatever was set by XML_SetBase.
The entityName, systemId and notationName arguments will never be null.
The other arguments may be. */

typedef void (*XML_UnparsedEntityDeclHandler)(void *userData,
					      const XML_Char *entityName,
					      const XML_Char *base,
					      const XML_Char *systemId,
					      const XML_Char *publicId,
					      const XML_Char *notationName);

/* This is called for a declaration of notation.
The base argument is whatever was set by XML_SetBase.
The notationName will never be null.  The other arguments can be. */

typedef void (*XML_NotationDeclHandler)(void *userData,
					const XML_Char *notationName,
					const XML_Char *base,
					const XML_Char *systemId,
					const XML_Char *publicId);

typedef void (*XML_ExternalParsedEntityDeclHandler)(void *userData,
						    const XML_Char *entityName,
						    const XML_Char *base,
						    const XML_Char *systemId,
						    const XML_Char *publicId);

typedef void (*XML_InternalParsedEntityDeclHandler)(void *userData,
						    const XML_Char *entityName,
						    const XML_Char *replacementText,
						    int replacementTextLength);

/* When namespace processing is enabled, these are called once for
each namespace declaration. The call to the start and end element
handlers occur between the calls to the start and end namespace
declaration handlers. For an xmlns attribute, prefix will be null.
For an xmlns="" attribute, uri will be null. */

typedef void (*XML_StartNamespaceDeclHandler)(void *userData,
					      const XML_Char *prefix,
					      const XML_Char *uri);

typedef void (*XML_EndNamespaceDeclHandler)(void *userData,
					    const XML_Char *prefix);

/* This is called if the document is not standalone (it has an
external subset or a reference to a parameter entity, but does not
have standalone="yes"). If this handler returns 0, then processing
will not continue, and the parser will return a
XML_ERROR_NOT_STANDALONE error. */

typedef int (*XML_NotStandaloneHandler)(void *userData);

/* This is called for a reference to an external parsed general entity.
The referenced entity is not automatically parsed.
The application can parse it immediately or later using
XML_ExternalEntityParserCreate.
The parser argument is the parser parsing the entity containing the reference;
it can be passed as the parser argument to XML_ExternalEntityParserCreate.
The systemId argument is the system identifier as specified in the entity declaration;
it will not be null.
The base argument is the system identifier that should be used as the base for
resolving systemId if systemId was relative; this is set by XML_SetBase;
it may be null.
The publicId argument is the public identifier as specified in the entity declaration,
or null if none was specified; the whitespace in the public identifier
will have been normalized as required by the XML spec.
The context argument specifies the parsing context in the format
expected by the context argument to
XML_ExternalEntityParserCreate; context is valid only until the handler
returns, so if the referenced entity is to be parsed later, it must be copied.
The handler should return 0 if processing should not continue because of
a fatal error in the handling of the external entity.
In this case the calling parser will return an XML_ERROR_EXTERNAL_ENTITY_HANDLING
error.
Note that unlike other handlers the first argument is the parser, not userData. */

typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser,
					    const XML_Char *context,
					    const XML_Char *base,
					    const XML_Char *systemId,
					    const XML_Char *publicId);

/* This structure is filled in by the XML_UnknownEncodingHandler
to provide information to the parser about encodings that are unknown
to the parser.
The map[b] member gives information about byte sequences
whose first byte is b.
If map[b] is c where c is >= 0, then b by itself encodes the Unicode scalar value c.
If map[b] is -1, then the byte sequence is malformed.
If map[b] is -n, where n >= 2, then b is the first byte of an n-byte
sequence that encodes a single Unicode scalar value.
The data member will be passed as the first argument to the convert function.
The convert function is used to convert multibyte sequences;
s will point to a n-byte sequence where map[(unsigned char)*s] == -n.
The convert function must return the Unicode scalar value
represented by this byte sequence or -1 if the byte sequence is malformed.
The convert function may be null if the encoding is a single-byte encoding,
that is if map[b] >= -1 for all bytes b.
When the parser is finished with the encoding, then if release is not null,
it will call release passing it the data member;
once release has been called, the convert function will not be called again.

Expat places certain restrictions on the encodings that are supported
using this mechanism.

1. Every ASCII character that can appear in a well-formed XML document,
other than the characters

  $@\^`{}~

must be represented by a single byte, and that byte must be the
same byte that represents that character in ASCII.

2. No character may require more than 4 bytes to encode.

3. All characters encoded must have Unicode scalar values <= 0xFFFF,
(ie characters that would be encoded by surrogates in UTF-16
are  not allowed).  Note that this restriction doesn't apply to
the built-in support for UTF-8 and UTF-16.

4. No Unicode character may be encoded by more than one distinct sequence
of bytes. */

typedef struct {
  int map[256];
  void *data;
  int (*convert)(void *data, const char *s);
  void (*release)(void *data);
} XML_Encoding;

/* This is called for an encoding that is unknown to the parser.
The encodingHandlerData argument is that which was passed as the
second argument to XML_SetUnknownEncodingHandler.
The name argument gives the name of the encoding as specified in
the encoding declaration.
If the callback can provide information about the encoding,
it must fill in the XML_Encoding structure, and return 1.
Otherwise it must return 0.
If info does not describe a suitable encoding,
then the parser will return an XML_UNKNOWN_ENCODING error. */

typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData,
					  const XML_Char *name,
					  XML_Encoding *info);

void XMLPARSEAPI
XML_SetElementHandler(XML_Parser parser,
		      XML_StartElementHandler start,
		      XML_EndElementHandler end);

void XMLPARSEAPI
XML_SetCharacterDataHandler(XML_Parser parser,
			    XML_CharacterDataHandler handler);

void XMLPARSEAPI
XML_SetProcessingInstructionHandler(XML_Parser parser,
				    XML_ProcessingInstructionHandler handler);
void XMLPARSEAPI
XML_SetCommentHandler(XML_Parser parser,
                      XML_CommentHandler handler);

void XMLPARSEAPI
XML_SetCdataSectionHandler(XML_Parser parser,
			   XML_StartCdataSectionHandler start,
			   XML_EndCdataSectionHandler end);

/* This sets the default handler and also inhibits expansion of internal entities.
The entity reference will be passed to the default handler. */

void XMLPARSEAPI
XML_SetDefaultHandler(XML_Parser parser,
		      XML_DefaultHandler handler);

/* This sets the default handler but does not inhibit expansion of internal entities.
The entity reference will not be passed to the default handler. */

void XMLPARSEAPI
XML_SetDefaultHandlerExpand(XML_Parser parser,
		            XML_DefaultHandler handler);

void XMLPARSEAPI
XML_SetDoctypeDeclHandler(XML_Parser parser,
			  XML_StartDoctypeDeclHandler start,
			  XML_EndDoctypeDeclHandler end);

void XMLPARSEAPI
XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
				 XML_UnparsedEntityDeclHandler handler);

void XMLPARSEAPI
XML_SetNotationDeclHandler(XML_Parser parser,
			   XML_NotationDeclHandler handler);

void XMLPARSEAPI
XML_SetExternalParsedEntityDeclHandler(XML_Parser parser,
				       XML_ExternalParsedEntityDeclHandler handler);

void XMLPARSEAPI
XML_SetInternalParsedEntityDeclHandler(XML_Parser parser,
				       XML_InternalParsedEntityDeclHandler handler);

void XMLPARSEAPI
XML_SetNamespaceDeclHandler(XML_Parser parser,
			    XML_StartNamespaceDeclHandler start,
			    XML_EndNamespaceDeclHandler end);

void XMLPARSEAPI
XML_SetNotStandaloneHandler(XML_Parser parser,
			    XML_NotStandaloneHandler handler);

void XMLPARSEAPI
XML_SetExternalEntityRefHandler(XML_Parser parser,
				XML_ExternalEntityRefHandler handler);

/* If a non-null value for arg is specified here, then it will be passed
as the first argument to the external entity ref handler instead
of the parser object. */
void XMLPARSEAPI
XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);

void XMLPARSEAPI
XML_SetUnknownEncodingHandler(XML_Parser parser,
			      XML_UnknownEncodingHandler handler,
			      void *encodingHandlerData);

/* This can be called within a handler for a start element, end element,
processing instruction or character data.  It causes the corresponding
markup to be passed to the default handler. */
void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser);

/* This value is passed as the userData argument to callbacks. */
void XMLPARSEAPI
XML_SetUserData(XML_Parser parser, void *userData);

/* Returns the last value set by XML_SetUserData or null. */
#define XML_GetUserData(parser) (*(void **)(parser))

/* This is equivalent to supplying an encoding argument
to XML_ParserCreate. It must not be called after XML_Parse
or XML_ParseBuffer. */

int XMLPARSEAPI
XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);

/* If this function is called, then the parser will be passed
as the first argument to callbacks instead of userData.
The userData will still be accessible using XML_GetUserData. */

void XMLPARSEAPI
XML_UseParserAsHandlerArg(XML_Parser parser);

/* Sets the base to be used for resolving relative URIs in system identifiers in
declarations.  Resolving relative identifiers is left to the application:
this value will be passed through as the base argument to the
XML_ExternalEntityRefHandler, XML_NotationDeclHandler
and XML_UnparsedEntityDeclHandler. The base argument will be copied.
Returns zero if out of memory, non-zero otherwise. */

int XMLPARSEAPI
XML_SetBase(XML_Parser parser, const XML_Char *base);

const XML_Char XMLPARSEAPI *
XML_GetBase(XML_Parser parser);

/* Returns the number of the attribute/value pairs passed in last call
to the XML_StartElementHandler that were specified in the start-tag
rather than defaulted. Each attribute/value pair counts as 2; thus
this correspondds to an index into the atts array passed to the
XML_StartElementHandler. */

int XMLPARSEAPI XML_GetSpecifiedAttributeCount(XML_Parser parser);

/* Returns the index of the ID attribute passed in the last call to
XML_StartElementHandler, or -1 if there is no ID attribute.  Each
attribute/value pair counts as 2; thus this correspondds to an index
into the atts array passed to the XML_StartElementHandler. */
int XMLPARSEAPI XML_GetIdAttributeIndex(XML_Parser parser);

/* Parses some input. Returns 0 if a fatal error is detected.
The last call to XML_Parse must have isFinal true;
len may be zero for this call (or any other). */
int XMLPARSEAPI
XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);

void XMLPARSEAPI *
XML_GetBuffer(XML_Parser parser, int len);

int XMLPARSEAPI
XML_ParseBuffer(XML_Parser parser, int len, int isFinal);

/* Creates an XML_Parser object that can parse an external general entity;
context is a '\0'-terminated string specifying the parse context;
encoding is a '\0'-terminated string giving the name of the externally specified encoding,
or null if there is no externally specified encoding.
The context string consists of a sequence of tokens separated by formfeeds (\f);
a token consisting of a name specifies that the general entity of the name
is open; a token of the form prefix=uri specifies the namespace for a particular
prefix; a token of the form =uri specifies the default namespace.
This can be called at any point after the first call to an ExternalEntityRefHandler
so longer as the parser has not yet been freed.
The new parser is completely independent and may safely be used in a separate thread.
The handlers and userData are initialized from the parser argument.
Returns 0 if out of memory.  Otherwise returns a new XML_Parser object. */
XML_Parser XMLPARSEAPI
XML_ExternalEntityParserCreate(XML_Parser parser,
			       const XML_Char *context,
			       const XML_Char *encoding);

enum XML_ParamEntityParsing {
  XML_PARAM_ENTITY_PARSING_NEVER,
  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
  XML_PARAM_ENTITY_PARSING_ALWAYS
};

/* Controls parsing of parameter entities (including the external DTD
subset). If parsing of parameter entities is enabled, then references
to external parameter entities (including the external DTD subset)
will be passed to the handler set with
XML_SetExternalEntityRefHandler.  The context passed will be 0.
Unlike external general entities, external parameter entities can only
be parsed synchronously.  If the external parameter entity is to be
parsed, it must be parsed during the call to the external entity ref
handler: the complete sequence of XML_ExternalEntityParserCreate,
XML_Parse/XML_ParseBuffer and XML_ParserFree calls must be made during
this call.  After XML_ExternalEntityParserCreate has been called to
create the parser for the external parameter entity (context must be 0
for this call), it is illegal to make any calls on the old parser
until XML_ParserFree has been called on the newly created parser.  If
the library has been compiled without support for parameter entity
parsing (ie without XML_DTD being defined), then
XML_SetParamEntityParsing will return 0 if parsing of parameter
entities is requested; otherwise it will return non-zero. */

int XMLPARSEAPI
XML_SetParamEntityParsing(XML_Parser parser,
			  enum XML_ParamEntityParsing parsing);

enum XML_Error {
  XML_ERROR_NONE,
  XML_ERROR_NO_MEMORY,
  XML_ERROR_SYNTAX,
  XML_ERROR_NO_ELEMENTS,
  XML_ERROR_INVALID_TOKEN,
  XML_ERROR_UNCLOSED_TOKEN,
  XML_ERROR_PARTIAL_CHAR,
  XML_ERROR_TAG_MISMATCH,
  XML_ERROR_DUPLICATE_ATTRIBUTE,
  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
  XML_ERROR_PARAM_ENTITY_REF,
  XML_ERROR_UNDEFINED_ENTITY,
  XML_ERROR_RECURSIVE_ENTITY_REF,
  XML_ERROR_ASYNC_ENTITY,
  XML_ERROR_BAD_CHAR_REF,
  XML_ERROR_BINARY_ENTITY_REF,
  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
  XML_ERROR_MISPLACED_XML_PI,
  XML_ERROR_UNKNOWN_ENCODING,
  XML_ERROR_INCORRECT_ENCODING,
  XML_ERROR_UNCLOSED_CDATA_SECTION,
  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
  XML_ERROR_NOT_STANDALONE
};

/* If XML_Parse or XML_ParseBuffer have returned 0, then XML_GetErrorCode
returns information about the error. */

enum XML_Error XMLPARSEAPI XML_GetErrorCode(XML_Parser parser);

/* These functions return information about the current parse location.
They may be called when XML_Parse or XML_ParseBuffer return 0;
in this case the location is the location of the character at which
the error was detected.
They may also be called from any other callback called to report
some parse event; in this the location is the location of the first
of the sequence of characters that generated the event. */

int XMLPARSEAPI XML_GetCurrentLineNumber(XML_Parser parser);
int XMLPARSEAPI XML_GetCurrentColumnNumber(XML_Parser parser);
long XMLPARSEAPI XML_GetCurrentByteIndex(XML_Parser parser);

/* Return the number of bytes in the current event.
Returns 0 if the event is in an internal entity. */

int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser);

/* For backwards compatibility with previous versions. */
#define XML_GetErrorLineNumber XML_GetCurrentLineNumber
#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
#define XML_GetErrorByteIndex XML_GetCurrentByteIndex

/* Frees memory used by the parser. */
void XMLPARSEAPI
XML_ParserFree(XML_Parser parser);

/* Returns a string describing the error. */
const XML_LChar XMLPARSEAPI *XML_ErrorString(int code);

#ifdef __cplusplus
}
#endif

#endif /* not XmlParse_INCLUDED */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

/* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML,
/* 0x0C */ BT_NONXML, BT_S, BT_NONXML, BT_NONXML,
/* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM,
/* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS,
/* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS,
/* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL,
/* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
/* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT,
/* 0x38 */ BT_DIGIT, BT_DIGIT, BT_COLON, BT_SEMI,
/* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST,
/* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
/* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
/* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB,
/* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT,
/* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX,
/* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT,
/* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
/* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER,

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

/* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x84 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x88 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x8C */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x90 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x94 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x98 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0x9C */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xA0 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xA4 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xA8 */ BT_OTHER, BT_OTHER, BT_NMSTRT, BT_OTHER,
/* 0xAC */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xB0 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xB4 */ BT_OTHER, BT_NMSTRT, BT_OTHER, BT_NAME,
/* 0xB8 */ BT_OTHER, BT_OTHER, BT_NMSTRT, BT_OTHER,
/* 0xBC */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
/* 0xC0 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xC4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xC8 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xCC */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xD0 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xD4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
/* 0xD8 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xDC */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xE0 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xE4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xE8 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xEC */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xF0 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xF4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER,
/* 0xF8 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,
/* 0xFC */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT,

--- NEW FILE ---
static const unsigned namingBitmap[] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0x00000000, 0x04000000, 0x87FFFFFE, 0x07FFFFFE,
0x00000000, 0x00000000, 0xFF7FFFFF, 0xFF7FFFFF,
0xFFFFFFFF, 0x7FF3FFFF, 0xFFFFFDFE, 0x7FFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFE00F, 0xFC31FFFF,
0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,
0xFFFFFFFF, 0xF80001FF, 0x00000003, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0xFFFFD740, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,
0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,
0xFFFF0003, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,
0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,
0x0000007F, 0x00000000, 0xFFFF0000, 0x000707FF,
0x00000000, 0x07FFFFFE, 0x000007FE, 0xFFFE0000,
0xFFFFFFFF, 0x7CFFFFFF, 0x002F7FFF, 0x00000060,
0xFFFFFFE0, 0x23FFFFFF, 0xFF000000, 0x00000003,
0xFFF99FE0, 0x03C5FDFF, 0xB0000000, 0x00030003,
0xFFF987E0, 0x036DFDFF, 0x5E000000, 0x001C0000,
0xFFFBAFE0, 0x23EDFDFF, 0x00000000, 0x00000001,
0xFFF99FE0, 0x23CDFDFF, 0xB0000000, 0x00000003,
0xD63DC7E0, 0x03BFC718, 0x00000000, 0x00000000,
0xFFFDDFE0, 0x03EFFDFF, 0x00000000, 0x00000003,
0xFFFDDFE0, 0x03EFFDFF, 0x40000000, 0x00000003,
0xFFFDDFE0, 0x03FFFDFF, 0x00000000, 0x00000003,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0xFFFFFFFE, 0x000D7FFF, 0x0000003F, 0x00000000,
0xFEF02596, 0x200D6CAE, 0x0000001F, 0x00000000,
0x00000000, 0x00000000, 0xFFFFFEFF, 0x000003FF,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0xFFFFFFFF, 0xFFFF003F, 0x007FFFFF,
0x0007DAED, 0x50000000, 0x82315001, 0x002C62AB,
0x40000000, 0xF580C900, 0x00000007, 0x02010800,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0x0FFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x03FFFFFF,
0x3F3FFFFF, 0xFFFFFFFF, 0xAAFF3F3F, 0x3FFFFFFF,
0xFFFFFFFF, 0x5FDFFFFF, 0x0FCF1FDC, 0x1FDC1FFF,
0x00000000, 0x00004C40, 0x00000000, 0x00000000,
0x00000007, 0x00000000, 0x00000000, 0x00000000,
0x00000080, 0x000003FE, 0xFFFFFFFE, 0xFFFFFFFF,
0x001FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x07FFFFFF,
0xFFFFFFE0, 0x00001FFF, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0x0000003F, 0x00000000, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0x0000000F, 0x00000000, 0x00000000,
0x00000000, 0x07FF6000, 0x87FFFFFE, 0x07FFFFFE,
0x00000000, 0x00800000, 0xFF7FFFFF, 0xFF7FFFFF,
0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,
0xFFFFFFFF, 0xF80001FF, 0x00030003, 0x00000000,
0xFFFFFFFF, 0xFFFFFFFF, 0x0000003F, 0x00000003,
0xFFFFD7C0, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,
0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,
0xFFFF007B, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,
0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,
0xFFFE007F, 0xBBFFFFFB, 0xFFFF0016, 0x000707FF,
0x00000000, 0x07FFFFFE, 0x0007FFFF, 0xFFFF03FF,
0xFFFFFFFF, 0x7CFFFFFF, 0xFFEF7FFF, 0x03FF3DFF,
0xFFFFFFEE, 0xF3FFFFFF, 0xFF1E3FFF, 0x0000FFCF,
0xFFF99FEE, 0xD3C5FDFF, 0xB080399F, 0x0003FFCF,
0xFFF987E4, 0xD36DFDFF, 0x5E003987, 0x001FFFC0,
0xFFFBAFEE, 0xF3EDFDFF, 0x00003BBF, 0x0000FFC1,
0xFFF99FEE, 0xF3CDFDFF, 0xB0C0398F, 0x0000FFC3,
0xD63DC7EC, 0xC3BFC718, 0x00803DC7, 0x0000FF80,
0xFFFDDFEE, 0xC3EFFDFF, 0x00603DDF, 0x0000FFC3,
0xFFFDDFEC, 0xC3EFFDFF, 0x40603DDF, 0x0000FFC3,
0xFFFDDFEC, 0xC3FFFDFF, 0x00803DCF, 0x0000FFC3,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0xFFFFFFFE, 0x07FF7FFF, 0x03FF7FFF, 0x00000000,
0xFEF02596, 0x3BFF6CAE, 0x03FF3F5F, 0x00000000,
0x03000000, 0xC2A003FF, 0xFFFFFEFF, 0xFFFE03FF,
0xFEBF0FDF, 0x02FE3FFF, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x1FFF0000, 0x00000002,
0x000000A0, 0x003EFFFE, 0xFFFFFFFE, 0xFFFFFFFF,
0x661FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x77FFFFFF,
};
static const unsigned char nmstrtPages[] = {
0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00,
0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,
0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x15, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static const unsigned char namePages[] = {
0x19, 0x03, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x00,
0x00, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,
0x26, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x27, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/


/* 0x80 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x84 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x88 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x8C */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x90 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x94 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x98 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0x9C */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xA0 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xA4 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xA8 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xAC */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xB0 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xB4 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xB8 */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xBC */ BT_TRAIL, BT_TRAIL, BT_TRAIL, BT_TRAIL,
/* 0xC0 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xC4 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xC8 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xCC */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xD0 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xD4 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xD8 */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xDC */ BT_LEAD2, BT_LEAD2, BT_LEAD2, BT_LEAD2,
/* 0xE0 */ BT_LEAD3, BT_LEAD3, BT_LEAD3, BT_LEAD3,
/* 0xE4 */ BT_LEAD3, BT_LEAD3, BT_LEAD3, BT_LEAD3,
/* 0xE8 */ BT_LEAD3, BT_LEAD3, BT_LEAD3, BT_LEAD3,
/* 0xEC */ BT_LEAD3, BT_LEAD3, BT_LEAD3, BT_LEAD3,
/* 0xF0 */ BT_LEAD4, BT_LEAD4, BT_LEAD4, BT_LEAD4,
/* 0xF4 */ BT_LEAD4, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0xF8 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
/* 0xFC */ BT_NONXML, BT_NONXML, BT_MALFORM, BT_MALFORM,

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#include <string.h>

#ifdef XML_WINLIB

#define WIN32_LEAN_AND_MEAN
#define STRICT
#include <windows.h>

#define malloc(x) HeapAlloc(GetProcessHeap(), 0, (x))
#define calloc(x, y) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (x)*(y))
#define free(x) HeapFree(GetProcessHeap(), 0, (x))
#define realloc(x, y) HeapReAlloc(GetProcessHeap(), 0, x, y)
#define abort() /* as nothing */

#else /* not XML_WINLIB */

#include <stdlib.h>

#endif /* not XML_WINLIB */

/* This file can be used for any definitions needed in
particular environments. */

/* Mozilla specific defines */

#ifdef MOZILLA_CLIENT

#include "nspr.h"
#define malloc(x) PR_Malloc((size_t)(x))
#define realloc(x, y) PR_Realloc((x), (size_t)(y))
#define calloc(x, y) PR_Calloc((x),(y))
#define free(x) PR_Free(x)
#if PR_BYTES_PER_INT != 4
#define int int32
#endif

/* Enable Unicode string processing in expat. */
#ifndef XML_UNICODE
#define XML_UNICODE
#endif

/* Enable external parameter entity parsing in expat */
#ifndef XML_DTD
#define XML_DTD 1
#endif

#endif /* MOZILLA_CLIENT */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#include <config.h>
#include "expat.h"
#include <stddef.h>

#ifdef XML_UNICODE
#define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
#define XmlConvert XmlUtf16Convert
#define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
#define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
#define XmlEncode XmlUtf16Encode
#define MUST_CONVERT(enc, s) (!(enc)->isUtf16 || (((unsigned long)s) & 1))
typedef unsigned short ICHAR;
#else
#define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
[...3886 lines suppressed...]
    BLOCK *tem;
    int blockSize = pool->end - pool->start;
    if (blockSize < INIT_BLOCK_SIZE)
      blockSize = INIT_BLOCK_SIZE;
    else
      blockSize *= 2;
    tem = malloc(offsetof(BLOCK, s) + blockSize * sizeof(XML_Char));
    if (!tem)
      return 0;
    tem->size = blockSize;
    tem->next = pool->blocks;
    pool->blocks = tem;
    if (pool->ptr != pool->start)
      memcpy(tem->s, pool->start, (pool->ptr - pool->start) * sizeof(XML_Char));
    pool->ptr = tem->s + (pool->ptr - pool->start);
    pool->start = tem->s;
    pool->end = tem->s + blockSize;
  }
  return 1;
}

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#include <config.h>
#include "xmldef.h"
#include "xmlrole.h"
#include "ascii.h"

/* Doesn't check:

 that ,| are not mixed in a model group
 content of literals

*/

static const char KW_ANY[] = { ASCII_A, ASCII_N, ASCII_Y, '\0' };
static const char KW_ATTLIST[] = { ASCII_A, ASCII_T, ASCII_T, ASCII_L, ASCII_I, ASCII_S, ASCII_T, '\0' };
[...1227 lines suppressed...]

void XmlPrologStateInit(PROLOG_STATE *state)
{
  state->handler = prolog0;
#ifdef XML_DTD
  state->documentEntity = 1;
  state->includeLevel = 0;
#endif /* XML_DTD */
}

#ifdef XML_DTD

void XmlPrologStateInitExternalEntity(PROLOG_STATE *state)
{
  state->handler = externalSubset0;
  state->documentEntity = 0;
  state->includeLevel = 0;
}

#endif /* XML_DTD */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#ifndef XmlRole_INCLUDED
#define XmlRole_INCLUDED 1

#include "xmltok.h"

#ifdef __cplusplus
extern "C" {
#endif

enum {
  XML_ROLE_ERROR = -1,
  XML_ROLE_NONE = 0,
  XML_ROLE_XML_DECL,
  XML_ROLE_INSTANCE_START,
  XML_ROLE_DOCTYPE_NAME,
  XML_ROLE_DOCTYPE_SYSTEM_ID,
  XML_ROLE_DOCTYPE_PUBLIC_ID,
  XML_ROLE_DOCTYPE_CLOSE,
  XML_ROLE_GENERAL_ENTITY_NAME,
  XML_ROLE_PARAM_ENTITY_NAME,
  XML_ROLE_ENTITY_VALUE,
  XML_ROLE_ENTITY_SYSTEM_ID,
  XML_ROLE_ENTITY_PUBLIC_ID,
  XML_ROLE_ENTITY_NOTATION_NAME,
  XML_ROLE_NOTATION_NAME,
  XML_ROLE_NOTATION_SYSTEM_ID,
  XML_ROLE_NOTATION_NO_SYSTEM_ID,
  XML_ROLE_NOTATION_PUBLIC_ID,
  XML_ROLE_ATTRIBUTE_NAME,
  XML_ROLE_ATTRIBUTE_TYPE_CDATA,
  XML_ROLE_ATTRIBUTE_TYPE_ID,
  XML_ROLE_ATTRIBUTE_TYPE_IDREF,
  XML_ROLE_ATTRIBUTE_TYPE_IDREFS,
  XML_ROLE_ATTRIBUTE_TYPE_ENTITY,
  XML_ROLE_ATTRIBUTE_TYPE_ENTITIES,
  XML_ROLE_ATTRIBUTE_TYPE_NMTOKEN,
  XML_ROLE_ATTRIBUTE_TYPE_NMTOKENS,
  XML_ROLE_ATTRIBUTE_ENUM_VALUE,
  XML_ROLE_ATTRIBUTE_NOTATION_VALUE,
  XML_ROLE_ATTLIST_ELEMENT_NAME,
  XML_ROLE_IMPLIED_ATTRIBUTE_VALUE,
  XML_ROLE_REQUIRED_ATTRIBUTE_VALUE,
  XML_ROLE_DEFAULT_ATTRIBUTE_VALUE,
  XML_ROLE_FIXED_ATTRIBUTE_VALUE,
  XML_ROLE_ELEMENT_NAME,
  XML_ROLE_CONTENT_ANY,
  XML_ROLE_CONTENT_EMPTY,
  XML_ROLE_CONTENT_PCDATA,
  XML_ROLE_GROUP_OPEN,
  XML_ROLE_GROUP_CLOSE,
  XML_ROLE_GROUP_CLOSE_REP,
  XML_ROLE_GROUP_CLOSE_OPT,
  XML_ROLE_GROUP_CLOSE_PLUS,
  XML_ROLE_GROUP_CHOICE,
  XML_ROLE_GROUP_SEQUENCE,
  XML_ROLE_CONTENT_ELEMENT,
  XML_ROLE_CONTENT_ELEMENT_REP,
  XML_ROLE_CONTENT_ELEMENT_OPT,
  XML_ROLE_CONTENT_ELEMENT_PLUS,
#ifdef XML_DTD
  XML_ROLE_TEXT_DECL,
  XML_ROLE_IGNORE_SECT,
  XML_ROLE_INNER_PARAM_ENTITY_REF,
#endif /* XML_DTD */
  XML_ROLE_PARAM_ENTITY_REF,
  XML_ROLE_EXTERNAL_GENERAL_ENTITY_NO_NOTATION
};

typedef struct prolog_state {
  int (*handler)(struct prolog_state *state,
	         int tok,
		 const char *ptr,
		 const char *end,
		 const ENCODING *enc);
  unsigned level;
#ifdef XML_DTD
  unsigned includeLevel;
  int documentEntity;
#endif /* XML_DTD */
} PROLOG_STATE;

void XMLTOKAPI XmlPrologStateInit(PROLOG_STATE *);
#ifdef XML_DTD
void XMLTOKAPI XmlPrologStateInitExternalEntity(PROLOG_STATE *);
#endif /* XML_DTD */

#define XmlTokenRole(state, tok, ptr, end, enc) \
 (((state)->handler)(state, tok, ptr, end, enc))

#ifdef __cplusplus
}
#endif

#endif /* not XmlRole_INCLUDED */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#include <config.h>
#include "xmldef.h"
#include "xmltok.h"
#include "nametab.h"

#ifdef XML_DTD
#define IGNORE_SECTION_TOK_VTABLE , PREFIX(ignoreSectionTok)
#else
#define IGNORE_SECTION_TOK_VTABLE /* as nothing */
#endif

#define VTABLE1 \
  { PREFIX(prologTok), PREFIX(contentTok), \
    PREFIX(cdataSectionTok) IGNORE_SECTION_TOK_VTABLE }, \
[...1519 lines suppressed...]
#define ns(x) x ## _ns

#include "xmltok_ns.c"

#undef NS
#undef ns

ENCODING *
XmlInitUnknownEncodingNS(void *mem,
		         int *table,
		         int (*convert)(void *userData, const char *p),
		         void *userData)
{
  ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);
  if (enc)
    ((struct normal_encoding *)enc)->type[ASCII_COLON] = BT_COLON;
  return enc;
}

#endif /* XML_NS */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#ifndef XmlTok_INCLUDED
#define XmlTok_INCLUDED 1

#ifdef __cplusplus
extern "C" {
#endif

#ifndef XMLTOKAPI
#define XMLTOKAPI /* as nothing */
#endif

/* The following token may be returned by XmlContentTok */
#define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be start of
                                    illegal ]]> sequence */
/* The following tokens may be returned by both XmlPrologTok and XmlContentTok */
#define XML_TOK_NONE -4    /* The string to be scanned is empty */
#define XML_TOK_TRAILING_CR -3 /* A CR at the end of the scan;
                                  might be part of CRLF sequence */ 
#define XML_TOK_PARTIAL_CHAR -2 /* only part of a multibyte sequence */
#define XML_TOK_PARTIAL -1 /* only part of a token */
#define XML_TOK_INVALID 0

/* The following tokens are returned by XmlContentTok; some are also
  returned by XmlAttributeValueTok, XmlEntityTok, XmlCdataSectionTok */

#define XML_TOK_START_TAG_WITH_ATTS 1
#define XML_TOK_START_TAG_NO_ATTS 2
#define XML_TOK_EMPTY_ELEMENT_WITH_ATTS 3 /* empty element tag <e/> */
#define XML_TOK_EMPTY_ELEMENT_NO_ATTS 4
#define XML_TOK_END_TAG 5
#define XML_TOK_DATA_CHARS 6
#define XML_TOK_DATA_NEWLINE 7
#define XML_TOK_CDATA_SECT_OPEN 8
#define XML_TOK_ENTITY_REF 9
#define XML_TOK_CHAR_REF 10     /* numeric character reference */

/* The following tokens may be returned by both XmlPrologTok and XmlContentTok */
#define XML_TOK_PI 11      /* processing instruction */
#define XML_TOK_XML_DECL 12 /* XML decl or text decl */
#define XML_TOK_COMMENT 13
#define XML_TOK_BOM 14     /* Byte order mark */

/* The following tokens are returned only by XmlPrologTok */
#define XML_TOK_PROLOG_S 15
#define XML_TOK_DECL_OPEN 16 /* <!foo */
#define XML_TOK_DECL_CLOSE 17 /* > */
#define XML_TOK_NAME 18
#define XML_TOK_NMTOKEN 19
#define XML_TOK_POUND_NAME 20 /* #name */
#define XML_TOK_OR 21 /* | */
#define XML_TOK_PERCENT 22
#define XML_TOK_OPEN_PAREN 23
#define XML_TOK_CLOSE_PAREN 24
#define XML_TOK_OPEN_BRACKET 25
#define XML_TOK_CLOSE_BRACKET 26
#define XML_TOK_LITERAL 27
#define XML_TOK_PARAM_ENTITY_REF 28
#define XML_TOK_INSTANCE_START 29

/* The following occur only in element type declarations */
#define XML_TOK_NAME_QUESTION 30 /* name? */
#define XML_TOK_NAME_ASTERISK 31 /* name* */
#define XML_TOK_NAME_PLUS 32 /* name+ */
#define XML_TOK_COND_SECT_OPEN 33 /* <![ */
#define XML_TOK_COND_SECT_CLOSE 34 /* ]]> */
#define XML_TOK_CLOSE_PAREN_QUESTION 35 /* )? */
#define XML_TOK_CLOSE_PAREN_ASTERISK 36 /* )* */
#define XML_TOK_CLOSE_PAREN_PLUS 37 /* )+ */
#define XML_TOK_COMMA 38

/* The following token is returned only by XmlAttributeValueTok */
#define XML_TOK_ATTRIBUTE_VALUE_S 39

/* The following token is returned only by XmlCdataSectionTok */
#define XML_TOK_CDATA_SECT_CLOSE 40

/* With namespace processing this is returned by XmlPrologTok
   for a name with a colon. */
#define XML_TOK_PREFIXED_NAME 41

#ifdef XML_DTD
#define XML_TOK_IGNORE_SECT 42
#endif /* XML_DTD */

#ifdef XML_DTD
#define XML_N_STATES 4
#else /* not XML_DTD */
#define XML_N_STATES 3
#endif /* not XML_DTD */

#define XML_PROLOG_STATE 0
#define XML_CONTENT_STATE 1
#define XML_CDATA_SECTION_STATE 2
#ifdef XML_DTD
#define XML_IGNORE_SECTION_STATE 3
#endif /* XML_DTD */

#define XML_N_LITERAL_TYPES 2
#define XML_ATTRIBUTE_VALUE_LITERAL 0
#define XML_ENTITY_VALUE_LITERAL 1

/* The size of the buffer passed to XmlUtf8Encode must be at least this. */
#define XML_UTF8_ENCODE_MAX 4
/* The size of the buffer passed to XmlUtf16Encode must be at least this. */
#define XML_UTF16_ENCODE_MAX 2

typedef struct position {
  /* first line and first column are 0 not 1 */
  unsigned long lineNumber;
  unsigned long columnNumber;
} POSITION;

typedef struct {
  const char *name;
  const char *valuePtr;
  const char *valueEnd;
  char normalized;
} ATTRIBUTE;

struct encoding;
typedef struct encoding ENCODING;

struct encoding {
  int (*scanners[XML_N_STATES])(const ENCODING *,
			        const char *,
			        const char *,
			        const char **);
  int (*literalScanners[XML_N_LITERAL_TYPES])(const ENCODING *,
					      const char *,
					      const char *,
					      const char **);
  int (*sameName)(const ENCODING *,
	          const char *, const char *);
  int (*nameMatchesAscii)(const ENCODING *,
			  const char *, const char *, const char *);
  int (*nameLength)(const ENCODING *, const char *);
  const char *(*skipS)(const ENCODING *, const char *);
  int (*getAtts)(const ENCODING *enc, const char *ptr,
	         int attsMax, ATTRIBUTE *atts);
  int (*charRefNumber)(const ENCODING *enc, const char *ptr);
  int (*predefinedEntityName)(const ENCODING *, const char *, const char *);
  void (*updatePosition)(const ENCODING *,
			 const char *ptr,
			 const char *end,
			 POSITION *);
  int (*isPublicId)(const ENCODING *enc, const char *ptr, const char *end,
		    const char **badPtr);
  void (*utf8Convert)(const ENCODING *enc,
		      const char **fromP,
		      const char *fromLim,
		      char **toP,
		      const char *toLim);
  void (*utf16Convert)(const ENCODING *enc,
		       const char **fromP,
		       const char *fromLim,
		       unsigned short **toP,
		       const unsigned short *toLim);
  int minBytesPerChar;
  char isUtf8;
  char isUtf16;
};

/*
Scan the string starting at ptr until the end of the next complete token,
but do not scan past eptr.  Return an integer giving the type of token.

Return XML_TOK_NONE when ptr == eptr; nextTokPtr will not be set.

Return XML_TOK_PARTIAL when the string does not contain a complete token;
nextTokPtr will not be set.

Return XML_TOK_INVALID when the string does not start a valid token; nextTokPtr
will be set to point to the character which made the token invalid.

Otherwise the string starts with a valid token; nextTokPtr will be set to point
to the character following the end of that token.

Each data character counts as a single token, but adjacent data characters
may be returned together.  Similarly for characters in the prolog outside
literals, comments and processing instructions.
*/


#define XmlTok(enc, state, ptr, end, nextTokPtr) \
  (((enc)->scanners[state])(enc, ptr, end, nextTokPtr))

#define XmlPrologTok(enc, ptr, end, nextTokPtr) \
   XmlTok(enc, XML_PROLOG_STATE, ptr, end, nextTokPtr)

#define XmlContentTok(enc, ptr, end, nextTokPtr) \
   XmlTok(enc, XML_CONTENT_STATE, ptr, end, nextTokPtr)

#define XmlCdataSectionTok(enc, ptr, end, nextTokPtr) \
   XmlTok(enc, XML_CDATA_SECTION_STATE, ptr, end, nextTokPtr)

#ifdef XML_DTD

#define XmlIgnoreSectionTok(enc, ptr, end, nextTokPtr) \
   XmlTok(enc, XML_IGNORE_SECTION_STATE, ptr, end, nextTokPtr)

#endif /* XML_DTD */

/* This is used for performing a 2nd-level tokenization on
the content of a literal that has already been returned by XmlTok. */ 

#define XmlLiteralTok(enc, literalType, ptr, end, nextTokPtr) \
  (((enc)->literalScanners[literalType])(enc, ptr, end, nextTokPtr))

#define XmlAttributeValueTok(enc, ptr, end, nextTokPtr) \
   XmlLiteralTok(enc, XML_ATTRIBUTE_VALUE_LITERAL, ptr, end, nextTokPtr)

#define XmlEntityValueTok(enc, ptr, end, nextTokPtr) \
   XmlLiteralTok(enc, XML_ENTITY_VALUE_LITERAL, ptr, end, nextTokPtr)

#define XmlSameName(enc, ptr1, ptr2) (((enc)->sameName)(enc, ptr1, ptr2))

#define XmlNameMatchesAscii(enc, ptr1, end1, ptr2) \
  (((enc)->nameMatchesAscii)(enc, ptr1, end1, ptr2))

#define XmlNameLength(enc, ptr) \
  (((enc)->nameLength)(enc, ptr))

#define XmlSkipS(enc, ptr) \
  (((enc)->skipS)(enc, ptr))

#define XmlGetAttributes(enc, ptr, attsMax, atts) \
  (((enc)->getAtts)(enc, ptr, attsMax, atts))

#define XmlCharRefNumber(enc, ptr) \
  (((enc)->charRefNumber)(enc, ptr))

#define XmlPredefinedEntityName(enc, ptr, end) \
  (((enc)->predefinedEntityName)(enc, ptr, end))

#define XmlUpdatePosition(enc, ptr, end, pos) \
  (((enc)->updatePosition)(enc, ptr, end, pos))

#define XmlIsPublicId(enc, ptr, end, badPtr) \
  (((enc)->isPublicId)(enc, ptr, end, badPtr))

#define XmlUtf8Convert(enc, fromP, fromLim, toP, toLim) \
  (((enc)->utf8Convert)(enc, fromP, fromLim, toP, toLim))

#define XmlUtf16Convert(enc, fromP, fromLim, toP, toLim) \
  (((enc)->utf16Convert)(enc, fromP, fromLim, toP, toLim))

typedef struct {
  ENCODING initEnc;
  const ENCODING **encPtr;
} INIT_ENCODING;

int XMLTOKAPI XmlParseXmlDecl(int isGeneralTextEntity,
			      const ENCODING *enc,
			      const char *ptr,
	  		      const char *end,
			      const char **badPtr,
			      const char **versionPtr,
			      const char **encodingNamePtr,
			      const ENCODING **namedEncodingPtr,
			      int *standalonePtr);

int XMLTOKAPI XmlInitEncoding(INIT_ENCODING *, const ENCODING **, const char *name);
const ENCODING XMLTOKAPI *XmlGetUtf8InternalEncoding(void);
const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncoding(void);
int XMLTOKAPI XmlUtf8Encode(int charNumber, char *buf);
int XMLTOKAPI XmlUtf16Encode(int charNumber, unsigned short *buf);

int XMLTOKAPI XmlSizeOfUnknownEncoding(void);
ENCODING XMLTOKAPI *
XmlInitUnknownEncoding(void *mem,
		       int *table,
		       int (*conv)(void *userData, const char *p),
		       void *userData);

int XMLTOKAPI XmlParseXmlDeclNS(int isGeneralTextEntity,
			        const ENCODING *enc,
			        const char *ptr,
	  		        const char *end,
			        const char **badPtr,
			        const char **versionPtr,
			        const char **encodingNamePtr,
			        const ENCODING **namedEncodingPtr,
			        int *standalonePtr);
int XMLTOKAPI XmlInitEncodingNS(INIT_ENCODING *, const ENCODING **, const char *name);
const ENCODING XMLTOKAPI *XmlGetUtf8InternalEncodingNS(void);
const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncodingNS(void);
ENCODING XMLTOKAPI *
XmlInitUnknownEncodingNS(void *mem,
		         int *table,
		         int (*conv)(void *userData, const char *p),
		         void *userData);
#ifdef __cplusplus
}
#endif

#endif /* not XmlTok_INCLUDED */

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

#ifndef IS_INVALID_CHAR
#define IS_INVALID_CHAR(enc, ptr, n) (0)
#endif

#define INVALID_LEAD_CASE(n, ptr, nextTokPtr) \
    case BT_LEAD ## n: \
      if (end - ptr < n) \
	return XML_TOK_PARTIAL_CHAR; \
      if (IS_INVALID_CHAR(enc, ptr, n)) { \
        *(nextTokPtr) = (ptr); \
        return XML_TOK_INVALID; \
      } \
      ptr += n; \
      break;
[...1726 lines suppressed...]
      ptr += MINBPC(enc);
      if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF)
	ptr += MINBPC(enc);
      pos->columnNumber = (unsigned)-1;
      break;
    default:
      ptr += MINBPC(enc);
      break;
    }
    pos->columnNumber++;
  }
}

#undef DO_LEAD_CASE
#undef MULTIBYTE_CASES
#undef INVALID_CASES
#undef CHECK_NAME_CASE
#undef CHECK_NAME_CASES
#undef CHECK_NMSTRT_CASE
#undef CHECK_NMSTRT_CASES

--- NEW FILE ---
/*
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
See the file copying.txt for copying permission.
*/

enum {
  BT_NONXML,
  BT_MALFORM,
  BT_LT,
  BT_AMP,
  BT_RSQB,
  BT_LEAD2,
  BT_LEAD3,
  BT_LEAD4,
  BT_TRAIL,
  BT_CR,
  BT_LF,
  BT_GT,
  BT_QUOT,
  BT_APOS,
  BT_EQUALS,
  BT_QUEST,
  BT_EXCL,
  BT_SOL,
  BT_SEMI,
  BT_NUM,
  BT_LSQB,
  BT_S,
  BT_NMSTRT,
  BT_COLON,
  BT_HEX,
  BT_DIGIT,
  BT_NAME,
  BT_MINUS,
  BT_OTHER, /* known not to be a name or name start character */
  BT_NONASCII, /* might be a name or name start character */
  BT_PERCNT,
  BT_LPAR,
  BT_RPAR,
  BT_AST,
  BT_PLUS,
  BT_COMMA,
  BT_VERBAR
};

#include <stddef.h>

--- NEW FILE ---
const ENCODING *NS(XmlGetUtf8InternalEncoding)(void)
{
  return &ns(internal_utf8_encoding).enc;
}

const ENCODING *NS(XmlGetUtf16InternalEncoding)(void)
{
#if XML_BYTE_ORDER == 12
  return &ns(internal_little2_encoding).enc;
#elif XML_BYTE_ORDER == 21
  return &ns(internal_big2_encoding).enc;
#else
  const short n = 1;
  return *(const char *)&n ? &ns(internal_little2_encoding).enc : &ns(internal_big2_encoding).enc;
#endif
}

static
const ENCODING *NS(encodings)[] = {
  &ns(latin1_encoding).enc,
  &ns(ascii_encoding).enc,
  &ns(utf8_encoding).enc,
  &ns(big2_encoding).enc,
  &ns(big2_encoding).enc,
  &ns(little2_encoding).enc,
  &ns(utf8_encoding).enc /* NO_ENC */
};

static
int NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end,
		       const char **nextTokPtr)
{
  return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_PROLOG_STATE, ptr, end, nextTokPtr);
}

static
int NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end,
		       const char **nextTokPtr)
{
  return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_CONTENT_STATE, ptr, end, nextTokPtr);
}

int NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr, const char *name)
{
  int i = getEncodingIndex(name);
  if (i == UNKNOWN_ENC)
    return 0;
  SET_INIT_ENC_INDEX(p, i);
  p->initEnc.scanners[XML_PROLOG_STATE] = NS(initScanProlog);
  p->initEnc.scanners[XML_CONTENT_STATE] = NS(initScanContent);
  p->initEnc.updatePosition = initUpdatePosition;
  p->encPtr = encPtr;
  *encPtr = &(p->initEnc);
  return 1;
}

static
const ENCODING *NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end)
{
#define ENCODING_MAX 128
  char buf[ENCODING_MAX];
  char *p = buf;
  int i;
  XmlUtf8Convert(enc, &ptr, end, &p, p + ENCODING_MAX - 1);
  if (ptr != end)
    return 0;
  *p = 0;
  if (streqci(buf, KW_UTF_16) && enc->minBytesPerChar == 2)
    return enc;
  i = getEncodingIndex(buf);
  if (i == UNKNOWN_ENC)
    return 0;
  return NS(encodings)[i];
}

int NS(XmlParseXmlDecl)(int isGeneralTextEntity,
			const ENCODING *enc,
			const char *ptr,
			const char *end,
			const char **badPtr,
			const char **versionPtr,
			const char **encodingName,
			const ENCODING **encoding,
			int *standalone)
{
  return doParseXmlDecl(NS(findEncoding),
			isGeneralTextEntity,
			enc,
			ptr,
			end,
			badPtr,
			versionPtr,
			encodingName,
			encoding,
			standalone);
}


From coopercc@users.sourceforge.net  Thu Sep 21 22:20:21 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 21 Sep 2000 14:20:21 -0700
Subject: [Expat-checkins] CVS: expat/xmltok dllmain.c,1.6,1.7 xmltok.c,1.56,1.57
Message-ID: <200009212120.OAA07356@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmltok
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917/xmltok

Modified Files:
	dllmain.c xmltok.c 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: dllmain.c
===================================================================
RCS file: /cvsroot/expat/expat/xmltok/dllmain.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dllmain.c	2000/04/21 04:20:31	1.6
--- dllmain.c	2000/09/21 21:20:18	1.7
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/xmltok/xmltok.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** xmltok.c	2000/05/08 04:26:17	1.56
--- xmltok.c	2000/09/21 21:20:18	1.57
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  


From coopercc@users.sourceforge.net  Thu Sep 21 22:20:20 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 21 Sep 2000 14:20:20 -0700
Subject: [Expat-checkins] CVS: expat Makefile.in,1.1,1.2 config.hin,1.1,1.2 configure.in,1.1,1.2
Message-ID: <200009212120.OAA07340@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917

Modified Files:
	Makefile.in config.hin configure.in 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:20	1.1
--- Makefile.in	2000/09/21 21:20:10	1.2
***************
*** 79,83 ****
  SUBDIRS = lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! CONFIG_HEADERS = @CONFIG_HEADERS@
  DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
--- 79,83 ----
  SUBDIRS = lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! CONFIG_HEADERS = config.h:config.hin
  DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
***************
*** 109,123 ****
  
  $(SUBDIRS): config.status
! 	$(MAKE) -C $@
  
  
  clean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir clean; \
  	done
  
  distclean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir distclean; \
  	done
  	rm -f config.h config.status libtool
--- 109,124 ----
  
  $(SUBDIRS): config.status
! 	cd $@; $(MAKE)
  
  
  clean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) clean; cd ..; \
  	done
+ 	rm -f core *~
  
  distclean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) distclean; cd ..; \
  	done
  	rm -f config.h config.status libtool
***************
*** 131,135 ****
  	@list='$(SUBDIRS)'; for dir in $$list; do \
  	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
! 	  $(MAKE) -C $$dir distdir; \
  	done
  	@for file in $(DIST_COMMON); do \
--- 132,136 ----
  	@list='$(SUBDIRS)'; for dir in $$list; do \
  	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
! 	  cd $$dir; $(MAKE) distdir; cd ..; \
  	done
  	@for file in $(DIST_COMMON); do \
***************
*** 150,158 ****
  install:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir install; \
  	done
  
  uninstall:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir uninstall; \
  	done
--- 151,159 ----
  install:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) install; cd ..; \
  	done
  
  uninstall:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) uninstall; cd ..; \
  	done

Index: config.hin
===================================================================
RCS file: /cvsroot/expat/expat/config.hin,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.hin	2000/09/18 16:26:20	1.1
--- config.hin	2000/09/21 21:20:10	1.2
***************
*** 61,64 ****
--- 61,66 ----
  #endif
  
+ #define XML_CONTEXT_BYTES 1024
+ 
  #ifndef HAVE_MEMMOVE
  #ifdef HAVE_BCOPY

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure.in	2000/09/18 16:26:20	1.1
--- configure.in	2000/09/21 21:20:10	1.2
***************
*** 25,29 ****
  AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
- AC_SUBST(CONFIG_HEADERS)
  
  dnl Checks for programs.
--- 25,28 ----


From coopercc@users.sourceforge.net  Thu Sep 21 22:20:20 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 21 Sep 2000 14:20:20 -0700
Subject: [Expat-checkins] CVS: expat/gennmtab gennmtab.c,1.5,1.6
Message-ID: <200009212120.OAA07339@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/gennmtab
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917/gennmtab

Modified Files:
	gennmtab.c 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: gennmtab.c
===================================================================
RCS file: /cvsroot/expat/expat/gennmtab/gennmtab.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gennmtab.c	2000/04/21 04:20:31	1.5
--- gennmtab.c	2000/09/21 21:20:17	1.6
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  


From coopercc@users.sourceforge.net  Thu Sep 21 22:20:22 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 21 Sep 2000 14:20:22 -0700
Subject: [Expat-checkins] CVS: expat/xmlwf codepage.c,1.8,1.9 codepage.h,1.6,1.7 filemap.h,1.6,1.7 readfilemap.c,1.6,1.7 unixfilemap.c,1.5,1.6 win32filemap.c,1.9,1.10 xmlfile.c,1.7,1.8 xmlfile.h,1.4,1.5 xmlwf.c,1.53,1.54
Message-ID: <200009212120.OAA07380@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmlwf
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917/xmlwf

Modified Files:
	codepage.c codepage.h filemap.h readfilemap.c unixfilemap.c 
	win32filemap.c xmlfile.c xmlfile.h xmlwf.c 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: codepage.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/codepage.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** codepage.c	2000/04/21 04:20:31	1.8
--- codepage.c	2000/09/21 21:20:18	1.9
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: codepage.h
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/codepage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** codepage.h	2000/04/21 04:20:31	1.6
--- codepage.h	2000/09/21 21:20:18	1.7
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: filemap.h
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/filemap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** filemap.h	2000/04/21 04:20:31	1.6
--- filemap.h	2000/09/21 21:20:18	1.7
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: readfilemap.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/readfilemap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** readfilemap.c	2000/04/21 04:20:31	1.6
--- readfilemap.c	2000/09/21 21:20:18	1.7
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: unixfilemap.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/unixfilemap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** unixfilemap.c	2000/04/21 04:20:31	1.5
--- unixfilemap.c	2000/09/21 21:20:18	1.6
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: win32filemap.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/win32filemap.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** win32filemap.c	2000/04/21 04:20:31	1.9
--- win32filemap.c	2000/09/21 21:20:18	1.10
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** xmlfile.c	2000/09/18 16:26:23	1.7
--- xmlfile.c	2000/09/21 21:20:18	1.8
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmlfile.h
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xmlfile.h	2000/04/21 04:20:31	1.4
--- xmlfile.h	2000/09/21 21:20:18	1.5
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** xmlwf.c	2000/09/18 16:26:23	1.53
--- xmlwf.c	2000/09/21 21:20:18	1.54
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  


From coopercc@users.sourceforge.net  Thu Sep 21 22:20:22 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 21 Sep 2000 14:20:22 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.1,1.2 ascii.h,1.1,1.2 asciitab.h,1.1,1.2 expat.h,1.1,1.2 iasciitab.h,1.1,1.2 latin1tab.h,1.1,1.2 utf8tab.h,1.1,1.2 xmldef.h,1.1,1.2 xmlparse.c,1.1,1.2 xmlrole.c,1.1,1.2 xmlrole.h,1.1,1.2 xmltok.c,1.1,1.2 xmltok.h,1.1,1.2 xmltok_impl.c,1.1,1.2 xmltok_impl.h,1.1,1.2 xmltok_ns.c,1.1,1.2
Message-ID: <200009212120.OAA07400@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917/lib

Modified Files:
	Makefile.in ascii.h asciitab.h expat.h iasciitab.h latin1tab.h 
	utf8tab.h xmldef.h xmlparse.c xmlrole.c xmlrole.h xmltok.c 
	xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:22	1.1
--- Makefile.in	2000/09/21 21:20:18	1.2
***************
*** 134,139 ****
  
  clean:
! 	rm -f $(LIBRARY) *.o *.lo
! 	rm -rf .libs _libs
  
  distclean: clean
--- 134,139 ----
  
  clean:
! 	rm -f $(LIBRARY) *.o *.lo *~
! 	rm -rf .libs _libs .deps
  
  distclean: clean

Index: ascii.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/ascii.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ascii.h	2000/09/18 16:26:22	1.1
--- ascii.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: asciitab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/asciitab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** asciitab.h	2000/09/18 16:26:22	1.1
--- asciitab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** expat.h	2000/09/18 16:26:22	1.1
--- expat.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 49,53 ****
--- 49,156 ----
  #endif /* not XML_UNICODE_WCHAR_T */
  
+ enum XML_Content_Type {
+   XML_CTYPE_EMPTY = 1,
+   XML_CTYPE_ANY,
+   XML_CTYPE_MIXED,
+   XML_CTYPE_NAME,
+   XML_CTYPE_CHOICE,
+   XML_CTYPE_SEQ
+ };
+ 
+ enum XML_Content_Quant {
+   XML_CQUANT_NONE,
+   XML_CQUANT_OPT,
+   XML_CQUANT_REP,
+   XML_CQUANT_PLUS
+ };
+ 
+ /* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
+    XML_CQUANT_NONE, and the other fields will be zero or NULL.
+    If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
+    numchildren will contain number of elements that may be mixed in
+    and children point to an array of XML_Content cells that will be
+    all of XML_CTYPE_NAME type with no quantification.
+ 
+    If type == XML_CTYPE_NAME, then the name points to the name, and
+    the numchildren field will be zero and children will be NULL. The
+    quant fields indicates any quantifiers placed on the name.
+ 
+    CHOICE and SEQ will have name NULL, the number of children in
+    numchildren and children will point, recursively, to an array
+    of XML_Content cells.
+ 
+    The EMPTY, ANY, and MIXED types will only occur at top level.
+ */
+ 
+ typedef struct XML_cp XML_Content;
+ 
+ struct XML_cp {
+   enum XML_Content_Type		type;
+   enum XML_Content_Quant	quant;
+   const XML_Char *		name;
+   unsigned int			numchildren;
+   XML_Content *			children;
+ };
+ 
+ 
+ /* This is called for an element declaration. See above for
+    description of the model argument. It's the caller's responsibility
+    to free model when finished with it by calling XML_ContentFree.
+ */
+ 
+ typedef void (*XML_ElementDeclHandler) (void *userData,
+ 					const XML_Char *name,
+ 					XML_Content *model);
+ 
+ void XMLPARSEAPI
+ XML_SetElementDeclHandler(XML_Parser parser,
+ 			  XML_ElementDeclHandler eldecl);
+ 
+ 
+ void XMLPARSEAPI
+ XML_ContentFree(XML_Content *content);
+ 
+ /*
+   The Attlist declaration handler is called for *each* attribute. So
+   a single Attlist declaration with multiple attributes declared will
+   generate multiple calls to this handler. The "default" parameter
+   may be NULL in the case of the "#IMPLIED" or "#REQUIRED" keyword.
+   The "isrequired" parameter will be true and the default value will
+   be NULL in the case of "#REQUIRED". If "isrequired" is true and
+   default is non-NULL, then this is a "#FIXED" default.
+  */
+ 
+ typedef void (*XML_AttlistDeclHandler) (void		*userData,
+ 					const XML_Char	*elname,
+ 					const XML_Char	*attname,
+ 					const XML_Char	*att_type,
+ 					const XML_Char	*dflt,
+ 					int		isrequired);
+ 
+ void XMLPARSEAPI
+ XML_SetAttlistDeclHandler(XML_Parser parser,
+ 			  XML_AttlistDeclHandler attdecl);
+ 
+ 
+   /* The XML declaration handler is called for *both* XML declarations and
+      text declarations. The way to distinguish is that the version parameter
+      will be null for text declarations. The encoding parameter may be null
+      for XML declarations. The standalone parameter will be -1, 0, or 1
+      indicating respectively that there was no standalone parameter in
+      the declaration, that it was given as no, or that it was given as yes.
+   */
+ 
+ typedef void (*XML_XmlDeclHandler) (void		*userData,
+ 				    const XML_Char	*version,
+ 				    const XML_Char	*encoding,
+ 				    int			standalone);
+ 
+ 
  
+ void XMLPARSEAPI
+ XML_SetXmlDeclHandler(XML_Parser parser,
+ 		      XML_XmlDeclHandler xmldecl);
+ 
+ 
  /* Constructs a new parser; encoding is the encoding specified by the external
  protocol or null if there is none specified. */
***************
*** 113,126 ****
  				   int len);
  
! /* This is called for the start of the DOCTYPE declaration when the
! name of the DOCTYPE is encountered. */
  typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
! 					    const XML_Char *doctypeName);
  
  /* This is called for the start of the DOCTYPE declaration when the
  closing > is encountered, but after processing any external subset. */
  typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
  
! /* This is called for a declaration of an unparsed (NDATA)
  entity.  The base argument is whatever was set by XML_SetBase.
  The entityName, systemId and notationName arguments will never be null.
--- 216,267 ----
  				   int len);
  
! /* This is called for the start of the DOCTYPE declaration, before
!    any DTD or internal subset is parsed. */
! 
  typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
! 					    const XML_Char *doctypeName,
! 					    const XML_Char *sysid,
! 					    const XML_Char *pubid,
! 					    int has_internal_subset
! 					    );
  
  /* This is called for the start of the DOCTYPE declaration when the
  closing > is encountered, but after processing any external subset. */
  typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
+ 
+ /* This is called for entity declarations. The is_parameter_entity
+    argument will be non-zero if the entity is a parameter entity, zero
+    otherwise.
+ 
+    For internal entities (<!ENTITY foo "bar">), value will
+    be non-null and systemId, publicID, and notationName will be null.
+    The value string is NOT null terminated; the length is provided in
+    the value_length argument. Since it is legal to have zero-length
+    values, do not use this argument to test for internal entities.
+ 
+    For external entities, value will be null and systemId will be non-null.
+    The publicId argument will be null unless a public identifier was
+    provided. The notationName argument will have a non-null value only
+    for unparsed entity declarations.
+ */
  
! typedef void (*XML_EntityDeclHandler) (void *userData,
! 				       const XML_Char *entityName,
! 				       int is_parameter_entity,
! 				       const XML_Char *value,
! 				       int value_length,
! 				       const XML_Char *base,
! 				       const XML_Char *systemId,
! 				       const XML_Char *publicId,
! 				       const XML_Char *notationName);
! 				       
! void XMLPARSEAPI
! XML_SetEntityDeclHandler(XML_Parser parser,
! 			 XML_EntityDeclHandler handler);
! 
! /* OBSOLETE -- OBSOLETE -- OBSOLETE
!    This handler has been superceded by the EntityDeclHandler above.
!    It is provided here for backward compatibility.
! This is called for a declaration of an unparsed (NDATA)
  entity.  The base argument is whatever was set by XML_SetBase.
  The entityName, systemId and notationName arguments will never be null.
***************
*** 144,158 ****
  					const XML_Char *publicId);
  
- typedef void (*XML_ExternalParsedEntityDeclHandler)(void *userData,
- 						    const XML_Char *entityName,
- 						    const XML_Char *base,
- 						    const XML_Char *systemId,
- 						    const XML_Char *publicId);
- 
- typedef void (*XML_InternalParsedEntityDeclHandler)(void *userData,
- 						    const XML_Char *entityName,
- 						    const XML_Char *replacementText,
- 						    int replacementTextLength);
- 
  /* When namespace processing is enabled, these are called once for
  each namespace declaration. The call to the start and end element
--- 285,288 ----
***************
*** 275,278 ****
--- 405,414 ----
  
  void XMLPARSEAPI
+ XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler);
+ 
+ void XMLPARSEAPI
+ XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler);
+ 
+ void XMLPARSEAPI
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
***************
*** 290,293 ****
--- 426,437 ----
  			   XML_EndCdataSectionHandler end);
  
+ void XMLPARSEAPI
+ XML_SetStartCdataSectionHandler(XML_Parser parser,
+                                 XML_StartCdataSectionHandler start);
+ 
+ void XMLPARSEAPI
+ XML_SetEndCdataSectionHandler(XML_Parser parser,
+                               XML_EndCdataSectionHandler end);
+ 
  /* This sets the default handler and also inhibits expansion of internal entities.
  The entity reference will be passed to the default handler. */
***************
*** 310,313 ****
--- 454,465 ----
  
  void XMLPARSEAPI
+ XML_SetStartDoctypeDeclHandler(XML_Parser parser,
+ 			       XML_StartDoctypeDeclHandler start);
+ 
+ void XMLPARSEAPI
+ XML_SetEndDoctypeDeclHandler(XML_Parser parser,
+ 			     XML_EndDoctypeDeclHandler end);
+ 
+ void XMLPARSEAPI
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
***************
*** 318,332 ****
  
  void XMLPARSEAPI
! XML_SetExternalParsedEntityDeclHandler(XML_Parser parser,
! 				       XML_ExternalParsedEntityDeclHandler handler);
  
  void XMLPARSEAPI
! XML_SetInternalParsedEntityDeclHandler(XML_Parser parser,
! 				       XML_InternalParsedEntityDeclHandler handler);
  
  void XMLPARSEAPI
! XML_SetNamespaceDeclHandler(XML_Parser parser,
! 			    XML_StartNamespaceDeclHandler start,
! 			    XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
--- 470,484 ----
  
  void XMLPARSEAPI
! XML_SetNamespaceDeclHandler(XML_Parser parser,
! 			    XML_StartNamespaceDeclHandler start,
! 			    XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
! XML_SetStartNamespaceDeclHandler(XML_Parser parser,
! 				 XML_StartNamespaceDeclHandler start);
  
  void XMLPARSEAPI
! XML_SetEndNamespaceDeclHandler(XML_Parser parser,
! 			       XML_EndNamespaceDeclHandler end);
  
  void XMLPARSEAPI
***************
*** 508,511 ****
--- 660,676 ----
  
  int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser);
+ 
+ /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
+    the integer pointed to by offset to the offset within this buffer
+    of the current parse position, and sets the integer pointed to by size
+    to the size of this buffer (the number of input bytes). Otherwise
+    returns a null pointer. Also returns a null pointer if a parse isn't active.
+ 
+    NOTE: The character pointer returned should not be used outside
+    the handler that makes the call. */
+ 
+ const char XMLPARSEAPI * XML_GetInputContext(XML_Parser parser,
+ 					     int *offset,
+ 					     int *size);
  
  /* For backwards compatibility with previous versions. */

Index: iasciitab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/iasciitab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** iasciitab.h	2000/09/18 16:26:22	1.1
--- iasciitab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: latin1tab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/latin1tab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** latin1tab.h	2000/09/18 16:26:22	1.1
--- latin1tab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: utf8tab.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/utf8tab.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** utf8tab.h	2000/09/18 16:26:22	1.1
--- utf8tab.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmldef.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmldef.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmldef.h	2000/09/18 16:26:22	1.1
--- xmldef.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlparse.c	2000/09/18 16:26:22	1.1
--- xmlparse.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
[...1219 lines suppressed...]
+ 	       const char *ptr,
+ 	       const char *end)
+ {
+   const XML_Char *name = poolStoreString(&dtd.pool, enc, ptr, end);
+   ELEMENT_TYPE *ret;
+ 
+   if (! name)
+     return 0;
+   ret = (ELEMENT_TYPE *) lookup(&dtd.elementTypes, name, sizeof(ELEMENT_TYPE));
+   if (! ret)
+     return 0;
+   if (ret->name != name)
+     poolDiscard(&dtd.pool);
+   else {
+     poolFinish(&dtd.pool);
+     if (!setElementTypePrefix(parser, ret))
+       return 0;
+   }
+   return ret;
+ }  /* End getElementType */

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlrole.c	2000/09/18 16:26:22	1.1
--- xmlrole.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 195,199 ****
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_NONE;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
--- 195,199 ----
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_DOCTYPE_INTERNAL_SUBSET;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
***************
*** 259,263 ****
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_NONE;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
--- 259,263 ----
    case XML_TOK_OPEN_BRACKET:
      state->handler = internalSubset;
!     return XML_ROLE_DOCTYPE_INTERNAL_SUBSET;
    case XML_TOK_DECL_CLOSE:
      state->handler = prolog2;
***************
*** 494,498 ****
    case XML_TOK_DECL_CLOSE:
      setTopLevel(state);
!     return XML_ROLE_EXTERNAL_GENERAL_ENTITY_NO_NOTATION;
    case XML_TOK_NAME:
      if (XmlNameMatchesAscii(enc, ptr, end, KW_NDATA)) {
--- 494,498 ----
    case XML_TOK_DECL_CLOSE:
      setTopLevel(state);
!     return XML_ROLE_ENTITY_COMPLETE;
    case XML_TOK_NAME:
      if (XmlNameMatchesAscii(enc, ptr, end, KW_NDATA)) {
***************
*** 1007,1010 ****
--- 1007,1012 ----
      return XML_ROLE_NONE;
    case XML_TOK_CLOSE_PAREN:
+     state->handler = declClose;
+     return XML_ROLE_GROUP_CLOSE;
    case XML_TOK_CLOSE_PAREN_ASTERISK:
      state->handler = declClose;

Index: xmlrole.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmlrole.h	2000/09/18 16:26:22	1.1
--- xmlrole.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 21,24 ****
--- 21,25 ----
    XML_ROLE_DOCTYPE_SYSTEM_ID,
    XML_ROLE_DOCTYPE_PUBLIC_ID,
+   XML_ROLE_DOCTYPE_INTERNAL_SUBSET,
    XML_ROLE_DOCTYPE_CLOSE,
    XML_ROLE_GENERAL_ENTITY_NAME,
***************
*** 27,30 ****
--- 28,32 ----
    XML_ROLE_ENTITY_SYSTEM_ID,
    XML_ROLE_ENTITY_PUBLIC_ID,
+   XML_ROLE_ENTITY_COMPLETE,
    XML_ROLE_ENTITY_NOTATION_NAME,
    XML_ROLE_NOTATION_NAME,
***************
*** 68,73 ****
    XML_ROLE_INNER_PARAM_ENTITY_REF,
  #endif /* XML_DTD */
!   XML_ROLE_PARAM_ENTITY_REF,
!   XML_ROLE_EXTERNAL_GENERAL_ENTITY_NO_NOTATION
  };
  
--- 70,74 ----
    XML_ROLE_INNER_PARAM_ENTITY_REF,
  #endif /* XML_DTD */
!   XML_ROLE_PARAM_ENTITY_REF
  };
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok.c	2000/09/18 16:26:22	1.1
--- xmltok.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 1021,1024 ****
--- 1021,1025 ----
  		   const char **badPtr,
  		   const char **versionPtr,
+ 		   const char **versionEndPtr,
  		   const char **encodingName,
  		   const ENCODING **encoding,
***************
*** 1043,1046 ****
--- 1044,1049 ----
      if (versionPtr)
        *versionPtr = val;
+     if (versionEndPtr)
+       *versionEndPtr = ptr;
      if (!parsePseudoAttribute(enc, ptr, end, &name, &nameEnd, &val, &ptr)) {
        *badPtr = ptr;

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok.h	2000/09/18 16:26:22	1.1
--- xmltok.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  
***************
*** 261,264 ****
--- 261,265 ----
  			      const char **badPtr,
  			      const char **versionPtr,
+ 			      const char **versionEndPtr,
  			      const char **encodingNamePtr,
  			      const ENCODING **namedEncodingPtr,
***************
*** 284,287 ****
--- 285,289 ----
  			        const char **badPtr,
  			        const char **versionPtr,
+ 				const char **versionEndPtr,
  			        const char **encodingNamePtr,
  			        const ENCODING **namedEncodingPtr,

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_impl.c	2000/09/18 16:26:22	1.1
--- xmltok_impl.c	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmltok_impl.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_impl.h	2000/09/18 16:26:22	1.1
--- xmltok_impl.h	2000/09/21 21:20:18	1.2
***************
*** 1,5 ****
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file copying.txt for copying permission.
  */
  
--- 1,5 ----
  /*
  Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
! See the file COPYING for copying permission.
  */
  

Index: xmltok_ns.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_ns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** xmltok_ns.c	2000/09/18 16:26:22	1.1
--- xmltok_ns.c	2000/09/21 21:20:18	1.2
***************
*** 80,83 ****
--- 80,84 ----
  			const char **badPtr,
  			const char **versionPtr,
+ 			const char **versionEndPtr,
  			const char **encodingName,
  			const ENCODING **encoding,
***************
*** 91,94 ****
--- 92,96 ----
  			badPtr,
  			versionPtr,
+ 			versionEndPtr,
  			encodingName,
  			encoding,


From coopercc@users.sourceforge.net  Fri Sep 22 19:24:32 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 22 Sep 2000 11:24:32 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.1,1.2
Message-ID: <200009221824.LAA13347@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13163

Modified Files:
	reference.html 
Log Message:
Update reference with API changes made by the perl-expat merge.


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** reference.html	2000/09/18 16:26:21	1.1
--- reference.html	2000/09/22 18:24:28	1.2
***************
*** 48,52 ****
                    <li><a href="#XML_ParserCreate">XML_ParserCreate</a></li>
  		  <li><a href="#XML_ParserCreateNS">XML_ParserCreateNS</a></li>
! 		  <li><a href="#XML_ExternalEntityParserCreate">XML_ExternalEntityParserCreate</a><li>
  		  <li><a href="#XML_ParserFree">XML_ParserFree</a></li>
                </ul>
--- 48,52 ----
                    <li><a href="#XML_ParserCreate">XML_ParserCreate</a></li>
  		  <li><a href="#XML_ParserCreateNS">XML_ParserCreateNS</a></li>
! 		  <li><a href="#XML_ExternalEntityParserCreate">XML_ExternalEntityParserCreate</a></li>
  		  <li><a href="#XML_ParserFree">XML_ParserFree</a></li>
[...1040 lines suppressed...]
! Returns the index of the ID attribute passed in the atts array
! in the last call to XML_StartElementHandler, or -1 if there is no ID
! attribute. If called inside a start handler, then that means the current call.
  </div>
  
***************
*** 1186,1189 ****
--- 1414,1425 ----
  <li>XML_PARAM_ENTITY_PARSING_ALWAYS
  </ul>
+ </div>
+ 
+ <div class="fcndec"><a name="XML_ContentFree"><pre>
+ void
+ XML_ContentFree(XML_Content *content);
+ </pre></a></div>
+ <div class="fcndef">
+ Free the model data structure passed to an element declaration handler.
  </div>
  


From coopercc@users.sourceforge.net  Sun Sep 24 04:43:40 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Sat, 23 Sep 2000 20:43:40 -0700
Subject: [Expat-checkins] CVS: expat config.hin,1.2,1.3 configure.in,1.2,1.3
Message-ID: <200009240343.UAA27711@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26511

Modified Files:
	config.hin configure.in 
Log Message:
Added dynamic malloc substitution. Added libtool versioning.


Index: config.hin
===================================================================
RCS file: /cvsroot/expat/expat/config.hin,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config.hin	2000/09/21 21:20:10	1.2
--- config.hin	2000/09/24 03:43:36	1.3
***************
*** 50,55 ****
  #undef VERSION
  
- #include <stdlib.h>
- 
  #define XML_NS
  #define XML_DTD
--- 50,53 ----
***************
*** 69,72 ****
--- 67,71 ----
  #define memmove(d,s,l) ;punting on memmove;
  #endif
+ 
  #endif
  

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.in	2000/09/21 21:20:10	1.2
--- configure.in	2000/09/24 03:43:36	1.3
***************
*** 20,23 ****
--- 20,27 ----
  PACKAGE=expat
  
+ LIBCURRENT=0
+ LIBREVISION=0
+ LIBAGE=0
+ 
  AC_CONFIG_HEADER(config.h:config.hin)
  AC_PROG_LIBTOOL
***************
*** 25,28 ****
--- 29,36 ----
  AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
+ 
+ AC_SUBST(LIBCURRENT)
+ AC_SUBST(LIBREVISION)
+ AC_SUBST(LIBAGE)
  
  dnl Checks for programs.


From coopercc@users.sourceforge.net  Sun Sep 24 04:43:40 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Sat, 23 Sep 2000 20:43:40 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.2,1.3
Message-ID: <200009240343.UAA27719@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26511/doc

Modified Files:
	reference.html 
Log Message:
Added dynamic malloc substitution. Added libtool versioning.


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** reference.html	2000/09/22 18:24:28	1.2
--- reference.html	2000/09/24 03:43:37	1.3
***************
*** 111,115 ****
  		  <li><a href="#XML_SetEncoding">XML_SetEncoding</a></li>
  		  <li><a href="#XML_SetParamEntityParsing">XML_SetParamEntityParsing</a></li>
- 		  <li><a href="#XML_ContentFree">XML_ContentFree</a></li>
  	      </ul>
  	  </li>
--- 111,114 ----
***************
*** 565,568 ****
--- 564,589 ----
  part of a legal URI.</div>
  
+ <div class="fcndec"><a name="XML_ParserCreate_MM"><pre>
+ XML_Parser
+ XML_ParserCreate_MM(const XML_Char *encoding,
+                     const XML_Memory_Handling_Suite *ms,
+ 		    const XML_Char *sep)
+ </pre></a></div>
+ <div class="fcndef">
+ <p>Construct a new parser using the suite of memory handling functions
+ specified in <code>ms</code>. If <code>ms</code> is NULL, then use the
+ standard set of memory management functions. If <code>sep</code> is
+ non NULL, then namespace processing is enabled in the created parser
+ and the character pointed at by sep is used as the separator between
+ the namespace URI and the local part of the name</p>
+ <div class="eg"><pre>
+ typedef struct {
+   void *(*malloc_fcn)(size_t size);
+   void *(*realloc_fcn)(void *ptr, size_t size);
+   void (*free_fcn)(void *ptr);
+ } XML_Memory_Handling_Suite;
+ </pre></div>
+ </div>
+ 
  <div class="fcndec"><a name="XML_ExternalEntityParserCreate"><pre>
  XML_Parser
***************
*** 1072,1077 ****
  with the name of the element in the declaration and a pointer to a structure
  that contains the element model. It is the application's responsibility to
! free this data structure by calling
! <a href="#XML_ContentFree">XML_ContentFree</a>.</p>
  
  <p>The <code>model</code> argument is the root of a tree of
--- 1093,1097 ----
  with the name of the element in the declaration and a pointer to a structure
  that contains the element model. It is the application's responsibility to
! free this data structure.</p>
  
  <p>The <code>model</code> argument is the root of a tree of
***************
*** 1414,1425 ****
  <li>XML_PARAM_ENTITY_PARSING_ALWAYS
  </ul>
- </div>
- 
- <div class="fcndec"><a name="XML_ContentFree"><pre>
- void
- XML_ContentFree(XML_Content *content);
- </pre></a></div>
- <div class="fcndef">
- Free the model data structure passed to an element declaration handler.
  </div>
  
--- 1434,1437 ----


From coopercc@users.sourceforge.net  Sun Sep 24 04:43:40 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Sat, 23 Sep 2000 20:43:40 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.2,1.3 expat.h,1.2,1.3 xmlparse.c,1.2,1.3
Message-ID: <200009240343.UAA27728@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26511/lib

Modified Files:
	Makefile.in expat.h xmlparse.c 
Log Message:
Added dynamic malloc substitution. Added libtool versioning.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in	2000/09/21 21:20:18	1.2
--- Makefile.in	2000/09/24 03:43:37	1.3
***************
*** 81,93 ****
  CONFIG_CLEAN_FILES = 
  
! DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
  DIST_COMMON =  Makefile.in
  
--- 81,98 ----
  CONFIG_CLEAN_FILES = 
  
! DEFS = @DEFS@ -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  CFLAGS = @CFLAGS@
+ 
+ LIBREVISION = @LIBREVISION@
+ LIBCURRENT  = @LIBCURRENT@
+ LIBAGE      = @LIBAGE@
+ 
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link  $(CCLD) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@
  DIST_COMMON =  Makefile.in
  
***************
*** 170,178 ****
  	done
  
! xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h $(top_builddir)/config.h
  
! xmlrole.o: xmlrole.c ascii.h xmldef.h xmlrole.h $(top_builddir)/config.h
  
! xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c \
            ascii.h asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h \
            xmldef.h xmltok.h xmltok_impl.h $(top_builddir)/config.h
--- 175,186 ----
  	done
  
! xmlparse.o \
! xmlparse.lo: xmlparse.c expat.h xmlrole.h xmltok.h $(top_builddir)/config.h
  
! xmlrole.o \
! xmlrole.lo: xmlrole.c ascii.h xmldef.h xmlrole.h $(top_builddir)/config.h
  
! xmltok.o \
! xmltok.lo: xmltok.c xmltok_impl.c xmltok_ns.c \
            ascii.h asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h \
            xmldef.h xmltok.h xmltok_impl.h $(top_builddir)/config.h

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** expat.h	2000/09/21 21:20:18	1.2
--- expat.h	2000/09/24 03:43:37	1.3
***************
*** 7,52 ****
  #define XmlParse_INCLUDED 1
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
- #ifndef XMLPARSEAPI
- #define XMLPARSEAPI /* as nothing */
- #endif
- 
  typedef void *XML_Parser;
  
- #ifdef XML_UNICODE_WCHAR_T
- 
- /* XML_UNICODE_WCHAR_T will work only if sizeof(wchar_t) == 2 and wchar_t
- uses Unicode. */
- /* Information is UTF-16 encoded as wchar_ts */
- 
- #ifndef XML_UNICODE
- #define XML_UNICODE
- #endif
- 
- #include <stddef.h>
- typedef wchar_t XML_Char;
- typedef wchar_t XML_LChar;
- 
- #else /* not XML_UNICODE_WCHAR_T */
- 
- #ifdef XML_UNICODE
- 
- /* Information is UTF-16 encoded as unsigned shorts */
- typedef unsigned short XML_Char;
- typedef char XML_LChar;
- 
- #else /* not XML_UNICODE */
- 
  /* Information is UTF-8 encoded. */
  typedef char XML_Char;
  typedef char XML_LChar;
  
- #endif /* not XML_UNICODE */
- 
- #endif /* not XML_UNICODE_WCHAR_T */
- 
  enum XML_Content_Type {
    XML_CTYPE_EMPTY = 1,
--- 7,22 ----
  #define XmlParse_INCLUDED 1
  
+ #include <stdlib.h>
+ 
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  typedef void *XML_Parser;
  
  /* Information is UTF-8 encoded. */
  typedef char XML_Char;
  typedef char XML_LChar;
  
  enum XML_Content_Type {
    XML_CTYPE_EMPTY = 1,
***************
*** 96,100 ****
  /* This is called for an element declaration. See above for
     description of the model argument. It's the caller's responsibility
!    to free model when finished with it by calling XML_ContentFree.
  */
  
--- 66,70 ----
  /* This is called for an element declaration. See above for
     description of the model argument. It's the caller's responsibility
!    to free model when finished with it.
  */
  
***************
*** 103,114 ****
  					XML_Content *model);
  
! void XMLPARSEAPI
  XML_SetElementDeclHandler(XML_Parser parser,
  			  XML_ElementDeclHandler eldecl);
  
- 
- void XMLPARSEAPI
- XML_ContentFree(XML_Content *content);
- 
  /*
    The Attlist declaration handler is called for *each* attribute. So
--- 73,80 ----
  					XML_Content *model);
  
! void 
  XML_SetElementDeclHandler(XML_Parser parser,
  			  XML_ElementDeclHandler eldecl);
  
  /*
    The Attlist declaration handler is called for *each* attribute. So
***************
*** 128,132 ****
  					int		isrequired);
  
! void XMLPARSEAPI
  XML_SetAttlistDeclHandler(XML_Parser parser,
  			  XML_AttlistDeclHandler attdecl);
--- 94,98 ----
  					int		isrequired);
  
! void 
  XML_SetAttlistDeclHandler(XML_Parser parser,
  			  XML_AttlistDeclHandler attdecl);
***************
*** 145,160 ****
  				    const XML_Char	*encoding,
  				    int			standalone);
- 
- 
  
! void XMLPARSEAPI
  XML_SetXmlDeclHandler(XML_Parser parser,
  		      XML_XmlDeclHandler xmldecl);
  
  
  /* Constructs a new parser; encoding is the encoding specified by the external
  protocol or null if there is none specified. */
  
! XML_Parser XMLPARSEAPI
  XML_ParserCreate(const XML_Char *encoding);
  
--- 111,130 ----
  				    const XML_Char	*encoding,
  				    int			standalone);
  
! void 
  XML_SetXmlDeclHandler(XML_Parser parser,
  		      XML_XmlDeclHandler xmldecl);
  
  
+ typedef struct {
+   void *(*malloc_fcn)(size_t size);
+   void *(*realloc_fcn)(void *ptr, size_t size);
+   void (*free_fcn)(void *ptr);
+ } XML_Memory_Handling_Suite;
+ 
  /* Constructs a new parser; encoding is the encoding specified by the external
  protocol or null if there is none specified. */
  
! XML_Parser 
  XML_ParserCreate(const XML_Char *encoding);
  
***************
*** 169,176 ****
  passed through without expansion. */
  
! XML_Parser XMLPARSEAPI
  XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
  
  
  /* atts is array of name/value pairs, terminated by 0;
     names and values are 0 terminated. */
--- 139,161 ----
  passed through without expansion. */
  
! XML_Parser 
  XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
  
  
+ /* Constructs a new parser using the memory management suit referred to
+    by memsuite. If memsuite is NULL, then use the standard library memory
+    suite. If namespaceSeparator is non-NULL it creates a parser with
+    namespace processing as described above. The character pointed at
+    will serve as the namespace separator.
+ 
+    All further memory operations used for the created parser will come from
+    the given suite.
+ */
+ 
+ XML_Parser
+ XML_ParserCreate_MM(const XML_Char *encoding,
+ 		    const XML_Memory_Handling_Suite *memsuite,
+ 		    const XML_Char *namespaceSeparator);
+ 
  /* atts is array of name/value pairs, terminated by 0;
     names and values are 0 terminated. */
***************
*** 256,260 ****
  				       const XML_Char *notationName);
  				       
! void XMLPARSEAPI
  XML_SetEntityDeclHandler(XML_Parser parser,
  			 XML_EntityDeclHandler handler);
--- 241,245 ----
  				       const XML_Char *notationName);
  				       
! void 
  XML_SetEntityDeclHandler(XML_Parser parser,
  			 XML_EntityDeclHandler handler);
***************
*** 399,434 ****
  					  XML_Encoding *info);
  
! void XMLPARSEAPI
  XML_SetElementHandler(XML_Parser parser,
  		      XML_StartElementHandler start,
  		      XML_EndElementHandler end);
  
! void XMLPARSEAPI
  XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler);
  
! void XMLPARSEAPI
  XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler);
  
! void XMLPARSEAPI
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
  
! void XMLPARSEAPI
  XML_SetProcessingInstructionHandler(XML_Parser parser,
  				    XML_ProcessingInstructionHandler handler);
! void XMLPARSEAPI
  XML_SetCommentHandler(XML_Parser parser,
                        XML_CommentHandler handler);
  
! void XMLPARSEAPI
  XML_SetCdataSectionHandler(XML_Parser parser,
  			   XML_StartCdataSectionHandler start,
  			   XML_EndCdataSectionHandler end);
  
! void XMLPARSEAPI
  XML_SetStartCdataSectionHandler(XML_Parser parser,
                                  XML_StartCdataSectionHandler start);
  
! void XMLPARSEAPI
  XML_SetEndCdataSectionHandler(XML_Parser parser,
                                XML_EndCdataSectionHandler end);
--- 384,419 ----
  					  XML_Encoding *info);
  
! void 
  XML_SetElementHandler(XML_Parser parser,
  		      XML_StartElementHandler start,
  		      XML_EndElementHandler end);
  
! void 
  XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler);
  
! void 
  XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler);
  
! void 
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
  
! void 
  XML_SetProcessingInstructionHandler(XML_Parser parser,
  				    XML_ProcessingInstructionHandler handler);
! void 
  XML_SetCommentHandler(XML_Parser parser,
                        XML_CommentHandler handler);
  
! void 
  XML_SetCdataSectionHandler(XML_Parser parser,
  			   XML_StartCdataSectionHandler start,
  			   XML_EndCdataSectionHandler end);
  
! void 
  XML_SetStartCdataSectionHandler(XML_Parser parser,
                                  XML_StartCdataSectionHandler start);
  
! void 
  XML_SetEndCdataSectionHandler(XML_Parser parser,
                                XML_EndCdataSectionHandler end);
***************
*** 437,441 ****
  The entity reference will be passed to the default handler. */
  
! void XMLPARSEAPI
  XML_SetDefaultHandler(XML_Parser parser,
  		      XML_DefaultHandler handler);
--- 422,426 ----
  The entity reference will be passed to the default handler. */
  
! void 
  XML_SetDefaultHandler(XML_Parser parser,
  		      XML_DefaultHandler handler);
***************
*** 444,490 ****
  The entity reference will not be passed to the default handler. */
  
! void XMLPARSEAPI
  XML_SetDefaultHandlerExpand(XML_Parser parser,
  		            XML_DefaultHandler handler);
  
! void XMLPARSEAPI
  XML_SetDoctypeDeclHandler(XML_Parser parser,
  			  XML_StartDoctypeDeclHandler start,
  			  XML_EndDoctypeDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetStartDoctypeDeclHandler(XML_Parser parser,
  			       XML_StartDoctypeDeclHandler start);
  
! void XMLPARSEAPI
  XML_SetEndDoctypeDeclHandler(XML_Parser parser,
  			     XML_EndDoctypeDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
  
! void XMLPARSEAPI
  XML_SetNotationDeclHandler(XML_Parser parser,
  			   XML_NotationDeclHandler handler);
  
! void XMLPARSEAPI
  XML_SetNamespaceDeclHandler(XML_Parser parser,
  			    XML_StartNamespaceDeclHandler start,
  			    XML_EndNamespaceDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetStartNamespaceDeclHandler(XML_Parser parser,
  				 XML_StartNamespaceDeclHandler start);
  
! void XMLPARSEAPI
  XML_SetEndNamespaceDeclHandler(XML_Parser parser,
  			       XML_EndNamespaceDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetNotStandaloneHandler(XML_Parser parser,
  			    XML_NotStandaloneHandler handler);
  
! void XMLPARSEAPI
  XML_SetExternalEntityRefHandler(XML_Parser parser,
  				XML_ExternalEntityRefHandler handler);
--- 429,475 ----
  The entity reference will not be passed to the default handler. */
  
! void 
  XML_SetDefaultHandlerExpand(XML_Parser parser,
  		            XML_DefaultHandler handler);
  
! void 
  XML_SetDoctypeDeclHandler(XML_Parser parser,
  			  XML_StartDoctypeDeclHandler start,
  			  XML_EndDoctypeDeclHandler end);
  
! void 
  XML_SetStartDoctypeDeclHandler(XML_Parser parser,
  			       XML_StartDoctypeDeclHandler start);
  
! void 
  XML_SetEndDoctypeDeclHandler(XML_Parser parser,
  			     XML_EndDoctypeDeclHandler end);
  
! void 
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
  
! void 
  XML_SetNotationDeclHandler(XML_Parser parser,
  			   XML_NotationDeclHandler handler);
  
! void 
  XML_SetNamespaceDeclHandler(XML_Parser parser,
  			    XML_StartNamespaceDeclHandler start,
  			    XML_EndNamespaceDeclHandler end);
  
! void 
  XML_SetStartNamespaceDeclHandler(XML_Parser parser,
  				 XML_StartNamespaceDeclHandler start);
  
! void 
  XML_SetEndNamespaceDeclHandler(XML_Parser parser,
  			       XML_EndNamespaceDeclHandler end);
  
! void 
  XML_SetNotStandaloneHandler(XML_Parser parser,
  			    XML_NotStandaloneHandler handler);
  
! void 
  XML_SetExternalEntityRefHandler(XML_Parser parser,
  				XML_ExternalEntityRefHandler handler);
***************
*** 493,500 ****
  as the first argument to the external entity ref handler instead
  of the parser object. */
! void XMLPARSEAPI
  XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
  
! void XMLPARSEAPI
  XML_SetUnknownEncodingHandler(XML_Parser parser,
  			      XML_UnknownEncodingHandler handler,
--- 478,485 ----
  as the first argument to the external entity ref handler instead
  of the parser object. */
! void 
  XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
  
! void 
  XML_SetUnknownEncodingHandler(XML_Parser parser,
  			      XML_UnknownEncodingHandler handler,
***************
*** 504,511 ****
  processing instruction or character data.  It causes the corresponding
  markup to be passed to the default handler. */
! void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser);
  
  /* This value is passed as the userData argument to callbacks. */
! void XMLPARSEAPI
  XML_SetUserData(XML_Parser parser, void *userData);
  
--- 489,496 ----
  processing instruction or character data.  It causes the corresponding
  markup to be passed to the default handler. */
! void  XML_DefaultCurrent(XML_Parser parser);
  
  /* This value is passed as the userData argument to callbacks. */
! void 
  XML_SetUserData(XML_Parser parser, void *userData);
  
***************
*** 517,521 ****
  or XML_ParseBuffer. */
  
! int XMLPARSEAPI
  XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
  
--- 502,506 ----
  or XML_ParseBuffer. */
  
! int 
  XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
  
***************
*** 524,528 ****
  The userData will still be accessible using XML_GetUserData. */
  
! void XMLPARSEAPI
  XML_UseParserAsHandlerArg(XML_Parser parser);
  
--- 509,513 ----
  The userData will still be accessible using XML_GetUserData. */
  
! void 
  XML_UseParserAsHandlerArg(XML_Parser parser);
  
***************
*** 534,541 ****
  Returns zero if out of memory, non-zero otherwise. */
  
! int XMLPARSEAPI
  XML_SetBase(XML_Parser parser, const XML_Char *base);
  
! const XML_Char XMLPARSEAPI *
  XML_GetBase(XML_Parser parser);
  
--- 519,526 ----
  Returns zero if out of memory, non-zero otherwise. */
  
! int 
  XML_SetBase(XML_Parser parser, const XML_Char *base);
  
! const XML_Char  *
  XML_GetBase(XML_Parser parser);
  
***************
*** 546,550 ****
  XML_StartElementHandler. */
  
! int XMLPARSEAPI XML_GetSpecifiedAttributeCount(XML_Parser parser);
  
  /* Returns the index of the ID attribute passed in the last call to
--- 531,535 ----
  XML_StartElementHandler. */
  
! int  XML_GetSpecifiedAttributeCount(XML_Parser parser);
  
  /* Returns the index of the ID attribute passed in the last call to
***************
*** 552,567 ****
  attribute/value pair counts as 2; thus this correspondds to an index
  into the atts array passed to the XML_StartElementHandler. */
! int XMLPARSEAPI XML_GetIdAttributeIndex(XML_Parser parser);
  
  /* Parses some input. Returns 0 if a fatal error is detected.
  The last call to XML_Parse must have isFinal true;
  len may be zero for this call (or any other). */
! int XMLPARSEAPI
  XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
  
! void XMLPARSEAPI *
  XML_GetBuffer(XML_Parser parser, int len);
  
! int XMLPARSEAPI
  XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
  
--- 537,552 ----
  attribute/value pair counts as 2; thus this correspondds to an index
  into the atts array passed to the XML_StartElementHandler. */
! int  XML_GetIdAttributeIndex(XML_Parser parser);
  
  /* Parses some input. Returns 0 if a fatal error is detected.
  The last call to XML_Parse must have isFinal true;
  len may be zero for this call (or any other). */
! int 
  XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
  
! void  *
  XML_GetBuffer(XML_Parser parser, int len);
  
! int 
  XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
  
***************
*** 579,583 ****
  The handlers and userData are initialized from the parser argument.
  Returns 0 if out of memory.  Otherwise returns a new XML_Parser object. */
! XML_Parser XMLPARSEAPI
  XML_ExternalEntityParserCreate(XML_Parser parser,
  			       const XML_Char *context,
--- 564,568 ----
  The handlers and userData are initialized from the parser argument.
  Returns 0 if out of memory.  Otherwise returns a new XML_Parser object. */
! XML_Parser 
  XML_ExternalEntityParserCreate(XML_Parser parser,
  			       const XML_Char *context,
***************
*** 609,613 ****
  entities is requested; otherwise it will return non-zero. */
  
! int XMLPARSEAPI
  XML_SetParamEntityParsing(XML_Parser parser,
  			  enum XML_ParamEntityParsing parsing);
--- 594,598 ----
  entities is requested; otherwise it will return non-zero. */
  
! int 
  XML_SetParamEntityParsing(XML_Parser parser,
  			  enum XML_ParamEntityParsing parsing);
***************
*** 642,646 ****
  returns information about the error. */
  
! enum XML_Error XMLPARSEAPI XML_GetErrorCode(XML_Parser parser);
  
  /* These functions return information about the current parse location.
--- 627,631 ----
  returns information about the error. */
  
! enum XML_Error  XML_GetErrorCode(XML_Parser parser);
  
  /* These functions return information about the current parse location.
***************
*** 652,663 ****
  of the sequence of characters that generated the event. */
  
! int XMLPARSEAPI XML_GetCurrentLineNumber(XML_Parser parser);
! int XMLPARSEAPI XML_GetCurrentColumnNumber(XML_Parser parser);
! long XMLPARSEAPI XML_GetCurrentByteIndex(XML_Parser parser);
  
  /* Return the number of bytes in the current event.
  Returns 0 if the event is in an internal entity. */
  
! int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser);
  
  /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
--- 637,648 ----
  of the sequence of characters that generated the event. */
  
! int  XML_GetCurrentLineNumber(XML_Parser parser);
! int  XML_GetCurrentColumnNumber(XML_Parser parser);
! long  XML_GetCurrentByteIndex(XML_Parser parser);
  
  /* Return the number of bytes in the current event.
  Returns 0 if the event is in an internal entity. */
  
! int  XML_GetCurrentByteCount(XML_Parser parser);
  
  /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
***************
*** 670,674 ****
     the handler that makes the call. */
  
! const char XMLPARSEAPI * XML_GetInputContext(XML_Parser parser,
  					     int *offset,
  					     int *size);
--- 655,659 ----
     the handler that makes the call. */
  
! const char  * XML_GetInputContext(XML_Parser parser,
  					     int *offset,
  					     int *size);
***************
*** 680,688 ****
  
  /* Frees memory used by the parser. */
! void XMLPARSEAPI
  XML_ParserFree(XML_Parser parser);
  
  /* Returns a string describing the error. */
! const XML_LChar XMLPARSEAPI *XML_ErrorString(int code);
  
  #ifdef __cplusplus
--- 665,673 ----
  
  /* Frees memory used by the parser. */
! void 
  XML_ParserFree(XML_Parser parser);
  
  /* Returns a string describing the error. */
! const XML_LChar  *XML_ErrorString(int code);
  
  #ifdef __cplusplus

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xmlparse.c	2000/09/21 21:20:18	1.2
--- xmlparse.c	2000/09/24 03:43:37	1.3
***************
*** 60,63 ****
--- 60,64 ----
    size_t used;
    size_t usedLim;
+   XML_Memory_Handling_Suite *mem;
  } HASH_TABLE;
  
***************
*** 140,143 ****
--- 141,145 ----
    XML_Char *ptr;
[...1074 lines suppressed...]
  					      dtd.scaffSize * sizeof(CONTENT_SCAFFOLD));
      }
      else {
        dtd.scaffSize = 32;
!       dtd.scaffold = (CONTENT_SCAFFOLD *) MALLOC(dtd.scaffSize * sizeof(CONTENT_SCAFFOLD));
      }
      if (! dtd.scaffold)
***************
*** 4457,4461 ****
    int allocsize = dtd.scaffCount * sizeof(XML_Content) + dtd.contentStringLen;
    
!   ret = malloc(allocsize);
    if (! ret)
      return 0;
--- 4530,4534 ----
    int allocsize = dtd.scaffCount * sizeof(XML_Content) + dtd.contentStringLen;
    
!   ret = MALLOC(allocsize);
    if (! ret)
      return 0;


From coopercc@users.sourceforge.net  Mon Sep 25 01:59:04 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Sun, 24 Sep 2000 17:59:04 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.3,1.4
Message-ID: <200009250059.RAA28593@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28081/doc

Modified Files:
	reference.html 
Log Message:
Changes for namespace triplets.


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** reference.html	2000/09/24 03:43:37	1.3
--- reference.html	2000/09/25 00:58:47	1.4
***************
*** 390,395 ****
  
  <p>Element type and attribute names that belong to a given namespace are
! passed to the appropriate handler in expanded form. This expanded form
! is a concatenation of the namespace URI, the separator character (which
  is the 2nd argument to <code>XML_ParserCreateNS</code>), and the local
  name (i.e. the part after the colon). Names with undeclared prefixes are
--- 390,395 ----
  
  <p>Element type and attribute names that belong to a given namespace are
! passed to the appropriate handler in expanded form. By default this expanded
! form is a concatenation of the namespace URI, the separator character (which
  is the 2nd argument to <code>XML_ParserCreateNS</code>), and the local
  name (i.e. the part after the colon). Names with undeclared prefixes are
***************
*** 399,402 ****
--- 399,408 ----
  namespace.
  
+ <p>However if <a href="XML_SetReturnNSTriplet">XML_SetReturnNSTriplet</a>
+ has been called with a non-zero <code>do_nst</code> parameter, then the
+ expanded form for names with an explicit prefix is a concatenation of:
+ URI, separator, local name, separator, prefix.
+ </p>
+ 
  <p>You can set handlers for the start of a namespace declaration and for
  the end of a scope of a declaration with the
***************
*** 1434,1437 ****
--- 1440,1463 ----
  <li>XML_PARAM_ENTITY_PARSING_ALWAYS
  </ul>
+ </div>
+ 
+ <div class="fcndec"><a name="XML_SetReturnNSTriplet"><pre>
+ void
+ XML_SetReturnNSTriplet(XML_Parser parser,
+                        int        do_nst);
+ </pre></a></div>
+ <div class="fcndef">
+ <p>
+ This function only has an effect when using a parser created with
+ <a href="#XML_ParserCreateNS">XML_ParserCreateNS</a>, i.e. when namespace
+ processing is in effect. The <code>do_nst</code> sets whether or not prefixes
+ are returned with names qualified with a namespace prefix. If this function
+ is called with <code>do_nst</code> non-zero, then afterwards namespace
+ qualified names (that is qualified with a prefix as opposed to belonging
+ to a default namespace) are returned as a triplet with the three parts
+ separated by the namespace separator specified when the parser was created.
+ The order of returned parts is URI, local name, and prefix.</p>
+ <p>If <code>do_nst</code> is zero, then namespaces are reported in the
+ default manner, URI then local_name separated by the namespace separator.</p>
  </div>
  


From coopercc@users.sourceforge.net  Mon Sep 25 01:59:03 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Sun, 24 Sep 2000 17:59:03 -0700
Subject: [Expat-checkins] CVS: expat/lib expat.h,1.3,1.4 xmlparse.c,1.3,1.4
Message-ID: <200009250059.RAA28599@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28081/lib

Modified Files:
	expat.h xmlparse.c 
Log Message:
Changes for namespace triplets.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** expat.h	2000/09/24 03:43:37	1.3
--- expat.h	2000/09/25 00:58:49	1.4
***************
*** 168,171 ****
--- 168,172 ----
  				      const XML_Char *name);
  
+ 
  /* s is not 0 terminated. */
  typedef void (*XML_CharacterDataHandler)(void *userData,
***************
*** 390,397 ****
  
  void 
! XML_SetStartElementHandler(XML_Parser parser, XML_StartElementHandler);
  
  void 
! XML_SetEndElementHandler(XML_Parser parser, XML_EndElementHandler);
  
  void 
--- 391,398 ----
  
  void 
! XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
  
  void 
! XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
  
  void 
***************
*** 490,493 ****
--- 491,508 ----
  markup to be passed to the default handler. */
  void  XML_DefaultCurrent(XML_Parser parser);
+ 
+ /* If do_nst is non-zero, and namespace processing is in effect, and
+    a name has a prefix (i.e. an explicit namespace qualifier) then
+    that name is returned as a triplet in a single
+    string separated by the separator character specified when the parser
+    was created: URI + sep + local_name + sep + prefix.
+ 
+    If do_nst is zero, then namespace information is returned in the
+    default manner (URI + sep + local_name) whether or not the names
+    has a prefix.
+ */
+ 
+ void
+ XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
  
  /* This value is passed as the userData argument to callbacks. */

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xmlparse.c	2000/09/24 03:43:37	1.3
--- xmlparse.c	2000/09/25 00:58:49	1.4
***************
*** 363,366 ****
--- 363,367 ----
    const XML_Char *m_protocolEncodingName;
    int m_ns;
+   int m_ns_triplets;
    void *m_unknownEncodingMem;
    void *m_unknownEncodingData;
***************
*** 448,451 ****
--- 449,453 ----
  #define protocolEncodingName (((Parser *)parser)->m_protocolEncodingName)
  #define ns (((Parser *)parser)->m_ns)
+ #define ns_triplets (((Parser *)parser)->m_ns_triplets)
  #define prologState (((Parser *)parser)->m_prologState)
  #define processor (((Parser *)parser)->m_processor)
***************
*** 628,631 ****
--- 630,634 ----
  #endif
    ns = 0;
+   ns_triplets = 0;
    poolInit(&tempPool, &(((Parser *) parser)->m_mem));
    poolInit(&temp2Pool, &(((Parser *) parser)->m_mem));
***************
*** 696,699 ****
--- 699,703 ----
    XML_XmlDeclHandler oldXmlDeclHandler = xmlDeclHandler;
    ELEMENT_TYPE * oldDeclElementType = declElementType;
+ 
    void *oldUserData = userData;
    void *oldHandlerArg = handlerArg;
***************
*** 703,706 ****
--- 707,711 ----
    int oldParamEntityParsing = paramEntityParsing;
  #endif
+   int oldns_triplets = ns_triplets;
  
    if (ns) {
***************
*** 747,750 ****
--- 752,756 ----
      externalEntityRefHandlerArg = oldExternalEntityRefHandlerArg;
    defaultExpandInternalEntities = oldDefaultExpandInternalEntities;
+   ns_triplets = oldns_triplets;
  #ifdef XML_DTD
    paramEntityParsing = oldParamEntityParsing;
***************
*** 828,831 ****
--- 834,842 ----
  }
  
+ void
+ XML_SetReturnNSTriplet(XML_Parser parser, int do_nst) {
+   ns_triplets = do_nst;
+ }
+ 
  void XML_SetUserData(XML_Parser parser, void *p)
  {
***************
*** 1986,1989 ****
--- 1997,2009 ----
  	      return XML_ERROR_NO_MEMORY;
  	  } while (*s++);
+ 	  if (ns_triplets) {
+ 	    tempPool.ptr[-1] = namespaceSeparator;
+ 	    s = b->prefix->name;
+ 	    do {
+ 	      if (!poolAppendChar(&tempPool, *s))
+ 		return XML_ERROR_NO_MEMORY;
+ 	    } while (*s++);
+ 	  }
+ 
  	  appAtts[i] = poolStart(&tempPool);
  	  poolFinish(&tempPool);


From coopercc@users.sourceforge.net  Mon Sep 25 14:06:43 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Mon, 25 Sep 2000 06:06:43 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.4,1.5
Message-ID: <200009251306.GAA10709@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10240

Modified Files:
	reference.html 
Log Message:
Make more explicit the need to do an include of expat.h


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** reference.html	2000/09/25 00:58:47	1.4
--- reference.html	2000/09/25 13:06:39	1.5
***************
*** 233,237 ****
  <p>Unless you installed expat in a location not expected by your compiler
  and linker, all you have to do to use expat in your programs is to include
! the expat header in your files that make calls to it and to tell the linker
  that it needs to link against the expat library. On Unix systems, this would
  be the <code>-lexpat</code> argument.
--- 233,238 ----
  <p>Unless you installed expat in a location not expected by your compiler
  and linker, all you have to do to use expat in your programs is to include
! the expat header (<code>#include &lt;expat.h&gt;</code>) in your files that
! make calls to it and to tell the linker
  that it needs to link against the expat library. On Unix systems, this would
  be the <code>-lexpat</code> argument.


From coopercc@users.sourceforge.net  Tue Sep 26 14:52:37 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Tue, 26 Sep 2000 06:52:37 -0700
Subject: [Expat-checkins] CVS: expat configure.in,1.3,1.4
Message-ID: <200009261352.GAA29589@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28879

Modified Files:
	configure.in 
Log Message:
Change version number to accord with beta release.


Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure.in	2000/09/24 03:43:36	1.3
--- configure.in	2000/09/26 13:52:33	1.4
***************
*** 14,22 ****
  AC_CONFIG_AUX_DIR(conftools)
  
! EXPAT_MAJOR_VERSION=2
! EXPAT_MINOR_VERSION=0
! EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION
  VERSION=$EXPAT_VERSION
  PACKAGE=expat
  
  LIBCURRENT=0
--- 14,42 ----
  AC_CONFIG_AUX_DIR(conftools)
  
! dnl
! dnl Follow the GNU/Linux convention of odd number minor version for
! dnl beta/development releases and even number minor version for stable
! dnl releases. Edit is bumped with each release and set to 0 with
! dnl change to major or minor version.
! dnl
! 
! EXPAT_MAJOR_VERSION=1
! EXPAT_MINOR_VERSION=99
! EXPAT_EDIT=0
! 
! EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
  VERSION=$EXPAT_VERSION
  PACKAGE=expat
+ 
+ dnl
+ dnl Increment LIBREVISION if source code has changed at all
+ dnl
+ dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
+ dnl
+ dnl If the API changes compatibly (i.e. simply adding a new function
+ dnl without changing or removing earlier interfaces), then increment LIBAGE.
+ dnl 
+ dnl If the API changes incompatibly set LIBAGE back to 0
+ dnl
  
  LIBCURRENT=0


From coopercc@users.sourceforge.net  Thu Sep 28 18:53:03 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 10:53:03 -0700
Subject: [Expat-checkins] CVS: expat configure.in,1.4,1.5
Message-ID: <200009281753.KAA05623@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2284

Modified Files:
	configure.in 
Log Message:
Fixes to allow DLLs to built under Windows.


Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** configure.in	2000/09/26 13:52:33	1.4
--- configure.in	2000/09/28 17:53:00	1.5
***************
*** 22,26 ****
  
  EXPAT_MAJOR_VERSION=1
! EXPAT_MINOR_VERSION=99
  EXPAT_EDIT=0
  
--- 22,26 ----
  
  EXPAT_MAJOR_VERSION=1
! EXPAT_MINOR_VERSION=95
  EXPAT_EDIT=0
  
***************
*** 45,48 ****
--- 45,50 ----
  
  AC_CONFIG_HEADER(config.h:config.hin)
+ 
+ AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
  


From coopercc@users.sourceforge.net  Thu Sep 28 18:53:04 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 10:53:04 -0700
Subject: [Expat-checkins] CVS: expat/lib expat.h,1.4,1.5 xmlparse.c,1.4,1.5 xmlrole.c,1.2,1.3 xmlrole.h,1.2,1.3 xmltok.c,1.2,1.3 xmltok.h,1.2,1.3 xmldef.h,1.2,NONE
Message-ID: <200009281753.KAA05643@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2284/lib

Modified Files:
	expat.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h 
Removed Files:
	xmldef.h 
Log Message:
Fixes to allow DLLs to built under Windows.


Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** expat.h	2000/09/25 00:58:49	1.4
--- expat.h	2000/09/28 17:53:00	1.5
***************
*** 9,12 ****
--- 9,20 ----
  #include <stdlib.h>
  
+ #ifndef XMLPARSEAPI
+ #  ifdef __declspec
+ #    define XMLPARSEAPI __declspec(dllimport)
+ #  else
+ #    define XMLPARSEAPI /* nothing */
+ #  endif
+ #endif  /* not defined XMLPARSEAPI */
+ 
  #ifdef __cplusplus
  extern "C" {
***************
*** 73,77 ****
  					XML_Content *model);
  
! void 
  XML_SetElementDeclHandler(XML_Parser parser,
  			  XML_ElementDeclHandler eldecl);
--- 81,85 ----
  					XML_Content *model);
  
! void XMLPARSEAPI
  XML_SetElementDeclHandler(XML_Parser parser,
  			  XML_ElementDeclHandler eldecl);
***************
*** 94,98 ****
  					int		isrequired);
  
! void 
  XML_SetAttlistDeclHandler(XML_Parser parser,
  			  XML_AttlistDeclHandler attdecl);
--- 102,106 ----
  					int		isrequired);
  
! void XMLPARSEAPI
  XML_SetAttlistDeclHandler(XML_Parser parser,
  			  XML_AttlistDeclHandler attdecl);
***************
*** 112,116 ****
  				    int			standalone);
  
! void 
  XML_SetXmlDeclHandler(XML_Parser parser,
  		      XML_XmlDeclHandler xmldecl);
--- 120,124 ----
  				    int			standalone);
  
! void XMLPARSEAPI
  XML_SetXmlDeclHandler(XML_Parser parser,
  		      XML_XmlDeclHandler xmldecl);
***************
*** 126,130 ****
  protocol or null if there is none specified. */
  
! XML_Parser 
  XML_ParserCreate(const XML_Char *encoding);
  
--- 134,138 ----
  protocol or null if there is none specified. */
  
! XML_Parser XMLPARSEAPI
  XML_ParserCreate(const XML_Char *encoding);
  
***************
*** 139,143 ****
  passed through without expansion. */
  
! XML_Parser 
  XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
  
--- 147,151 ----
  passed through without expansion. */
  
! XML_Parser XMLPARSEAPI
  XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
  
***************
*** 153,157 ****
  */
  
! XML_Parser
  XML_ParserCreate_MM(const XML_Char *encoding,
  		    const XML_Memory_Handling_Suite *memsuite,
--- 161,165 ----
  */
  
! XML_Parser XMLPARSEAPI
  XML_ParserCreate_MM(const XML_Char *encoding,
  		    const XML_Memory_Handling_Suite *memsuite,
***************
*** 242,246 ****
  				       const XML_Char *notationName);
  				       
! void 
  XML_SetEntityDeclHandler(XML_Parser parser,
  			 XML_EntityDeclHandler handler);
--- 250,254 ----
  				       const XML_Char *notationName);
  				       
! void XMLPARSEAPI
  XML_SetEntityDeclHandler(XML_Parser parser,
  			 XML_EntityDeclHandler handler);
***************
*** 385,420 ****
  					  XML_Encoding *info);
  
! void 
  XML_SetElementHandler(XML_Parser parser,
  		      XML_StartElementHandler start,
  		      XML_EndElementHandler end);
  
! void 
  XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
  
! void 
  XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
  
! void 
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
  
! void 
  XML_SetProcessingInstructionHandler(XML_Parser parser,
  				    XML_ProcessingInstructionHandler handler);
! void 
  XML_SetCommentHandler(XML_Parser parser,
                        XML_CommentHandler handler);
  
! void 
  XML_SetCdataSectionHandler(XML_Parser parser,
  			   XML_StartCdataSectionHandler start,
  			   XML_EndCdataSectionHandler end);
  
! void 
  XML_SetStartCdataSectionHandler(XML_Parser parser,
                                  XML_StartCdataSectionHandler start);
  
! void 
  XML_SetEndCdataSectionHandler(XML_Parser parser,
                                XML_EndCdataSectionHandler end);
--- 393,428 ----
  					  XML_Encoding *info);
  
! void XMLPARSEAPI
  XML_SetElementHandler(XML_Parser parser,
  		      XML_StartElementHandler start,
  		      XML_EndElementHandler end);
  
! void XMLPARSEAPI
  XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
  
! void XMLPARSEAPI
  XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
  
! void XMLPARSEAPI
  XML_SetCharacterDataHandler(XML_Parser parser,
  			    XML_CharacterDataHandler handler);
  
! void XMLPARSEAPI
  XML_SetProcessingInstructionHandler(XML_Parser parser,
  				    XML_ProcessingInstructionHandler handler);
! void XMLPARSEAPI
  XML_SetCommentHandler(XML_Parser parser,
                        XML_CommentHandler handler);
  
! void XMLPARSEAPI
  XML_SetCdataSectionHandler(XML_Parser parser,
  			   XML_StartCdataSectionHandler start,
  			   XML_EndCdataSectionHandler end);
  
! void XMLPARSEAPI
  XML_SetStartCdataSectionHandler(XML_Parser parser,
                                  XML_StartCdataSectionHandler start);
  
! void XMLPARSEAPI
  XML_SetEndCdataSectionHandler(XML_Parser parser,
                                XML_EndCdataSectionHandler end);
***************
*** 423,427 ****
  The entity reference will be passed to the default handler. */
  
! void 
  XML_SetDefaultHandler(XML_Parser parser,
  		      XML_DefaultHandler handler);
--- 431,435 ----
  The entity reference will be passed to the default handler. */
  
! void XMLPARSEAPI
  XML_SetDefaultHandler(XML_Parser parser,
  		      XML_DefaultHandler handler);
***************
*** 430,476 ****
  The entity reference will not be passed to the default handler. */
  
! void 
  XML_SetDefaultHandlerExpand(XML_Parser parser,
  		            XML_DefaultHandler handler);
  
! void 
  XML_SetDoctypeDeclHandler(XML_Parser parser,
  			  XML_StartDoctypeDeclHandler start,
  			  XML_EndDoctypeDeclHandler end);
  
! void 
  XML_SetStartDoctypeDeclHandler(XML_Parser parser,
  			       XML_StartDoctypeDeclHandler start);
  
! void 
  XML_SetEndDoctypeDeclHandler(XML_Parser parser,
  			     XML_EndDoctypeDeclHandler end);
  
! void 
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
  
! void 
  XML_SetNotationDeclHandler(XML_Parser parser,
  			   XML_NotationDeclHandler handler);
  
! void 
  XML_SetNamespaceDeclHandler(XML_Parser parser,
  			    XML_StartNamespaceDeclHandler start,
  			    XML_EndNamespaceDeclHandler end);
  
! void 
  XML_SetStartNamespaceDeclHandler(XML_Parser parser,
  				 XML_StartNamespaceDeclHandler start);
  
! void 
  XML_SetEndNamespaceDeclHandler(XML_Parser parser,
  			       XML_EndNamespaceDeclHandler end);
  
! void 
  XML_SetNotStandaloneHandler(XML_Parser parser,
  			    XML_NotStandaloneHandler handler);
  
! void 
  XML_SetExternalEntityRefHandler(XML_Parser parser,
  				XML_ExternalEntityRefHandler handler);
--- 438,484 ----
  The entity reference will not be passed to the default handler. */
  
! void XMLPARSEAPI
  XML_SetDefaultHandlerExpand(XML_Parser parser,
  		            XML_DefaultHandler handler);
  
! void XMLPARSEAPI
  XML_SetDoctypeDeclHandler(XML_Parser parser,
  			  XML_StartDoctypeDeclHandler start,
  			  XML_EndDoctypeDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetStartDoctypeDeclHandler(XML_Parser parser,
  			       XML_StartDoctypeDeclHandler start);
  
! void XMLPARSEAPI
  XML_SetEndDoctypeDeclHandler(XML_Parser parser,
  			     XML_EndDoctypeDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
  				 XML_UnparsedEntityDeclHandler handler);
  
! void XMLPARSEAPI
  XML_SetNotationDeclHandler(XML_Parser parser,
  			   XML_NotationDeclHandler handler);
  
! void XMLPARSEAPI
  XML_SetNamespaceDeclHandler(XML_Parser parser,
  			    XML_StartNamespaceDeclHandler start,
  			    XML_EndNamespaceDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetStartNamespaceDeclHandler(XML_Parser parser,
  				 XML_StartNamespaceDeclHandler start);
  
! void XMLPARSEAPI
  XML_SetEndNamespaceDeclHandler(XML_Parser parser,
  			       XML_EndNamespaceDeclHandler end);
  
! void XMLPARSEAPI
  XML_SetNotStandaloneHandler(XML_Parser parser,
  			    XML_NotStandaloneHandler handler);
  
! void XMLPARSEAPI
  XML_SetExternalEntityRefHandler(XML_Parser parser,
  				XML_ExternalEntityRefHandler handler);
***************
*** 479,486 ****
  as the first argument to the external entity ref handler instead
  of the parser object. */
! void 
  XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
  
! void 
  XML_SetUnknownEncodingHandler(XML_Parser parser,
  			      XML_UnknownEncodingHandler handler,
--- 487,494 ----
  as the first argument to the external entity ref handler instead
  of the parser object. */
! void XMLPARSEAPI
  XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
  
! void XMLPARSEAPI
  XML_SetUnknownEncodingHandler(XML_Parser parser,
  			      XML_UnknownEncodingHandler handler,
***************
*** 503,511 ****
  */
  
! void
  XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
  
  /* This value is passed as the userData argument to callbacks. */
! void 
  XML_SetUserData(XML_Parser parser, void *userData);
  
--- 511,519 ----
  */
  
! void XMLPARSEAPI
  XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
  
  /* This value is passed as the userData argument to callbacks. */
! void XMLPARSEAPI
  XML_SetUserData(XML_Parser parser, void *userData);
  
***************
*** 517,521 ****
  or XML_ParseBuffer. */
  
! int 
  XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
  
--- 525,529 ----
  or XML_ParseBuffer. */
  
! int XMLPARSEAPI
  XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
  
***************
*** 524,528 ****
  The userData will still be accessible using XML_GetUserData. */
  
! void 
  XML_UseParserAsHandlerArg(XML_Parser parser);
  
--- 532,536 ----
  The userData will still be accessible using XML_GetUserData. */
  
! void XMLPARSEAPI 
  XML_UseParserAsHandlerArg(XML_Parser parser);
  
***************
*** 534,541 ****
  Returns zero if out of memory, non-zero otherwise. */
  
! int 
  XML_SetBase(XML_Parser parser, const XML_Char *base);
  
! const XML_Char  *
  XML_GetBase(XML_Parser parser);
  
--- 542,549 ----
  Returns zero if out of memory, non-zero otherwise. */
  
! int XMLPARSEAPI
  XML_SetBase(XML_Parser parser, const XML_Char *base);
  
! const XML_Char  XMLPARSEAPI *
  XML_GetBase(XML_Parser parser);
  
***************
*** 546,550 ****
  XML_StartElementHandler. */
  
! int  XML_GetSpecifiedAttributeCount(XML_Parser parser);
  
  /* Returns the index of the ID attribute passed in the last call to
--- 554,559 ----
  XML_StartElementHandler. */
  
! int XMLPARSEAPI
! XML_GetSpecifiedAttributeCount(XML_Parser parser);
  
  /* Returns the index of the ID attribute passed in the last call to
***************
*** 552,567 ****
  attribute/value pair counts as 2; thus this correspondds to an index
  into the atts array passed to the XML_StartElementHandler. */
! int  XML_GetIdAttributeIndex(XML_Parser parser);
  
  /* Parses some input. Returns 0 if a fatal error is detected.
  The last call to XML_Parse must have isFinal true;
  len may be zero for this call (or any other). */
! int 
  XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
  
! void  *
  XML_GetBuffer(XML_Parser parser, int len);
  
! int 
  XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
  
--- 561,578 ----
  attribute/value pair counts as 2; thus this correspondds to an index
  into the atts array passed to the XML_StartElementHandler. */
! 
! int XMLPARSEAPI
! XML_GetIdAttributeIndex(XML_Parser parser);
  
  /* Parses some input. Returns 0 if a fatal error is detected.
  The last call to XML_Parse must have isFinal true;
  len may be zero for this call (or any other). */
! int XMLPARSEAPI
  XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
  
! void XMLPARSEAPI *
  XML_GetBuffer(XML_Parser parser, int len);
  
! int XMLPARSEAPI
  XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
  
***************
*** 579,583 ****
  The handlers and userData are initialized from the parser argument.
  Returns 0 if out of memory.  Otherwise returns a new XML_Parser object. */
! XML_Parser 
  XML_ExternalEntityParserCreate(XML_Parser parser,
  			       const XML_Char *context,
--- 590,594 ----
  The handlers and userData are initialized from the parser argument.
  Returns 0 if out of memory.  Otherwise returns a new XML_Parser object. */
! XML_Parser XMLPARSEAPI
  XML_ExternalEntityParserCreate(XML_Parser parser,
  			       const XML_Char *context,
***************
*** 609,613 ****
  entities is requested; otherwise it will return non-zero. */
  
! int 
  XML_SetParamEntityParsing(XML_Parser parser,
  			  enum XML_ParamEntityParsing parsing);
--- 620,624 ----
  entities is requested; otherwise it will return non-zero. */
  
! int XMLPARSEAPI
  XML_SetParamEntityParsing(XML_Parser parser,
  			  enum XML_ParamEntityParsing parsing);
***************
*** 659,663 ****
  Returns 0 if the event is in an internal entity. */
  
! int  XML_GetCurrentByteCount(XML_Parser parser);
  
  /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
--- 670,675 ----
  Returns 0 if the event is in an internal entity. */
  
! int XMLPARSEAPI
! XML_GetCurrentByteCount(XML_Parser parser);
  
  /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
***************
*** 670,676 ****
     the handler that makes the call. */
  
! const char  * XML_GetInputContext(XML_Parser parser,
! 					     int *offset,
! 					     int *size);
  
  /* For backwards compatibility with previous versions. */
--- 682,689 ----
     the handler that makes the call. */
  
! const char XMLPARSEAPI *
! XML_GetInputContext(XML_Parser parser,
! 		    int *offset,
! 		    int *size);
  
  /* For backwards compatibility with previous versions. */
***************
*** 680,688 ****
  
  /* Frees memory used by the parser. */
! void 
  XML_ParserFree(XML_Parser parser);
  
  /* Returns a string describing the error. */
! const XML_LChar  *XML_ErrorString(int code);
  
  #ifdef __cplusplus
--- 693,702 ----
  
  /* Frees memory used by the parser. */
! void XMLPARSEAPI
  XML_ParserFree(XML_Parser parser);
  
  /* Returns a string describing the error. */
! const XML_LChar XMLPARSEAPI *
! XML_ErrorString(int code);
  
  #ifdef __cplusplus

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xmlparse.c	2000/09/25 00:58:49	1.4
--- xmlparse.c	2000/09/28 17:53:00	1.5
***************
*** 5,9 ****
--- 5,19 ----
  
  #include <config.h>
+ 
+ #ifdef __declspec
+ #  define XMLPARSEAPI __declspec(dllexport)
+ #endif
+ 
  #include "expat.h"
+ 
+ #ifdef __declspec
+ #  undef XMLPARSEAPI
+ #endif
+ 
  #include <stddef.h>
  

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xmlrole.c	2000/09/21 21:20:18	1.2
--- xmlrole.c	2000/09/28 17:53:00	1.3
***************
*** 5,9 ****
  
  #include <config.h>
- #include "xmldef.h"
  #include "xmlrole.h"
  #include "ascii.h"
--- 5,8 ----

Index: xmlrole.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xmlrole.h	2000/09/21 21:20:18	1.2
--- xmlrole.h	2000/09/28 17:53:00	1.3
***************
*** 86,92 ****
  } PROLOG_STATE;
  
! void XMLTOKAPI XmlPrologStateInit(PROLOG_STATE *);
  #ifdef XML_DTD
! void XMLTOKAPI XmlPrologStateInitExternalEntity(PROLOG_STATE *);
  #endif /* XML_DTD */
  
--- 86,92 ----
  } PROLOG_STATE;
  
! void XmlPrologStateInit(PROLOG_STATE *);
  #ifdef XML_DTD
! void XmlPrologStateInitExternalEntity(PROLOG_STATE *);
  #endif /* XML_DTD */
  

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xmltok.c	2000/09/21 21:20:18	1.2
--- xmltok.c	2000/09/28 17:53:00	1.3
***************
*** 5,9 ****
  
  #include <config.h>
- #include "xmldef.h"
  #include "xmltok.h"
  #include "nametab.h"
--- 5,8 ----

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xmltok.h	2000/09/21 21:20:18	1.2
--- xmltok.h	2000/09/28 17:53:00	1.3
***************
*** 11,18 ****
  #endif
  
- #ifndef XMLTOKAPI
- #define XMLTOKAPI /* as nothing */
- #endif
- 
  /* The following token may be returned by XmlContentTok */
  #define XML_TOK_TRAILING_RSQB -5 /* ] or ]] at the end of the scan; might be start of
--- 11,14 ----
***************
*** 255,259 ****
  } INIT_ENCODING;
  
! int XMLTOKAPI XmlParseXmlDecl(int isGeneralTextEntity,
  			      const ENCODING *enc,
  			      const char *ptr,
--- 251,255 ----
  } INIT_ENCODING;
  
! int  XmlParseXmlDecl(int isGeneralTextEntity,
  			      const ENCODING *enc,
  			      const char *ptr,
***************
*** 266,277 ****
  			      int *standalonePtr);
  
! int XMLTOKAPI XmlInitEncoding(INIT_ENCODING *, const ENCODING **, const char *name);
! const ENCODING XMLTOKAPI *XmlGetUtf8InternalEncoding(void);
! const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncoding(void);
! int XMLTOKAPI XmlUtf8Encode(int charNumber, char *buf);
! int XMLTOKAPI XmlUtf16Encode(int charNumber, unsigned short *buf);
  
! int XMLTOKAPI XmlSizeOfUnknownEncoding(void);
! ENCODING XMLTOKAPI *
  XmlInitUnknownEncoding(void *mem,
  		       int *table,
--- 262,273 ----
  			      int *standalonePtr);
  
! int  XmlInitEncoding(INIT_ENCODING *, const ENCODING **, const char *name);
! const ENCODING  *XmlGetUtf8InternalEncoding(void);
! const ENCODING  *XmlGetUtf16InternalEncoding(void);
! int  XmlUtf8Encode(int charNumber, char *buf);
! int  XmlUtf16Encode(int charNumber, unsigned short *buf);
  
! int  XmlSizeOfUnknownEncoding(void);
! ENCODING  *
  XmlInitUnknownEncoding(void *mem,
  		       int *table,
***************
*** 279,283 ****
  		       void *userData);
  
! int XMLTOKAPI XmlParseXmlDeclNS(int isGeneralTextEntity,
  			        const ENCODING *enc,
  			        const char *ptr,
--- 275,279 ----
  		       void *userData);
  
! int  XmlParseXmlDeclNS(int isGeneralTextEntity,
  			        const ENCODING *enc,
  			        const char *ptr,
***************
*** 289,296 ****
  			        const ENCODING **namedEncodingPtr,
  			        int *standalonePtr);
! int XMLTOKAPI XmlInitEncodingNS(INIT_ENCODING *, const ENCODING **, const char *name);
! const ENCODING XMLTOKAPI *XmlGetUtf8InternalEncodingNS(void);
! const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncodingNS(void);
! ENCODING XMLTOKAPI *
  XmlInitUnknownEncodingNS(void *mem,
  		         int *table,
--- 285,292 ----
  			        const ENCODING **namedEncodingPtr,
  			        int *standalonePtr);
! int  XmlInitEncodingNS(INIT_ENCODING *, const ENCODING **, const char *name);
! const ENCODING  *XmlGetUtf8InternalEncodingNS(void);
! const ENCODING  *XmlGetUtf16InternalEncodingNS(void);
! ENCODING  *
  XmlInitUnknownEncodingNS(void *mem,
  		         int *table,

--- xmldef.h DELETED ---


From coopercc@users.sourceforge.net  Thu Sep 28 20:48:05 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 12:48:05 -0700
Subject: [Expat-checkins] CVS: expat Changes,NONE,1.1 Makefile.in,1.2,1.3 ChangeLog,1.1,NONE
Message-ID: <200009281948.MAA16111@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14959

Modified Files:
	Makefile.in 
Added Files:
	Changes 
Removed Files:
	ChangeLog 
Log Message:
Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.


--- NEW FILE ---

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in	2000/09/21 21:20:10	1.2
--- Makefile.in	2000/09/28 19:47:32	1.3
***************
*** 80,84 ****
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADERS = config.h:config.hin
! DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
  
--- 80,84 ----
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADERS = config.h:config.hin
! DIST_COMMON =  Changes COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
  
***************
*** 122,126 ****
  	  cd $$dir; $(MAKE) distclean; cd ..; \
  	done
! 	rm -f config.h config.status libtool
  
  maintainer-clean: distclean
--- 122,126 ----
  	  cd $$dir; $(MAKE) distclean; cd ..; \
  	done
! 	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile
  
  maintainer-clean: distclean
***************
*** 128,146 ****
  	rm -rf $(DISTDIR)
  
! distdir: $(DIST_COMMON) clean
! 	test -d $(DISTDIR) || mkdir $(DISTDIR)
! 	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
! 	  cd $$dir; $(MAKE) distdir; cd ..; \
  	done
- 	@for file in $(DIST_COMMON); do \
- 	  if test -d $$file; then \
- 	    cp -prf $$file $(DISTDIR)/$$file; \
- 	  else \
- 	    test -f $(DISTDIR)/$$file \
- 	    || ln $$file $(DISTDIR)/$$file 2> /dev/null \
- 	    || cp -p $$file $(DISTDIR)/$$file || :; \
- 	  fi; \
- 	done    
  
  $(DISTRIBUTION): distdir
--- 128,137 ----
  	rm -rf $(DISTDIR)
  
! distdir: MANIFEST
! 	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
! 	mkdir $(DISTDIR); \
! 	flist=`sed -e "s/[ 	]:.*$$//" MANIFEST`; for file in $$flist; do \
! 	  cp -P $$file $(DISTDIR); \
  	done
  
  $(DISTRIBUTION): distdir

--- ChangeLog DELETED ---


From coopercc@users.sourceforge.net  Fri Sep 29 15:57:48 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 29 Sep 2000 07:57:48 -0700
Subject: [Expat-checkins] CVS: expat Changes,1.1,1.2 Makefile.in,1.3,1.4 README,1.1,1.2 config.hin,1.3,1.4
Message-ID: <200009291457.HAA05578@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4975

Modified Files:
	Changes Makefile.in README config.hin 
Log Message:
Versioning information, fill in Changes file, possible final commit before
first release (1.95.0)


Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Changes	2000/09/28 19:47:32	1.1
--- Changes	2000/09/29 14:57:44	1.2
***************
*** 0 ****
--- 1,22 ----
+ Release 1.95.0 Fri Sep 29 2000
+ 	- XML_ParserCreate_MM
+ 		Allows you to set a memory management suite to replace the
+ 		standard malloc,realloc, and free.
+ 	- XML_SetReturnNSTriplet
+ 		If you turn this feature on when namespace processing is in
+ 		effect, then qualified, prefixed element and attribute names
+ 		are returned as "uri|name|prefix" where '|' is whatever
+ 		separator character is used in namespace processing.
+ 	- Merged in features from perl-expat
+ 		o XML_SetElementDeclHandler
+ 		o XML_SetAttlistDeclHandler
+ 		o XML_SetXmlDeclHandler
+ 		o XML_SetEntityDeclHandler
+ 		o StartDoctypeDeclHandler takes 3 additional parameters:
+ 			sysid, pubid, has_internal_subset
+ 		o Many paired handler setters (like XML_SetElementHandler)
+ 		  now have corresponding individual handler setters
+ 		o XML_GetInputContext for getting the input context of
+ 		  the current parse position.
+ 	- Added reference material
+ 	- Packaged into a distribution that builds a sharable library
\ No newline at end of file

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2000/09/28 19:47:32	1.3
--- Makefile.in	2000/09/29 14:57:44	1.4
***************
*** 129,132 ****
--- 129,134 ----
  
  distdir: MANIFEST
+ 	sed -e "1,3s/Release .*/Release $(VERSION)." README > README.tmp; \
+ 	mv -f README.tmp README; \
  	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
  	mkdir $(DISTDIR); \

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README	2000/09/18 16:26:20	1.1
--- README	2000/09/29 14:57:44	1.2
***************
*** 1,45 ****
- 
- 			Expat, Release 2.00
- 
- This is expat, the C library for parsing XML, written by James Clark. Expat
- is a stream oriented XML parser. This means that you register handlers with
- the parser prior to starting the parse. These handlers are called when
- the parser discovers the associated structures in the document being parsed.
- A start tag is an example of the kind of structures for which you may
- register handlers.
- 
- Expat is free software. You may copy, distribute, and modify it under the
- terms of the License contained in the file, COPYING, distributed with this
- package. This license is the same as the MIT/X Consortium license.
- 
- To build expat, you first run the configuration shell script in the top
- level distribution directory:
- 
- 	./configure
- 
- There are many options which you may provide to configure (which you can
- discover by running configure with the --help option.) But the one of most
- interest is the one that sets the installation directory. By default,
- the configure script will set things up to install libexpat into
- /usr/local/lib and expat.h into /usr/local/include. If, for example, you'd
- prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include,
- you can tell configure about that with:
- 
- 	./configure --prefix=/home/me/mystuff
- 
- After running the configure script, the "make" command will build things and
- "make install" will install things into their proper location. Note that
- you need to have write permission into the directories into which things
- will be installed.
- 
- A reference manual is available in the doc/reference.html in this
- distribution.
- 
- The homepage for this project is http://expat.sourceforge.net. There are
- links there to connect you to the bug reports page. If you need to report
- a bug when you don't have access to a browser, you may also send a bug
- report by email to expat-bugs@lists.sourceforge.net.
- 
- Discussion related to the direction of future expat development takes place
- on expat-discuss@lists.sourceforge.net. Archives of this list may be found
- at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.
--- 0 ----

Index: config.hin
===================================================================
RCS file: /cvsroot/expat/expat/config.hin,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.hin	2000/09/24 03:43:36	1.3
--- config.hin	2000/09/29 14:57:44	1.4
***************
*** 44,53 ****
  #undef HAVE_UNISTD_H
  
- /* Name of package */
- #undef PACKAGE
- 
- /* Version number of package */
- #undef VERSION
- 
  #define XML_NS
  #define XML_DTD
--- 44,47 ----


From coopercc@users.sourceforge.net  Fri Sep 29 15:57:49 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 29 Sep 2000 07:57:49 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.4,1.5 expat.h,1.5,1.6 xmlparse.c,1.5,1.6 xmlrole.c,1.3,1.4 xmltok.c,1.3,1.4
Message-ID: <200009291457.HAA05591@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4975/lib

Modified Files:
	Makefile.in expat.h xmlparse.c xmlrole.c xmltok.c 
Log Message:
Versioning information, fill in Changes file, possible final commit before
first release (1.95.0)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	2000/09/28 19:47:33	1.4
--- Makefile.in	2000/09/29 14:57:45	1.5
***************
*** 47,52 ****
  top_builddir = ..
  
- AUTOCONF = @AUTOCONF@
- 
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
--- 47,50 ----
***************
*** 61,65 ****
  LIBTOOL = @LIBTOOL@
  LN_S = @LN_S@
- MAKEINFO = @MAKEINFO@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
--- 59,62 ----
***************
*** 81,85 ****
  CONFIG_CLEAN_FILES = 
  
! DEFS = @DEFS@ -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
--- 78,83 ----
  CONFIG_CLEAN_FILES = 
  
! INCLUDES = -I$(srcdir) -I..
! DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(VERSION)"'
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** expat.h	2000/09/28 17:53:00	1.5
--- expat.h	2000/09/29 14:57:45	1.6
***************
*** 700,703 ****
--- 700,707 ----
  XML_ErrorString(int code);
  
+ /* Return a string containing the version number of this expat */
+ const XML_LChar XMLPARSEAPI *
+ XML_ExpatVersion();
+ 
  #ifdef __cplusplus
  }

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** xmlparse.c	2000/09/28 17:53:00	1.5
--- xmlparse.c	2000/09/29 14:57:45	1.6
***************
*** 4,7 ****
--- 4,10 ----
  */
  
+ static char RCSId[]
+   = "$Header$";
+ 
  #include <config.h>
  
***************
*** 1303,1306 ****
--- 1306,1314 ----
      return message[code];
    return 0;
+ }
+ 
+ const XML_LChar *
+ XML_ExpatVersion() {
+   return VERSION;
  }
  

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xmlrole.c	2000/09/28 17:53:00	1.3
--- xmlrole.c	2000/09/29 14:57:45	1.4
***************
*** 4,7 ****
--- 4,10 ----
  */
  
+ static char RCSId[]
+   = "$Header$";
+ 
  #include <config.h>
  #include "xmlrole.h"

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xmltok.c	2000/09/28 17:53:00	1.3
--- xmltok.c	2000/09/29 14:57:45	1.4
***************
*** 4,7 ****
--- 4,10 ----
  */
  
+ static char RCSId[]
+   = "$Header$";
+ 
  #include <config.h>
  #include "xmltok.h"


From coopercc@users.sourceforge.net  Fri Sep 29 15:57:48 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 29 Sep 2000 07:57:48 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.5,1.6
Message-ID: <200009291457.HAA05570@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4975/doc

Modified Files:
	reference.html 
Log Message:
Versioning information, fill in Changes file, possible final commit before
first release (1.95.0)


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** reference.html	2000/09/25 13:06:39	1.5
--- reference.html	2000/09/29 14:57:45	1.6
***************
*** 48,51 ****
--- 48,52 ----
                    <li><a href="#XML_ParserCreate">XML_ParserCreate</a></li>
  		  <li><a href="#XML_ParserCreateNS">XML_ParserCreateNS</a></li>
+ 		  <li><a href="#XML_ParserCreate_MM">XML_ParserCreate_MM</a></li>
  		  <li><a href="#XML_ExternalEntityParserCreate">XML_ExternalEntityParserCreate</a></li>
  		  <li><a href="#XML_ParserFree">XML_ParserFree</a></li>
***************
*** 111,114 ****
--- 112,117 ----
  		  <li><a href="#XML_SetEncoding">XML_SetEncoding</a></li>
  		  <li><a href="#XML_SetParamEntityParsing">XML_SetParamEntityParsing</a></li>
+ 		  <li><a href="#XML_SetReturnNSTriplet">XML_SetReturnNSTriplet</a></li>
+ 		  <li><a href="#XML_ExpatVersion">XML_ExpatVersion</a></li>
  	      </ul>
  	  </li>
***************
*** 1461,1464 ****
--- 1464,1475 ----
  <p>If <code>do_nst</code> is zero, then namespaces are reported in the
  default manner, URI then local_name separated by the namespace separator.</p>
+ </div>
+ 
+ <div class="fcndec"><a name="XML_ExpatVersion"><pre>
+ XML_LChar *
+ XML_ExpatVersion();
+ </pre></a>
+ <div class="fcndef">
+ Return the library version string.
  </div>
  


From coopercc@users.sourceforge.net  Fri Sep 29 16:44:03 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 29 Sep 2000 08:44:03 -0700
Subject: [Expat-checkins] CVS: expat Makefile.in,1.4,1.5 README,1.2,1.3
Message-ID: <200009291544.IAA00741@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv508

Modified Files:
	Makefile.in README 
Log Message:
Fixed a bug in Makefile.in that wiped out README.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in	2000/09/29 14:57:44	1.4
--- Makefile.in	2000/09/29 15:43:59	1.5
***************
*** 80,85 ****
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADERS = config.h:config.hin
- DIST_COMMON =  Changes COPYING README Makefile.in aclocal.m4 config.hin \
-                configure configure.in conftools doc examples xmlwf
  
  DISTDIR = $(PACKAGE)-$(VERSION)
--- 80,83 ----
***************
*** 129,134 ****
  
  distdir: MANIFEST
! 	sed -e "1,3s/Release .*/Release $(VERSION)." README > README.tmp; \
! 	mv -f README.tmp README; \
  	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
  	mkdir $(DISTDIR); \
--- 127,134 ----
  
  distdir: MANIFEST
! 	if head -3 README | grep -q "Release $(VERSION)"; then \
! 	  sed -e "1,3s/Release .*/Release $(VERSION)/" README > README.tmp; \
! 	  mv -f README.tmp README; \
! 	fi; \
  	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
  	mkdir $(DISTDIR); \

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** README	2000/09/29 14:57:44	1.2
--- README	2000/09/29 15:44:00	1.3
***************
*** 0 ****
--- 1,50 ----
+ 
+ 			Expat, Release 1.95.0
+ 
+ This is expat, the C library for parsing XML, written by James Clark. Expat
+ is a stream oriented XML parser. This means that you register handlers with
+ the parser prior to starting the parse. These handlers are called when
+ the parser discovers the associated structures in the document being parsed.
+ A start tag is an example of the kind of structures for which you may
+ register handlers.
+ 
+ Expat is free software. You may copy, distribute, and modify it under the
+ terms of the License contained in the file, COPYING, distributed with this
+ package. This license is the same as the MIT/X Consortium license.
+ 
+ Versions of expat that have an odd minor version (the middle number in the
+ release above), are development releases and should be considered as
+ beta software. Releases with even minor version numbers are intended to be
+ production grade software.
+ 
+ To build expat, you first run the configuration shell script in the top
+ level distribution directory:
+ 
+ 	./configure
+ 
+ There are many options which you may provide to configure (which you can
+ discover by running configure with the --help option.) But the one of most
+ interest is the one that sets the installation directory. By default,
+ the configure script will set things up to install libexpat into
+ /usr/local/lib and expat.h into /usr/local/include. If, for example, you'd
+ prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include,
+ you can tell configure about that with:
+ 
+ 	./configure --prefix=/home/me/mystuff
+ 
+ After running the configure script, the "make" command will build things and
+ "make install" will install things into their proper location. Note that
+ you need to have write permission into the directories into which things
+ will be installed.
+ 
+ A reference manual is available in the doc/reference.html in this
+ distribution.
+ 
+ The homepage for this project is http://expat.sourceforge.net. There are
+ links there to connect you to the bug reports page. If you need to report
+ a bug when you don't have access to a browser, you may also send a bug
+ report by email to expat-bugs@lists.sourceforge.net.
+ 
+ Discussion related to the direction of future expat development takes place
+ on expat-discuss@lists.sourceforge.net. Archives of this list may be found
+ at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.


From coopercc@users.sourceforge.net  Fri Sep 29 16:47:47 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Fri, 29 Sep 2000 08:47:47 -0700
Subject: [Expat-checkins] CVS: expat MANIFEST,NONE,1.1 expatfaq.html,1.6,NONE
Message-ID: <200009291547.IAA03274@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3069

Added Files:
	MANIFEST 
Removed Files:
	expatfaq.html 
Log Message:
Add MANIFEST and remove expatfaq.html


--- NEW FILE ---
Changes
COPYING
MANIFEST
Makefile.in
README
aclocal.m4
config.hin
configure
configure.in
conftools/config.guess
conftools/config.sub
conftools/install-sh
conftools/ltconfig
conftools/ltmain.sh
conftools/missing
conftools/mkinstalldirs
doc/reference.html
doc/style.css
examples/Makefile.in
examples/outline.c
lib/Makefile.in
lib/ascii.h
lib/asciitab.h
lib/expat.h
lib/iasciitab.h
lib/latin1tab.h
lib/nametab.h
lib/utf8tab.h
lib/xmlparse.c
lib/xmlrole.c
lib/xmlrole.h
lib/xmltok.c
lib/xmltok.h
lib/xmltok_impl.c
lib/xmltok_impl.h
lib/xmltok_ns.c
xmlwf/Makefile.in
xmlwf/codepage.c
xmlwf/codepage.h
xmlwf/ct.c
xmlwf/filemap.h
xmlwf/readfilemap.c
xmlwf/unixfilemap.c
xmlwf/wfcheck.c
xmlwf/wfcheck.h
xmlwf/wfcheckmessage.c
xmlwf/win32filemap.c
xmlwf/xmlfile.c
xmlwf/xmlfile.h
xmlwf/xmlmime.c
xmlwf/xmlmime.h
xmlwf/xmltchar.h
xmlwf/xmlurl.h
xmlwf/xmlwf.c
xmlwf/xmlwf.dsp
xmlwf/xmlwin32url.cxx

--- expatfaq.html DELETED ---


From coopercc@users.sourceforge.net  Thu Sep 28 20:47:36 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 12:47:36 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.3,1.4
Message-ID: <200009281947.MAA15737@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14959/lib

Modified Files:
	Makefile.in 
Log Message:
Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in	2000/09/24 03:43:37	1.3
--- Makefile.in	2000/09/28 19:47:33	1.4
***************
*** 106,110 ****
  
  .SUFFIXES: .c .lo .o
! .PHONY: all clean distclean maintainer-clean distdir
  
  %.o: %.c
--- 106,110 ----
  
  .SUFFIXES: .c .lo .o
! .PHONY: all clean distclean maintainer-clean
  
  %.o: %.c
***************
*** 143,146 ****
--- 143,147 ----
  
  distclean: clean
+ 	rm -f Makefile
  
  maintainer-clean: distclean
***************
*** 158,186 ****
  	$(LINK) -rpath $(libdir) $(LDFLAGS) $(LTOBJECTS)
  
- distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
- 
- distdir: $(DISTFILES)
- 	@here=`cd $(top_builddir) && pwd`; \
- 	top_distdir=`cd $(top_distdir) && pwd`; \
- 	distdir=`cd $(distdir) && pwd`; \
- 	for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
- 	    cp -pr $$d/$$file $(distdir)/$$file; \
- 	  else \
- 	    test -f $(distdir)/$$file \
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
- 
  xmlparse.o \
  xmlparse.lo: xmlparse.c expat.h xmlrole.h xmltok.h $(top_builddir)/config.h
  
  xmlrole.o \
! xmlrole.lo: xmlrole.c ascii.h xmldef.h xmlrole.h $(top_builddir)/config.h
  
  xmltok.o \
  xmltok.lo: xmltok.c xmltok_impl.c xmltok_ns.c \
            ascii.h asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h \
!           xmldef.h xmltok.h xmltok_impl.h $(top_builddir)/config.h
--- 159,170 ----
  	$(LINK) -rpath $(libdir) $(LDFLAGS) $(LTOBJECTS)
  
  xmlparse.o \
  xmlparse.lo: xmlparse.c expat.h xmlrole.h xmltok.h $(top_builddir)/config.h
  
  xmlrole.o \
! xmlrole.lo: xmlrole.c ascii.h xmlrole.h $(top_builddir)/config.h
  
  xmltok.o \
  xmltok.lo: xmltok.c xmltok_impl.c xmltok_ns.c \
            ascii.h asciitab.h iasciitab.h latin1tab.h nametab.h utf8tab.h \
!           xmltok.h xmltok_impl.h $(top_builddir)/config.h


From coopercc@users.sourceforge.net  Thu Sep 28 20:47:36 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 12:47:36 -0700
Subject: [Expat-checkins] CVS: expat/conftools ltmain.sh,1.1,1.2
Message-ID: <200009281947.MAA15738@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/conftools
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14959/conftools

Modified Files:
	ltmain.sh 
Log Message:
Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.


Index: ltmain.sh
===================================================================
RCS file: /cvsroot/expat/expat/conftools/ltmain.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ltmain.sh	2000/09/18 16:26:21	1.1
--- ltmain.sh	2000/09/28 19:47:33	1.2
***************
*** 628,632 ****
        # which system we are compiling for in order to pass an extra
        # flag for every libtool invokation.
!       # allow_undefined=no
  
        # FIXME: Unfortunately, there are problems with the above when trying
--- 628,632 ----
        # which system we are compiling for in order to pass an extra
        # flag for every libtool invokation.
!       allow_undefined=no
  
        # FIXME: Unfortunately, there are problems with the above when trying
***************
*** 635,639 ****
        # -no-undefined on the libtool link line when we can be certain
        # that all symbols are satisfied, otherwise we get a static library.
!       allow_undefined=yes
  
        # This is a source program that is used to create dlls on Windows
--- 635,639 ----
        # -no-undefined on the libtool link line when we can be certain
        # that all symbols are satisfied, otherwise we get a static library.
!       # allow_undefined=yes
  
        # This is a source program that is used to create dlls on Windows
***************
*** 651,666 ****
  # #endif
  #
! # #ifdef __cplusplus
  # extern "C" {
! # #endif
  # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
! # #ifdef __cplusplus
  # }
! # #endif
  #
- # #ifdef __CYGWIN__
- # #include <cygwin/cygwin_dll.h>
- # DECLARE_CYGWIN_DLL( DllMain );
- # #endif
  # HINSTANCE __hDllInstance_base;
  #
--- 651,666 ----
  # #endif
  #
! # #ifdef __CYGWIN__
! # #include <cygwin/cygwin_dll.h>
! # DECLARE_CYGWIN_DLL( DllMain );
! # #else
! # #  ifdef __cplusplus
  # extern "C" {
! # #  endif
  # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
! # #  ifdef __cplusplus
  # }
! # #  endif
  #
  # HINSTANCE __hDllInstance_base;
  #
***************
*** 671,674 ****
--- 671,675 ----
  #   return TRUE;
  # }
+ # #endif
  # /* ltdll.c ends here */
        # This is a source program that is used to create import libraries


From coopercc@users.sourceforge.net  Thu Sep 28 20:47:37 2000
From: coopercc@users.sourceforge.net (Clark Cooper)
Date: Thu, 28 Sep 2000 12:47:37 -0700
Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.1,1.2 xmlwf.c,1.54,1.55
Message-ID: <200009281947.MAA15760@slayer.i.sourceforge.net>

Update of /cvsroot/expat/expat/xmlwf
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14959/xmlwf

Modified Files:
	Makefile.in xmlwf.c 
Log Message:
Switch to using MANIFEST to build distribution.
Also fix xmlwf to use current entity declaration signature.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:23	1.1
--- Makefile.in	2000/09/28 19:47:34	1.2
***************
*** 10,12 ****
  
  xmlwf: $(OBJS)
! 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
\ No newline at end of file
--- 10,15 ----
  
  xmlwf: $(OBJS)
! 	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
! 
! clean:
! 	rm -f xmlwf core *.o
\ No newline at end of file

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** xmlwf.c	2000/09/21 21:20:18	1.54
--- xmlwf.c	2000/09/28 19:47:35	1.55
***************
*** 398,402 ****
  
  static
! void metaStartDoctypeDecl(XML_Parser parser, const XML_Char *doctypeName)
  {
    FILE *fp = XML_GetUserData(parser);
--- 398,406 ----
  
  static
! void metaStartDoctypeDecl(XML_Parser parser,
! 			  const XML_Char *doctypeName,
! 			  const XML_Char *sysid,
! 			  const XML_Char *pubid,
! 			  int has_internal_subset)
  {
    FILE *fp = XML_GetUserData(parser);
***************
*** 416,439 ****
  
  static
- void metaUnparsedEntityDecl(XML_Parser parser,
- 			    const XML_Char *entityName,
- 			    const XML_Char *base,
- 			    const XML_Char *systemId,
- 			    const XML_Char *publicId,
- 			    const XML_Char *notationName)
- {
-   FILE *fp = XML_GetUserData(parser);
-   ftprintf(fp, T("<entity name=\"%s\""), entityName);
-   if (publicId)
-     ftprintf(fp, T(" public=\"%s\""), publicId);
-   fputts(T(" system=\""), fp);
-   characterData(fp, systemId, tcslen(systemId));
-   puttc(T('"'), fp);
-   ftprintf(fp, T(" notation=\"%s\""), notationName);
-   metaLocation(parser);
-   fputts(T("/>\n"), fp);
- }
- 
- static
  void metaNotationDecl(XML_Parser parser,
  		      const XML_Char *notationName,
--- 420,423 ----
***************
*** 457,489 ****
  
  static
! void metaExternalParsedEntityDecl(XML_Parser parser,
! 				  const XML_Char *entityName,
! 				  const XML_Char *base,
! 				  const XML_Char *systemId,
! 				  const XML_Char *publicId)
  {
    FILE *fp = XML_GetUserData(parser);
-   ftprintf(fp, T("<entity name=\"%s\""), entityName);
-   if (publicId)
-     ftprintf(fp, T(" public=\"%s\""), publicId);
-   fputts(T(" system=\""), fp);
-   characterData(fp, systemId, tcslen(systemId));
-   puttc(T('"'), fp);
-   metaLocation(parser);
-   fputts(T("/>\n"), fp);
- }
  
! static
! void metaInternalParsedEntityDecl(XML_Parser parser,
! 				  const XML_Char *entityName,
! 				  const XML_Char *text,
! 				  int textLen)
! {
!   FILE *fp = XML_GetUserData(parser);
!   ftprintf(fp, T("<entity name=\"%s\""), entityName);
!   metaLocation(parser);
!   puttc(T('>'), fp);
!   characterData(fp, text, textLen);
!   fputts(T("</entity/>\n"), fp);
  }
  
--- 441,484 ----
  
  static
! void metaEntityDecl(XML_Parser parser,
! 		    const XML_Char *entityName,
! 		    int  is_param,
! 		    const XML_Char *value,
! 		    int  value_length,
! 		    const XML_Char *base,
! 		    const XML_Char *systemId,
! 		    const XML_Char *publicId,
! 		    const XML_Char *notationName)
  {
    FILE *fp = XML_GetUserData(parser);
  
!   if (value) {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     metaLocation(parser);
!     puttc(T('>'), fp);
!     characterData(fp, value, value_length);
!     fputts(T("</entity/>\n"), fp);
!   }
!   else if (notationName) {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     if (publicId)
!       ftprintf(fp, T(" public=\"%s\""), publicId);
!     fputts(T(" system=\""), fp);
!     characterData(fp, systemId, tcslen(systemId));
!     puttc(T('"'), fp);
!     ftprintf(fp, T(" notation=\"%s\""), notationName);
!     metaLocation(parser);
!     fputts(T("/>\n"), fp);
!   }
!   else {
!     ftprintf(fp, T("<entity name=\"%s\""), entityName);
!     if (publicId)
!       ftprintf(fp, T(" public=\"%s\""), publicId);
!     fputts(T(" system=\""), fp);
!     characterData(fp, systemId, tcslen(systemId));
!     puttc(T('"'), fp);
!     metaLocation(parser);
!     fputts(T("/>\n"), fp);
!   }
  }
  
***************
*** 724,731 ****
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
  	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, metaEndDoctypeDecl);
! 	XML_SetUnparsedEntityDeclHandler(parser, metaUnparsedEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
- 	XML_SetExternalParsedEntityDeclHandler(parser, metaExternalParsedEntityDecl);
- 	XML_SetInternalParsedEntityDeclHandler(parser, metaInternalParsedEntityDecl);
  	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, metaEndNamespaceDecl);
  	metaStartDocument(parser);
--- 719,724 ----
  	XML_SetCharacterDataHandler(parser, metaCharacterData);
  	XML_SetDoctypeDeclHandler(parser, metaStartDoctypeDecl, metaEndDoctypeDecl);
! 	XML_SetEntityDeclHandler(parser, metaEntityDecl);
  	XML_SetNotationDeclHandler(parser, metaNotationDecl);
  	XML_SetNamespaceDeclHandler(parser, metaStartNamespaceDecl, metaEndNamespaceDecl);
  	metaStartDocument(parser);